Merging changes form main trunk 2.2.5-2.2.6

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

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 1e5718b514060c1854ebef6e3aabab340c2f6a4f..b3b3345cb51b75d3ef6b179953fe23eabed48b66 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -9,10 +9,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = isset($_GET['NewPayment']) ? 'SA_PAYMENT' : 'SA_DEPOSIT';
 $path_to_root = "..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 include_once($path_to_root . "/includes/session.inc");
+$page_security = isset($_GET['NewPayment']) || 
+       @($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT)
+ ? 'SA_PAYMENT' : 'SA_DEPOSIT';
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
@@ -28,11 +30,11 @@ if ($use_date_picker)
        $js .= get_js_date_picker();
 
 if (isset($_GET['NewPayment'])) {
-       $_SESSION['page_title'] = _("Bank Account Payment Entry");
+       $_SESSION['page_title'] = _($help_context = "Bank Account Payment Entry");
        handle_new_order(ST_BANKPAYMENT);
 
 } else if(isset($_GET['NewDeposit'])) {
-       $_SESSION['page_title'] = _("Bank Account Deposit Entry");
+       $_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry");
        handle_new_order(ST_BANKDEPOSIT);
 }
 page($_SESSION['page_title'], false, false, '', $js);
@@ -62,7 +64,7 @@ if (isset($_GET['AddedID']))
        $trans_no = $_GET['AddedID'];
        $trans_type = ST_BANKPAYMENT;
 
-       display_notification_centered(_("Payment has been entered"));
+       display_notification_centered(_("Payment $trans_no has been entered"));
 
        display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment")));
 
@@ -78,7 +80,7 @@ if (isset($_GET['AddedDep']))
        $trans_no = $_GET['AddedDep'];
        $trans_type = ST_BANKDEPOSIT;
 
-       display_notification_centered(_("Deposit has been entered"));
+       display_notification_centered(_("Deposit $trans_no has been entered"));
 
        display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit")));
 
@@ -100,7 +102,7 @@ function handle_new_order($type)
                unset ($_SESSION['pay_items']);
        }
 
-       session_register("pay_items");
+       //session_register("pay_items");
 
        $_SESSION['pay_items'] = new items_cart($type);
 
@@ -123,6 +125,12 @@ if (isset($_POST['Process']))
                $input_error = 1;
        }
 
+       if ($_SESSION['pay_items']->gl_items_total() == 0.0) {
+               display_error(_("The total bank amount cannot be 0."));
+               set_focus('code_id');
+               $input_error = 1;
+       }
+
        if (!$Refs->is_valid($_POST['ref']))
        {
                display_error( _("You must enter a reference."));
@@ -211,8 +219,8 @@ function handle_update_item()
        $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount');
     if($_POST['UpdateItem'] != "" && check_item_data())
     {
-       $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['dimension_id'],
-               $_POST['dimension2_id'], $amount , $_POST['LineMemo']);
+       $_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['code_id'], 
+           $_POST['dimension_id'], $_POST['dimension2_id'], $amount , $_POST['LineMemo']);
     }
        line_start_focus();
 }