diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 85720de5156..3aed4bc11d5 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -273,7 +273,7 @@ if (empty($reshook))
{
if (empty($login)) {
$error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
}
}
// Create new object
@@ -509,7 +509,7 @@ if (empty($reshook))
{
if (empty($login)) {
$error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
}
else {
$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 54f3a4cbb73..32398f05ada 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -987,7 +987,7 @@ else
print '';
print "\n";
$s.=''.$langs->trans("VATIntraCheck").'';
- $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
+ $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
}
else
{
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 160e8b079e8..1d05d5e0afe 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -268,8 +268,8 @@ print $langs->trans("DescWeather").'
';
if($action == 'edit') {
- $str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoPercentageMod'));
- $str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoStdMod'));
+ $str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
+ $str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
else $str_mode_enabled = $str_mode_percentage;
print ''.$str_mode_enabled.'';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 51fe9a25554..b4f5fbd3355 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -177,13 +177,13 @@ if ($action == 'add')
}
if (! $error && ! $_POST['url'])
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("URL")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
$action = 'create';
$error++;
}
if (! $error && ! $_POST['titre'])
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
$action = 'create';
$error++;
}
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index fff9b40d5ea..a4bba8f7adc 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -267,7 +267,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
$error = 0;
if ($action == 'createfilter' && empty($template_name)) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('AdvTgtOrCreateNewFilter')), null, 'errors');
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('AdvTgtOrCreateNewFilter')), null, 'errors');
$error ++;
}
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 53f1a881cbe..b6f5d9328f8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -424,7 +424,7 @@ if (empty($reshook))
$object->sendto = $_POST["sendto"];
if (! $object->sendto)
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("MailTo")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTo")), null, 'errors');
$error++;
}
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 48b4ee6440d..eabb217fb99 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -161,7 +161,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
$error=0;
if (empty($desc))
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("ReasonDiscount")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReasonDiscount")), null, 'errors');
$error++;
}
@@ -193,7 +193,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
}
else
{
- setEventMessages($langs->trans("ErrorFieldFormat", $langs->trans("NewGlobalDiscount")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("NewGlobalDiscount")), null, 'errors');
}
}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6a5f333492e..fd7832f868f 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -815,7 +815,7 @@ class Commande extends CommonOrder
}
if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->trans("Source"));
+ $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Source"));
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 722976890c0..260edb5f61c 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -939,7 +939,7 @@ if (empty($reshook))
if (empty($dateinvoice))
{
$error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
}
$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -1566,7 +1566,7 @@ if (empty($reshook))
$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
if (empty($datefacture)) {
$error++;
- $mesg = $langs->trans("ErrorFieldRequired", $langs->trans("Date"));
+ $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
setEventMessages($mesg, null, 'errors');
}
@@ -1574,7 +1574,7 @@ if (empty($reshook))
if (!($_POST['situations'] > 0)) {
$error++;
- $mesg = $langs->trans("ErrorFieldRequired", $langs->trans("InvoiceSituation"));
+ $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
setEventMessages($mesg, null, 'errors');
}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4fbcc3cbd01..686190c359b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2284,7 +2284,7 @@ class Facture extends CommonInvoice
// Controle que facture source connue
if ($this->fk_facture_source <= 0)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->trans("InvoiceReplacement"));
+ $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceReplacement"));
$this->db->rollback();
return -10;
}
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 33728093ec1..8b11716bf6f 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -59,7 +59,7 @@ if ($action == 'confirm_rejet')
if (empty($daterej))
{
$error++;
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
}
elseif ($daterej > dol_now())
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 316983a5d0a..d21b383bf97 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -878,14 +878,14 @@ class Contrat extends CommonObject
if ($this->commercial_signature_id <= 0)
{
$langs->load("commercial");
- $this->error.=$langs->trans("ErrorFieldRequired", $langs->trans("SalesRepresentativeSignature"));
+ $this->error.=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SalesRepresentativeSignature"));
$paramsok=0;
}
if ($this->commercial_suivi_id <= 0)
{
$langs->load("commercial");
$this->error.=($this->error?"
":'');
- $this->error.=$langs->trans("ErrorFieldRequired", $langs->trans("SalesRepresentativeFollowUp"));
+ $this->error.=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SalesRepresentativeFollowUp"));
$paramsok=0;
}
if (! $paramsok) return -1;
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 6c473b83691..2ecb127f3b2 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -488,7 +488,7 @@ jQuery(document).ready(function() {
console.log("We click on submitcrop");
var idClicked = e.target.id;
if (parseInt(jQuery(\'#w\').val())) return true;
- alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->trans("Dimension"))).'\');
+ alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Dimension"))).'\');
return false;
});
});
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 5662b3272f0..cd92d8d02f5 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -84,14 +84,14 @@ if ($action == 'update')
if (empty($donation_date))
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = "create";
$error++;
}
if (empty($amount))
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
$action = "create";
$error++;
}
@@ -140,14 +140,14 @@ if ($action == 'add')
if (empty($donation_date))
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = "create";
$error++;
}
if (empty($amount))
{
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
$action = "create";
$error++;
}
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index de360d8cc3b..d75e658a191 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -271,32 +271,32 @@ class Don extends CommonObject
{
if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Company').'/'.$langs->transnoentitiesnoconv('Firstname').'-'.$langs->transnoentitiesnoconv('Lastname'));
$err++;
}
}
if (dol_strlen(trim($this->address)) == 0)
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Address'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Address'));
$err++;
}
if (dol_strlen(trim($this->zip)) == 0)
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Zip'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Zip'));
$err++;
}
if (dol_strlen(trim($this->town)) == 0)
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Town'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Town'));
$err++;
}
if (dol_strlen(trim($this->email)) == 0)
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('EMail'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMail'));
$err++;
}
@@ -308,7 +308,7 @@ class Don extends CommonObject
{
if (!isset($map[substr($this->amount, $i, 1)]))
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Amount'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
$err++;
$amount_invalid = 1;
break;
@@ -319,14 +319,14 @@ class Don extends CommonObject
{
if ($this->amount == 0)
{
- $error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Amount'));
+ $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
$err++;
}
else
{
if ($this->amount < $minimum && $minimum > 0)
{
- $error_string[] = $langs->trans('MinimumAmount', $langs->trans('$minimum'));
+ $error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
$err++;
}
}
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 20d9d786354..31db9d0c2b4 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -427,7 +427,7 @@ if (empty($reshook))
}
else
{
- $mesg=''.$langs->trans("ErrorFieldRequired", $langs->trans("ThirdParty")).'
';
+ $mesg=''.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'
';
$action = 'create';
}
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index e876d5caee2..bf0a3da62b3 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1540,7 +1540,7 @@ class CommandeFournisseur extends CommonOrder
// Check parameters
if ($qty < 1 && ! $fk_product)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->trans("Product"));
+ $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product"));
return -1;
}
if ($type < 0) return -1;
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 37a3d7f538b..071277bd501 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -127,7 +127,7 @@ elseif ($action == 'update')
$name = GETPOST('name', 'alpha');
if (empty($name)) {
- setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('Name')), null, 'errors');
+ setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Name')), null, 'errors');
$error ++;
}
@@ -291,7 +291,7 @@ if (($id || $ref) && $action == 'edit')
print '| '.$form->editfieldkey('Name', 'name', '', $object, 0, 'string', '', 1).' | ';
print '';
print ' |
';
-
+
// Parent
print '| '.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).' | ';
print '';
@@ -380,7 +380,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print ' | '.$langs->trans("Name").' | ';
print ''.$object->name.' | ';
print '
';
-
+
// Parent
print '';
print '| '.$langs->trans("Parent").' | ';
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 0cb8fe68c5a..c37dee6570a 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -366,7 +366,7 @@ if (! $error && $db->connected && $action == "set")
print "
";
print $langs->trans("ErrorDirDoesNotExists", $main_dir).'
';
- print $langs->trans("ErrorWrongValueForParameter", $langs->trans("WebPagesDirectory")).'
';
+ print $langs->trans("ErrorWrongValueForParameter", $langs->transnoentitiesnoconv("WebPagesDirectory")).'
';
print $langs->trans("ErrorGoBackAndCorrectParameters").'
';
print ' | ';
print $langs->trans("Error");
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 7b0e1ddcc64..d50e474026e 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -183,7 +183,7 @@ $genPriceOptions = function ($level) use ($price_options) {
|
- trans('PercentDiscountOver', $langs->trans('SellingPrice').' '.$i) ?>
+ trans('PercentDiscountOver', $langs->transnoentitiesnoconv('SellingPrice').' '.$i) ?>
|
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index a4a3d71a4a9..27aeca883cc 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -131,7 +131,7 @@ class ActionsCardCompany extends ActionsCardCommon
if ($conf->use_javascript_ajax)
{
$s.=''.$langs->trans("VATIntraCheck").'';
- $this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
+ $this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
}
else
{
@@ -170,7 +170,7 @@ class ActionsCardCompany extends ActionsCardCommon
if ($conf->use_javascript_ajax)
{
$s.=''.$langs->trans("VATIntraCheck").'';
- $this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
+ $this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
}
else
{
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 9c688c19c99..d55ea537297 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -126,7 +126,7 @@ if (empty($reshook))
{
$langs->load('errors');
$langs->load('companies');
- setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
+ setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
}
else
{
@@ -2042,7 +2042,7 @@ else
print '';
print "\n";
$s.=''.$langs->trans("VATIntraCheck").'';
- $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
+ $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
}
else
{
@@ -2454,7 +2454,7 @@ else
print '';
print "\n";
$s.=''.$langs->trans("VATIntraCheck").'';
- $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1);
+ $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
}
else
{
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 021a932f388..aaafc334e9e 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -163,7 +163,7 @@ else
}
print '
';
-print $langs->trans("VATIntraManualCheck", $langs->trans("VATIntraCheckURL"), $langs->trans("VATIntraCheckURL")).'
';
+print $langs->trans("VATIntraManualCheck", $langs->trans("VATIntraCheckURL"), $langs->transnoentitiesnoconv("VATIntraCheckURL")).'
';
print '
';
print '';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 4bec5fc6f49..84bda8abd54 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1642,7 +1642,7 @@ class Societe extends CommonObject
$note=trim($note);
if (! $note)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
+ $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
return -2;
}
@@ -1705,7 +1705,7 @@ class Societe extends CommonObject
$note=trim($note);
if (! $note)
{
- $this->error=$langs->trans("ErrorFieldRequired", $langs->trans("NoteReason"));
+ $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
return -2;
}
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index b2b2b1bdfc6..39d32094fe4 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -331,7 +331,7 @@ if (! empty($id) || ! empty($ref)) {