Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

[fa-stable.git] / gl / gl_bank.php

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 14a8518d1ecf81b00a2f37ebdbfa4c99f3dd641e..2d220c4fd25fbca9bfa4a2b19eb580ba54cd1bec 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -25,9 +25,9 @@ include_once($path_to_root . "/gl/includes/gl_ui.inc");
 include_once($path_to_root . "/admin/db/attachments_db.inc");
 
 $js = '';
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 if (isset($_GET['NewPayment'])) {
@@ -60,11 +60,15 @@ if (list_updated('PersonDetailID')) {
 
 //--------------------------------------------------------------------------------------------------
 function line_start_focus() {
-  global       $Ajax;
-
-  $Ajax->activate('items_table');
-  $Ajax->activate('footer');
-  set_focus('_code_id_edit');
+       global  $Ajax;
+
+    unset($_POST['amount']);
+    unset($_POST['dimension_id']);
+    unset($_POST['dimension2_id']);
+    unset($_POST['LineMemo']);
+       $Ajax->activate('items_table');
+       $Ajax->activate('footer');
+       set_focus('_code_id_edit');
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -153,7 +157,8 @@ function create_cart($type, $trans_no)
                $bank_trans = db_fetch(get_bank_trans($type, $trans_no));
                $_POST['bank_account'] = $bank_trans["bank_act"];
                $_POST['PayType'] = $bank_trans["person_type_id"];
-               
+               $cart->reference = $bank_trans["ref"];
+
                if ($bank_trans["person_type_id"] == PT_CUSTOMER)
                {
                        $trans = get_customer_trans($trans_no, $type);  
@@ -174,7 +179,6 @@ function create_cart($type, $trans_no)
 
                $cart->memo_ = get_comments_string($type, $trans_no);
                $cart->tran_date = sql2date($bank_trans['trans_date']);
-               $cart->reference = $Refs->get($type, $trans_no);
 
                $cart->original_amount = $bank_trans['amount'];
                $result = get_gl_trans($type, $trans_no);
@@ -185,7 +189,6 @@ function create_cart($type, $trans_no)
                                        // so we have to restore it from original gl amounts
                                        $ex_rate = $bank_trans['amount']/$row['amount'];
                                } else {
-                                       $date = $row['tran_date'];
                                        $cart->add_gl_item( $row['account'], $row['dimension_id'],
                                                $row['dimension2_id'], $row['amount'], $row['memo_']);
                                }
@@ -197,7 +200,7 @@ function create_cart($type, $trans_no)
                        $cart->gl_items[$line_no]->amount *= $ex_rate;
 
        } else {
-               $cart->reference = $Refs->get_next($cart->trans_type);
+               $cart->reference = $Refs->get_next($cart->trans_type, null, $cart->tran_date);
                $cart->tran_date = new_doc_date();
                if (!is_date_in_fiscalyear($cart->tran_date))
                        $cart->tran_date = end_fiscalyear();
@@ -213,7 +216,7 @@ function create_cart($type, $trans_no)
 
 function check_trans()
 {
-       global $Refs;
+       global $Refs, $systypes_array;
 
        $input_error = 0;
 
@@ -241,20 +244,15 @@ function check_trans()
        }
        if ($trans = check_bank_account_history($amnt_chg, $_POST['bank_account'], $_POST['date_'])) {
 
-               display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."),
-                       $systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date'])));
-               set_focus('amount');
-               $input_error = 1;
-       }
-       if (!$Refs->is_valid($_POST['ref']))
-       {
-               display_error( _("You must enter a reference."));
-               set_focus('ref');
-               $input_error = 1;
+               if (isset($trans['trans_no'])) {
+                       display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."),
+                               $systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date'])));
+                       set_focus('amount');
+                       $input_error = 1;
+               }       
        }
-       elseif ($_POST['ref'] != $_SESSION['pay_items']->reference && !is_new_reference($_POST['ref'], $_SESSION['pay_items']->trans_type))
+       if (!check_reference($_POST['ref'], $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id))
        {
-               display_error( _("The entered reference is already in use."));
                set_focus('ref');
                $input_error = 1;
        }
@@ -388,7 +386,7 @@ if (isset($_POST['AddItem']))
 if (isset($_POST['UpdateItem']))
        handle_update_item();
 
-if (isset($_POST['CancelItemChanges']))
+if (isset($_POST['CancelItemChanges']) || isset($_POST['Index']))
        line_start_focus();
 
 if (isset($_POST['go']))
@@ -404,7 +402,7 @@ start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
@@ -424,4 +422,3 @@ end_form();
 
 end_page();
 
-?>