Left to allocate is showing wrong. Fixed by @notrinos.

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index d4cc6d5736d2c7e43d064c941fb618346ee80e46..3af7ed4a7ca8eb5583e39e8bae004b2fb04c3024 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -560,8 +560,8 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
        if ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT)
                $alloc_row['Total'] = -$alloc_row['Total'];
        amount_cell($alloc_row['Total']);
-               amount_cell($alloc_row['Total'] - $alloc_row['amt']);
        amount_cell($alloc_row['amt']);
+               amount_cell($alloc_row['Total'] - $alloc_row['amt']);
        end_row();
 
        $total_allocated += $alloc_row['amt'];
@@ -908,13 +908,23 @@ function get_js_lookup_window() {
 function get_js_select_combo_item() {
        $js = "function selectComboItem(doc, client_id, value){
        var element = doc.getElementById(client_id);
-               var options = element.options;
-               for (var i = 0, optionsLength = options.length; i < optionsLength; i++) {
-                       if (options[i].value == value) {
-                               element.selectedIndex = i;
-                       element.onchange();
+               if (typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT' ){
+                       var options = element.options;
+                       for (var i = 0, optionsLength = options.length; i < optionsLength; i++) {
+                               if (options[i].value == value) {
+                                       element.selectedIndex = i;
+                               element.onchange();
+                               }
                        }
-               }
+               } else {                        
+                       var stock_element = doc.getElementsByName('stock_id');
+               if( stock_element.length > 0) {
+                               stock_element.value = value;    
+                               var stock_id = doc.getElementById('_stock_id_edit'); 
+                               stock_id.value=value;
+                               stock_id.onblur();              
+                       }
+               }                       
                window.close();
        }";
        return $js;
@@ -923,14 +933,24 @@ function get_js_select_combo_item() {
 function get_js_set_combo_item() {
        $js = "function setComboItem(doc, client_id, value, text){
        var element = doc.getElementById(client_id);
-               var options = element.options;
-               options.length = 0;
-               var option = doc.createElement('option');
-               option.value = value;
-               option.text = text;
-       element.add(option, 0);
-               element.selectedIndex = 0;
-        element.onchange();
+               if(typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT') {
+                       var options = element.options;
+                       options.length = 0;
+                       var option = doc.createElement('option');
+                       option.value = value;
+                       option.text = text;
+                       element.add(option, 0);
+                       element.selectedIndex = 0;
+               element.onchange();
+           } else {
+                       var stock_element = doc.getElementsByName('stock_id');
+               if( stock_element.length > 0) {
+                               stock_element[0].value = value; 
+                               var stock_id = doc.getElementById('_stock_id_edit'); 
+                               stock_id.value=value;
+                               stock_id.onblur();                                      
+                       }
+               }
                window.close();
        }";
        return $js;