X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=67abbbde5861271a68e393e98e56c33cf2e998db;hb=dcb13782fcae94b2111445f96ac75129fadf3d61;hp=aab5fd18c5d3873ea564282878d5de6060f26b41;hpb=9ad27981afdaa91591f4e71d19ac59653c524cea;p=fa-stable.git
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index aab5fd18..67abbbde 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,5 +1,25 @@
$postval ) {
+ if (strpos($postkey, $prefix) === 0) {
+ $id = substr($postkey, strlen($prefix));
+ return $numeric ? (int)$id : $id;
+ }
+ }
+ return $numeric ? -1 : null;
+}
+
+//------------------------------------------------------------------------------
+//
+// Read numeric value from user formatted input
+//
function input_num($postname=null) {
if (!isset($_POST[$postname]))
return null;
@@ -18,6 +38,7 @@ function hidden($name, $value)
function submit($name, $value, $echo=true)
{
+
$submit_str = "\n";
if ($echo)
echo $submit_str;
@@ -98,7 +119,7 @@ function submit_row($name, $value, $right=true, $extra="")
function button($name, $value, $onclick)
{
- echo "\n";
+ echo "\n";
}
function button_cell($name, $value, $onclick)
@@ -164,25 +185,25 @@ function label_cell($label, $params="")
function amount_cell($label, $bold=false)
{
if ($bold)
- label_cell("".number_format2($label,user_price_dec())."", "nowrap align=right");
+ label_cell("".price_format($label)."", "nowrap align=right");
else
- label_cell(number_format2($label,user_price_dec()), "nowrap align=right");
+ label_cell(price_format($label), "nowrap align=right");
}
function percent_cell($label, $bold=false)
{
if ($bold)
- label_cell("".number_format2($label,user_percent_dec())."", "nowrap align=right");
+ label_cell("".percent_format($label)."", "nowrap align=right");
else
- label_cell(number_format2($label,user_percent_dec()), "nowrap align=right");
+ label_cell(percent_format($label), "nowrap align=right");
}
-function qty_cell($label, $bold=false)
+function qty_cell($label, $bold=false, $dec=null)
{
if ($bold)
- label_cell("".number_format2($label,user_qty_dec())."", "nowrap align=right");
+ label_cell("".qty_format($label, $dec)."", "nowrap align=right");
else
- label_cell(number_format2($label,user_qty_dec()), "nowrap align=right");
+ label_cell(qty_format($label, $dec), "nowrap align=right");
}
function label_cells($label, $value, $params="", $params2="")
@@ -291,7 +312,7 @@ function date_cells($label, $name, $init=null, $inc_days=0, $inc_months=0, $inc_
$_POST[$name] = $init;
}
if ($use_date_picker)
- $post_label = ""
+ $post_label = ""
. " \n";
else
$post_label = "";
@@ -331,11 +352,13 @@ function percent_row($label, $name, $init=null)
$_POST[$name] = $init== null ? '' : $init;
}
- small_amount_row($label, $name, $_POST[$name], null, "%");
+ small_amount_row($label, $name, $_POST[$name], null, "%", user_percent_dec());
}
-function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null)
+function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=null, $post_label=null, $dec=null)
{
+ if (!isset($dec))
+ $dec = user_price_dec();
if (!isset($_POST[$name]) || $_POST[$name] == "")
{
if ($init)
@@ -351,7 +374,7 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
echo "