Bank Payment, Bank Deposit: all parameters now passed to write_bank_transaction(...

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 2d220c4fd25fbca9bfa4a2b19eb580ba54cd1bec..b11111530a0129d852f60ddf27f84096382c36fd 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -144,38 +144,32 @@ function create_cart($type, $trans_no)
 {
        global $Refs;
 
-       if (isset($_SESSION['pay_items']))
-       {
-               unset ($_SESSION['pay_items']);
-       }
-
        $cart = new items_cart($type);
     $cart->order_id = $trans_no;
 
        if ($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->bank_act = $bank_trans["bank_act"];
+
                $cart->reference = $bank_trans["ref"];
 
                if ($bank_trans["person_type_id"] == PT_CUSTOMER)
                {
                        $trans = get_customer_trans($trans_no, $type);  
-                       $_POST['person_id'] = $trans["debtor_no"];
-                       $_POST['PersonDetailID'] = $trans["branch_code"];
+                       $cart->person_id = $trans["debtor_no"];
+                       $cart->person_detail_id = $trans["branch_code"];
                }
                elseif ($bank_trans["person_type_id"] == PT_SUPPLIER)
                {
                        $trans = get_supp_trans($trans_no, $type);
-                       $_POST['person_id'] = $trans["supplier_id"];
+                       $cart->person_id = $trans["supplier_id"];
                }
                elseif ($bank_trans["person_type_id"] == PT_MISC)
-                       $_POST['person_id'] = $bank_trans["person_id"];
+                       $cart->person_id = $bank_trans["person_id"];
                elseif ($bank_trans["person_type_id"] == PT_QUICKENTRY)
-                       $_POST['person_id'] = $bank_trans["person_id"];
+                       $cart->person_id = $bank_trans["person_id"];
                else 
-                       $_POST['person_id'] = $bank_trans["person_id"];
+                       $cart->person_id = $bank_trans["person_id"];
 
                $cart->memo_ = get_comments_string($type, $trans_no);
                $cart->tran_date = sql2date($bank_trans['trans_date']);
@@ -206,6 +200,11 @@ function create_cart($type, $trans_no)
                        $cart->tran_date = end_fiscalyear();
        }
 
+       $_POST['PayType'] = $cart->person_type_id;
+       $_POST['person_id'] = $cart->person_id;
+       $_POST['PersonDetailID'] = $cart->person_detail_id;
+
+       $_POST['bank_account'] = $cart->bank_act;
        $_POST['memo_'] = $cart->memo_;
        $_POST['ref'] = $cart->reference;
        $_POST['date_'] = $cart->tran_date;
@@ -291,28 +290,29 @@ function check_trans()
 
 if (isset($_POST['Process']) && !check_trans())
 {
-       begin_transaction();
+       $cart = &$_SESSION['pay_items'];
+
+       $cart->person_type_id = get_post('PayType');
+       $cart->person_id = get_post('person_id');
+       $cart->person_detail_id = get_post('PersonDetailID');
+       $cart->bank_act = get_post('bank_account');
+       $cart->ex_rate = input_num('_ex_rate');
+       $cart->tran_date = get_post('date_');
+       $cart->memo_ = get_post('memo_');
+       $cart->reference = get_post('ref');
+       $cart->settled_amount = input_num('settled_amount', null);
 
-       $_SESSION['pay_items'] = &$_SESSION['pay_items'];
        $new = $_SESSION['pay_items']->order_id == 0;
 
-       add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));
+       write_bank_transaction($cart);
 
-       $trans = write_bank_transaction(
-               $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'],
-               $_SESSION['pay_items'], $_POST['date_'],
-               $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
-               $_POST['ref'], $_POST['memo_'], true, input_num('settled_amount', null));
+       $trans_type = $cart->trans_type;
+       $trans_no = $cart->order_id;
 
-       $trans_type = $trans[0];
-       $trans_no = $trans[1];
        new_doc_date($_POST['date_']);
-
        $_SESSION['pay_items']->clear_items();
        unset($_SESSION['pay_items']);
 
-       commit_transaction();
-
        if ($new)
                meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
                        "AddedID=$trans_no" : "AddedDep=$trans_no");

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index a2cf9f78db893d7426ac7769d9b4a0e5f83d507f..7817fe3f8b12e3c391172ee6a1c692fc0307c2cc 100644 (file)
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -379,24 +379,23 @@ function update_bank_transfer(
 //
 // FIXME -revise code for update case
 //
-function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $date_,
-       $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true, $settled_amount=null)
+function write_bank_transaction(&$cart)
 {
        global $Refs, $SysPrefs;
 
-       // we can only handle type 1 (payment)and type 2 (deposit)
-       if ($trans_type != ST_BANKPAYMENT && $trans_type != ST_BANKDEPOSIT)
-               display_db_error("Invalid type ($trans_type) sent to add_bank_transaction");
+       $trans_type = $cart->trans_type;
+       $trans_no = $cart->order_id;
+       $from_account = $cart->bank_act;
+       $person_type_id = $cart->person_type_id;
+       $person_id = $cart->person_id;
+       $ref = $cart->reference;
 
        $do_exchange_variance = false;
        $exchanged = false;
-       if ($use_transaction)
-               begin_transaction();
 
-       $args = func_get_args(); if (count($args) < 11) $args[] = true;
-       $args = (object)array_combine(array('trans_type', 'trans_no', 'from_account', 'items', 'date_',
-               'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction', 'settled_amount'),
-               $args);
+       begin_transaction();
+
+       $args = func_get_args();
        hook_db_prewrite($args, $trans_type);
 
        $aid = 0;
@@ -411,21 +410,21 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
        $bank_gl_account = get_bank_gl_account($from_account);
 
        // the gl items are already inversed/negated for type 2 (deposit)
-       $total_amount = $items->gl_items_total();
+       $total_amount = $cart->gl_items_total();
 
     if ($person_type_id == PT_CUSTOMER)
     {
        // we need to add a customer transaction record
                // convert to customer currency
-               if (!isset($settled_amount)) // leaved for backward/ext compatibility 
-                       $cust_amount = exchange_from_to(abs($total_amount), $currency, get_customer_currency($person_id), $date_);
+               if (!isset($cart->settled_amount)) // leaved for backward/ext compatibility 
+                       $cust_amount = exchange_from_to(abs($total_amount), $currency, get_customer_currency($person_id), $cart->tran_date);
                else
-                       $cust_amount = $settled_amount;
+                       $cust_amount = $cart->settled_amount;
 
                if ($trans_type == ST_BANKPAYMENT)
                        $cust_amount = -$cust_amount;
 
-               $trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_,
+               $trans_no = write_customer_trans($trans_type, 0, $person_id, $cart->person_detail_id, $cart->tran_date,
                $ref, $cust_amount);
                if ($old_trans)
                        move_trans_attachments($trans_type, $old_trans, $trans_no);
@@ -434,15 +433,15 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
     {
        // we need to add a supplier transaction record
                // convert to supp currency
-               if (!isset($settled_amount)) // leaved for for backward/ext compatibility 
-                       $supp_amount = exchange_from_to(abs($total_amount), $currency, get_supplier_currency($person_id), $date_);
+               if (!isset($cart->settled_amount)) // leaved for for backward/ext compatibility 
+                       $supp_amount = exchange_from_to(abs($total_amount), $currency, get_supplier_currency($person_id), $cart->tran_date);
                else
-                       $supp_amount = $settled_amount;
+                       $supp_amount = $cart->settled_amount;
 
                if ($trans_type == ST_BANKPAYMENT)
                        $supp_amount = -$supp_amount;
 
-               $trans_no = write_supp_trans($trans_type, 0, $person_id, $date_, '',
+               $trans_no = write_supp_trans($trans_type, 0, $person_id, $cart->tran_date, '',
                        $ref, "", $supp_amount, 0, 0);
                if ($old_trans)
                        move_trans_attachments($trans_type, $old_trans, $trans_no);
@@ -463,11 +462,11 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
        // do the source account postings
 
     add_bank_trans($trans_type, $trans_no, $from_account, $ref,
-       $date_, -$total_amount,
+       $cart->tran_date, -$total_amount,
        $person_type_id, $person_id,
        $currency);
        $total = 0;
-       foreach ($items->gl_items as $gl_item)
+       foreach ($cart->gl_items as $gl_item)
        {
                $is_bank_to = is_bank_account($gl_item->code_id);
 
@@ -478,49 +477,49 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
                }
 
        // do the destination account postings
-       $total += add_gl_trans($trans_type, $trans_no, $date_, $gl_item->code_id,
+       $total += add_gl_trans($trans_type, $trans_no, $cart->tran_date, $gl_item->code_id,
                $gl_item->dimension_id, $gl_item->dimension2_id, $gl_item->reference,
                $gl_item->amount, $currency, $person_type_id, $person_id);
 
        if ($is_bank_to)
        {
                add_bank_trans($trans_type, $trans_no, $is_bank_to, $ref,
-                       $date_, $gl_item->amount,
+                       $cart->tran_date, $gl_item->amount,
                        $person_type_id, $person_id, $currency);
                if ($do_exchange_variance)
                {
-                       add_exchange_variation($trans_no1, $date_, $is_bank_to, $gl_item->code_id, 
+                       add_exchange_variation($trans_no1, $cart->tran_date, $is_bank_to, $gl_item->code_id, 
                                $currency, $person_type_id, $person_id);
                }
        }
                // store tax details if the gl account is a tax account
 
                $amount = $gl_item->amount;
-               $ex_rate = get_exchange_rate_from_home_currency($currency, $date_);
+               $ex_rate = get_exchange_rate_from_home_currency($currency, $cart->tran_date);
 
                add_gl_tax_details($gl_item->code_id, $trans_type, $trans_no, -$amount,
-                       $ex_rate, $date_, $memo_);
+                       $ex_rate, $cart->tran_date, $cart->memo_);
        }
 
        // do the source account postings
-    add_gl_trans($trans_type, $trans_no, $date_, $bank_gl_account, 0, 0, $memo_,
+    add_gl_trans($trans_type, $trans_no, $cart->tran_date, $bank_gl_account, 0, 0, $cart->memo_,
        -$total, null, $person_type_id, $person_id);
 
     if ($do_exchange_variance)
     {
-       if ($exchanged || add_exchange_variation($trans_no1, $date_, $from_account, $bank_gl_account, 
+       if ($exchanged || add_exchange_variation($trans_no1, $cart->tran_date, $from_account, $bank_gl_account, 
                $currency, $person_type_id, $person_id))
        {
-                       $ref1 = $Refs->get_next(ST_JOURNAL, null, $date_);
+                       $ref1 = $Refs->get_next(ST_JOURNAL, null, $cart->tran_date);
                        $Refs->save(ST_JOURNAL, $trans_no1, $ref1);
-                       add_audit_trail(ST_JOURNAL, $trans_no1, $date_);
+                       add_audit_trail(ST_JOURNAL, $trans_no1, $cart->tran_date);
                }
        }
 
-       add_comments($trans_type, $trans_no, $date_, $memo_);
+       add_comments($trans_type, $trans_no, $cart->tran_date, $cart->memo_);
 
        $Refs->save($trans_type, $trans_no, $ref);
-       add_audit_trail($trans_type, $trans_no, $date_);
+       add_audit_trail($trans_type, $trans_no, $cart->tran_date);
 
        // old transaction can be voided only after new transaction is entered,
        //  otherwise the operation could fail for cash accounts due to temporary negative balance
@@ -534,11 +533,9 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
                }
        }
 
-
-       $args->trans_no = $trans_no;
+       $cart->order_id = $trans_no;
        hook_db_postwrite($args, $trans_type);
-       if ($use_transaction)
-               commit_transaction();
 
-       return array($trans_type, $trans_no);
+       commit_transaction();
+
 }

diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index a9bcc5798c1c8141084e1b61025487ac9bdc3207..fd8c735735bdfd4d71c015c8bc76f424582f7d14 100644 (file)
--- a/includes/ui/items_cart.inc
+++ b/includes/ui/items_cart.inc
@@ -12,6 +12,18 @@
 include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
+/*
+       FIXME: This class currently handles three different types of transactions:
+       . simple inventory transactions working on quantities:
+               ST_INVADJUST, ST_LOCTRANSFER, ST_MANUISSUE
+       . balanced low level GL transactions, working on amounts:
+               ST_JOURNAL, ST_COSTUPDATE, used also in purchase invoice costing 
+       . unbalanced bank transaction:
+               ST_BANKPAYMENT, ST_BANK_DEPOSIT
+
+       No reason to keep all this in the same class.
+*/
+
 class items_cart
 {
        var $trans_type;
@@ -37,9 +49,17 @@ class items_cart
        var $vat_category;
 
        var $tax_info;  // tax info for the GL transaction
+       var $reconcile_date;
 
        var $fixed_asset;
 
+       // bank transaction related
+       var $bank_act;
+       var $person_type_id;
+       var $person_id;
+       var $person_detail_id;
+       var $settled_amount;
+
        function __construct($type, $trans_no=0)
        {
                $this->trans_type = $type;