lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Duplicate encoding on error message

Browse Source
This commit is contained in:
Laurent Destailleur 2019-05-29 09:51:45 +02:00
parent b024c288b8
commit 2218994958
25 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/card.php
View File

@ -273,7 +273,7 @@ if (empty($reshook))
{ {
if (empty($login)) { if (empty($login)) {
$error++; $error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
} }
} }
// Create new object // Create new object
@ -509,7 +509,7 @@ if (empty($reshook))
{ {
if (empty($login)) { if (empty($login)) {
$error++; $error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Login")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
} }
else { else {
$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'"; $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";

2
htdocs/admin/company.php
View File

@ -987,7 +987,7 @@ else
print '</script>'; print '</script>';
print "\n"; print "\n";
$s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onClick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
} }
else else
{ {

4
htdocs/admin/delais.php
View File

@ -268,8 +268,8 @@ print $langs->trans("DescWeather").'<br>';
if($action == 'edit') { if($action == 'edit') {
$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoPercentageMod')); $str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->trans('MeteoStdMod')); $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; if(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
else $str_mode_enabled = $str_mode_percentage; else $str_mode_enabled = $str_mode_percentage;
print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>'; print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';

4
htdocs/admin/menus/edit.php
View File

@ -177,13 +177,13 @@ if ($action == 'add')
} }
if (! $error && ! $_POST['url']) if (! $error && ! $_POST['url'])
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("URL")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
$action = 'create'; $action = 'create';
$error++; $error++;
} }
if (! $error && ! $_POST['titre']) if (! $error && ! $_POST['titre'])
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Title")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
$action = 'create'; $action = 'create';
$error++; $error++;
} }

2
htdocs/comm/mailing/advtargetemailing.php
View File

@ -267,7 +267,7 @@ if ($action == 'savefilter' || $action == 'createfilter') {
$error = 0; $error = 0;
if ($action == 'createfilter' && empty($template_name)) { 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 ++; $error ++;
} }

2
htdocs/comm/mailing/card.php
View File

@ -424,7 +424,7 @@ if (empty($reshook))
$object->sendto = $_POST["sendto"]; $object->sendto = $_POST["sendto"];
if (! $object->sendto) if (! $object->sendto)
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("MailTo")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTo")), null, 'errors');
$error++; $error++;
} }

4
htdocs/comm/remx.php
View File

@ -161,7 +161,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
$error=0; $error=0;
if (empty($desc)) if (empty($desc))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("ReasonDiscount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReasonDiscount")), null, 'errors');
$error++; $error++;
} }
@ -193,7 +193,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
} }
else else
{ {
setEventMessages($langs->trans("ErrorFieldFormat", $langs->trans("NewGlobalDiscount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("NewGlobalDiscount")), null, 'errors');
} }
} }

2
htdocs/commande/class/commande.class.php
View File

@ -815,7 +815,7 @@ class Commande extends CommonOrder
} }
if (! empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0) 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); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1; return -1;
} }

6
htdocs/compta/facture/card.php
View File

@ -939,7 +939,7 @@ if (empty($reshook))
if (empty($dateinvoice)) if (empty($dateinvoice))
{ {
$error++; $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']); $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']); $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
if (empty($datefacture)) { if (empty($datefacture)) {
$error++; $error++;
$mesg = $langs->trans("ErrorFieldRequired", $langs->trans("Date")); $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
setEventMessages($mesg, null, 'errors'); setEventMessages($mesg, null, 'errors');
} }
@ -1574,7 +1574,7 @@ if (empty($reshook))
if (!($_POST['situations'] > 0)) { if (!($_POST['situations'] > 0)) {
$error++; $error++;
$mesg = $langs->trans("ErrorFieldRequired", $langs->trans("InvoiceSituation")); $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
setEventMessages($mesg, null, 'errors'); setEventMessages($mesg, null, 'errors');
} }

2
htdocs/compta/facture/class/facture.class.php
View File

@ -2284,7 +2284,7 @@ class Facture extends CommonInvoice
// Controle que facture source connue // Controle que facture source connue
if ($this->fk_facture_source <= 0) 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(); $this->db->rollback();
return -10; return -10;
} }

2
htdocs/compta/prelevement/ligne.php
View File

@ -59,7 +59,7 @@ if ($action == 'confirm_rejet')
if (empty($daterej)) if (empty($daterej))
{ {
$error++; $error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
} }
elseif ($daterej > dol_now()) elseif ($daterej > dol_now())

4
htdocs/contrat/class/contrat.class.php
View File

@ -878,14 +878,14 @@ class Contrat extends CommonObject
if ($this->commercial_signature_id <= 0) if ($this->commercial_signature_id <= 0)
{ {
$langs->load("commercial"); $langs->load("commercial");
$this->error.=$langs->trans("ErrorFieldRequired", $langs->trans("SalesRepresentativeSignature")); $this->error.=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SalesRepresentativeSignature"));
$paramsok=0; $paramsok=0;
} }
if ($this->commercial_suivi_id <= 0) if ($this->commercial_suivi_id <= 0)
{ {
$langs->load("commercial"); $langs->load("commercial");
$this->error.=($this->error?"<br>":''); $this->error.=($this->error?"<br>":'');
$this->error.=$langs->trans("ErrorFieldRequired", $langs->trans("SalesRepresentativeFollowUp")); $this->error.=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SalesRepresentativeFollowUp"));
$paramsok=0; $paramsok=0;
} }
if (! $paramsok) return -1; if (! $paramsok) return -1;

