merge devel-france

This commit is contained in:
sparkyx 2023-07-27 20:24:34 +02:00
parent 9cfb489c41
commit 844484c39d
67 changed files with 484 additions and 246 deletions

View file

@ -200,7 +200,7 @@ if ($aRap != null ) {
array($internal));
// add additional tax if any
$add=$operation->get_sum_other_tax();
$amount=bcadd($amount,$add,2);
$amount=noalyss_bcadd($amount,$add,2);
break;
case 'V':
$amount=$cn->get_value("select sum(qs_price+qs_vat-qs_vat_sided) from quant_sold qs

View file

@ -48,7 +48,7 @@ if (!defined('ALLOWED'))
elseif ($row['me_javascript']!='')
{
$url="javascript:void(0)";
$js_dossier=str_replace('<DOSSIER>', Dossier::id(), $row['me_javascript']);
$js_dossier=noalyss_str_replace('<DOSSIER>', Dossier::id(), $row['me_javascript']);
$js=sprintf(' onclick="%s"', $js_dossier);
}
else

View file

@ -115,7 +115,7 @@ endif;?>
elseif ($row['me_javascript'] != '')
{
$url="javascript:void(0)";
$js_dossier=str_replace('<DOSSIER>', Dossier::id(), $row['me_javascript']);
$js_dossier=noalyss_str_replace('<DOSSIER>', Dossier::id(), $row['me_javascript']);
$js=sprintf(' onclick="%s"',$js_dossier);
}
else
@ -159,7 +159,7 @@ endif;?>
elseif ($row['me_javascript'] != '')
{
$url="javascript:void(0)";
$js_dossier=str_replace('<DOSSIER>', Dossier::id(), $row['me_javascript']);
$js_dossier=noalyss_str_replace('<DOSSIER>', Dossier::id(), $row['me_javascript']);
$js=sprintf(' onclick="%s"',$js_dossier);
}
else