X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=1b73f1a40397d848dca2c422dbc123c4637e6a96;hb=05ba2d82d4230a8ea991920515cdc2377fcacfd0;hp=483a885115df40f7edf9998049ebda9c9937ee27;hpb=c2f2b28297b0355051ca2508fc7778438f5c6a3d;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 483a8851..1b73f1a4 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -241,7 +241,8 @@ function submit_return($name, $value, $title=false)
 
 function submit_js_confirm($name, $msg) {
 	add_js_source(
-		"_validate.$name=function(){ return confirm('$msg');};");
+		"_validate.$name=function(){ return confirm('"
+			. strtr($msg, array("\n"=>'\\n')) . "');};");
 };
 //-----------------------------------------------------------------------------------
 
@@ -386,6 +387,12 @@ function email_cell($label, $params="", $id=null)
 	label_cell("<a href='mailto:$label'>$label</a>", $params, $id);
 }
 
+function amount_decimal_cell($label, $params="", $id=null)
+{
+	$dec = 0;
+	label_cell(price_decimal_format($label, $dec), "nowrap align=right ".$params, $id);
+}
+
 function amount_cell($label, $bold=false, $params="", $id=null)
 {
 	if ($bold)
@@ -394,6 +401,16 @@ function amount_cell($label, $bold=false, $params="", $id=null)
 		label_cell(price_format($label), "nowrap align=right ".$params, $id);
 }
 
+//JAM  Allow entered unit prices to be fractional
+function unit_amount_cell($label, $bold=false, $params="", $id=null)
+{
+	if ($bold)
+		label_cell("<b>".unit_price_format($label)."</b>", "nowrap align=right ".$params, $id);
+	else
+		label_cell(unit_price_format($label), "nowrap align=right ".$params, $id);
+}
+
+
 function percent_cell($label, $bold=false, $id=null)
 {
 	if ($bold)
@@ -675,6 +692,15 @@ function amount_cells($label, $name, $init=null, $params=null, $post_label=null,
 	amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec);
 }
 
+//JAM  Allow entered unit prices to be fractional
+function unit_amount_cells($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
+{
+	if (!isset($dec))
+	  	$dec = user_price_dec()+2;
+
+	amount_cells_ex($label, $name, 15, 15, $init, $params, $post_label, $dec+2);
+}
+
 function amount_row($label, $name, $init=null, $params=null, $post_label=null, $dec=null)
 {
 	echo "<tr>";