2
htdocs/core/photos_resize.php
View File

@ -488,7 +488,7 @@ jQuery(document).ready(function() {
console.log("We click on submitcrop"); console.log("We click on submitcrop");
var idClicked = e.target.id; var idClicked = e.target.id;
if (parseInt(jQuery(\'#w\').val())) return true; 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; return false;
}); });
}); });

8
htdocs/don/card.php
View File

@ -84,14 +84,14 @@ if ($action == 'update')
if (empty($donation_date)) if (empty($donation_date))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }
if (empty($amount)) if (empty($amount))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }
@ -140,14 +140,14 @@ if ($action == 'add')
if (empty($donation_date)) if (empty($donation_date))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }
if (empty($amount)) if (empty($amount))
{ {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
$action = "create"; $action = "create";
$error++; $error++;
} }

16
htdocs/don/class/don.class.php
View File

@ -271,32 +271,32 @@ class Don extends CommonObject
{ {
if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0) 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++; $err++;
} }
} }
if (dol_strlen(trim($this->address)) == 0) if (dol_strlen(trim($this->address)) == 0)
{ {
$error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Address')); $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Address'));
$err++; $err++;
} }
if (dol_strlen(trim($this->zip)) == 0) if (dol_strlen(trim($this->zip)) == 0)
{ {
$error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Zip')); $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Zip'));
$err++; $err++;
} }
if (dol_strlen(trim($this->town)) == 0) if (dol_strlen(trim($this->town)) == 0)
{ {
$error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Town')); $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Town'));
$err++; $err++;
} }
if (dol_strlen(trim($this->email)) == 0) if (dol_strlen(trim($this->email)) == 0)
{ {
$error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('EMail')); $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMail'));
$err++; $err++;
} }
@ -308,7 +308,7 @@ class Don extends CommonObject
{ {
if (!isset($map[substr($this->amount, $i, 1)])) 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++; $err++;
$amount_invalid = 1; $amount_invalid = 1;
break; break;
@ -319,14 +319,14 @@ class Don extends CommonObject
{ {
if ($this->amount == 0) if ($this->amount == 0)
{ {
$error_string[] = $langs->trans('ErrorFieldRequired', $langs->trans('Amount')); $error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
$err++; $err++;
} }
else else
{ {
if ($this->amount < $minimum && $minimum > 0) if ($this->amount < $minimum && $minimum > 0)
{ {
$error_string[] = $langs->trans('MinimumAmount', $langs->trans('$minimum')); $error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
$err++; $err++;
} }
} }

2
htdocs/fichinter/card.php
View File

@ -427,7 +427,7 @@ if (empty($reshook))
} }
else else
{ {
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->trans("ThirdParty")).'</div>'; $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'</div>';
$action = 'create'; $action = 'create';
} }
} }

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -1540,7 +1540,7 @@ class CommandeFournisseur extends CommonOrder
// Check parameters // Check parameters
if ($qty < 1 && ! $fk_product) if ($qty < 1 && ! $fk_product)
{ {
$this->error=$langs->trans("ErrorFieldRequired", $langs->trans("Product")); $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product"));
return -1; return -1;
} }
if ($type < 0) return -1; if ($type < 0) return -1;

6
htdocs/hrm/establishment/card.php
View File

@ -127,7 +127,7 @@ elseif ($action == 'update')
$name = GETPOST('name', 'alpha'); $name = GETPOST('name', 'alpha');
if (empty($name)) { if (empty($name)) {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->trans('Name')), null, 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Name')), null, 'errors');
$error ++; $error ++;
} }
@ -291,7 +291,7 @@ if (($id || $ref) && $action == 'edit')
print '<tr><td>'.$form->editfieldkey('Name', 'name', '', $object, 0, 'string', '', 1).'</td><td>'; print '<tr><td>'.$form->editfieldkey('Name', 'name', '', $object, 0, 'string', '', 1).'</td><td>';
print '<input name="name" id="name" class="flat" size="32" value="'.$object->name.'">'; print '<input name="name" id="name" class="flat" size="32" value="'.$object->name.'">';
print '</td></tr>'; print '</td></tr>';
// Parent // Parent
print '<tr><td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>'; print '<tr><td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
print '<td class="maxwidthonsmartphone">'; print '<td class="maxwidthonsmartphone">';
@ -380,7 +380,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<td class="titlefield">'.$langs->trans("Name").'</td>'; print '<td class="titlefield">'.$langs->trans("Name").'</td>';
print '<td>'.$object->name.'</td>'; print '<td>'.$object->name.'</td>';
print '</tr>'; print '</tr>';
// Parent // Parent
print '<tr>'; print '<tr>';
print '<td class="titlefield">'.$langs->trans("Parent").'</td>'; print '<td class="titlefield">'.$langs->trans("Parent").'</td>';

