Merged last changes from stable.
[fa-stable.git] / includes / ui / ui_view.inc
index 492bd48634523ac838984c7b30e5401683b91e40..5ed17abd8c96eae5790b2e872f4aac86366dde05 100644 (file)
@@ -50,11 +50,11 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $
        {
                $label = _("GL");
                $icon = ICON_GL;
-       }       
+       }
+       $url = ($type == ST_WORKORDER && !work_order_is_closed($trans_no)) ? "manufacturing/view/wo_costs_view.php?trans_no=$trans_no"
+               : "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
 
-       return viewer_link($label, 
-               "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no", 
-               $class, $id, $icon);
+       return viewer_link($label, $url, $class, $id, $icon);
 }
 
 //--------------------------------------------------------------------------------------
@@ -272,14 +272,14 @@ function check_ui_refresh($name=null)
 //
 function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
 {
-    global $Ajax;
+    global $Ajax, $xr_provider_authoritative;
 
        $readonly = false;
 
        if ($from_currency != $to_currency)
        {
                $rate = get_post('_ex_rate');
-               if (!$rate || check_ui_refresh()) { // readonly or ui context changed
+               if (check_ui_refresh() || !$rate) { // readonly or ui context changed
                        $comp_currency = get_company_currency();
                        if ($from_currency == $comp_currency)
                                $currency = $to_currency;
@@ -287,27 +287,31 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit
                                $currency = $from_currency;
 
                        $rate = get_date_exchange_rate($currency, $date_); // try local
+
                        if ($rate)
-                               $readonly = true;
+                               $readonly = true; // if we have already local exrate keep it unchanged 
+
                        if (!$rate) {   // retry from remote service
                                $row = get_currency($currency);
-                               if ($row['auto_update'])
-                                       $rate = retrieve_exrate($currency, $date_);
-                               if ($rate)
-                                       add_new_exchange_rate($currency, $date_, $rate);
-                               else
-                               {
-                                       display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
-                                       $readonly = false;
+
+                               if ($row['auto_update']) // autoupdate means use remote service & store exrate on first transaction.
+                               {
+                                       $rate = retrieve_exrate($currency, $date_);
+                                       if (!$rate)
+                                               display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
+                                       elseif ($xr_provider_authoritative) {
+                                               // if the remote exrate is considered authoritative we can store the rate here,
+                                               // otherwise exrate will be stored during transaction write
+                                               $readonly = true;
+                                               add_new_exchange_rate($currency, $date_, $rate);
+                                       }
                                }
                        }
                        if (!$rate)     {       // get and edit latest available
-                               $readonly = false;
                                $rate = get_exchange_rate_from_home_currency($currency, $date_);
                        }
                        if ($from_currency != $comp_currency)
                                $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
-
                        $Ajax->activate('_ex_rate_span');
                }
 
@@ -354,7 +358,7 @@ function comments_display_row($type, $id)
                echo "<tr><td colspan=15>";
        while ($comment = db_fetch($comments))
        {
-               echo $comment["memo_"] . "<br>";
+               echo nl2br($comment["memo_"]) . "<br>";
        }
                echo "</td></tr>";
        }
@@ -529,14 +533,14 @@ function display_footer_exit($space=2)
 
 //--------------------------------------------------------------------------------------
 
-function display_allocations($alloc_result, $total, $payments=false)
+function display_allocations($alloc_result, $total, $title, $show_summary=true)
 {
        global $systypes_array;
 
        if (!$alloc_result || db_num_rows($alloc_result) == 0)
                return;
 
-    display_heading2(($payments ? _("Payments") : _("Allocations")));
+    display_heading2($title);
 
     start_table(TABLESTYLE, "width=80%");
 
@@ -547,7 +551,6 @@ function display_allocations($alloc_result, $total, $payments=false)
 
     while ($alloc_row = db_fetch($alloc_result))
     {
-
        alt_table_row_color($k);
 
        label_cell($systypes_array[$alloc_row['type']]);
@@ -555,7 +558,7 @@ function display_allocations($alloc_result, $total, $payments=false)
        label_cell(sql2date($alloc_row['tran_date']));
        $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
        $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
-       if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+       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']);
@@ -568,12 +571,14 @@ function display_allocations($alloc_result, $total, $payments=false)
        label_cell(_("Total Allocated:"), "align=right colspan=5");
        amount_cell($total_allocated);
        end_row();
-       start_row();
-    label_cell(_("Left to Allocate:"), "align=right colspan=5");
-    $total = round2($total, user_price_dec());
-    amount_cell($total - $total_allocated);
-    end_row();
-
+       if ($show_summary)
+       {
+               start_row();
+           label_cell(_("Left to Allocate:"), "align=right colspan=5");
+           $total = round2($total, user_price_dec());
+       amount_cell($total - $total_allocated);
+       end_row();
+       }
     end_table(1);
 }
 
@@ -585,11 +590,11 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
        {
                case PT_CUSTOMER :
                        $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total);
+                       display_allocations($alloc_result, $total, _("Allocations"));
                        return;
                case PT_SUPPLIER :
                        $alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total);
+                       display_allocations($alloc_result, $total, _("Allocations"));
                        return;
        }
 }
@@ -602,11 +607,11 @@ function display_allocations_to($person_type, $person_id, $type, $type_no, $tota
        {
                case PT_CUSTOMER :
                        $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total, true);
+                       display_allocations($alloc_result, $total, $type == ST_SALESORDER ? _("Pre-Payments") : _("Payments"), false);
                        return;
                case PT_SUPPLIER :
                        $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total, true);
+                       display_allocations($alloc_result, $total, $type == ST_PURCHORDER ? _("Pre-Payments") : _("Payments"), false);
                        return;
        }
 }
@@ -642,9 +647,9 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                        $begin = "";
                                else
                                        $begin = begin_fiscalyear(); // from fiscalyear begin
-                       }               
+                       }
                        $base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']);
-                               
+
                }
                if ($descr != '') $qe['description'] .= ': '.$descr;
                $result = get_quick_entry_lines($id);
@@ -653,7 +658,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                        display_error( _("No Quick Entry lines are defined."));
                        set_focus('totamount');
                        return 0;
-               }       
+               }
                $totrate = 0;
                while ($row = db_fetch($result))
                {
@@ -664,7 +669,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                case "t+": // ditto & increase base amount
                                case "t-": // ditto & reduce base amount
                                        if (substr($row['action'],0,1) != 'T') 
-                                               $totrate += get_tax_type_default_rate($row['dest_id']);
+                                               $totrate += get_tax_type_rate($row['dest_id']);
                        }
                }
                $first = true;
@@ -838,7 +843,7 @@ function price_in_words($amount, $document=0)
     else
        $frac = "";
     return _number_to_words(intval($amount)) . $frac;
-}    
+}
 
 function get_js_open_window($width, $height)
 {
@@ -1426,5 +1431,3 @@ function payment_link($name, $options)
 
        return strtr($link, $patterns);
 }
-
-?>
\ No newline at end of file