When using templates for delivery and invoice, the lines and comments were missing.

[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 2b3cd451452564753209224898eee15f593fafa9..52f05b0f30b2ce014b6589778257f27dcec7fdb4 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -43,7 +43,7 @@ function get_customer_trans_version($type, $trans_no) {
        $sql .= implode(' OR ', $trans_no) . ')';
 
        $res = db_query($sql, 'document version retreival');
-
+       
        $vers = array();
        while($mysql=db_fetch($res)) {
                $vers[$mysql['trans_no']] = $mysql['version'];
@@ -72,8 +72,10 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
        if ($trans_type == ST_BANKPAYMENT)
                $Total = -$Total;
 
-       if ($new) {
-       $trans_no = get_next_trans_no($trans_type);
+    if ($new || !exists_customer_trans($trans_type, $trans_no))
+    {
+        if ($new)
+        $trans_no = get_next_trans_no($trans_type);
 
        $sql = "INSERT INTO ".TB_PREF."debtor_trans (
                trans_no, type,
@@ -91,7 +93,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                ".db_escape($Freight).",
                $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt,
                ".db_escape($dimension_id).", ".db_escape($dimension2_id).", "
-               .db_escape($payment_terms).")";
+               .db_escape($payment_terms, true).")";
        } 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).",
@@ -122,7 +124,8 @@ function get_customer_trans($trans_id, $trans_type)
 
        if ($trans_type == ST_CUSTPAYMENT) {
                // it's a payment so also get the bank account
-               $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
+               // 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 ";
        }
 
@@ -137,7 +140,9 @@ function get_customer_trans($trans_id, $trans_type)
                .TB_PREF."tax_groups.id AS tax_group_id ";
        }
 
-       $sql .= " FROM ".TB_PREF."debtor_trans trans, ".TB_PREF."debtors_master cust";
+       $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, 
+                                       ".TB_PREF."debtors_master cust";
 
        if ($trans_type == ST_CUSTPAYMENT) {
                // it's a payment so also get the bank account
@@ -146,8 +151,7 @@ function get_customer_trans($trans_id, $trans_type)
 
        if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
                // it's an invoice so also get the shipper, salestypes
-               $sql .= ", ".TB_PREF."shippers, "
-               .TB_PREF."sales_types, "
+               $sql .= ", ".TB_PREF."sales_types, "
                .TB_PREF."cust_branch branch, "
                .TB_PREF."tax_groups ";
        }
@@ -160,12 +164,12 @@ 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 =".db_escape($trans_id)."
                        AND ".TB_PREF."bank_trans.type=$trans_type
+                       AND ".TB_PREF."bank_trans.amount != 0
                        AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
        }
        if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
                // it's an invoice so also get the shipper
-               $sql .= " AND ".TB_PREF."shippers.shipper_id=trans.ship_via
-                       AND ".TB_PREF."sales_types.id = trans.tpe
+               $sql .= " AND ".TB_PREF."sales_types.id = trans.tpe
                        AND branch.branch_code = trans.branch_code
                        AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
        }
@@ -315,7 +319,7 @@ function get_sql_for_customer_inquiry()
        {
                if ($_POST['filterType'] == '1')
                {
-                       $sql .= " AND (trans.type = ".ST_SALESINVOICE." OR trans.type = ".ST_BANKPAYMENT.") ";
+                       $sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
                }
                elseif ($_POST['filterType'] == '2')
                {
@@ -324,7 +328,7 @@ function get_sql_for_customer_inquiry()
                elseif ($_POST['filterType'] == '3')
                {
                        $sql .= " AND (trans.type = " . ST_CUSTPAYMENT 
-                                       ." OR trans.type = ".ST_BANKDEPOSIT.") ";
+                                       ." OR trans.type = ".ST_BANKDEPOSIT." OR trans.type = ".ST_BANKPAYMENT.") ";
                }
                elseif ($_POST['filterType'] == '4')
                {