2
htdocs/install/step1.php
View File

@ -366,7 +366,7 @@ if (! $error && $db->connected && $action == "set")
print "<tr><td>"; print "<tr><td>";
print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>'; print $langs->trans("ErrorDirDoesNotExists", $main_dir).'<br>';
print $langs->trans("ErrorWrongValueForParameter", $langs->trans("WebPagesDirectory")).'<br>'; print $langs->trans("ErrorWrongValueForParameter", $langs->transnoentitiesnoconv("WebPagesDirectory")).'<br>';
print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>'; print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
print '</td><td>'; print '</td><td>';
print $langs->trans("Error"); print $langs->trans("Error");

2
htdocs/product/admin/price_rules.php
View File

@ -183,7 +183,7 @@ $genPriceOptions = function ($level) use ($price_options) {
</td> </td>
<td style="text-align: center"> <td style="text-align: center">
<input type="text" style="text-align: right" name="var_min_percent[<?php echo $i ?>]" size="5" value="<?php echo price(isset($rules[$i]) ? $rules[$i]->var_min_percent : 0, 2) ?>"> <input type="text" style="text-align: right" name="var_min_percent[<?php echo $i ?>]" size="5" value="<?php echo price(isset($rules[$i]) ? $rules[$i]->var_min_percent : 0, 2) ?>">
<?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' '.$i) ?> <?php echo $langs->trans('PercentDiscountOver', $langs->transnoentitiesnoconv('SellingPrice').' '.$i) ?>
</td> </td>
</tr> </tr>
<?php endfor ?> <?php endfor ?>

4
htdocs/societe/canvas/company/actions_card_company.class.php
View File

@ -131,7 +131,7 @@ class ActionsCardCompany extends ActionsCardCommon
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$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 else
{ {
@ -170,7 +170,7 @@ class ActionsCardCompany extends ActionsCardCommon
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$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 else
{ {

6
htdocs/societe/card.php
View File

@ -126,7 +126,7 @@ if (empty($reshook))
{ {
$langs->load('errors'); $langs->load('errors');
$langs->load('companies'); $langs->load('companies');
setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors'); setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
} }
else else
{ {
@ -2042,7 +2042,7 @@ else
print '</script>'; print '</script>';
print "\n"; print "\n";
$s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
} }
else else
{ {
@ -2454,7 +2454,7 @@ else
print '</script>'; print '</script>';
print "\n"; print "\n";
$s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>'; $s.='<a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
$s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->trans("VATIntraCheck")), 1); $s = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
} }
else else
{ {

2
htdocs/societe/checkvat/checkVatPopup.php
View File

@ -163,7 +163,7 @@ else
} }
print '<br>'; print '<br>';
print $langs->trans("VATIntraManualCheck", $langs->trans("VATIntraCheckURL"), $langs->trans("VATIntraCheckURL")).'<br>'; print $langs->trans("VATIntraManualCheck", $langs->trans("VATIntraCheckURL"), $langs->transnoentitiesnoconv("VATIntraCheckURL")).'<br>';
print '<br>'; print '<br>';
print '<div class="center"><input type="button" class="button" value="'.$langs->trans("CloseWindow").'" onclick="javascript: window.close()"></div>'; print '<div class="center"><input type="button" class="button" value="'.$langs->trans("CloseWindow").'" onclick="javascript: window.close()"></div>';

4
htdocs/societe/class/societe.class.php
View File

@ -1642,7 +1642,7 @@ class Societe extends CommonObject
$note=trim($note); $note=trim($note);
if (! $note) if (! $note)
{ {
$this->error=$langs->trans("ErrorFieldRequired", $langs->trans("NoteReason")); $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
return -2; return -2;
} }
@ -1705,7 +1705,7 @@ class Societe extends CommonObject
$note=trim($note); $note=trim($note);
if (! $note) if (! $note)
{ {
$this->error=$langs->trans("ErrorFieldRequired", $langs->trans("NoteReason")); $this->error=$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NoteReason"));
return -2; return -2;
} }

2
htdocs/variants/generator.php
View File

@ -331,7 +331,7 @@ if (! empty($id) || ! empty($ref)) {
<form method="post" id="combinationsform"> <form method="post" id="combinationsform">
<p><?php echo $langs->trans('TooMuchCombinationsWarning', $langs->trans('DoNotRemovePreviousCombinations')) ?></p> <p><?php echo $langs->trans('TooMuchCombinationsWarning', $langs->transnoentitiesnoconv('DoNotRemovePreviousCombinations')) ?></p>
<input type="checkbox" name="price_var_percent" <input type="checkbox" name="price_var_percent"
id="price_var_percent"<?php echo $price_var_percent ? ' checked' : '' ?>> <label id="price_var_percent"<?php echo $price_var_percent ? ' checked' : '' ?>> <label
for="price_var_percent"><?php echo $langs->trans('UsePercentageVariations') ?></label> for="price_var_percent"><?php echo $langs->trans('UsePercentageVariations') ?></label>