Minor bug

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 186c7a1414d70b1f6ab7924e2468dcd1939bf1f2..4cf763ab284523d57c863ce81336882f7667e288 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -25,7 +25,7 @@ function get_supplier_trans_view_str($type, $trans_no, $label="", $icon=false,
        elseif ($type == 21)
                $viewer .= "view_supp_credit.php";
        elseif ($type == 22)
-               $viewer = "view_supp_payment.php";
+               $viewer .= "view_supp_payment.php";
        elseif ($type == 25)
                $viewer .= "view_grn.php";
        else
@@ -257,9 +257,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
                if ($date_ == Today()) {
                        $rate = get_date_exchange_rate($currency, $date_);
                        if (!$rate) {
-                               $rate = get_ecb_rate($currency);
-                               if ($rate) 
-                                       add_exchange_rate($currency, $date_, $rate, $rate);
+                               $row = get_currency($currency);
+                               if ($row['auto_update']) {
+                                       $rate = retrieve_exrate($currency, $date_);
+                                       if ($rate) 
+                                               add_exchange_rate($currency, $date_, $rate, $rate);
+                               }
                        }
                }
                if (!$rate)
@@ -271,7 +274,7 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=
                if ($edit_rate)
                        text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); 
                else
-               label_row(_("Exchange Rate:"),"<span id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
+               label_row(_("Exchange Rate:"),"<span style='vertical-align:top;' id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
                $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
        }
 }
@@ -355,7 +358,7 @@ function view_stock_status_cell($stock_id, $description=null)
 
 function display_debit_or_credit_cells($value)
 {
-       if ($value > 0)
+       if ($value >= 0)
        {
                amount_cell($value);
                label_cell("");
@@ -365,12 +368,6 @@ function display_debit_or_credit_cells($value)
                label_cell("");
                amount_cell(abs($value));
        }
-       else
-       {
-               //label_cell("");
-               amount_cell(0);
-               label_cell("");
-       }
 }
 
 //--------------------------------------------------------------------------------------
@@ -568,6 +565,11 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                                $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
                                                        ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
                                                $tax_total += $tax;
+                                               if ($tax==0) continue;
+                                               if (!is_tax_gl_unique($gl_code)) {
+                                                       display_error(_("Cannot post to GL account used by more than one tax type."));
+                                                       break 3;
+                                               }
                                                if ($type != QE_SUPPINV)
                                                        $cart->add_gl_item($gl_code, 
                                                                $qe_line['dimension_id'], $qe_line['dimension2_id'], 
@@ -635,6 +637,13 @@ function default_focus($name=null, $form_no=0) {
     }
        return $name;
 }
+/*
+       Reset focus to next control element (e.g. link).
+*/
+function reset_focus()
+{
+       unset($_POST['_focus']);
+}
 
 function get_js_png_fix()
 {