Merging version 2.1 RC to main trunk.

[fa-stable.git] / sales / includes / db / cust_trans_db.inc

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 95e5889734a50a4ffef58bee80dd743b6f750f0f..7beb733cde6559b7e728c79d6d0900bc011a77c2 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    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>.
+***********************************************************************/
 //------------------------------------------------------------------------------
 //     Retreive parent document number(s) for given transaction
 //
@@ -79,7 +89,7 @@ function get_customer_trans_version($type, $trans_no) {
 function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
        $date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
        $sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
-       $AllocAmt=0, $rate=0)
+       $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0)
 {
 
        $curr = get_customer_currency($debtor_no);
@@ -102,13 +112,15 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                reference, tpe,
                order_, ov_amount, ov_discount,
                ov_gst, ov_freight, ov_freight_tax,
-               rate, ship_via, alloc, trans_link
+               rate, ship_via, alloc, trans_link,
+               dimension_id, dimension2_id
                ) VALUES ($trans_no, $trans_type,
                ".db_escape($debtor_no).", ".db_escape($BranchNo).",
                '$SQLDate', '$SQLDueDate', ".db_escape($reference).",
                ".db_escape($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
                ".db_escape($Freight).",
-               $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).")";
+               $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).",
+               $dimension_id, $dimension2_id)";
        } else {        // may be optional argument should stay unchanged ?
        $sql = "UPDATE ".TB_PREF."debtor_trans SET
                debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
@@ -116,7 +128,8 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                reference=".db_escape($reference).", tpe=".db_escape($sales_type).", order_=$order_no,
                ov_amount=$Total, ov_discount=".db_escape($discount).", ov_gst=$Tax,
                ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
-               ship_via=".db_escape($ship_via).", alloc=$AllocAmt, trans_link='$trans_link'
+               ship_via=".db_escape($ship_via).", alloc=$AllocAmt, trans_link=$trans_link,
+               dimension_id=$dimension_id, dimension2_id=$dimension2_id
                WHERE trans_no=$trans_no AND type=$trans_type";
        }
        db_query($sql, "The debtor transaction record could not be inserted");
@@ -136,7 +149,7 @@ function get_customer_trans($trans_id, $trans_type)
        if ($trans_type == systypes::cust_payment()) {
                // it's a payment so also get the bank account
                $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
-                       ".TB_PREF."bank_trans_types.name AS BankTransType ";
+                       ".TB_PREF."bank_accounts.account_type AS BankTransType ";
        }
 
        if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
@@ -155,7 +168,7 @@ function get_customer_trans($trans_id, $trans_type)
 
        if ($trans_type == systypes::cust_payment()) {
                // it's a payment so also get the bank account
-               $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types ";
+               $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
        }
 
        if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
@@ -171,8 +184,7 @@ function get_customer_trans($trans_id, $trans_type)
                // it's a payment so also get the bank account
                $sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_id
                        AND ".TB_PREF."bank_trans.type=$trans_type
-                       AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
-                       AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act ";
+                       AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
        }
        if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
                // it's an invoice so also get the shipper
@@ -204,32 +216,6 @@ function get_customer_trans($trans_id, $trans_type)
 
 //----------------------------------------------------------------------------------------
 
-function get_customer_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null)
-{
-       $sql = "SELECT ".TB_PREF."debtor_trans.*,
-               ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
-               ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address,
-               ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtor_trans.version ";
-
-       if ($extra_fields)
-               $sql .= ", $extra_fields ";
-
-       $sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
-       if ($extra_tables)
-               $sql .= ",$extra_tables ";
-
-       $sql .= " WHERE ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
-
-       if ($extra_conditions)
-               $sql .= " AND $extra_conditions ";
-
-       $sql .= " ORDER BY trans_no";
-
-       return db_query($sql, "Cannot retreive debtor transactions");
-}
-
-//----------------------------------------------------------------------------------------
-
 function exists_customer_trans($type, $type_no)
 {
        $sql = "SELECT trans_no FROM ".TB_PREF."debtor_trans WHERE type=$type