Merging changes form main trunk 2.2.5-2.2.6
[fa-stable.git] / gl / gl_bank.php
index 522cdd86c9d25213df7a5a09d912c95b486f559a..b3b3345cb51b75d3ef6b179953fe23eabed48b66 100644 (file)
@@ -1,9 +1,20 @@
 <?php
-
-$page_security = 3;
-$path_to_root="..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$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");
@@ -19,44 +30,25 @@ if ($use_date_picker)
        $js .= get_js_date_picker();
 
 if (isset($_GET['NewPayment'])) {
-       $_SESSION['page_title'] = _("Bank Account Payment Entry");
-       handle_new_order(systypes::bank_payment());
+       $_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");
-       handle_new_order(systypes::bank_deposit());
+       $_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry");
+       handle_new_order(ST_BANKDEPOSIT);
 }
 page($_SESSION['page_title'], false, false, '', $js);
 
 //-----------------------------------------------------------------------------------------------
 check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
 
-check_db_has_bank_trans_types(_("There are no bank payment types defined in the system."));
-
 //----------------------------------------------------------------------------------------
-if ($ret = context_restore()) {
-       if(isset($ret['supplier_id']))
-               $_POST['person_id'] = $ret['supplier_id'];
-       if(isset($ret['customer_id']))
-               $_POST['person_id'] = $ret['customer_id'];
-       set_focus('person_id');
-       if(isset($ret['branch_id'])) {
-               $_POST['PersonDetailID'] = $ret['branch_id'];
-               set_focus('PersonDetailID');
-       }
-}
-if (isset($_POST['_person_id_editor'])) {
-       if ($_POST['PayType']==payment_person_types::supplier())
-               $editor = '/purchasing/manage/suppliers.php?supplier_id=';
-       else
-               $editor = '/sales/manage/customers.php?debtor_no=';
-               
-//     $_SESSION['pay_items'] should stay unchanged during call
-//
-context_call($path_to_root.$editor.$_POST['person_id'], 
-       array('bank_account', 'date_', 'PayType', 'person_id',
-               'PersonDetailID', 'type', 'ref', 'memo_') );
+if (list_updated('PersonDetailID')) {
+       $br = get_branch(get_post('PersonDetailID'));
+       $_POST['person_id'] = $br['debtor_no'];
+       $Ajax->activate('person_id');
 }
+
 //--------------------------------------------------------------------------------------------------
 function line_start_focus() {
   global       $Ajax;
@@ -70,9 +62,9 @@ function line_start_focus() {
 if (isset($_GET['AddedID']))
 {
        $trans_no = $_GET['AddedID'];
-       $trans_type = systypes::bank_payment();
+       $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")));
 
@@ -86,9 +78,9 @@ if (isset($_GET['AddedID']))
 if (isset($_GET['AddedDep']))
 {
        $trans_no = $_GET['AddedDep'];
-       $trans_type = systypes::bank_deposit();
+       $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")));
 
@@ -107,15 +99,14 @@ function handle_new_order($type)
 {
        if (isset($_SESSION['pay_items']))
        {
-               $_SESSION['pay_items']->clear_items();
                unset ($_SESSION['pay_items']);
        }
 
-       session_register("pay_items");
+       //session_register("pay_items");
 
        $_SESSION['pay_items'] = new items_cart($type);
 
-       $_POST['date_'] = Today();
+       $_POST['date_'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['date_']))
                $_POST['date_'] = end_fiscalyear();
        $_SESSION['pay_items']->tran_date = $_POST['date_'];
@@ -134,7 +125,13 @@ if (isset($_POST['Process']))
                $input_error = 1;
        }
 
-       if (!references::is_valid($_POST['ref']))
+       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."));
                set_focus('ref');
@@ -170,15 +167,16 @@ if (isset($_POST['Process']))
                $_SESSION['pay_items']->trans_type, $_POST['bank_account'],
                $_SESSION['pay_items'], $_POST['date_'],
                $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
-               $_POST['type'], $_POST['ref'], $_POST['memo_']);
+               $_POST['ref'], $_POST['memo_']);
 
        $trans_type = $trans[0];
        $trans_no = $trans[1];
+       new_doc_date($_POST['date_']);
 
        $_SESSION['pay_items']->clear_items();
        unset($_SESSION['pay_items']);
 
-       meta_forward($_SERVER['PHP_SELF'], $trans_type==systypes::bank_payment() ?
+       meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
                "AddedID=$trans_no" : "AddedDep=$trans_no");
 
 } /*end of process credit note */
@@ -187,12 +185,12 @@ if (isset($_POST['Process']))
 
 function check_item_data()
 {
-       if (!check_num('amount', 0))
-       {
-               display_error( _("The amount entered is not a valid number or is less than zero."));
-               set_focus('amount');
-               return false;
-       }
+       //if (!check_num('amount', 0))
+       //{
+       //      display_error( _("The amount entered is not a valid number or is less than zero."));
+       //      set_focus('amount');
+       //      return false;
+       //}
 
        if ($_POST['code_id'] == $_POST['bank_account'])
        {
@@ -201,15 +199,15 @@ function check_item_data()
                return false;
        }
 
-       if (is_bank_account($_POST['code_id']))
-       {
-               if ($_SESSION['pay_items']->trans_type == systypes::bank_payment())
-                       display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
-               else
-                       display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this."));
-               set_focus('code_id');
-               return false;
-       }
+       //if (is_bank_account($_POST['code_id']))
+       //{
+       //      if ($_SESSION['pay_items']->trans_type == ST_BANKPAYMENT)
+       //              display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
+       //      else
+       //              display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this."));
+       //      set_focus('code_id');
+       //      return false;
+       //}
 
        return true;
 }
@@ -218,11 +216,11 @@ function check_item_data()
 
 function handle_update_item()
 {
-       $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount');
+       $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();
 }
@@ -241,13 +239,12 @@ function handle_new_item()
 {
        if (!check_item_data())
                return;
-       $amount = ($_SESSION['pay_items']->trans_type==systypes::bank_payment() ? 1:-1) * input_num('amount');
+       $amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount');
 
        $_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'],
                $_POST['dimension2_id'], $amount, $_POST['LineMemo']);
        line_start_focus();
 }
-
 //-----------------------------------------------------------------------------------------------
 $id = find_submit('Delete');
 if ($id != -1)
@@ -262,17 +259,23 @@ if (isset($_POST['UpdateItem']))
 if (isset($_POST['CancelItemChanges']))
        line_start_focus();
 
-
+if (isset($_POST['go']))
+{
+       display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'), 
+               $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? QE_PAYMENT : QE_DEPOSIT);
+       $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
+       line_start_focus();
+}
 //-----------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
 start_table("$table_style2 width=90%", 10);
 start_row();
 echo "<td>";
-display_gl_items($_SESSION['pay_items']->trans_type==systypes::bank_payment() ?
+display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
        _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']);
 gl_options_controls();
 echo "</td>";
@@ -280,8 +283,8 @@ end_row();
 end_table(1);
 
 submit_center_first('Update', _("Update"), '', null);
-submit_center_last('Process', $_SESSION['pay_items']->trans_type==systypes::bank_payment() ?
-       _("Process Payment"):_("Process Deposit"), '', true);
+submit_center_last('Process', $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
+       _("Process Payment"):_("Process Deposit"), '', 'default');
 
 end_form();