Fix: $form argument to price() must be int (#28699)

* Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0 * Fix: $form argument to price() must be int # Fix: $form argument to price() must be int Changed '' for $form into 0
2024-03-08 21:30:04 +01:00
parent 9cc3476765
commit d846044e38
43 changed files with 160 additions and 159 deletions
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -349,7 +349,7 @@ class Form
 				} elseif (preg_match('/^url/', $typeofdata)) {
 					$ret .= dol_print_url($value, '_blank', 32, 1);
 				} elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
-					$ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+					$ret .= ($value != '' ? price($value, 0, $langs, 0, -1, -1, $conf->currency) : '');
 				} elseif (preg_match('/^checkbox/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata);
 					$ret .= '<input type="checkbox" disabled id="' . $htmlname . '" name="' . $htmlname . '" value="' . $value . '"' . ($value ? ' checked' : '') . ($tmp[1] ? $tmp[1] : '') . '/>';
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -272,10 +272,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pa_products']) . '</td>';
 				print '<td class="right">' . price($marginInfo['margin_on_products']) . '</td>';
 				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
 			}
@@ -287,10 +287,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pa_services']) . '</td>';
 				print '<td class="right">' . price($marginInfo['margin_on_services']) . '</td>';
 				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
 			}
@@ -302,10 +302,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pa_total']) . '</td>';
 				print '<td class="right">' . price($marginInfo['total_margin']) . '</td>';
 				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
-					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
-					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . '</td>';
+					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
 			}