Rewritten sales shipping cost taxation, improved shipping cost handling in sales...

[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 74ff8f01f051f9ee2de1abde8943b3f794aaebba..453a3b3f2f1748d5583734bc0269d2c921adbc7c 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -139,8 +139,8 @@ function get_customer_trans($trans_id, $trans_type, $customer_id=null)
        }
 
        if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
-               // it's an invoice so also get the shipper and salestype
-               $sql .= ", ".TB_PREF."shippers.shipper_name, "
+               // it's an invoice so also get the shipping method and salestype
+               $sql .= ", IFNULL(ship.description, '-') shipping, "
                .TB_PREF."sales_types.sales_type, "
                .TB_PREF."sales_types.tax_included, "
                ."branch.*, "
@@ -155,7 +155,7 @@ function get_customer_trans($trans_id, $trans_type, $customer_id=null)
 
        $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, 
+                                       LEFT JOIN ".TB_PREF."stock_master ship ON ship.stock_id=trans.ship_via, 
                                        ".TB_PREF."debtors_master cust";
 
        if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
@@ -164,7 +164,6 @@ function get_customer_trans($trans_id, $trans_type, $customer_id=null)
        }
 
        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."sales_types, "
                .TB_PREF."cust_branch branch, "
                .TB_PREF."tax_groups ";
@@ -302,7 +301,7 @@ function post_void_customer_trans($type, $type_no)
 }
 
 //----------------------------------------------------------------------------------------
-function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT)
+function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT, $show_voided = 0)
 {
     $date_after = date2sql($from);
     $date_to = date2sql($to);
@@ -347,8 +346,9 @@ function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter =
                         LEFT JOIN ".TB_PREF."users as user ON (audit.user=user.id)
                        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" // exclude voided transactions and self-balancing (journal) transactions:
-               ." AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
+               WHERE debtor.debtor_no = trans.debtor_no"; // exclude voided transactions and self-balancing (journal) transactions:
+    if (!$show_voided)         
+               $sql .= " AND ISNULL(v.date_) AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) != 0";
 
        if ($filter == '2')
                $sql .= " AND ABS(IF(prep_amount, prep_amount, trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount)-trans.alloc)>"