diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index f391f2f6f50..f06bb32b62b 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -631,7 +631,7 @@ class Translate
// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
// we want to keep '"' '' '' '' '' '
' '< ' '' that are reliable HTML tags inside translation strings.
$str = str_replace(
- array('"', '', '', '', '', '', '', '', '', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
+ array('"', '', '', '', '', '', '', '', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>'
array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
$str
);
@@ -646,7 +646,7 @@ class Translate
// Restore reliable HTML tags into original translation string
$str = str_replace(
array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
- array('"', '', '', '', '', '', '', '', '', '', '
', '', '< ', '>'),
+ array('"', '', '', '', '', '', '', '', '', '
', '', '< ', '>'),
$str
);
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 83701e59e40..bbfccb3b945 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -317,11 +317,16 @@ if (empty($reshook)) {
//var_dump($_POST);exit;
for ($i = 1; $i <= $num; $i++) {
$lineToTest = '';
+ $lineId = GETPOST($idl, 'int');
foreach ($objectsrc->lines as $linesrc) {
- if ($linesrc->id == GETPOST($idl, 'int')) {
+ if ($linesrc->id == $lineId) {
$lineToTest = $linesrc;
+ break;
}
}
+ if (empty($lineToTest)) {
+ continue;
+ }
$qty = "qtyl".$i;
$comment = "comment".$i;
$eatby = "dlc".$i;
@@ -340,7 +345,7 @@ if (empty($reshook)) {
if ($entrepot_id < 0) {
$entrepot_id = '';
}
- if (!($linesrc->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+ if (!($lineToTest->fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
$entrepot_id = 0;
}
$eatby = GETPOST($eatby, 'alpha');
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 0010484a280..3b0eda077a2 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -175,7 +175,7 @@ if ($action == 'create') {
print '';
print '';
- print dol_get_fiche_end();
+ print dol_get_fiche_head();
print '