Fixed handling extended journal entries in various places.

[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 fd52d9ce1e1b7d508f17fe32ba4f34f618015279..d6eddbe090934c43625f725935df0c2a09eb279e 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -111,15 +111,16 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
        }
        db_query($sql, "The debtor transaction record could not be inserted");
 
-       add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
+       if ($trans_type != ST_JOURNAL) // skip for journal entries
+               add_audit_trail($trans_type, $trans_no, $date_, $new ? '': _("Updated."));
 
        return $trans_no;
 }
 //----------------------------------------------------------------------------------------
 
-function get_customer_trans($trans_id, $trans_type)
+function get_customer_trans($trans_id, $trans_type, $customer_id=null)
 {
-       global $go_debug;
+       global $SysPrefs;
 
        $sql = "SELECT trans.*,"
                ."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
@@ -131,7 +132,6 @@ function get_customer_trans($trans_id, $trans_type)
 
        if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
-               // Chaitanya : Added bank_act to support Customer Payment Edit
                $sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
                        ".TB_PREF."bank_accounts.account_type AS BankTransType,
                        ".TB_PREF."bank_accounts.bank_curr_code,
@@ -149,6 +149,10 @@ function get_customer_trans($trans_id, $trans_type)
                .TB_PREF."tax_groups.id AS tax_group_id ";
        }
 
+       if ($trans_type == ST_JOURNAL) {
+               $sql .= ", branch.*";
+       }
+
        $sql .= " FROM ".TB_PREF."debtor_trans trans
                                        LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
                                        LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, 
@@ -166,10 +170,17 @@ function get_customer_trans($trans_id, $trans_type)
                .TB_PREF."tax_groups ";
        }
 
+       if ($trans_type == ST_JOURNAL) {
+               $sql .= ", ".TB_PREF."cust_branch branch ";
+       }
+
        $sql .= " WHERE trans.trans_no=".db_escape($trans_id)."
                AND trans.type=".db_escape($trans_type)."
                AND trans.debtor_no=cust.debtor_no";
 
+       if (isset($customer_id))
+               $sql .= " AND trans.debtor_no=".db_escape($customer_id);
+
        if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
                $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
@@ -183,19 +194,22 @@ function get_customer_trans($trans_id, $trans_type)
                        AND branch.branch_code = trans.branch_code
                        AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
        }
+       if ($trans_type == ST_JOURNAL) {
+               $sql .= " AND branch.branch_code = trans.branch_code ";
+       }
 
        $result = db_query($sql, "Cannot retreive a debtor transaction");
 
        if (db_num_rows($result) == 0) {
                // can't return nothing
-               if($go_debug)
+               if ($SysPrefs->go_debug)
                        display_backtrace();
                display_db_error("no debtor trans found for given params", $sql, true);
                exit;
        }
        if (db_num_rows($result) > 1) {
                // can't return multiple
-               if($go_debug)
+               if($SysPrefs->go_debug)
                        display_backtrace();
                display_db_error("duplicate debtor transactions found for given params", $sql, true);
                exit;
@@ -300,6 +314,7 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                debtor.name, 
                branch.br_name,
                debtor.curr_code,
+               debtor.debtor_no,
                (trans.ov_amount + trans.ov_gst + trans.ov_freight 
                        + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount, "; 
        if ($filter != ALL_TEXT)
@@ -312,17 +327,21 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                $sql .= "trans.alloc AS Allocated,
                ((trans.type = ".ST_SALESINVOICE.")
                        AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
-               Sum(line.quantity-line.qty_done) AS Outstanding
+               Sum(line.quantity-line.qty_done) AS Outstanding,
+               Sum(line.qty_done) AS HasChild
                FROM "
                        .TB_PREF."debtor_trans as trans
                        LEFT JOIN ".TB_PREF."debtor_trans_details as line
-                               ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type,"
-                       .TB_PREF."debtors_master as debtor, "
-                       .TB_PREF."cust_branch as branch
+                               ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type
+                       LEFT JOIN ".TB_PREF."voided as v
+                               ON trans.trans_no=v.id AND trans.type=v.type
+                       LEFT JOIN ".TB_PREF."cust_branch as branch ON trans.branch_code=branch.branch_code,"
+                       .TB_PREF."debtors_master as debtor
                WHERE debtor.debtor_no = trans.debtor_no
                        AND trans.tran_date >= '$date_after'
                        AND trans.tran_date <= '$date_to'
-                       AND trans.branch_code = branch.branch_code";
+                       AND trans.branch_code = branch.branch_code
+                       AND ISNULL(v.date_)";
 
        if ($cust_id != ALL_TEXT)
                $sql .= " AND trans.debtor_no = ".db_escape($cust_id);
@@ -401,7 +420,7 @@ function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item
        //figure out the sql required from the inputs available
        if ($delivery)
        {
-               $sql .= " AND trans.trans_no LIKE %".db_escape($delivery);
+               $sql .= " AND trans.trans_no LIKE ".db_escape('%' . $delivery . '%');
                $sql .= " GROUP BY trans.trans_no";
        }
        else
@@ -409,7 +428,7 @@ function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item
                $sql .= " AND trans.tran_date >= '".date2sql($from)."'";
                $sql .= " AND trans.tran_date <= '".date2sql($to)."'";
 
-               if ($stock_item)
+               if ($stock_item != ALL_TEXT)
                        $sql .= " AND line.stock_id=".db_escape($stock_item)." ";
 
                if ($location != ALL_TEXT)
@@ -423,4 +442,3 @@ function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item
        } //end no delivery number selected
        return $sql;
 }
-?>
\ No newline at end of file