Fixed invalid reference number update in document edition.

[fa-stable.git] / gl / includes / ui / gl_bank_ui.inc

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index fbbf770851c8e847ddeaa3d0539b88846e7cf43b..b5a0932bc3dbcfa8f3d8491f2fe6632e8edd82bc 100644 (file)
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -11,19 +11,19 @@
 ***********************************************************************/
 function display_bank_header(&$order)
 {
-       global $Ajax, $Refs;
+       global $Ajax;
        $payment = $order->trans_type == ST_BANKPAYMENT;
 
        $customer_error = false;
        div_start('pmt_header');
 
-       start_outer_table(TABLESTYLE2, "width=90%"); // outer table
+       start_outer_table(TABLESTYLE2, "width='90%'"); // outer table
 
        table_section(1);
        
     date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
 
-       ref_row(_("Reference:"), 'ref', '');
+       ref_row(_("Reference:"), 'ref', '', $order->reference, false, $order->trans_type, get_post('date_'));
 
        table_section(2, "33%");
 
@@ -57,9 +57,6 @@ function display_bank_header(&$order)
                text_row_ex($payment ?_("To the Order of:"):_("Name:"),
                                 'person_id', 40, 50);
                break;
-               //case PT_WORKORDER :
-       //      workorders_list_row(_("Work Order:"), 'person_id', null);
-       //      break;
                case PT_SUPPLIER :
                supplier_list_row(_("Supplier:"), 'person_id', null, false, true, false, true);
                break;
@@ -84,9 +81,9 @@ function display_bank_header(&$order)
                                $customer_error = true;
                                        display_error(_("This customer account is on hold."));
                        }
-                       else                    
+                       else
                                        display_warning(_("This customer account is on hold."));
-               }               
+               }
                break;
 
                case PT_QUICKENTRY :
@@ -100,9 +97,6 @@ function display_bank_header(&$order)
                        amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
                                 null, "  ".submit('go', _("Go"), false, false, true));
                        break;  
-               //case payment_person_types::Project() :
-       //      dimensions_list_row(_("Dimension:"), 'person_id', $_POST['person_id'], false, null, true);
-       //      break;
     }
 
        table_section(3, "33%");
@@ -123,7 +117,7 @@ function display_bank_header(&$order)
 
        $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
-       exchange_rate_display($bank_currency, get_company_currency(), $_POST['date_']);
+       exchange_rate_display(get_company_currency(), $bank_currency, $_POST['date_']);
 
        end_outer_table(1); // outer table
 
@@ -146,12 +140,12 @@ function display_gl_items($title, &$order)
        display_heading($title);
 
     div_start('items_table');
-       start_table(TABLESTYLE, "colspan=7 width=95%");
+       start_table(TABLESTYLE, "width='95%'");
 
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
                        _("Dimension")." 2", _("Amount"), _("Memo"), "");
-       else if ($dim == 1)
+       elseif ($dim == 1)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension"),
                        _("Amount"), _("Memo"), "");
        else
@@ -176,7 +170,6 @@ function display_gl_items($title, &$order)
                                label_cell(get_dimension_string($item->dimension_id, true));
                if ($dim > 1)
                                label_cell(get_dimension_string($item->dimension2_id, true));
-                       //amount_cell(abs($item->amount));
                        if ($order->trans_type == ST_BANKDEPOSIT)
                                amount_cell(-$item->amount);
                        else            
@@ -237,7 +230,6 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                $_POST['amount'] = price_format(0);
                $_POST['dimension_id'] = 0;
                $_POST['dimension2_id'] = 0;
-               //$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
                if(isset($_POST['_code_id_update'])) {
                            $Ajax->activate('code_id');
                }
@@ -252,8 +244,6 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
                        $acc = get_supplier_accounts($_POST['person_id']);
                        $_POST['code_id'] = $acc['payable_account'];
                }
-               //elseif ($_POST['PayType'] == PT_WORKORDER)
-               //      $_POST['code_id'] = get_company_pref('default_assembly_act');
                else {
                        $_POST['code_id'] =
                                get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
@@ -305,7 +295,7 @@ function gl_options_controls($order)
        if ($person_curr != $bank_curr)
        {
                $_POST['settled_amount'] =
-                       price_format($order->gl_items_total() / get_exchange_rate_from_to($bank_curr, $person_curr, get_post('date_')));
+                       price_format(abs($order->gl_items_total() / get_exchange_rate_from_to($bank_curr, $person_curr, get_post('date_'))));
                amount_row($type == PT_CUSTOMER ? _("Settled AR Amount:") :  _("Settled AP Amount:"),
                         'settled_amount', null, null, $person_curr, user_price_dec());
        }
@@ -318,4 +308,3 @@ function gl_options_controls($order)
 
 //---------------------------------------------------------------------------------
 
-?>
\ No newline at end of file