';
- if (!empty($cum_ht[$case])) {
+ if (!empty($cumulative_ht[$case])) {
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
- print ''.price($cum_ht[$case], 1).'';
+ print ''.price($cumulative_ht[$case], 1).'';
} else {
if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
print '0';
@@ -380,12 +380,12 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Value turnover of month
print '
';
- if (!empty($cum[$case])) {
+ if (!empty($cumulative[$case])) {
$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
if ($modecompta != 'BOOKKEEPING') {
print '';
}
- print price($cum[$case], 1);
+ print price($cumulative[$case], 1);
if ($modecompta != 'BOOKKEEPING') {
print '';
}
@@ -400,22 +400,22 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
// Percentage of month
if ($annee_decalage > $minyear && $case <= $casenow) {
- if (!empty($cum[$caseprev]) && !empty($cum[$case])) {
- $percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
- //print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
+ if (!empty($cumulative[$caseprev]) && !empty($cumulative[$case])) {
+ $percent = (round(($cumulative[$case] - $cumulative[$caseprev]) / $cumulative[$caseprev], 4) * 100);
+ //print "X $cumulative[$case] - $cumulative[$caseprev] - $cumulative[$caseprev] - $percent X";
print '
'.($percent >= 0 ? "+$percent" : "$percent").'%
';
}
- if (!empty($cum[$caseprev]) && empty($cum[$case])) {
+ if (!empty($cumulative[$caseprev]) && empty($cumulative[$case])) {
print '
-100%
';
}
- if (empty($cum[$caseprev]) && !empty($cum[$case])) {
+ if (empty($cumulative[$caseprev]) && !empty($cumulative[$case])) {
//print '
+Inf%
';
print '
-
';
}
- if (isset($cum[$caseprev]) && empty($cum[$caseprev]) && empty($cum[$case])) {
+ if (isset($cumulative[$caseprev]) && empty($cumulative[$caseprev]) && empty($cumulative[$case])) {
print '
+0%
';
}
- if (!isset($cum[$caseprev]) && empty($cum[$case])) {
+ if (!isset($cumulative[$caseprev]) && empty($cumulative[$case])) {
print '
-
';
}
} else {
@@ -434,14 +434,14 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
}
if (empty($total_ht[$annee])) {
- $total_ht[$annee] = ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
+ $total_ht[$annee] = ((!empty($cumulative_ht[$case])) ? $cumulative_ht[$case] : 0);
} else {
- $total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
+ $total_ht[$annee] += ((!empty($cumulative_ht[$case])) ? $cumulative_ht[$case] : 0);
}
if (empty($total[$annee])) {
- $total[$annee] = (empty($cum[$case]) ? 0 : $cum[$case]);
+ $total[$annee] = (empty($cumulative[$case]) ? 0 : $cumulative[$case]);
} else {
- $total[$annee] += (empty($cum[$case]) ? 0 : $cum[$case]);
+ $total[$annee] += (empty($cumulative[$case]) ? 0 : $cumulative[$case]);
}
}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 323b544c9ba..c517f9dfad4 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -2,11 +2,11 @@
/**
* Copyright (C) Dan Potter
* Copyright (C) Eric Seigne
- * Copyright (C) 2000-2005 Rodolphe Quiedeville
- * Copyright (C) 2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2015 Laurent Destailleur
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2019-2023 Frédéric France
+ * Copyright (C) 2000-2005 Rodolphe Quiedeville
+ * Copyright (C) 2003 Jean-Louis Bergamo
+ * Copyright (C) 2004-2015 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2019-2024 Frédéric France
* Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
@@ -297,7 +297,7 @@ class CMailFile
$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
if ($findimg < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
- $this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
+ $this->error = 'ErrorInAddAttachmentsImageBaseOnMedia';
return;
}
}
@@ -308,7 +308,7 @@ class CMailFile
$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
if ($resultImageData < 0) {
dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp);
- $this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
+ $this->error = 'ErrorInAddAttachmentsImageBaseIsSrcData';
return;
}
$findimg += $resultImageData;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 2f5a6df1449..846f4709e2b 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1369,7 +1369,7 @@ abstract class CommonDocGenerator
$extrafieldOutputContent = '';
if (isset($object->array_options[$extrafieldOptionsKey])) {
- $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+ $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element, $outputlangs);
}
// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 711a0bb499d..94611852d22 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -4,7 +4,6 @@
* Copyright (C) 2004-2020 Laurent Destailleur
* Copyright (C) 2005-2017 Regis Houssin
* Copyright (C) 2006 Jean Heimburger
- * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,7 +19,6 @@
* along with this program. If not, see .
*/
-require_once DOL_DOCUMENT_ROOT.'/core/class/doldeprecationhandler.class.php';
/**
* \file htdocs/core/class/conf.class.php
@@ -31,17 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doldeprecationhandler.class.php';
/**
* Class to stock current configuration
- *
*/
class Conf extends stdClass
{
- use DolDeprecationHandler;
- /**
- * When true, indicates to the DeprecationHandler that this
- * class supports dynamic properties.
- */
- protected $enableDynamicProperties = true;
-
/**
* @var Object Associative array with properties found in conf file
*/
@@ -95,6 +85,7 @@ class Conf extends stdClass
//! Used to store current menu handler
public $standard_menu;
+
/**
* @var array List of activated modules
*/
@@ -163,173 +154,53 @@ class Conf extends stdClass
public $fournisseur;
/**
- * @var stdClass
+ * @var stdClass Product
*/
public $product;
/**
- * @var stdClass
- * @deprecated Use $product
- * @see $product
- */
- private $produit;
-
- /**
- * @var stdClass
+ * @deprecated Use product
*/
+ public $produit;
public $service;
-
/**
- * @var stdClass
- * @deprecated Use $contract
- * @see $contract
- */
- private $contrat;
-
- /**
- * @var stdClass
+ * @deprecated Use contract
*/
+ public $contrat;
public $contract;
-
- /**
- * @var stdClass
- */
public $actions;
-
- /**
- * @var stdClass
- */
public $agenda;
-
- /**
- * @var stdClass
- * @deprecated Use $order
- * @see $order
- */
- private $commande;
-
- /**
- * @var stdClass
- */
public $propal;
-
/**
- * @var stdClass
+ * @deprecated Use order
*/
+ public $commande;
public $order;
-
/**
- * @var stdClass
- * @deprecated Use $invoice
- * @see $invoice
- */
- private $facture;
-
-
- /**
- * @var stdClass
+ * @deprecated Use invoice
*/
+ public $facture;
public $invoice;
-
- /**
- * @var stdClass
- */
public $user;
-
/**
- * @var stdClass
- * @deprecated Use $member
- * @see $member
- */
- private $adherent;
-
-
- /**
- * @var stdClass
+ * @deprecated Use member
*/
+ public $adherent;
public $member;
-
- /**
- * @var stdClass
- */
public $bank;
-
- /**
- * @var stdClass
- */
public $notification;
-
- /**
- * @var stdClass
- */
public $expensereport;
-
- /**
- * @var stdClass
- */
public $productbatch;
-
/**
- * @var stdClass
- * @deprecated Use $project
- * @see $project
- */
- private $projet;
-
-
- /**
- * @var stdClass
+ * @deprecated Use project
*/
+ public $projet;
public $project;
-
- /**
- * @var stdClass
- */
public $supplier_proposal;
-
- /**
- * @var stdClass
- */
public $supplier_order;
-
- /**
- * @var stdClass
- */
public $supplier_invoice;
-
- /**
- * @var stdClass
- */
public $category;
- /**
- * @var stdClass
- * @deprecated Use $category
- * @see $category
- */
- private $categorie;
-
- /**
- * @var stdClass
- * @deprecated Use $supplier_proposal
- * @see $supplier_proposal
- */
- private $supplierproposal;
-
- /**
- * @var stdClass
- * @deprecated Use $delivery_note
- * @see $delivery_note
- */
- private $expedition;
-
- /**
- * @var stdClass
- * @deprecated Use $bank
- * @see $bank
- */
- private $banque;
-
/**
* Constructor
@@ -381,45 +252,20 @@ class Conf extends stdClass
$this->fournisseur = new stdClass();
$this->product = new stdClass();
$this->service = new stdClass();
- $this->contract = new stdClass();
+ $this->contrat = new stdClass();
$this->actions = new stdClass();
$this->agenda = new stdClass();
- $this->order = new stdClass();
+ $this->commande = new stdClass();
$this->propal = new stdClass();
- $this->invoice = new stdClass();
+ $this->facture = new stdClass();
$this->user = new stdClass();
- $this->member = new stdClass();
+ $this->adherent = new stdClass();
$this->bank = new stdClass();
$this->notification = new stdClass();
$this->expensereport = new stdClass();
$this->productbatch = new stdClass();
}
- /**
- * Provide list of deprecated properties and replacements
- *
- * @return array
- */
- protected function deprecatedProperties()
- {
- return MODULE_MAPPING
- + array(
- // Previously detected module names, already in mapping
- //'adherent' => 'member',
- //'banque' => 'bank',
- //'categorie' => 'category',
- //'commande' => 'order',
- //'contrat' => 'contract',
- //'expedition' => 'delivery_note',
- //'facture' => 'invoice',
- //'projet' => 'project',
-
- // Other, not deprecated module names
- 'produit' => 'product',
- 'supplierproposal' => 'supplier_proposal',
- );
- }
-
/**
* Load setup values into conf object (read llx_const) for a specified entity
@@ -474,14 +320,14 @@ class Conf extends stdClass
$this->fournisseur = new stdClass();
$this->product = new stdClass();
$this->service = new stdClass();
- $this->contract = new stdClass();
+ $this->contrat = new stdClass();
$this->actions = new stdClass();
$this->agenda = new stdClass();
- $this->order = new stdClass();
+ $this->commande = new stdClass();
$this->propal = new stdClass();
- $this->invoice = new stdClass();
+ $this->facture = new stdClass();
$this->user = new stdClass();
- $this->member = new stdClass();
+ $this->adherent = new stdClass();
$this->bank = new stdClass();
$this->notification = new stdClass();
$this->expensereport = new stdClass();
@@ -582,6 +428,12 @@ class Conf extends stdClass
} elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
// If this is a module constant (must be at end)
$modulename = strtolower($reg[1]);
+ if ($modulename == 'propale') {
+ $modulename = 'propal';
+ }
+ if ($modulename == 'supplierproposal') {
+ $modulename = 'supplier_proposal';
+ }
$this->modules[$modulename] = $modulename; // Add this module in list of enabled modules
// deprecated in php 8.2
@@ -592,6 +444,7 @@ class Conf extends stdClass
$this->$modulename->enabled = true; // TODO Remove this
// Duplicate entry with the new name
+ /*
$mapping = $this->deprecatedProperties();
if (array_key_exists($modulename, $mapping)) {
$newmodulename = $mapping[$modulename];
@@ -602,6 +455,7 @@ class Conf extends stdClass
}
$this->$newmodulename->enabled = true; // TODO Remove this
}
+ */
}
}
}
@@ -821,12 +675,12 @@ class Conf extends stdClass
$this->productbatch->multidir_output = array($this->entity => $rootfordata."/productlot");
$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/productlot/temp");
- // Module contract
- $this->contract->multidir_output = array($this->entity => $rootfordata."/contract");
- $this->contract->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");
+ // Module contrat
+ $this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");
+ $this->contrat->multidir_temp = array($this->entity => $rootfortemp."/contract/temp");
// For backward compatibility
- $this->contract->dir_output = $rootfordata."/contract";
- $this->contract->dir_temp = $rootfortemp."/contract/temp";
+ $this->contrat->dir_output = $rootfordata."/contract";
+ $this->contrat->dir_temp = $rootfortemp."/contract/temp";
// Module bank
$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");
@@ -1109,23 +963,23 @@ class Conf extends stdClass
// Delay before warnings
// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
if (isset($this->agenda)) {
- $this->member->subscription = new stdClass();
- $this->member->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? (int) $this->global->MAIN_DELAY_MEMBERS : 0) * 86400;
+ $this->adherent->subscription = new stdClass();
+ $this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? (int) $this->global->MAIN_DELAY_MEMBERS : 0) * 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;
}
- if (isset($this->project)) {
- $this->project->warning_delay = (getDolGlobalInt('MAIN_DELAY_PROJECT_TO_CLOSE', 7) * 86400);
- $this->project->task = new StdClass();
- $this->project->task->warning_delay = (getDolGlobalInt('MAIN_DELAY_TASKS_TODO', 7) * 86400);
+ if (isset($this->projet)) {
+ $this->projet->warning_delay = (getDolGlobalInt('MAIN_DELAY_PROJECT_TO_CLOSE', 7) * 86400);
+ $this->projet->task = new StdClass();
+ $this->projet->task->warning_delay = (getDolGlobalInt('MAIN_DELAY_TASKS_TODO', 7) * 86400);
}
- if (isset($this->order)) {
- $this->order->client = new stdClass();
- $this->order->fournisseur = new stdClass();
- $this->order->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 86400;
- $this->order->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? (int) $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 86400;
+ 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;
}
if (isset($this->propal)) {
$this->propal->cloture = new stdClass();
@@ -1133,20 +987,20 @@ class Conf extends 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;
}
- if (isset($this->invoice)) {
- $this->invoice->client = new stdClass();
- $this->invoice->fournisseur = new stdClass();
- $this->invoice->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? (int) $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 86400;
- $this->invoice->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? (int) $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 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;
}
- if (isset($this->contract)) {
- $this->contract->services = new stdClass();
- $this->contract->services->inactifs = new stdClass();
- $this->contract->services->expires = new stdClass();
- $this->contract->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? (int) $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
- $this->contract->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? (int) $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 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;
}
- if (isset($this->order)) {
+ 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;
@@ -1248,6 +1102,37 @@ class Conf extends stdClass
unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
}
+ // Simple deprecation management. We do not use DolDeprecationHandlet for $conf.
+
+ // product is new use
+ if (isset($this->product)) {
+ // For backward compatibility
+ $this->produit = $this->product;
+ }
+ // invoice is new use, facture is old use still initialised
+ if (isset($this->facture)) {
+ $this->invoice = $this->facture;
+ }
+ // order is new use, commande is old use still initialised
+ if (isset($this->commande)) {
+ $this->order = $this->commande;
+ }
+ // contract is new use, contrat is old use still initialised
+ if (isset($this->contrat)) {
+ $this->contract = $this->contrat;
+ }
+ // category is new use, categorie is old use still initialised
+ if (isset($this->categorie)) {
+ $this->category = $this->categorie;
+ }
+ // project is new use, projet is old use still initialised
+ if (isset($this->projet) && !isset($this->project)) {
+ $this->project = $this->projet;
+ }
+ // member is new use, adherent is old use still initialised
+ if (isset($this->adherent) && !isset($this->member)) {
+ $this->member = $this->adherent;
+ }
// Object $mc
if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 7cfc5187d49..51fa68adfc3 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1629,12 +1629,17 @@ class ExtraFields
* @param string $value Value to show
* @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering)
* @param string $extrafieldsobjectkey Required (for example $object->table_element).
+ * @param Translate $outputlangs Output language
* @return string Formatted value
*/
- public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
+ public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '', $outputlangs = null)
{
global $conf, $langs;
+ if (is_null($outputlangs) || !is_object($outputlangs)) {
+ $outputlangs = $langs;
+ }
+
if (empty($extrafieldsobjectkey)) {
dol_syslog(get_class($this).'::showOutputField extrafieldsobjectkey required', LOG_ERR);
return 'BadValueForParamExtraFieldsObjectKey';
@@ -1683,7 +1688,7 @@ class ExtraFields
//$value=price($value);
$sizeparts = explode(",", $size);
$number_decimals = array_key_exists(1, $sizeparts) ? $sizeparts[1] : 0;
- $value = price($value, 0, $langs, 0, 0, $number_decimals, '');
+ $value = price($value, 0, $outputlangs, 0, 0, $number_decimals, '');
}
} elseif ($type == 'boolean') {
$checked = '';
@@ -1708,7 +1713,7 @@ class ExtraFields
} elseif ($type == 'price') {
//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
if ($value || $value == '0') {
- $value = price($value, 0, $langs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$langs->getCurrencySymbol($conf->currency);
+ $value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$outputlangs->getCurrencySymbol($conf->currency);
}
} elseif ($type == 'pricecy') {
$currency = $conf->currency;
@@ -1719,7 +1724,7 @@ class ExtraFields
$value = $pricetmp[0];
}
if ($value || $value == '0') {
- $value = price($value, 0, $langs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
+ $value = price($value, 0, $outputlangs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1, $currency);
}
} elseif ($type == 'select') {
$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');
@@ -1727,7 +1732,7 @@ class ExtraFields
$valstr = substr($valstr, 0, $pos);
}
if ($langfile && $valstr) {
- $value = $langs->trans($valstr);
+ $value = $outputlangs->trans($valstr);
} else {
$value = $valstr;
}
@@ -1786,12 +1791,12 @@ class ExtraFields
foreach ($fields_label as $field_toshow) {
$translabel = '';
if (!empty($obj->$field_toshow)) {
- $translabel = $langs->trans($obj->$field_toshow);
+ $translabel = $outputlangs->trans($obj->$field_toshow);
if ($translabel != $obj->$field_toshow) {
- $value .= dol_trunc($translabel, 24).' ';
+ $value .= dol_trunc($translabel, 24) . ' ';
} else {
- $value .= $obj->$field_toshow.' ';
+ $value .= $obj->$field_toshow . ' ';
}
}
}
@@ -1800,7 +1805,7 @@ class ExtraFields
$tmppropname = $InfoFieldList[1];
//$obj->$tmppropname = '';
if (!empty(isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {
- $translabel = $langs->trans($obj->$tmppropname);
+ $translabel = $outputlangs->trans($obj->$tmppropname);
}
if ($translabel != (isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {
$value = dol_trunc($translabel, 18);
@@ -1829,10 +1834,10 @@ class ExtraFields
}
} elseif ($type == 'radio') {
if (!isset($param['options'][$value])) {
- $langs->load('errors');
- $value = $langs->trans('ErrorNoValueForRadioType');
+ $outputlangs->load('errors');
+ $value = $outputlangs->trans('ErrorNoValueForRadioType');
} else {
- $value = $langs->trans($param['options'][$value]);
+ $value = $outputlangs->trans($param['options'][$value]);
}
} elseif ($type == 'checkbox') {
$value_arr = explode(',', $value);
@@ -1896,7 +1901,7 @@ class ExtraFields
foreach ($fields_label as $field_toshow) {
$translabel = '';
if (!empty($obj->$field_toshow)) {
- $translabel = $langs->trans($obj->$field_toshow);
+ $translabel = $outputlangs->trans($obj->$field_toshow);
}
if ($translabel != $field_toshow) {
$label .= ' '.dol_trunc($translabel, 18);
@@ -1909,7 +1914,7 @@ class ExtraFields
} else {
$translabel = '';
if (!empty($obj->{$InfoFieldList[1]})) {
- $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+ $translabel = $outputlangs->trans($obj->{$InfoFieldList[1]});
}
if ($translabel != $obj->{$InfoFieldList[1]}) {
$toprint[] = '
'.dol_trunc($translabel, 18).'
';
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 4b6f6f60939..fae363c13e2 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -360,7 +360,7 @@ class Fiscalyear extends CommonObject
$linkclose = '';
if (empty($notooltip) && $user->hasRight('accounting', 'fiscalyear', 'write')) {
if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
- $label = $langs->trans("FiscalYear");
+ $label = $langs->trans("FiscalPeriod");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 0542b30a4e3..a10409161c3 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -238,7 +238,7 @@ class FormAccounting extends Form
* @param int $maxlen Max length of text in combo box
* @param int $help Add or not the admin help picto
* @param int $allcountries All countries
- * @return string HTML component with the select
+ * @return void|string HTML component with the select
*/
public function select_accounting_category($selected = 0, $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
{
@@ -250,6 +250,8 @@ class FormAccounting extends Form
exit;
}
+ $out = '';
+
if (!empty($mysoc->country_id)) {
$sql = "SELECT c.rowid, c.label as type, c.range_account";
$sql .= " FROM ".$this->db->prefix()."c_accounting_category as c";
@@ -280,7 +282,7 @@ class FormAccounting extends Form
if ($num) {
$this->nbaccounts_category = $num;
- $out = '';
+ $out = img_picto('', 'terminal', 'class="pictofixedwidth marginrightonly"').''.$langs->trans('CronType_command').'';
} elseif ($selected == 'method') {
- $out = $langs->trans('CronType_method');
- $out .= '';
- $out .= '';
- $out .= '';
+ $out = img_picto('', 'code', 'class="pictofixedwidth marginrightonly"').''.$langs->trans('CronType_method').'';
}
} else {
$out = '';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index b6f50754c6b..0ad1bf1d643 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -4,6 +4,7 @@
* Copyright (C) 2018 Charlene Benke
* Copyright (C) 2024 Frédéric France
* Copyright (C) 2024 MDW
+ * Copyright (C) 2024 Benjamin Falière
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -168,6 +169,9 @@ class FormProjets extends Form
if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {
$hideunselectables = true;
}
+ if (getDolGlobalInt('PROJECT_ALWAYS_DISCARD_CLOSED_PROJECTS_IN_SELECT')) {
+ $discard_closed = 1;
+ }
$projectsListId = false;
if (!$user->hasRight('projet', 'all', 'lire')) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9b7046edfed..149800d8f69 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4717,7 +4717,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
'error', 'warning',
'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'replacement', 'resource', 'recurring','rss',
'shapes', 'skill', 'square', 'sort-numeric-down', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
- 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
+ 'terminal', 'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
'uncheck', 'url', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
'conferenceorbooth', 'eventorganization',
'stamp', 'signature',
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index e8532129b53..16f7c627770 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -155,7 +155,7 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
$validpaymentmethod['paypal'] = 'valid';
}
if ((empty($paymentmethod) || $paymentmethod == 'paybox') && isModEnabled('paybox')) {
- $langs->load("paybox");
+ $langs->loadLangs(array("paybox", "stripe"));
$validpaymentmethod['paybox'] = 'valid';
}
if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe')) {
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index d56cd662e9d..1cd92a21d53 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -27,10 +27,10 @@
*/
function showOnlineSignatureUrl($type, $ref, $obj = null)
{
- global $conf, $langs;
+ global $langs;
// Load translation files required by the page
- $langs->loadLangs(array("payment", "paybox"));
+ $langs->loadLangs(array("payment", "paybox", "stripe"));
$servicename = 'Online';
@@ -61,7 +61,7 @@ function showOnlineSignatureUrl($type, $ref, $obj = null)
*/
function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1, $obj = null)
{
- global $conf, $dolibarr_main_url_root;
+ global $dolibarr_main_url_root;
if (empty($obj)) {
// For compatibility with 15.0 -> 19.0
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index f1185ea072b..dfb378a6a8e 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -787,7 +787,7 @@ class pdf_standard_asset extends ModelePDFAsset
return 0;
}
} else {
- $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+ $this->error = $langs->transnoentities("ErrorConstantNotDefined", "ASSET_OUTPUTDIR");
return 0;
}
}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 0c3e6a4b8e4..dce2d2484e6 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -139,7 +139,7 @@ class pdf_espadon extends ModelePdfExpedition
}
// Load traductions files required by page
- $outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+ $outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "other", "propal", "deliveries", "sendings", "productbatch"));
// Show Draft Watermark
if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('SHIPPING_DRAFT_WATERMARK'))) {
@@ -998,12 +998,6 @@ class pdf_espadon extends ModelePdfExpedition
}
$pdf->SetDrawColor(128, 128, 128);
- if (isModEnabled('barcode')) {
- // TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
- //$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
- //$pdf->Image($logo,10, 5, 0, 24);
- }
-
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;
@@ -1268,6 +1262,7 @@ class pdf_espadon extends ModelePdfExpedition
),
'content' => array(
'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+ 'align' => 'L',
),
);
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 38073c5adb4..4c5e1e6d144 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -908,12 +908,6 @@ class pdf_rouget extends ModelePdfExpedition
}
$pdf->SetDrawColor(128, 128, 128);
- if (isModEnabled('barcode')) {
- // TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
- //$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
- //$pdf->Image($logo,10, 5, 0, 24);
- }
-
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index f96a96bac8c..057e854c86f 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -908,12 +908,6 @@ class pdf_squille extends ModelePdfReception
}
$pdf->SetDrawColor(128, 128, 128);
- if (isModEnabled('barcode')) {
- // TODO Build code bar with function writeBarCode of barcode module for reception ref $object->ref
- //$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
- //$pdf->Image($logo,10, 5, 0, 24);
- }
-
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 006d1ecbf2d..424bb125da5 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -1008,12 +1008,6 @@ class pdf_eagle extends ModelePDFStockTransfer
}
$pdf->SetDrawColor(128, 128, 128);
- if (isModEnabled('barcode')) {
- // TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
- //$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
- //$pdf->Image($logo,10, 5, 0, 24);
- }
-
$posx = $this->page_largeur - $w - $this->marge_droite;
$posy = $this->marge_haute;
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 032dca46d45..15c6b847166 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -593,7 +593,7 @@ if (($action == "create") || ($action == "edit")) {
print "
';
}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 162f5cdb3d2..758d5639f4e 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1765,7 +1765,7 @@ class ExpenseReport extends CommonObject
{
global $conf, $langs;
- $langs->load('expensereport');
+ $langs->load('trips');
$nofetch = !empty($params['nofetch']);
$moretitle = $params['moretitle'] ?? '';
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 88431f01682..6048e5e50d0 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
// Load translation files required by the page
-$langs->loadLangs(array('expensereports', 'bills', 'banks', 'compta'));
+$langs->loadLangs(array('trips', 'bills', 'banks', 'compta'));
$action = GETPOST('action', 'alpha');
$massaction = GETPOST('massaction', 'alpha');
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 0bc5903fdcf..7ac7e7174cf 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -408,7 +408,7 @@ class Skill extends CommonObject
$this->lines = array();
require_once __DIR__ . '/skilldet.class.php';
$skilldet = new Skilldet($this->db);
- $this->lines = $skilldet->fetchAll('ASC', '', '', '', 'fk_skill:=:'.$this->id, '');
+ $this->lines = $skilldet->fetchAll('ASC', '', 0, 0, '(fk_skill:=:'.$this->id.')');
if (is_array($this->lines)) {
return (count($this->lines) > 0) ? $this->lines : array();
diff --git a/htdocs/langs/ar_EG/salaries.lang b/htdocs/langs/ar_EG/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/ar_EG/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/ar_EG/trips.lang b/htdocs/langs/ar_EG/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/ar_EG/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/ar_IQ/companies.lang b/htdocs/langs/ar_IQ/companies.lang
new file mode 100644
index 00000000000..5cb50736018
--- /dev/null
+++ b/htdocs/langs/ar_IQ/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+AllocateCommercial=Assigned to sales representative
+LastModifiedThirdParties=Latest %s Third Parties which were modified
diff --git a/htdocs/langs/ar_IQ/salaries.lang b/htdocs/langs/ar_IQ/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/ar_IQ/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/ar_IQ/trips.lang b/htdocs/langs/ar_IQ/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/ar_IQ/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 8e7f356a1cb..ec0b2c3c731 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -54,7 +54,6 @@ January=Jänner
Month01=Jänner
ReportName=Berichtname
RefCustomer=Kunden Nr.
-MailSentBy=E-Mail-Absender
TextUsedInTheMessageBody=E-Mail-Text
Offered=Angeboten
Receive=Erhalte
diff --git a/htdocs/langs/de_AT/paybox.lang b/htdocs/langs/de_AT/paybox.lang
index beae154072f..12339557005 100644
--- a/htdocs/langs/de_AT/paybox.lang
+++ b/htdocs/langs/de_AT/paybox.lang
@@ -1,3 +1,2 @@
# Dolibarr language file - Source file is en_US - paybox
YourPaymentHasBeenRecorded=Diese Seite wird bestätigt, dass Ihre Zahlung aufgezeichnet wurde. Danke.
-AccountParameter=Konto-Parameter
diff --git a/htdocs/langs/de_AT/salaries.lang b/htdocs/langs/de_AT/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/de_AT/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 074c9fb606a..784de05def9 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -46,15 +46,12 @@ SupplierCodeModel=Lieferanten - Code Format
ProfId1AR=Prof Id 1 (CUIT)
ProfId2AR=Prof Id 2 (Revenu Bestien)
ProfId1AT=Prof Id 1
-ProfId4AT=Prof Id 4
ProfId1BE=Prof Id 1 (Anzahl Professionnel)
-ProfId1BR=CNPJ
ProfId2BR=IE (Staatliche Behörde)
ProfId3BR=IM (kommunale Behörde)
ProfId3CH=Prof Id 1 (Bundes-Nummer)
ProfId4CH=Prof Id 2 (Commercial Record-Nummer)
ProfId1DE=Umsatzsteuer-Identifikationsnummer
-ProfId4DE=Steuernummer
ProfId1ES=Prof Id 1 (CIF / NIF)
ProfId2ES=Prof Id 2 (Social Security Number)
ProfId4ES=Prof Id 4 (Collegiate Anzahl)
@@ -66,9 +63,6 @@ ProfId2IN=Prof Id 2
ProfId3IN=Prof Id 3
ProfId1LU=Id prof. 1 (R.C.S. Luxemburg)
ProfId2LU=Id. Prof. 2
-ProfId3LU=Id. Prof. 3
-ProfId4LU=Id. Prof. 4
-ProfId6LU=Id. Prof. 6
ProfId4NL=-
ProfId2PT=Prof Id 2 (Social Security Number)
ProfId3PT=Prof Id 3 (Commercial Record-Nummer)
@@ -76,11 +70,6 @@ ProfId4PT=Prof Id 4 (Konservatorium)
ProfId2TN=Prof Id 2 (Geschäftsjahr matricule)
ProfId3TN=Prof Id 3 (Douane-Code)
ProfId1US=Employer Identification Number (FEIN)
-ProfId2US=Id. Prof. 6
-ProfId3US=Id. Prof. 6
-ProfId4US=Id. Prof. 6
-ProfId5US=Id. Prof. 6
-ProfId6US=Id. Prof. 6
ProfId1RO=Firmennummer CUI
ProfId2RO=Firmennummer (Nr. Înmatriculare)
ProfId3RO=Firmennummer CAEN
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 2fb4b1cf440..1dca21634a3 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -224,7 +224,6 @@ UndoExpandAll=Ausklappen rückgängig machen
SeeAll=Zeige alles an
CloseWindow=Fenster schliessen
Priority=Wichtigkeit
-MailSentBy=E-Mail Absender
NotSent=Nicht gesendet
SendAcknowledgementByMail=Bestätigungsemail senden
SendMail=sende E-Mail
diff --git a/htdocs/langs/de_CH/paybox.lang b/htdocs/langs/de_CH/paybox.lang
index cf8cd91b2e0..2fa44ffc490 100644
--- a/htdocs/langs/de_CH/paybox.lang
+++ b/htdocs/langs/de_CH/paybox.lang
@@ -1,6 +1,4 @@
# Dolibarr language file - Source file is en_US - paybox
-WelcomeOnPaymentPage=Willkommen auf der Online - Bezahlseite
-ThisIsInformationOnPayment=Informationen zu der vorzunehmenden Zahlunge
PayBoxDoPayment=Mit Paybox bezahlen
SetupPayBoxToHavePaymentCreatedAutomatically=Paybox mit der URL %s einrichten, um die Zahlung automatisch auszuführen, sobald von Paybox frei gegeben.
YourPaymentHasBeenRecorded=Diese Seite bestätigt, dass Ihre Zahlung erfasst wurde. Vielen Dank.
diff --git a/htdocs/langs/el_CY/salaries.lang b/htdocs/langs/el_CY/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/el_CY/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/el_CY/trips.lang b/htdocs/langs/el_CY/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/el_CY/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_AE/cashdesk.lang b/htdocs/langs/en_AE/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/en_AE/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/en_AE/errors.lang b/htdocs/langs/en_AE/errors.lang
new file mode 100644
index 00000000000..72c26d8ae21
--- /dev/null
+++ b/htdocs/langs/en_AE/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_AE/help.lang b/htdocs/langs/en_AE/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_AE/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_AE/salaries.lang b/htdocs/langs/en_AE/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/en_AE/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/en_AE/stocks.lang b/htdocs/langs/en_AE/stocks.lang
new file mode 100644
index 00000000000..9058791a569
--- /dev/null
+++ b/htdocs/langs/en_AE/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyCurrentlyKnownInStock=The quantity the system think 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=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/langs/en_AE/trips.lang b/htdocs/langs/en_AE/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/en_AE/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_AU/errors.lang b/htdocs/langs/en_AU/errors.lang
new file mode 100644
index 00000000000..72c26d8ae21
--- /dev/null
+++ b/htdocs/langs/en_AU/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_AU/help.lang b/htdocs/langs/en_AU/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_AU/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_AU/salaries.lang b/htdocs/langs/en_AU/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/en_AU/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
new file mode 100644
index 00000000000..9058791a569
--- /dev/null
+++ b/htdocs/langs/en_AU/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyCurrentlyKnownInStock=The quantity the system think 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=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/langs/en_AU/trips.lang b/htdocs/langs/en_AU/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/en_AU/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_CA/cashdesk.lang b/htdocs/langs/en_CA/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/en_CA/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/en_CA/errors.lang b/htdocs/langs/en_CA/errors.lang
new file mode 100644
index 00000000000..72c26d8ae21
--- /dev/null
+++ b/htdocs/langs/en_CA/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_CA/help.lang b/htdocs/langs/en_CA/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_CA/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_CA/salaries.lang b/htdocs/langs/en_CA/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/en_CA/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
new file mode 100644
index 00000000000..9058791a569
--- /dev/null
+++ b/htdocs/langs/en_CA/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyCurrentlyKnownInStock=The quantity the system think 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=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/langs/en_CA/trips.lang b/htdocs/langs/en_CA/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/en_CA/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_GB/errors.lang b/htdocs/langs/en_GB/errors.lang
new file mode 100644
index 00000000000..72c26d8ae21
--- /dev/null
+++ b/htdocs/langs/en_GB/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_GB/help.lang b/htdocs/langs/en_GB/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_GB/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_IN/cashdesk.lang b/htdocs/langs/en_IN/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/en_IN/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/en_IN/errors.lang b/htdocs/langs/en_IN/errors.lang
new file mode 100644
index 00000000000..72c26d8ae21
--- /dev/null
+++ b/htdocs/langs/en_IN/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_IN/help.lang b/htdocs/langs/en_IN/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_IN/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_IN/salaries.lang b/htdocs/langs/en_IN/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/en_IN/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
new file mode 100644
index 00000000000..9058791a569
--- /dev/null
+++ b/htdocs/langs/en_IN/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyCurrentlyKnownInStock=The quantity the system think 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=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/langs/en_IN/trips.lang b/htdocs/langs/en_IN/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/en_IN/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_SG/assets.lang b/htdocs/langs/en_SG/assets.lang
new file mode 100644
index 00000000000..05e09a549c8
--- /dev/null
+++ b/htdocs/langs/en_SG/assets.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - assets
+AssetRecoveredVAT=Recovered GST
+AssetDisposalSubjectToVat=Disposal subject to GST
+AssetDepreciationOptionAmountBaseDepreciationHT=Depreciation base (excl. GST)
+AssetDepreciationOptionAmountBaseDeductibleHT=Deductible base (excl. GST)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. GST)
+AssetAccountancyCodeVatCollected=Collected GST
+AssetAccountancyCodeVatDeductible=Recovered GST on assets
+AssetBaseDepreciationHT=Depreciation basis (excl. GST)
+AssetDepreciationHT=Depreciation (excl. GST)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. GST)
+AssetResidualHT=Residual value (excl. GST)
diff --git a/htdocs/langs/en_SG/cashdesk.lang b/htdocs/langs/en_SG/cashdesk.lang
new file mode 100644
index 00000000000..549058925f4
--- /dev/null
+++ b/htdocs/langs/en_SG/cashdesk.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+NoVAT=No GST for this sale
+TicketVatGrouped=Group GST by rate in tickets|receipts
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/en_SG/errors.lang b/htdocs/langs/en_SG/errors.lang
new file mode 100644
index 00000000000..c4c745d1898
--- /dev/null
+++ b/htdocs/langs/en_SG/errors.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - errors
+ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null GST rate (Found a negative total for GST rate %s%%).
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_SG/help.lang b/htdocs/langs/en_SG/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_SG/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_SG/members.lang b/htdocs/langs/en_SG/members.lang
new file mode 100644
index 00000000000..10e7071d915
--- /dev/null
+++ b/htdocs/langs/en_SG/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+VATToUseForSubscriptions=GST rate to use for contributions
+NoVatOnSubscription=No GST for contributions
diff --git a/htdocs/langs/en_SG/salaries.lang b/htdocs/langs/en_SG/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/en_SG/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/en_SG/stocks.lang b/htdocs/langs/en_SG/stocks.lang
new file mode 100644
index 00000000000..9058791a569
--- /dev/null
+++ b/htdocs/langs/en_SG/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyCurrentlyKnownInStock=The quantity the system think 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=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/langs/en_SG/trips.lang b/htdocs/langs/en_SG/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/en_SG/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a9d4bde40ae..78158e26c2c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -343,7 +343,7 @@ MenuHandlers=Menu handlers
MenuAdmin=Menu editor
DoNotUseInProduction=Do not use in production
ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsAlternativeProcessToFollow=This is an alternative deployment process you can run manually:
StepNb=Step %s
FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
DownloadPackageFromWebSite=Download package (for example from the official web site %s).
@@ -1992,6 +1992,7 @@ BackgroundColor=Background color
TopMenuBackgroundColor=Background color for Top menu
TopMenuDisableImages=Icon or Text in Top menu
LeftMenuBackgroundColor=Background color for Left menu
+LeftmenuId=Left menu ID
BackgroundTableTitleColor=Background color for Table title line
BackgroundTableTitleTextColor=Text color for Table title line
BackgroundTableTitleTextlinkColor=Text color for Table title link line
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 5d5c4f7f0a7..dec04d18cd5 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -55,6 +55,8 @@ ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (exam
ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
ErrorFieldsRequired=Some required fields have been left blank.
ErrorSubjectIsRequired=The email subject is required
+ErrorInAddAttachmentsImageBaseOnMedia=Error in add attachments image base in on media
+ErrorInAddAttachmentsImageBaseIsSrcData=Error in add attachments image base source is in data
ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode 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=Setup of emails is not complete
diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang
deleted file mode 100644
index 514b9d3ae87..00000000000
--- a/htdocs/langs/en_US/expensereports.lang
+++ /dev/null
@@ -1,169 +0,0 @@
-# Dolibarr language file - Source file is en_US - expensereports.lang
-# copied from trips.lang
-
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-AddTrip=Create expense report
-AllExpenseReport=All type of expense report
-AllExpenseReports=All expense reports
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
-AucuneLigne=There is no expense report declared yet
-BrouillonnerTrip=Move back expense report to status "Draft"
-byEX_DAY=by day (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-CANCEL_USER=Deleted by
-ACCOUNTING_ACCOUNT_EXPENSEREPORT=Account (from the Chart of Account) used by default for "users" on expensereport
-ACCOUNTING_ACCOUNT_EXPENSEREPORT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, and also as the default value of Subledger accounting if no dedicated accounting account is not defined on the user.
-CarCategory=Vehicle category
-ClassifyRefunded=Classify 'Refunded'
-CompanyVisited=Company/organization visited
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-DATE_CANCEL=Cancellation date
-DATE_PAIEMENT=Payment date
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-DeleteTrip=Delete expense report
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ExpenseRangeOffset=Offset amount: %s
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportCoef=Coefficient
-expenseReportCoefUndefined=(value not defined)
-expenseReportOffset=Offset
-expenseReportPrintExample=offset + (d x coef) = %s
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportTotalForFive=Example with d = 5
-ExpenseReportApplyTo=Apply to
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved. - User: %s - Approved by: %s Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled. - User: %s - Canceled by: %s - Motive for cancellation: %s Click here to show the expense report: %s
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
-ExpenseReportDateEnd=Date end
-ExpenseReportDateStart=Date start
-ExpenseReportDomain=Domain to apply
-ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. d is the distance in kilometers
-ExpenseReportLimitAmount=Max amount
-ExpenseReportLimitOn=Limit on
-ExpenseReportLine=Expense report line
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid. - User: %s - Paid by: %s Click here to show the expense report: %s
-ExpenseReportPayment=Expense report payment
-ExpenseReportRef=Ref. expense report
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused. - User: %s - Refused by: %s - Motive for refusal: %s Click here to show the expense report: %s
-ExpenseReportRestrictive=Exceeding forbidden
-ExpenseReportRuleErrorOnSave=Error: %s
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval. - User: %s - Period: %s Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval. The %s, you refused to approve the expense report for this reason: %s. A new version has been proposed and waiting for your approval. - User: %s - Period: %s Click here to validate: %s
-ExpenseReportsIk=Configuration of mileage charges
-ExpenseReportsRules=Expense report rules
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
-ExpensesArea=Expense reports area
-FeesKilometersOrAmout=Amount or kilometers
-LastExpenseReports=Latest %s expense reports
-ListOfFees=List of fees
-ListOfTrips=List of expense reports
-ListToApprove=Waiting for approval
-ListTripsAndExpenses=List of expense reports
-MOTIF_CANCEL=Reason
-MOTIF_REFUS=Reason
-ModePaiement=Payment mode
-NewTrip=New expense report
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-NoTripsToExportCSV=No expense report to export for this period.
-NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
-OnExpense=Expense line
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-PaidTrip=Pay an expense report
-REFUSEUR=Denied by
-RangeIk=Mileage range
-RangeNum=Range %d
-SaveTrip=Validate expense report
-ShowExpenseReport=Show expense report
-ShowTrip=Show expense report
-TripCard=Expense report card
-TripId=Id expense report
-TripNDF=Information expense report
-TripSociete=Information company
-Trips=Expense reports
-TripsAndExpenses=Expense reports
-TripsAndExpensesStatistics=Expense reports statistics
-TypeFees=Types of fees
-UploadANewFileNow=Upload a new document now
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-ValideTrip=Approve expense report
-
-## Dictionary
-EX_BRE=Breakfast
-EX_CAM=CV maintenance and repair
-EX_CAM_VP=PV maintenance and repair
-EX_CAR=Car rental
-EX_CUR=Customers receiving
-EX_DOC=Documentation
-EX_EMM=Employees meal
-EX_FUE=Fuel CV
-EX_FUE_VP=Fuel PV
-EX_GUM=Guests meal
-EX_HOT=Hotel
-EX_IND=Indemnity transportation subscription
-EX_KME=Mileage costs
-EX_OTR=Other receiving
-EX_PAR=Parking CV
-EX_PAR_VP=Parking PV
-EX_POS=Postage
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_TAX=Various Taxes
-EX_TOL=Toll CV
-EX_TOL_VP=Toll PV
-TF_BUS=Bus
-TF_CAR=Car
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_LUNCH=Lunch
-TF_METRO=Metro
-TF_OTHER=Other
-TF_PEAGE=Toll
-TF_TAXI=Taxi
-TF_TRAIN=Train
-TF_TRIP=Transportation
-
-
-## add new (not from trips.lang)
-ExpenseReportPayments=Expense report payments
-#
-# error
-#
-
-TaxUndefinedForThisCategory = Taxe undefined for this category
-ErrorRecordNotFound=Record not found
-errorComputeTtcOnMileageExpense=Error on computing mileage expense
-ErrorBadValueForParameter=Error bad value for parameter %s
-ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index ecaf9e21020..6de7a8f617e 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -44,7 +44,6 @@ InterventionsArea=Interventions area
DraftFichinter=Draft interventions
LastModifiedInterventions=Latest %s modified interventions
FichinterToProcess=Interventions to process
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
PrintProductsOnFichinterDetails=interventions generated from orders
UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -73,3 +72,7 @@ FichinterNoContractLinked=Intervention %s has been created without a linked cont
ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
NextDateToIntervention=Date for next intervention generation
NoIntervention=No intervention
+TypeContact_fichinter_internal_INTERREPFOLL=Responsible for intervention follow-up
+TypeContact_fichinter_internal_INTERVENING=Intervenant
+TypeContact_fichinter_external_BILLING=Contact customer of intervention billing
+TypeContact_fichinter_external_CUSTOMER=Customer contact of intervention follow-up
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 4c1a5a08f0a..8704735f1ac 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -9,6 +9,7 @@ MailRecipients=Recipients
MailRecipient=Recipient
MailTitle=Label
MailFrom=From
+ForceEmailFrom=Default email From
PhoneFrom=From
MailErrorsTo=Errors to
MailReply=Reply to
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index a2bfb1773e4..e6ff61ba623 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -1,26 +1,12 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=PayBox module setup
PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
PayBoxDoPayment=Pay with Paybox
YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-Continue=Next
SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url %s to have payment created automatically when validated by Paybox.
YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-CSSUrlForPaymentForm=CSS style sheet url for payment form
NewPayboxPaymentReceived=New Paybox payment received
NewPayboxPaymentFailed=New Paybox payment tried but failed
PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index f265f65bcc2..6439a8e8bf9 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - trips
+# Dolibarr language file - Source file is en_US - trips.lang
AUTHOR=Recorded by
AUTHORPAIEMENT=Paid by
AddTrip=Create expense report
@@ -13,6 +13,8 @@ byEX_EXP=by line (limitation to %s)
byEX_MON=by month (limitation to %s)
byEX_YEA=by year (limitation to %s)
CANCEL_USER=Deleted by
+ACCOUNTING_ACCOUNT_EXPENSEREPORT=Account (from the Chart of Account) used by default for "users" on expensereport
+ACCOUNTING_ACCOUNT_EXPENSEREPORT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, and also as the default value of Subledger accounting if no dedicated accounting account is not defined on the user.
CarCategory=Vehicle category
ClassifyRefunded=Classify 'Refunded'
CompanyVisited=Company/organization visited
@@ -106,7 +108,7 @@ TripId=Id expense report
TripNDF=Information expense report
TripSociete=Information company
Trips=Expense reports
-TripsAndExpenses=Expenses reports
+TripsAndExpenses=Expense reports
TripsAndExpensesStatistics=Expense reports statistics
TypeFees=Types of fees
UploadANewFileNow=Upload a new document now
@@ -115,6 +117,10 @@ VALIDOR=Approved by
ValidateAndSubmit=Validate and submit for approval
ValidatedWaitingApproval=Validated (waiting for approval)
ValideTrip=Approve expense report
+ExpenseReportPayments=Expense report payments
+TaxUndefinedForThisCategory = Taxe undefined for this category
+errorComputeTtcOnMileageExpense=Error on computing mileage expense
+ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action
## Dictionary
EX_BRE=Breakfast
diff --git a/htdocs/langs/en_ZA/cashdesk.lang b/htdocs/langs/en_ZA/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/en_ZA/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/en_ZA/errors.lang b/htdocs/langs/en_ZA/errors.lang
new file mode 100644
index 00000000000..72c26d8ae21
--- /dev/null
+++ b/htdocs/langs/en_ZA/errors.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - errors
+EmptyMessageNotAllowedError=Empty Message Not Allowed Error
diff --git a/htdocs/langs/en_ZA/help.lang b/htdocs/langs/en_ZA/help.lang
new file mode 100644
index 00000000000..3fa32c05c8d
--- /dev/null
+++ b/htdocs/langs/en_ZA/help.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - help
+AIProcessingPleaseWait=AI interrogation in progress, please wait...
diff --git a/htdocs/langs/en_ZA/salaries.lang b/htdocs/langs/en_ZA/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/en_ZA/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/en_ZA/stocks.lang b/htdocs/langs/en_ZA/stocks.lang
new file mode 100644
index 00000000000..9058791a569
--- /dev/null
+++ b/htdocs/langs/en_ZA/stocks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - stocks
+QtyCurrentlyKnownInStock=The quantity the system think 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=The quantity the system think you had in stock when the inventory was validated (before the stock correction)
diff --git a/htdocs/langs/en_ZA/trips.lang b/htdocs/langs/en_ZA/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/en_ZA/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_AR/agenda.lang b/htdocs/langs/es_AR/agenda.lang
index 23c17e0ae61..871319b9fab 100644
--- a/htdocs/langs/es_AR/agenda.lang
+++ b/htdocs/langs/es_AR/agenda.lang
@@ -7,7 +7,6 @@ EventOnFullDay=Evento de todo(s) el(los) día(s)
MenuToDoActions=Todos los eventos incompletos
MenuDoneActions=Todos los eventos terminados
ActionsAskedBy=Eventos informados por
-ActionsDoneBy=Eventos terminados por
ViewCal=Vista del mes
ViewDay=Vista del día
ViewWeek=Vista de la semana
diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
index 2c73f302d59..f29af10a1f7 100644
--- a/htdocs/langs/es_AR/commercial.lang
+++ b/htdocs/langs/es_AR/commercial.lang
@@ -36,7 +36,6 @@ TasksHistoryForThisContact=Eventos para este contacto
LastProspectNeverContacted=Nunca contactado
LastProspectToContact=Contactar
LastProspectContactDone=Contacto realizado
-ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar presupuesto por correo
ActionAC_EMAIL=Enviar correo
diff --git a/htdocs/langs/es_AR/datapolicy.lang b/htdocs/langs/es_AR/datapolicy.lang
index 83835053213..6176202b29e 100644
--- a/htdocs/langs/es_AR/datapolicy.lang
+++ b/htdocs/langs/es_AR/datapolicy.lang
@@ -5,4 +5,3 @@ DATAPOLICY_TIERS_NIPROSPECT_NICLIENT =Ni cliente potencial/ni cliente
DATAPOLICY_CONTACT_PROSPECT =Cliente Potencial
DATAPOLICY_CONTACT_PROSPECT_CLIENT =Cliente Potencial/Cliente
DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT =Ni cliente potencial/ni cliente
-DATAPOLICYMail =Configuración de correos electrónicos
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
index 34c18dfabce..36573ef159f 100644
--- a/htdocs/langs/es_AR/mails.lang
+++ b/htdocs/langs/es_AR/mails.lang
@@ -19,7 +19,6 @@ NewMailing=Nuevo correo
EditMailing=Editar correo
ResetMailing=Reenviar correo
DeleteMailing=Eliminar correo
-DeleteAMailing=Eliminar un correo
PreviewMailing=Previsualizar correo
CreateMailing=Crear correo
ValidMailing=Validar correo
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 7f9275bb75b..f9f071a07b3 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -376,7 +376,6 @@ Reason=Motivo
FeatureNotYetSupported=Característica todavía sin soportar
Response=Responder
SendByMail=Enviar por email
-MailSentBy=Email enviado por
TextUsedInTheMessageBody=Cuerpo del mensaje
SendMail=Enviar email
NoEMail=Sin email
diff --git a/htdocs/langs/es_AR/paybox.lang b/htdocs/langs/es_AR/paybox.lang
index 54d629f8cee..298b91ba05b 100644
--- a/htdocs/langs/es_AR/paybox.lang
+++ b/htdocs/langs/es_AR/paybox.lang
@@ -1,22 +1,12 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuración del módulo PayBox
PayBoxDesc=Este módulo ofrece páginas para permitir el pago en Paybox a los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr en particular (factura, orden, ...)
-FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer a un cliente una página para realizar un pago para elementos de Dolibarr
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea.
-ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
-ThisIsInformationOnPayment=Esta es información sobre el pago a realizar
-ToComplete=Para completar
-YourEMail=Correo electrónico para recibir confirmación de pago
-Creditor=Acreedor
PayBoxDoPayment=Pagar con Paybox
YouWillBeRedirectedOnPayBox=Serás redirigido al sitio seguro de Paybox para ingresar la información de su tarjeta de crédito
-Continue=Siguiente
SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la URL %s para que el pago se cree automáticamente cuando Paybox lo valide.
YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
-InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
PAYBOX_CGI_URL_V2=URL del módulo CGI para pago con Paybox
-CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
NewPayboxPaymentFailed=Se intentó un nuevo pago de Paybox pero falló
PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo luego del intento de pago (exitoso o fallido)
diff --git a/htdocs/langs/es_BO/cashdesk.lang b/htdocs/langs/es_BO/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_BO/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_BO/salaries.lang b/htdocs/langs/es_BO/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_BO/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_BO/trips.lang b/htdocs/langs/es_BO/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_BO/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index aec85ebdf1b..87f3b70c50f 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -7,7 +7,6 @@ EventOnFullDay=Evento todo el día (s)
MenuToDoActions=Todos los eventos incompletos
MenuDoneActions=Todos los eventos terminados
ActionsAskedBy=Eventos reportados por
-ActionsDoneBy=Eventos hechos por
ViewCal=Vista del mes
ViewDay=Vista del día
ViewWeek=Vista de la semana
diff --git a/htdocs/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang
index 2c0fdab5e36..4a55b2e18e9 100644
--- a/htdocs/langs/es_CL/commercial.lang
+++ b/htdocs/langs/es_CL/commercial.lang
@@ -35,7 +35,6 @@ LastProspectNeverContacted=Nunca contactado
LastProspectToContact=Contactar
LastProspectContactInProcess=Contacto en proceso
LastProspectContactDone=Contacto hecho
-ActionDoneBy=Evento hecho por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Envío cotización por correo
ActionAC_EMAIL=Enviar correo electrónico
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
index 5db0ce79b06..aa500dc1ebe 100644
--- a/htdocs/langs/es_CL/mails.lang
+++ b/htdocs/langs/es_CL/mails.lang
@@ -18,7 +18,6 @@ NewMailing=Nuevo correo electrónico
EditMailing=Edite el correo electrónico
ResetMailing=Reenviar correos electrónicos
DeleteMailing=Eliminar correo electrónico
-DeleteAMailing=Eliminar un correo electrónico
PreviewMailing=Enviar un correo electrónico
CreateMailing=Crear correos electrónicos
ValidMailing=Correo electrónico válido
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 8de90100578..1a728c1355b 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -328,7 +328,6 @@ Undo=Deshacer
UndoExpandAll=Deshacer expandir
FeatureNotYetSupported=Característica aún no compatible
SendByMail=Enviar por correo electrónico
-MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
SendAcknowledgementByMail=Enviar correo electrónico de confirmación
SendMail=Enviar correo electrónico
diff --git a/htdocs/langs/es_CL/paybox.lang b/htdocs/langs/es_CL/paybox.lang
index 3049702c5a7..0f69e855593 100644
--- a/htdocs/langs/es_CL/paybox.lang
+++ b/htdocs/langs/es_CL/paybox.lang
@@ -1,22 +1,11 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuración del módulo PayBox
PayBoxDesc=Este módulo ofrece páginas para permitir el pago en Paybox por parte de los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto Dolibarr particular (factura, orden, ...)
-FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos Dolibarr
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea.
-ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
-ThisIsInformationOnPayment=Esta es información sobre el pago a hacer
-ToComplete=Completar
-YourEMail=Correo electrónico para recibir la confirmación del pago
-Creditor=Acreedor
YouWillBeRedirectedOnPayBox=Será redirigido a la página segura de Paybox para ingresar su información de tarjeta de crédito
-Continue=Siguiente
SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con url %s para que el pago se cree automáticamente cuando sea validado por Paybox.
YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
-AccountParameter=Parámetros de cuenta
-InformationToFindParameters=Ayuda para encontrar su información de cuenta %s
PAYBOX_CGI_URL_V2=Url del módulo de pago CGI para el pago
-CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
NewPayboxPaymentFailed=El nuevo pago de Paybox intentó pero falló
PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (éxito o falla)
diff --git a/htdocs/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang
index bcb93d32bdc..62f3818aeaa 100644
--- a/htdocs/langs/es_CO/commercial.lang
+++ b/htdocs/langs/es_CO/commercial.lang
@@ -30,7 +30,6 @@ StatusActionInProcess=En proceso
TasksHistoryForThisContact=Eventos para este contacto
LastProspectNeverContacted=Nunca contactado
LastProspectContactDone=Contacto realizado
-ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar propuesta por correo
ActionAC_EMAIL=Enviar correo electrónico
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index 6c98425efe6..afc22290f6d 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -45,8 +45,6 @@ ProfId3AT=Id prof. 3 (Handelsregister-Nr.)
ProfId1CM=Prueba de ID 1 (Registro de Comercio)
ProfId2CM=Prueba de ID 2 (Nº de Contribuyente)
ProfId2ShortCM=Contribuyente No.
-ProfId2CO=Identificación (CC, NIT, CE)
-ProfId3CO=CIIU
ProfId1ShortFR=SIRENA
ProfId1LU=Identificación. profe. 1 (R.C.S. Luxemburgo)
ProfId2LU=Identificación. profe. 2 (permiso comercial)
diff --git a/htdocs/langs/es_CO/datapolicy.lang b/htdocs/langs/es_CO/datapolicy.lang
index 7c294832731..c978fde3d3d 100644
--- a/htdocs/langs/es_CO/datapolicy.lang
+++ b/htdocs/langs/es_CO/datapolicy.lang
@@ -4,6 +4,4 @@ DATAPOLICY_TIERS_PROSPECT_CLIENT =Prospecto/Cliente
DATAPOLICY_TIERS_NIPROSPECT_NICLIENT =Ni prospecto/ni cliente
DATAPOLICY_CONTACT_PROSPECT_CLIENT =Prospecto/Cliente
DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT =Ni prospecto/ni cliente
-DATAPOLICYMail =Configuración de correos electrónicos
-DATAPOLICY_POPUP_ANONYME_TEXTE =No puede eliminar este contacto de Dolibarr porque hay elementos relacionados. De acuerdo con el RGPD, harás anónimos todos estos datos para respetar tus obligaciones. Te gustaria continuar ?
DATAPOLICY_PORTABILITE_CONFIRMATION =Quiere exportar los datos personales de este contacto. Está seguro ?
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
index 56b0702b08d..7693ddbb5c5 100644
--- a/htdocs/langs/es_CO/mails.lang
+++ b/htdocs/langs/es_CO/mails.lang
@@ -18,7 +18,6 @@ NewMailing=Nuevo e-mailing
EditMailing=Editar e-mailing
ResetMailing=Reenviar e-mailing
DeleteMailing=Eliminar e-mailing
-DeleteAMailing=Eliminar un e-mailing
PreviewMailing=Vista previa del envío de e-mailing
CreateMailing=Crear e-mailing
ValidMailing=Envío de e-mailing válido
diff --git a/htdocs/langs/es_CO/paybox.lang b/htdocs/langs/es_CO/paybox.lang
index 8f962f29896..e99c8e2031e 100644
--- a/htdocs/langs/es_CO/paybox.lang
+++ b/htdocs/langs/es_CO/paybox.lang
@@ -1,22 +1,11 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuración del módulo PayBox
-FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos Dolibarr
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago online
-ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
-ThisIsInformationOnPayment=Esta es la información sobre el pago a realizar
-ToComplete=Completar
-YourEMail=Correo electrónico para recibir la confirmación del pago
-Creditor=Acreedor
PayBoxDoPayment=Pagar con Paybox
YouWillBeRedirectedOnPayBox=Será redirigido a la página segura de Paybox para ingresar la información de su tarjeta de crédito
-Continue=Siguiente
SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la URL %s para que el pago se cree automáticamente cuando lo valide Paybox.
YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
-AccountParameter=Parámetros de cuenta
-InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
PAYBOX_CGI_URL_V2=Url del módulo CGI de Paybox para pago
-CSSUrlForPaymentForm=URL de la hoja de estilo CSS para el formulario de pago
NewPayboxPaymentReceived=Nuevo pago recibido de Paybox
NewPayboxPaymentFailed=Nuevo pago de Paybox intentado pero fallido
PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (éxito o fracaso)
diff --git a/htdocs/langs/es_CR/agenda.lang b/htdocs/langs/es_CR/agenda.lang
index c2c2ada904c..c1acf49bd4b 100644
--- a/htdocs/langs/es_CR/agenda.lang
+++ b/htdocs/langs/es_CR/agenda.lang
@@ -9,7 +9,6 @@ MenuToDoActions=Todos los eventos incompletos
MenuDoneActions=Todos los eventos finalizados
MenuDoneMyActions=Mis eventos finalizados
ActionsAskedBy=Eventos reportados por
-ActionsDoneBy=Eventos terminados por
ViewCal=Vista del mes
ViewDay=Vista del día
ViewWeek=Vista de la semana
diff --git a/htdocs/langs/es_CR/commercial.lang b/htdocs/langs/es_CR/commercial.lang
index 41b22e597c8..5f3640eb45d 100644
--- a/htdocs/langs/es_CR/commercial.lang
+++ b/htdocs/langs/es_CR/commercial.lang
@@ -34,7 +34,6 @@ TasksHistoryForThisContact=Eventos para este contacto
LastProspectNeverContacted=Nunca contactado
LastProspectContactInProcess=Contacto en proceso
LastProspectContactDone=Contacto realizado
-ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar cotizacion por email
ActionAC_EMAIL=Enviar correo
diff --git a/htdocs/langs/es_CR/datapolicy.lang b/htdocs/langs/es_CR/datapolicy.lang
index d71d763ba4b..91b85d35c8a 100644
--- a/htdocs/langs/es_CR/datapolicy.lang
+++ b/htdocs/langs/es_CR/datapolicy.lang
@@ -3,4 +3,3 @@ DATAPOLICY_TIERS_PROSPECT_CLIENT =Cliente Potencial/Cliente
DATAPOLICY_TIERS_NIPROSPECT_NICLIENT =Ni cliente potencial/ni cliente
DATAPOLICY_CONTACT_PROSPECT_CLIENT =Cliente Potencial/Cliente
DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT =Ni cliente potencial/ni cliente
-DATAPOLICYMail =Configuración de correos electrónicos
diff --git a/htdocs/langs/es_CR/eventorganization.lang b/htdocs/langs/es_CR/eventorganization.lang
index 574aabcd460..1b9912678b8 100644
--- a/htdocs/langs/es_CR/eventorganization.lang
+++ b/htdocs/langs/es_CR/eventorganization.lang
@@ -8,5 +8,3 @@ EvntOrgCancelled =Cancelado
EmailCompanyForInvoice=E-mail de la empresa (para la factura, si es diferente del e-mail del asistente)
ConfirmModifyStatus=Confirmar el estado de modificación
ConfirmModifyStatusQuestion=¿Está seguro de que quiere modificar el %s registro(s) seleccionado?
-RecordsUpdated =%s Registros actualizados
-NoRecordUpdated =Registro no actualizado
diff --git a/htdocs/langs/es_CR/mails.lang b/htdocs/langs/es_CR/mails.lang
index 02958a26a08..5fe2b066541 100644
--- a/htdocs/langs/es_CR/mails.lang
+++ b/htdocs/langs/es_CR/mails.lang
@@ -19,7 +19,6 @@ NewMailing=Nuevo correo
EditMailing=Editar correo
ResetMailing=Reenviar correo
DeleteMailing=Eliminar correo electrónico
-DeleteAMailing=Eliminar un correo electrónico
PreviewMailing=Previsualizar correo
CreateMailing=Crear correo
ValidMailing=Validar correo
diff --git a/htdocs/langs/es_CR/main.lang b/htdocs/langs/es_CR/main.lang
index fc043c3de54..bcfcaa98c50 100644
--- a/htdocs/langs/es_CR/main.lang
+++ b/htdocs/langs/es_CR/main.lang
@@ -374,7 +374,6 @@ UndoExpandAll=Deshacer expandir
Reason=Motivo
FeatureNotYetSupported=Característica aún no admitida
SendByMail=Enviar por email
-MailSentBy=Email enviado por
TextUsedInTheMessageBody=Cuerpo del email
SendAcknowledgementByMail=Enviar correo electrónico de confirmación
SendMail=Enviar correo electrónico
diff --git a/htdocs/langs/es_CR/paybox.lang b/htdocs/langs/es_CR/paybox.lang
index 39a25bb0023..be7c201cd55 100644
--- a/htdocs/langs/es_CR/paybox.lang
+++ b/htdocs/langs/es_CR/paybox.lang
@@ -1,21 +1,11 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuración del módulo PayBox
-FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer a un cliente una página para realizar un pago para elementos de Dolibarr
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea
-ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
-ThisIsInformationOnPayment=Esta es la información sobre el pago a realizar
-ToComplete=Para completar
-YourEMail=Correo electrónico para recibir confirmación de pago
-Creditor=Acreedor
PayBoxDoPayment=Pagar con Paybox
YouWillBeRedirectedOnPayBox=Serás redirigido al sitio seguro de Paybox para ingresar la información de su tarjeta de crédito
-Continue=Siguiente
SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la URL %s para que el pago se cree automáticamente cuando Paybox lo valide.
YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
-InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
PAYBOX_CGI_URL_V2=URL del módulo CGI para pago con Paybox
-CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
NewPayboxPaymentFailed=Se intentó un nuevo pago de Paybox pero falló
PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo luego del intento de pago (exitoso o fallido)
diff --git a/htdocs/langs/es_CU/commercial.lang b/htdocs/langs/es_CU/commercial.lang
index 574f751ac54..95ed4a6932e 100644
--- a/htdocs/langs/es_CU/commercial.lang
+++ b/htdocs/langs/es_CU/commercial.lang
@@ -36,7 +36,6 @@ LastProspectNeverContacted=Nunca contactado
LastProspectToContact=Contactar
LastProspectContactInProcess=Contacto en proceso
LastProspectContactDone=Contacto hecho
-ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar propuesta por correo
ActionAC_EMAIL=Enviar correo electrónico
diff --git a/htdocs/langs/es_CU/datapolicy.lang b/htdocs/langs/es_CU/datapolicy.lang
index 61feb2fe8a6..be9693dabcb 100644
--- a/htdocs/langs/es_CU/datapolicy.lang
+++ b/htdocs/langs/es_CU/datapolicy.lang
@@ -6,6 +6,4 @@ DATAPOLICY_TIERS_NIPROSPECT_NICLIENT =Ni prospecto/ni cliente
DATAPOLICY_CONTACT_PROSPECT =Prospecto
DATAPOLICY_CONTACT_PROSPECT_CLIENT =Prospecto/Cliente
DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT =Ni prospecto/ni cliente
-DATAPOLICYMail =Configuración de correos electrónicos
-DATAPOLICY_POPUP_ANONYME_TEXTE =No puede eliminar este contacto de Dolibarr porque hay elementos relacionados. De acuerdo con el RGPD, harás anónimos todos estos datos para respetar tus obligaciones. Te gustaria continuar ?
DATAPOLICY_PORTABILITE_CONFIRMATION =Quiere exportar los datos personales de este contacto. Está seguro ?
diff --git a/htdocs/langs/es_CU/mails.lang b/htdocs/langs/es_CU/mails.lang
index ddc7ce58700..7322c930fff 100644
--- a/htdocs/langs/es_CU/mails.lang
+++ b/htdocs/langs/es_CU/mails.lang
@@ -20,7 +20,6 @@ NewMailing=Nuevo correo electrónico
EditMailing=Editar correo electrónico
ResetMailing=reenviar correo electrónico
DeleteMailing=Eliminar correo electrónico
-DeleteAMailing=Eliminar un correo electrónico
PreviewMailing=Vista previa de correo electrónico
CreateMailing=Crear correo electrónico
ValidMailing=Correo electrónico válido
diff --git a/htdocs/langs/es_CU/main.lang b/htdocs/langs/es_CU/main.lang
index f2a34287095..f292743644d 100644
--- a/htdocs/langs/es_CU/main.lang
+++ b/htdocs/langs/es_CU/main.lang
@@ -381,7 +381,6 @@ Undo=Deshacer
UndoExpandAll=Deshacer expandir
FeatureNotYetSupported=Característica aún no admitida
SendByMail=Enviar por correo electrónico
-MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
SendAcknowledgementByMail=Enviar correo electrónico de confirmación
SendMail=Enviar correo electrónico
diff --git a/htdocs/langs/es_CU/paybox.lang b/htdocs/langs/es_CU/paybox.lang
index a18a5e1a708..e3505009fdc 100644
--- a/htdocs/langs/es_CU/paybox.lang
+++ b/htdocs/langs/es_CU/paybox.lang
@@ -1,22 +1,12 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuración del módulo PayBox
PayBoxDesc=Este módulo ofrece páginas para permitir el pago en Paybox por parte de los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto particular de Dolibarr (factura, pedido, ...)
-FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos Dolibarr
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea
-ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a %s.
-ThisIsInformationOnPayment=Esta es la información sobre el pago a hacer
-ToComplete=Completar
-YourEMail=Email para recibir confirmación de pago
-Creditor=Acreedor
PayBoxDoPayment=Paga con Pay Box
YouWillBeRedirectedOnPayBox=Será redirigido a la página segura de Paybox para ingresar la información de su tarjeta de crédito
-Continue=Próximo
SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con la url %s para que el pago se cree automáticamente cuando lo valide Paybox.
YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado. Gracias.
YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
-InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
PAYBOX_CGI_URL_V2=URL del módulo CGI de Paybox para pago
-CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
NewPayboxPaymentFailed=Nuevo pago de Paybox intentado pero fallido
PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (éxito o falla)
diff --git a/htdocs/langs/es_DO/cashdesk.lang b/htdocs/langs/es_DO/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_DO/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_DO/salaries.lang b/htdocs/langs/es_DO/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_DO/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_DO/trips.lang b/htdocs/langs/es_DO/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_DO/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_EC/commercial.lang b/htdocs/langs/es_EC/commercial.lang
index 4820d13cd6a..f78862fdacd 100644
--- a/htdocs/langs/es_EC/commercial.lang
+++ b/htdocs/langs/es_EC/commercial.lang
@@ -37,7 +37,6 @@ LastProspectNeverContacted=Nunca contactado
LastProspectToContact=Contactar
LastProspectContactInProcess=Contacto en proceso
LastProspectContactDone=Contacto hecho
-ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar propuesta por correo
ActionAC_EMAIL=Enviar correo electrónico
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
index f9ff75a5a3f..f3104bd4a3e 100644
--- a/htdocs/langs/es_EC/mails.lang
+++ b/htdocs/langs/es_EC/mails.lang
@@ -15,7 +15,6 @@ NewMailing=Nuevo correo electrónico
EditMailing=Editar correos electrónicos
ResetMailing=Reenviar correo electrónico
DeleteMailing=Eliminar correo electrónico
-DeleteAMailing=Eliminar un correo electrónico
PreviewMailing=Previsualizar correo electrónico
CreateMailing=Crear correo electrónico
ValidMailing=Correo electrónico válido
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index c5978aef380..a21923c6718 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -360,7 +360,6 @@ Undo=Deshacer
UndoExpandAll=Deshacer expandir
FeatureNotYetSupported=Característica aún no soportado
SendByMail=Enviar por correo electrónico
-MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
SendAcknowledgementByMail=Enviar correo electrónico de confirmación
SendMail=Enviar correo electrónico
diff --git a/htdocs/langs/es_EC/paybox.lang b/htdocs/langs/es_EC/paybox.lang
index 4e13080316d..3746e59a94e 100644
--- a/htdocs/langs/es_EC/paybox.lang
+++ b/htdocs/langs/es_EC/paybox.lang
@@ -1,22 +1,12 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuración del módulo PayBox
PayBoxDesc=Este módulo ofrece páginas para permitir el pago en Paybox por los clientes. Esto se puede utilizar para un pago gratuito o para un pago en un objeto particular Dolibarr (factura, pedido, ...)
-FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para ofrecer una página a un cliente para realizar un pago en objetos de Dolibarr
-WelcomeOnPaymentPage=Bienvenido a nuestro servicio de pago en línea.
-ThisScreenAllowsYouToPay=Esta pantalla le permite realizar un pago en línea a%s.
-ThisIsInformationOnPayment=Esta es información sobre el pago a hacer
-ToComplete=Completar
-YourEMail=Correo electrónico para recibir confirmación de pago
-Creditor=Acreedor
PayBoxDoPayment=Paga con Paybox
YouWillBeRedirectedOnPayBox=Se le redirigirá a la página segura de Paybox para ingresar su información de tarjeta de crédito.
-Continue=Siguiente
SetupPayBoxToHavePaymentCreatedAutomatically=Configure su Paybox con url %s para que el pago se cree automáticamente cuando sea validado por Paybox.
YourPaymentHasBeenRecorded=Esta página confirma que se ha registrado su pago.
YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
-InformationToFindParameters=Ayuda para encontrar la información de tu cuenta de%s
PAYBOX_CGI_URL_V2=URL del módulo CGI de Paybox para el pago
-CSSUrlForPaymentForm=URL de estilo de hoja CSS para el formulario de pago
NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
NewPayboxPaymentFailed=Nuevo pago de Paybox probado pero fallido
PAYBOX_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después del intento de pago (exitoso o fallido)
diff --git a/htdocs/langs/es_GT/cashdesk.lang b/htdocs/langs/es_GT/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_GT/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_GT/salaries.lang b/htdocs/langs/es_GT/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_GT/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_GT/trips.lang b/htdocs/langs/es_GT/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_GT/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_HN/cashdesk.lang b/htdocs/langs/es_HN/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_HN/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_HN/salaries.lang b/htdocs/langs/es_HN/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_HN/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_HN/trips.lang b/htdocs/langs/es_HN/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_HN/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
index d26cbf57761..ac5697fc4f7 100644
--- a/htdocs/langs/es_MX/agenda.lang
+++ b/htdocs/langs/es_MX/agenda.lang
@@ -8,7 +8,6 @@ MenuToDoActions=Todos los eventos incompletos
MenuDoneActions=Todos los eventos finalizados
MenuDoneMyActions=Mis eventos finalizados
ActionsAskedBy=Eventos reportados por
-ActionsDoneBy=Eventos realizado por
ViewCal=Vista del mes
ViewDay=Vista de día
ViewWeek=Vista de la semana
diff --git a/htdocs/langs/es_MX/commercial.lang b/htdocs/langs/es_MX/commercial.lang
index 66727fc0e50..3e4e6dc40cb 100644
--- a/htdocs/langs/es_MX/commercial.lang
+++ b/htdocs/langs/es_MX/commercial.lang
@@ -35,7 +35,6 @@ LastProspectNeverContacted=Nunca contactado
LastProspectToContact=Para contactar
LastProspectContactInProcess=Contacto en proceso
LastProspectContactDone=Contacto realizado
-ActionDoneBy=Evento realizado por
ActionAC_FAX=Enviar fax
ActionAC_PROP=Enviar cotizacion por email
ActionAC_EMAIL=Enviar email
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 0685533d69d..138f954d774 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -223,7 +223,6 @@ Currency=Moneda
Undo=Deshacer
UndoExpandAll=Deshacer ampliar
FeatureNotYetSupported=Característica aún no soportada
-MailSentBy=Correo electrónico enviado por
TextUsedInTheMessageBody=Cuerpo del correo electronico
NoEMail=Sin correo electrónico
FollowingConstantsWillBeSubstituted=Las siguientes constantes serán reemplazadas con el valor correspondiente.
diff --git a/htdocs/langs/es_MX/paybox.lang b/htdocs/langs/es_MX/paybox.lang
deleted file mode 100644
index b5e026cdced..00000000000
--- a/htdocs/langs/es_MX/paybox.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - paybox
-Continue=Siguiente
diff --git a/htdocs/langs/es_PA/cashdesk.lang b/htdocs/langs/es_PA/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_PA/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_PA/salaries.lang b/htdocs/langs/es_PA/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_PA/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_PA/trips.lang b/htdocs/langs/es_PA/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_PA/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_PE/salaries.lang b/htdocs/langs/es_PE/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_PE/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_PY/cashdesk.lang b/htdocs/langs/es_PY/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_PY/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_PY/salaries.lang b/htdocs/langs/es_PY/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_PY/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_PY/trips.lang b/htdocs/langs/es_PY/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_PY/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_US/cashdesk.lang b/htdocs/langs/es_US/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_US/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_US/salaries.lang b/htdocs/langs/es_US/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_US/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_US/trips.lang b/htdocs/langs/es_US/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_US/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_UY/cashdesk.lang b/htdocs/langs/es_UY/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_UY/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_UY/salaries.lang b/htdocs/langs/es_UY/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_UY/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/es_UY/trips.lang b/htdocs/langs/es_UY/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/es_UY/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/es_VE/cashdesk.lang b/htdocs/langs/es_VE/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/es_VE/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/es_VE/salaries.lang b/htdocs/langs/es_VE/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/es_VE/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/eu_ES/expensereports.lang b/htdocs/langs/eu_ES/expensereports.lang
deleted file mode 100644
index b378b12060d..00000000000
--- a/htdocs/langs/eu_ES/expensereports.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - expensereports
-RelatedExpenseReports=associated expense reports
\ No newline at end of file
diff --git a/htdocs/langs/fr_BE/agenda.lang b/htdocs/langs/fr_BE/agenda.lang
index 54f6b109b08..6475e98330e 100644
--- a/htdocs/langs/fr_BE/agenda.lang
+++ b/htdocs/langs/fr_BE/agenda.lang
@@ -6,7 +6,6 @@ MenuToDoMyActions=Mes événements incomplets
MenuDoneMyActions=Mes événements terminés
ActionsAskedBy=Événements rapportés par
ActionsToDoBy=Événements assignés à
-ActionsDoneBy=Événements faits par
ViewCal=Vue mensuelle
ViewDay=Vue quotidienne
ViewWeek=Vue hebdomadaire
diff --git a/htdocs/langs/fr_BE/cashdesk.lang b/htdocs/langs/fr_BE/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/fr_BE/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/fr_BE/salaries.lang b/htdocs/langs/fr_BE/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/fr_BE/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/fr_BE/trips.lang b/htdocs/langs/fr_BE/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/fr_BE/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index 4123dab25ab..aa2b8625c32 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -15,7 +15,6 @@ NewMailing=Nouveau courrier électronique
EditMailing=Modifier le courrier électronique
ResetMailing=Renvoyer l'envoi par courrier électronique
DeleteMailing=Supprimer l'envoi par courrier électronique
-DeleteAMailing=Supprimer un courrier électronique
PreviewMailing=Aperçu de l'envoi par courrier électronique
CreateMailing=Créer un email
ValidMailing=Courrier électronique valide
diff --git a/htdocs/langs/fr_CA/paybox.lang b/htdocs/langs/fr_CA/paybox.lang
index 651c4f393b1..291a0e68801 100644
--- a/htdocs/langs/fr_CA/paybox.lang
+++ b/htdocs/langs/fr_CA/paybox.lang
@@ -1,18 +1,9 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuration du module PayBox
PayBoxDesc=Ce module offre des pages pour permettre le paiement sur Paybox par les clients. Cela peut être utilisé pour un paiement gratuit ou pour un paiement sur un objet Dolibarr particulier (facture, commande, ...)
-FollowingUrlAreAvailableToMakePayments=Les URL suivantes sont disponibles pour offrir une page à un client pour effectuer un paiement sur les objets Dolibarr
-ThisScreenAllowsYouToPay=Cet écran vous permet de faire un paiement en ligne à %s.
-ThisIsInformationOnPayment=Il s'agit d'informations sur le paiement à effectuer
-ToComplete=Compléter
-YourEMail=Email pour recevoir la confirmation de paiement
-Creditor=Créancier
YouWillBeRedirectedOnPayBox=Vous serez redirigé sur la page Paybox sécurisée pour vous inscrire les informations de votre carte de crédit
-Continue=Suivant
YourPaymentHasBeenRecorded=Cette page confirme que votre paiement a été enregistré. Je vous remercie.
-InformationToFindParameters=Aidez-nous à trouver vos informations sur le compte %s
PAYBOX_CGI_URL_V2=Url de Paybox CGI module de paiement
-CSSUrlForPaymentForm=URL de la feuille de style CSS pour le formulaire de paiement
NewPayboxPaymentFailed=Le nouveau paiement Paybox a échoué
PAYBOX_PBX_SITE=Valeur pour PBX SITE
PAYBOX_PBX_RANG=Valeur pour PBX Rang
diff --git a/htdocs/langs/fr_CH/cashdesk.lang b/htdocs/langs/fr_CH/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/fr_CH/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/fr_CH/salaries.lang b/htdocs/langs/fr_CH/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/fr_CH/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/fr_CH/trips.lang b/htdocs/langs/fr_CH/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/fr_CH/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/fr_CI/cashdesk.lang b/htdocs/langs/fr_CI/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/fr_CI/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/fr_CI/salaries.lang b/htdocs/langs/fr_CI/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/fr_CI/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/fr_CI/trips.lang b/htdocs/langs/fr_CI/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/fr_CI/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/fr_CM/cashdesk.lang b/htdocs/langs/fr_CM/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/fr_CM/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/fr_CM/salaries.lang b/htdocs/langs/fr_CM/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/fr_CM/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/fr_CM/trips.lang b/htdocs/langs/fr_CM/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/fr_CM/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index c5b1a476e07..d217e9b8b62 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -68,14 +68,14 @@ UserAccountNotDefined=Compte comptable pour l'utilisateur non défini dans la co
AccountancyArea=Espace comptabilité
AccountancyAreaDescIntro=L'utilisation du module de comptabilité se fait en plusieurs étapes:
AccountancyAreaDescActionOnce=Les actions suivantes sont habituellement exécutées une seule fois, ou une fois par an ...
-AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pour vous faire gagner du temps à l'avenir en vous proposant automatiquement le bon compte comptable par défaut lors de la ventilation (écrire des enregistrements dans les journaux et grand livre)
+AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pour vous faire gagner du temps à l'avenir en vous proposant automatiquement le bon compte comptable par défaut lors du transfert en comptabilité
AccountancyAreaDescActionFreq=Les actions suivantes sont habituellement exécutées chaque mois, semaine, ou jour pour les très grandes entreprises ...
AccountancyAreaDescJournalSetup=Étape %s : Créer ou vérifier le contenu de la liste des journaux depuis le menu %s
AccountancyAreaDescChartModel=Étape %s : Vérifiez qu'il existe un modèle de plan comptable ou créez-en un à partir du menu %s
AccountancyAreaDescChart=Étape %s : Sélectionnez et | ou complétez votre plan de compte dans le menu %s
-AccountancyAreaDescFiscalPeriod=Étape %s: Définissez un exercice par défaut sur lequel intégrer vos entrées en comptabilité. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescFiscalPeriod=Étape %s : Définissez un exercice par défaut sur lequel intégrer vos entrées en comptabilité. Pour cela, utilisez l'entrée de menu %s.
AccountancyAreaDescVat=Étape %s : Définissez les comptes comptables de chaque taux de TVA utilisé. Pour cela, suivez le menu suivant %s.
AccountancyAreaDescDefault=Étape %s : Définir les comptes de comptabilité par défaut. Pour cela, utilisez l'entrée de menu %s.
AccountancyAreaDescExpenseReport=Étape %s : Définissez les comptes comptables par défaut des dépenses des notes de frais. Pour cela, suivez le menu %s.
@@ -90,8 +90,8 @@ AccountancyAreaDescProd=Étape %s : Définissez les comptes comptables sur vos p
AccountancyAreaDescBind=Étape %s : Vérifier que la liaison entre les %s lignes existantes et le compte comptable est faite, ainsi l'application sera capable d'inscrire les transaction dans le grand livre en un seul clic. Compléter les liaisons manquantes. Pour cela, suivez le menu suivant %s.
AccountancyAreaDescWriteRecords=Étape %s: Ecrire les transactions dans le grand livre. Pour cela, suivez le menu %s, et cliquer sur le bouton %s.
-AccountancyAreaDescAnalyze=STEP %s : lire les rapports ou générer des fichiers d'exportation pour d'autres comptables.
-AccountancyAreaDescClosePeriod=ÉTAPE %s : Fermer la période afin que nous ne puissions plus transférer de données au cours de la même période dans le futur.
+AccountancyAreaDescAnalyze=Étape %s : Lire les rapports ou générer des fichiers d'exportation pour d'autres comptables.
+AccountancyAreaDescClosePeriod=Étape %s : Fermer la période afin que nous ne puissions plus transférer de données au cours de la même période dans le futur.
TheFiscalPeriodIsNotDefined=Une étape obligatoire de configuration n'a pas été complétée (l'exercice fiscal n'est pas défini)
TheJournalCodeIsNotDefinedOnSomeBankAccount=Une étape obligatoire dans la configuration n'a pas été terminée (journal de code de comptabilité non défini pour tous les comptes bancaires)
@@ -178,6 +178,7 @@ ACCOUNTING_SELL_JOURNAL=Ventes
ACCOUNTING_PURCHASE_JOURNAL=Achats
ACCOUNTING_BANK_JOURNAL=Banque
ACCOUNTING_EXPENSEREPORT_JOURNAL=Notes de frais
+
ACCOUNTING_MISCELLANEOUS_JOURNAL=Opérations diverses
ACCOUNTING_HAS_NEW_JOURNAL=A-nouveaux
ACCOUNTING_INVENTORY_JOURNAL=Inventaire
@@ -328,7 +329,7 @@ WarningRecordWithoutSubledgerAreExcluded=Attention, toutes les lignes sans compt
AccountRemovedFromCurrentChartOfAccount=Compte comptable qui n'existe pas dans le plan comptable actuel
## Admin
-BindingOptions=Options de liaisons avec les codes comptables
+BindingOptions=Options de l'outil permettant de lier des lignes avec des produits
ApplyMassCategories=Application en masse des catégories
AddAccountFromBookKeepingWithNoCategories=Comptes disponibles pas encore dans le groupe personnalisé
CategoryDeleted=Le groupe de comptes comptables a été supprimé
@@ -467,7 +468,7 @@ AccountancyClosureConfirmAccountingReversal=Êtes-vous sûr de vouloir enregistr
## Error
SomeMandatoryStepsOfSetupWereNotDone=Certaines étapes obligatoires de la configuration n'ont pas été réalisées, merci de compléter cette dernière
-ErrorNoAccountingCategoryForThisCountry=Pas de catégories de regroupement comptable disponibles pour le pays %s (Voir %s - %s - %s)
+ErrorNoAccountingCategoryForThisCountry=Pas de groupes de comptes personnalisés disponibles pour le pays %s (Voir %s - %s - %s)
ErrorInvoiceContainsLinesNotYetBounded=Vous essayez de journaliser certaines lignes de la facture %s , mais certaines autres lignes ne sont pas encore liées au compte de comptabilité. La journalisation de toutes les lignes de facture pour cette facture est refusée.
ErrorInvoiceContainsLinesNotYetBoundedShort=Certaines lignes sur la facture ne sont pas liées au compte comptable.
ExportNotSupported=Le format de l'export n'est pas supporté par cette page
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index be7a7729122..79b0a5d7735 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - deliveries
Delivery=Livraison
DeliveryRef=Référence de livraison
-DeliveryCard=Réception de stock
+DeliveryCard=Bon de réception
DeliveryOrder=Bon de réception
DeliveryDate=Date de livraison
CreateDeliveryOrder=Générer bon de réception
diff --git a/htdocs/langs/fr_FR/expensereports.lang b/htdocs/langs/fr_FR/expensereports.lang
deleted file mode 100644
index e08723322e2..00000000000
--- a/htdocs/langs/fr_FR/expensereports.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - expensereports
-RelatedExpenseReports=Notes de frais associées
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 8da1def9309..ea95262f6bf 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable par défaut pour les tiers "salariés"
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la fiche utilisateur sera utilisé en tant que compte comptable de tiers (Compte auxiliaire).
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable par défaut pour les salaires "utilisateurs"
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la fiche utilisateur sera utilisé pour le compte auxiliaire uniquement. Celui-ci sera utilisé pour le compte général, mais également comme valeur par défaut du compte auxiliaire s'il n'y a pas de compte comptable défini sur l'utilisateur.
SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires
CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Créer automatiquement un paiement complet" lors de la création d’un salaire
Salary=Salaire
diff --git a/htdocs/langs/fr_GA/cashdesk.lang b/htdocs/langs/fr_GA/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/fr_GA/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/fr_GA/salaries.lang b/htdocs/langs/fr_GA/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/fr_GA/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/fr_GA/trips.lang b/htdocs/langs/fr_GA/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/fr_GA/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/it_CH/salaries.lang b/htdocs/langs/it_CH/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/it_CH/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/it_CH/trips.lang b/htdocs/langs/it_CH/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/it_CH/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/nl_BE/blockedlog.lang b/htdocs/langs/nl_BE/blockedlog.lang
new file mode 100644
index 00000000000..9e82b56b544
--- /dev/null
+++ b/htdocs/langs/nl_BE/blockedlog.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - blockedlog
+logBILL_PAYED=Klantfactuur betaald
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index c8b3a5a4da9..fc7f7a85860 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -11,7 +11,6 @@ NewMailing=Nieuwe EMailing
EditMailing=Bewerk EMailing
ResetMailing=EMailing opnieuw verzenden
DeleteMailing=Verwijder EMailing
-DeleteAMailing=Verwijder een EMailing
PreviewMailing=Voorbeeldweergave EMailing
CreateMailing=Creëer EMailing
ValidMailing=Geldige EMailing
diff --git a/htdocs/langs/pt_AO/cashdesk.lang b/htdocs/langs/pt_AO/cashdesk.lang
new file mode 100644
index 00000000000..50bcc1dad32
--- /dev/null
+++ b/htdocs/langs/pt_AO/cashdesk.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+MainPrinterToUseMore=empty means the browser printer system
diff --git a/htdocs/langs/pt_AO/companies.lang b/htdocs/langs/pt_AO/companies.lang
new file mode 100644
index 00000000000..5cb50736018
--- /dev/null
+++ b/htdocs/langs/pt_AO/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+AllocateCommercial=Assigned to sales representative
+LastModifiedThirdParties=Latest %s Third Parties which were modified
diff --git a/htdocs/langs/pt_AO/salaries.lang b/htdocs/langs/pt_AO/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/pt_AO/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/pt_AO/trips.lang b/htdocs/langs/pt_AO/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/pt_AO/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 140f08a27b0..5f94a41c98b 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -10,7 +10,6 @@ MenuToDoMyActions=Meus eventos incompletos
MenuDoneMyActions=Meus eventos terminados
ListOfEvents=Lista de eventos (calendário padrão)
ActionsAskedBy=Eventos relatados pelo
-ActionsDoneBy=Eventos feito por
ViewCal=Ver Mês
ViewDay=Ver dia
ViewWeek=ver semana
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index aee8a797292..6a24386f1c3 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -37,7 +37,6 @@ LastProspectNeverContacted=Nunca contactado
LastProspectContactInProcess=Contato em andamento
LastProspectContactDone=Contato feito
ActionAffectedTo=Evento atribuído para
-ActionDoneBy=Evento feito por
ActionAC_TEL=Chamada telefônica
ActionAC_PROP=Enviar proposta por correio
ActionAC_EMAIL=Enviar e-mail
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 61762810022..9a00c3bd00a 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -327,7 +327,6 @@ SupplierPreview=Visualização do fornecedor
ShowCustomerPreview=Ver Historico Cliente
SeeAll=Ver tudo
SendByMail=Envio por e-mail
-MailSentBy=Mail enviado por
Email=E-mail
NotRead=Não lido
NoMobilePhone=Sem celular
diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang
index 4f849db5f2c..d385bc4020a 100644
--- a/htdocs/langs/pt_BR/paybox.lang
+++ b/htdocs/langs/pt_BR/paybox.lang
@@ -1,20 +1,11 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuração do módulo PayBox
PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor %s b> para que o pagamento seja criado automaticamente quando validado pelo Paybox.
YourPaymentHasBeenRecorded=Esta pagina confirma que o seu pagamento foi registrado com suçesso. Obrigado.
-AccountParameter=Parametros da conta
-UsageParameter=Parametros de uso
-InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
-CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
NewPayboxPaymentReceived=Novo pagamento recebido Paybox
NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de uma tentativa de pagamento (sucesso ou falha)
diff --git a/htdocs/langs/pt_MZ/agenda.lang b/htdocs/langs/pt_MZ/agenda.lang
index 7b4ce5a5b33..9de9dde9862 100644
--- a/htdocs/langs/pt_MZ/agenda.lang
+++ b/htdocs/langs/pt_MZ/agenda.lang
@@ -10,7 +10,6 @@ MenuToDoMyActions=Meus eventos incompletos
MenuDoneMyActions=Meus eventos terminados
ListOfEvents=Lista de eventos (calendário padrão)
ActionsAskedBy=Eventos relatados pelo
-ActionsDoneBy=Eventos feito por
ActionAssignedTo=Evento atribuído para
ViewCal=Ver Mês
ViewDay=Ver dia
diff --git a/htdocs/langs/pt_MZ/commercial.lang b/htdocs/langs/pt_MZ/commercial.lang
index 4e15f6d6895..1ac6d8509b5 100644
--- a/htdocs/langs/pt_MZ/commercial.lang
+++ b/htdocs/langs/pt_MZ/commercial.lang
@@ -38,7 +38,6 @@ LastProspectNeverContacted=Nunca contactado
LastProspectContactInProcess=Contato em andamento
LastProspectContactDone=Contato feito
ActionAffectedTo=Evento atribuído para
-ActionDoneBy=Evento feito por
ActionAC_TEL=Chamada telefônica
ActionAC_PROP=Enviar proposta por correio
ActionAC_EMAIL=Enviar e-mail
diff --git a/htdocs/langs/pt_MZ/main.lang b/htdocs/langs/pt_MZ/main.lang
index f21762b8d88..b69fd5e4398 100644
--- a/htdocs/langs/pt_MZ/main.lang
+++ b/htdocs/langs/pt_MZ/main.lang
@@ -326,7 +326,6 @@ SupplierPreview=Visualização do fornecedor
ShowCustomerPreview=Ver Historico Cliente
SeeAll=Ver tudo
SendByMail=Envio por e-mail
-MailSentBy=Mail enviado por
Email=E-mail
NotRead=Não lido
NoMobilePhone=Sem celular
diff --git a/htdocs/langs/pt_MZ/paybox.lang b/htdocs/langs/pt_MZ/paybox.lang
index 4f849db5f2c..d385bc4020a 100644
--- a/htdocs/langs/pt_MZ/paybox.lang
+++ b/htdocs/langs/pt_MZ/paybox.lang
@@ -1,20 +1,11 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=Configuração do módulo PayBox
PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor %s b> para que o pagamento seja criado automaticamente quando validado pelo Paybox.
YourPaymentHasBeenRecorded=Esta pagina confirma que o seu pagamento foi registrado com suçesso. Obrigado.
-AccountParameter=Parametros da conta
-UsageParameter=Parametros de uso
-InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
-CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
NewPayboxPaymentReceived=Novo pagamento recebido Paybox
NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de uma tentativa de pagamento (sucesso ou falha)
diff --git a/htdocs/langs/ru_UA/salaries.lang b/htdocs/langs/ru_UA/salaries.lang
new file mode 100644
index 00000000000..bc0559cc8b6
--- /dev/null
+++ b/htdocs/langs/ru_UA/salaries.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on the user card will be used for Subledger accounting only. This one will be used for General Ledger, bt also as the default value of Subledger accounting if no dedicated user accounting account is defined on the user.
diff --git a/htdocs/langs/ru_UA/trips.lang b/htdocs/langs/ru_UA/trips.lang
new file mode 100644
index 00000000000..28e05069da5
--- /dev/null
+++ b/htdocs/langs/ru_UA/trips.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - trips
+TripsAndExpenses=Expenses reports
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 910720b56f2..65035f02da5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2731,7 +2731,7 @@ function top_menu_quickadd()
// Key map shortcut
$(document).keydown(function(event){
- var ostype = "'.$conf->browser->os.'";
+ var ostype = \''.dol_escape_js($conf->browser->os).'\';
if (ostype === "macintosh") {
if ( event.which === 65 && event.ctrlKey ) {
console.log(\'control + a : trigger open quick add dropdown\');
@@ -3003,7 +3003,7 @@ function top_menu_bookmark()
// Key map shortcut
jQuery(document).keydown(function(event) {
- var ostype = "'.$conf->browser->os.'";
+ var ostype = \''.dol_escape_js($conf->browser->os).'\';
if (ostype === "macintosh") {
if ( event.which === 66 && event.ctrlKey ) {
console.log("Click on control + b : trigger open bookmark dropdown");
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index f2261034547..2f555335c2d 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2766,7 +2766,7 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) {
if (GETPOST('type', 'alpha') == 'left' && !empty(GETPOST('lefmenu', 'alpha'))) {
if (!str_contains(GETPOST('leftmenu'), strtolower($module))) {
$error++;
- setEventMessages($langs->trans("WarningFieldsMustContains", $langs->transnoentities("leftmenu")), null, 'errors');
+ setEventMessages($langs->trans("WarningFieldsMustContains", $langs->transnoentities("LeftmenuId")), null, 'errors');
}
}
$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
@@ -2776,7 +2776,7 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) {
if (GETPOST('type', 'alpha') == 'left') {
if (empty(GETPOST('leftmenu')) && count($objects) > 0) {
$error++;
- setEventMessages($langs->trans("ErrorCoherenceMenu", $langs->transnoentities("leftmenu"), $langs->transnoentities("type")), null, 'errors');
+ setEventMessages($langs->trans("ErrorCoherenceMenu", $langs->transnoentities("LeftmenuId"), $langs->transnoentities("type")), null, 'errors');
}
}
if (GETPOST('type', 'alpha') == 'top') {
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 9f09c6a3f4d..ea96b993db3 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -55,7 +55,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
// Load translation files
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "members", "paybox", "propal", "commercial"));
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "members", "paybox", "stripe", "propal", "commercial"));
// Security check
// No check on module enabled. Done later according to $validpaymentmethod
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index dcb89788136..46dbedbc533 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -178,9 +178,9 @@ if (!empty($_SESSION['ipaddress'])) { // To avoid to make action twice
if ($sendemail) {
$companylangs = new Translate('', $conf);
$companylangs->setDefaultLang($mysoc->default_lang);
- $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
+ $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox', 'stripe'));
- $from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
+ $from = getDolGlobalString('MAILING_EMAIL_FROM', getDolGlobalString("MAIN_MAIL_EMAIL_FROM"));
$sendto = $sendemail;
$urlback = $_SERVER["REQUEST_URI"];
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 87c49592c93..e3be4aeace0 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -64,7 +64,7 @@ $hookmanager = new HookManager($db);
$hookmanager->initHooks(array('newpayment'));
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal", "stripe"));
// Clean parameters
if (isModEnabled('paypal')) {
@@ -1892,7 +1892,7 @@ if ($ispaymentok) {
if ($sendemail) {
$companylangs = new Translate('', $conf);
$companylangs->setDefaultLang($mysoc->default_lang);
- $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
+ $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox', 'stripe'));
$sendto = $sendemail;
$from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
@@ -2000,7 +2000,7 @@ if ($ispaymentok) {
if ($sendemail) {
$companylangs = new Translate('', $conf);
$companylangs->setDefaultLang($mysoc->default_lang);
- $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
+ $companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox', 'stripe'));
$sendto = $sendemail;
$from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 722e21c5cd0..773137b9a1f 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1749,7 +1749,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '
';
$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', '0', 0, 0, 'AND u.statut = 1', 0, '', '', 0, 2);
// Note: If user has no right to "see all thirdparties", we force selection of sale representative to him, so after creation he can see the record.
- $selected = (GETPOSTISARRAY('commercial') ? GETPOST('commercial', 'array:int') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : (!$user->hasRight('societe', 'client', 'voir') ? array($user->id) : array())));
+ $selected = (GETPOSTISARRAY('commercial') ? GETPOST('commercial', 'array:int') : (GETPOSTINT('commercial') > 0 ? array(GETPOSTINT('commercial')) : array($user->id)));
print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $selected, null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
print '
';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index aecf5211359..8fc5513a792 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4061,18 +4061,25 @@ class Societe extends CommonObject
{
// Define if third party is treated as company (or not) when nature is unknown
$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES');
+
+ // Now try to guess using different tips
if (!empty($this->tva_intra)) {
$isACompany = 1;
} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
$isACompany = 1;
- } elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN') {
- // TODO Add a field is_a_company into dictionary
- if (preg_match('/^TE_PRIVATE/', $this->typent_code)) {
- $isACompany = 0;
+ } 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)) {
+ $isACompany = 0;
+ } else {
+ $isACompany = 1;
+ }
} else {
$isACompany = 1;
}
}
+
return (bool) $isACompany;
}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 5217d61f217..d9c192d8891 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -209,8 +209,9 @@ if (empty($reshook)) {
if ($invoice->total_ttc < 0) {
$invoice->type = $invoice::TYPE_CREDIT_NOTE;
- $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE";
- $sql .= " fk_soc = ".((int) $invoice->socid);
+ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture";
+ $sql .= " WHERE entity IN (".getEntity('invoice').")";
+ $sql .= " AND fk_soc = ".((int) $invoice->socid);
$sql .= " AND type <> ".Facture::TYPE_CREDIT_NOTE;
$sql .= " AND fk_statut >= ".$invoice::STATUS_VALIDATED;
$sql .= " ORDER BY rowid DESC";
@@ -809,7 +810,8 @@ if (empty($reshook)) {
$varforconst = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
$sql .= " SET fk_soc = ".((int) getDolGlobalString($varforconst)).", ";
$sql .= " datec = '".$db->idate(dol_now())."'";
- $sql .= " WHERE ref = '(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
+ $sql .= " WHERE entity IN (".getEntity('invoice').")";
+ $sql .= " AND ref = '(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
$resql1 = $db->query($sql);
if ($resdeletelines && $resql1) {
@@ -1364,14 +1366,14 @@ $( document ).ready(function() {
escape(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '')."-0%' AND entity IN (".getEntity('invoice').")";
+ $sql .= " AND ref LIKE '(PROV-POS".$db->escape(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '')."-0%'";
} else {
// If TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED set, we show also draft invoice that already has a reference defined
- $sql .= " WHERE pos_source = '".$db->escape($_SESSION["takeposterminal"])."'";
+ $sql .= " AND pos_source = '".$db->escape($_SESSION["takeposterminal"])."'";
$sql .= " AND module_source = 'takepos'";
- $sql .= " AND entity IN (".getEntity('invoice').")";
}
$sql .= $db->order('datec', 'ASC');
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 27fa2d103e3..b891f11de6e 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -152,7 +152,9 @@ $invoice = new Facture($db);
if ($invoiceid > 0) {
$invoice->fetch($invoiceid);
} else {
- $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture";
+ $sql .= " WHERE entity IN (".getEntity('invoice').")";
+ $sql .= " AND ref = '(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
$resql = $db->query($sql);
$obj = $db->fetch_object($resql);
if ($obj) {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 70d607c9633..9163ecb38a8 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2630,7 +2630,7 @@ class Ticket extends CommonObject
if (!GETPOST("message")) {
$error++;
- array_push($this->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("message")));
+ array_push($this->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")));
$action = 'add_message';
}
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index b042a7908c4..863e8367a00 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -335,7 +335,17 @@ $user_temp = new User($db);
$socstatic = new Societe($db);
$help_url = '';
-$title = $langs->trans('Tickets');
+
+$moretitle = '';
+if ($socid > 0) {
+ $socstatic->fetch($socid);
+ $moretitle = $langs->trans("ThirdParty") . ' - ';
+ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $socstatic->name) {
+ $moretitle = $socstatic->name . ' - ';
+ }
+}
+
+$title = $moretitle . $langs->trans('Tickets');
$morejs = array();
$morecss = array();