Fixed invalid reference number update in document edition.

[fa-stable.git] / includes / ui / ui_input.inc

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index bdb7e94545bba833171ea38d60b22a969facea16..1b37b4243b453cd324ae8c9c288155d76fc25622 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -215,9 +215,9 @@ function submit_add_or_update($add=true, $title=false, $async=false, $clone=fals
        elseif ($async === 'upgrade') {
                $async = 'default nonajax process'; $cancel = 'cancel';
        }
-       else if ($async === 'default')
+       elseif ($async === 'default')
                $cancel = true;
-       else if ($async === 'cancel')
+       elseif ($async === 'cancel')
                $async = true;
        
        if ($add)
@@ -287,7 +287,7 @@ function set_icon($icon, $title=false)
        global $path_to_root;
        if (basename($icon) === $icon) // standard icons does not contain path separator
                $icon = "$path_to_root/themes/".user_theme()."/images/$icon";
-       return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." >\n";   
+       return "<img src='$icon' style='vertical-align:middle;width:12px;height:12px;border:0;'".($title ? " title='$title'" : "")." >\n";      
 }
 
 function button($name, $value, $title=false, $icon=false,  $aspect='')
@@ -347,7 +347,7 @@ function select_button_cell($name, $value, $title=false)
 
 function check_value($name)
 {
-       if (!isset($_POST[$name]))
+    if (!isset($_POST[$name]) || ($_POST[$name]+0) === 0)
                return 0;
        return 1;
 }
@@ -653,7 +653,7 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
                $calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? 
                        "$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
                $post_label = "<a tabindex='-1' href=\"javascript:date_picker(document.getElementsByName('$name')[0]);\">"
-               . "     <img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+               . "     <img src='$calc_image' style='vertical-align:middle;padding-bottom:4px;width:16px;height:16px;border:0;' alt='"._('Click Here to Pick up the date')."'></a>\n";
        }       
        else
                $post_label = "";
@@ -709,19 +709,70 @@ function file_row($label, $name, $id = "")
        echo "</tr>\n";
 }      
 
-//-----------------------------------------------------------------------------------
+/*-----------------------------------------------------------------------------------
+
+ Reference number input.
 
-function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false)
+ Optional  $context array contains transaction data used in number parsing:
+       'data' - data used for month/year codes
+       'location' - location code
+       'customer' - debtor_no
+       'supplier' - supplier id
+       'branch' - branch_code
+*/
+function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false, $type=null, $context=null)
 {
-       text_cells_ex($label, $name, 16, 18, $init, $title, $params, null, $submit_on_change);
+       global $Ajax, $Refs;
+
+       if (isset($type)) {
+               if (empty($_POST[$name.'_list'])) // restore refline id
+                       $_POST[$name.'_list'] = $Refs->reflines->find_refline_id(empty($_POST[$name]) ? $init : $_POST[$name], $type);
+
+               if (empty($_POST[$name])) // initialization
+               {
+                       if (isset($init))
+                       {
+                               $_POST[$name] = $init;
+                       } else {
+                               $_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context);
+                       }
+                       $Ajax->addUpdate(true, $name, $_POST[$name]);
+               }
+
+               if (check_ui_refresh($name)) { // call context changed
+                       $_POST[$name] = $Refs->normalize($_POST[$name], $type, $context, $_POST[$name.'_list']);
+                       $Ajax->addUpdate(true, $name, $_POST[$name]);
+               }
+
+               if ($Refs->reflines->count($type)>1) {
+                       if (list_updated($name.'_list')) {
+                               $_POST[$name] = $Refs->get_next($type, $_POST[$name.'_list'], $context);
+                               $Ajax->addUpdate(true, $name, $_POST[$name]);
+                       }
+                       $list = refline_list($name.'_list', $type);
+               } else {
+                       $list = '';
+               }
+
+               if (isset($label))
+                       label_cell($label, $params);
+
+               label_cell($list."<input name='".$name."' "
+                       .(check_edit_access($name) ? '' : 'disabled ')
+                       ."value='".@$_POST[$name]."' size=10 maxlength=35>");
+       }
+       else // just wildcard ref field (e.g. for global inquires)
+       {
+               text_cells_ex($label, $name, 16, 35, $init, $title, $params, null, $submit_on_change);
+       }
 }
 
 //-----------------------------------------------------------------------------------
 
-function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false)
+function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false, $type=null, $context = null)
 {
        echo "<tr><td class='label'>$label</td>";
-       ref_cells(null, $name, $title, $init, null, $submit_on_change);
+       ref_cells(null, $name, $title, $init, null, $submit_on_change, $type, $context);
        echo "</tr>\n";
 }
 
@@ -877,26 +928,6 @@ function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params=
        echo "</tr>\n";
 }
 
-//-----------------------------------------------------------------------------------
-/*
-function text_row_with_submit($label, $name, $value, $size, $max, $input_name, $input_value)
-{
-       global $Ajax;
-
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td>";
-
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       echo "<input type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" value=\"$value\">   ";
-
-       submit($input_name, $input_value);
-
-       echo "</td></tr>\n";
-       $Ajax->addUpdate($name, $name, $value);
-}
-*/
 //-----------------------------------------------------------------------------------
 //
 //     When show_inactive page option is set 
@@ -981,3 +1012,12 @@ function bank_balance_row($bank_acc, $parms='')
                ."</a>", $parms);
 }
 
+function ahref($label, $href, $target="", $onclick="") {
+  echo "<a href='$href' target='$target' onclick='$onclick'>$label</a>";
+}
+
+function ahref_cell($label, $href, $target="", $onclick="") {
+  echo "<td align='center'>&nbsp;&nbsp;";
+  ahref($label, $href, $target, $onclick);
+  echo "&nbsp;&nbsp;</td>";
+}