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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-25 00:47:17 +01:00
commit 2bf5e1373b
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/translate.class.php
View File

@ -631,7 +631,7 @@ class Translate
// We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because
// we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings. // we want to keep '"' '<b>' '</b>' '<strong' '</strong>' '<a ' '</a>' '<br>' '< ' '<span' '</span>' that are reliable HTML tags inside translation strings.
$str = str_replace( $str = str_replace(
array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' array('"', '<b>', '</b>', '<u>', '</u>', '<i', '</i>', '<center>', '</center>', '<strong>', '</strong>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), // 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__'), array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
$str $str
); );
@ -646,7 +646,7 @@ class Translate
// Restore reliable HTML tags into original translation string // Restore reliable HTML tags into original translation string
$str = str_replace( $str = str_replace(
array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'), array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'),
array('"', '<b>', '</b>', '<u>', '</u>', '<i>', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'), array('"', '<b>', '</b>', '<u>', '</u>', '<i', '</i>', '<center>', '</center>', '<a ', '</a>', '<br>', '<span', '</span>', '< ', '>'),
$str $str
); );

9
htdocs/reception/card.php
View File

@ -317,11 +317,16 @@ if (empty($reshook)) {
//var_dump($_POST);exit; //var_dump($_POST);exit;
for ($i = 1; $i <= $num; $i++) { for ($i = 1; $i <= $num; $i++) {
$lineToTest = ''; $lineToTest = '';
$lineId = GETPOST($idl, 'int');
foreach ($objectsrc->lines as $linesrc) { foreach ($objectsrc->lines as $linesrc) {
if ($linesrc->id == GETPOST($idl, 'int')) { if ($linesrc->id == $lineId) {
$lineToTest = $linesrc; $lineToTest = $linesrc;
break;
} }
} }
if (empty($lineToTest)) {
continue;
}
$qty = "qtyl".$i; $qty = "qtyl".$i;
$comment = "comment".$i; $comment = "comment".$i;
$eatby = "dlc".$i; $eatby = "dlc".$i;
@ -340,7 +345,7 @@ if (empty($reshook)) {
if ($entrepot_id < 0) { if ($entrepot_id < 0) {
$entrepot_id = ''; $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; $entrepot_id = 0;
} }
$eatby = GETPOST($eatby, 'alpha'); $eatby = GETPOST($eatby, 'alpha');

2
htdocs/salaries/paiement_salary.php
View File

@ -175,7 +175,7 @@ if ($action == 'create') {
print '<input type="hidden" name="chid" value="'.$chid.'">'; print '<input type="hidden" name="chid" value="'.$chid.'">';
print '<input type="hidden" name="action" value="add_payment">'; print '<input type="hidden" name="action" value="add_payment">';
print dol_get_fiche_end(); print dol_get_fiche_head();
print '<table class="border centpercent">'; print '<table class="border centpercent">';