Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...
[fa-stable.git] / sales / includes / db / sales_order_db.inc
index 27b4fe9a81461d1d695a12aa4c57cae04c112060..386e3b86b2a1213d8d6419ab2ad9998d0efa4056 100644 (file)
@@ -15,13 +15,14 @@ function add_sales_order(&$order)
        global $loc_notification, $path_to_root, $Refs;
 
        begin_transaction();
-
+       hook_db_prewrite($order, $order->trans_type);
        $order_no = get_next_trans_no($order->trans_type);
        $del_date = date2sql($order->due_date);
        $order_type = 0; // this is default on new order
+       $total = $order->get_trans_total();
        $sql = "INSERT INTO ".TB_PREF."sales_orders (order_no, type, debtor_no, trans_type, branch_code, customer_ref, reference, comments, ord_date,
                order_type, ship_via, deliver_to, delivery_address, contact_phone,
-               freight_cost, from_stk_loc, delivery_date, payment_terms)
+               freight_cost, from_stk_loc, delivery_date, payment_terms, total)
                VALUES (" .db_escape($order_no) . "," .db_escape($order_type) . "," . db_escape($order->customer_id) .
                 ", " .db_escape($order->trans_type) . "," .db_escape($order->Branch) . ", ".
                        db_escape($order->cust_ref) .",". 
@@ -36,7 +37,8 @@ function add_sales_order(&$order)
                        db_escape($order->freight_cost) .", " . 
                        db_escape($order->Location) .", " .
                        db_escape($del_date) . "," .
-                       db_escape($order->payment) . ")";
+                       db_escape($order->payment) . "," .
+                       db_escape($total). ")";
 
        db_query($sql, "order Cannot be Added");
 
@@ -85,10 +87,17 @@ function add_sales_order(&$order)
                                $line->discount_percent)";
                db_query($sql, "order Details Cannot be Added");
 
+       // Now mark quotation line as processed
+               if ($order->trans_type == ST_SALESORDER && $line->src_id)
+                       update_parent_line(ST_SALESORDER, $line->src_id, $line->qty_dispatched); // clear all the quote despite all or the part was ordered
        } /* inserted line items into sales order details */
+       add_audit_trail($order->trans_type, $order_no, $order->document_date);
+       $Refs->save($order->trans_type, $order_no, $order->reference);
 
        add_audit_trail($order->trans_type, $order_no, $order->document_date);
        $Refs->save($order->trans_type, $order_no, $order->reference);
+
+       hook_db_postwrite($order, $order->trans_type);
        commit_transaction();
 
        if ($loc_notification == 1 && count($st_ids) > 0)
@@ -117,6 +126,7 @@ function add_sales_order(&$order)
 function delete_sales_order($order_no, $trans_type)
 {
        begin_transaction();
+       hook_db_prevoid($trans_type, $order_no);
 
        $sql = "DELETE FROM ".TB_PREF."sales_orders WHERE order_no=" . db_escape($order_no) 
                . " AND trans_type=".db_escape($trans_type);
@@ -139,7 +149,7 @@ function delete_sales_order($order_no, $trans_type)
 function update_sales_order_version($order)
 {
   foreach ($order as $so_num => $so_ver) {
-  $sql= 'UPDATE '.TB_PREF.'sales_orders SET version=version+1 WHERE order_no='. $so_num.
+  $sql= 'UPDATE '.TB_PREF.'sales_orders SET version=version+1 WHERE order_no='. db_escape($so_num).
        ' AND version='.$so_ver . " AND trans_type=30";
   db_query($sql, 'Concurrent editing conflict while sales order update');
   }
@@ -155,6 +165,7 @@ function update_sales_order($order)
        $ord_date = date2sql($order->document_date);
        $order_no =  key($order->trans_no);
        $version= current($order->trans_no);
+       $total = $order->get_trans_total();
 
        begin_transaction();
 
@@ -174,12 +185,13 @@ function update_sales_order($order)
                from_stk_loc = " .db_escape($order->Location) .",
                delivery_date = " .db_escape($del_date). ",
                version = ".($version+1).",
-               payment_terms = " .db_escape($order->payment). "
-        WHERE order_no=" . $order_no ."
+               payment_terms = " .db_escape($order->payment). ",
+               total = ". db_escape($total) ."
+        WHERE order_no=" . db_escape($order_no) ."
         AND trans_type=".$order->trans_type." AND version=".$version;
        db_query($sql, "order Cannot be Updated, this can be concurrent edition conflict");
 
-       $sql = "DELETE FROM ".TB_PREF."sales_order_details WHERE order_no =" . $order_no . " AND trans_type=".$order->trans_type;
+       $sql = "DELETE FROM ".TB_PREF."sales_order_details WHERE order_no =" . db_escape($order_no) . " AND trans_type=".$order->trans_type;
 
        db_query($sql, "Old order Cannot be Deleted");
 
@@ -238,7 +250,6 @@ function update_sales_order($order)
        } /* inserted line items into sales order details */
 
        add_audit_trail($order->trans_type, $order_no, $order->document_date, _("Updated."));
-       $Refs->delete($order->trans_type, $order_no);
        $Refs->save($order->trans_type, $order_no, $order->reference);
        commit_transaction();
        if ($loc_notification == 1 && count($st_ids) > 0)
@@ -277,7 +288,8 @@ function get_sales_order_header($order_no, $trans_type)
          ."stype.tax_included, "
          ."ship.shipper_name, "
          ."tax_group.name AS tax_group_name , "
-         ."tax_group.id AS tax_group_id "
+         ."tax_group.id AS tax_group_id, "
+         ."cust.tax_id "
        ."FROM ".TB_PREF."sales_orders sorder, "
          .TB_PREF."debtors_master cust,"
          .TB_PREF."sales_types stype, "
@@ -299,14 +311,14 @@ function get_sales_order_header($order_no, $trans_type)
        $num = db_num_rows($result);
        if ($num > 1)
        {
-               display_db_error("FATAL : sales order query returned a duplicate - " . db_num_rows($result), $sql, true);
+               display_warning("You have duplicate document in database: (type:$trans_type, number:$order_no).");
        }
        else if ($num == 1)
        {
                return db_fetch($result);
        }
        else
-               display_db_error("FATAL : sales order return nothing - " . db_num_rows($result), $sql, true);
+               display_warning("You have missing or invalid sales document in database (type:$trans_type, number:$order_no).");
 
 }
 
@@ -318,8 +330,9 @@ function get_sales_order_details($order_no, $trans_type) {
                .TB_PREF."sales_order_details.quantity,
                  discount_percent,
                  qty_sent as qty_done, "
-               .TB_PREF."stock_master.units,
-               ".TB_PREF."stock_master.material_cost + "
+               .TB_PREF."stock_master.units,"
+               .TB_PREF."stock_master.mb_flag,"
+               .TB_PREF."stock_master.material_cost + "
                        .TB_PREF."stock_master.labour_cost + "
                        .TB_PREF."stock_master.overhead_cost AS standard_cost
        FROM ".TB_PREF."sales_order_details, ".TB_PREF."stock_master
@@ -333,6 +346,7 @@ function get_sales_order_details($order_no, $trans_type) {
 
 function read_sales_order($order_no, &$order, $trans_type)
 {
+
        $myrow = get_sales_order_header($order_no, $trans_type);
 
        $order->trans_type = $myrow['trans_type'];
@@ -382,7 +396,7 @@ function sales_order_has_deliveries($order_no)
 {
        $sql = "SELECT SUM(qty_sent) FROM ".TB_PREF.
        "sales_order_details WHERE order_no=".db_escape($order_no)
-       ." AND trans_type=".ST_SALESORDER."";
+       ." AND trans_type=".ST_SALESORDER;
 
        $result = db_query($sql, "could not query for sales order usage");
 
@@ -402,7 +416,7 @@ function close_sales_order($order_no)
        // set the quantity of each item to the already sent quantity. this will mark item as closed.
        $sql = "UPDATE ".TB_PREF."sales_order_details
                SET quantity = qty_sent WHERE order_no = ".db_escape($order_no)
-               ." AND trans_type=".ST_SALESORDER."";
+               ." AND trans_type=".ST_SALESORDER;
 
        db_query($sql, "The sales order detail record could not be updated");
 }
@@ -431,26 +445,29 @@ function get_invoice_duedate($terms, $invdate)
 function get_customer_to_order($customer_id) {
 
        // Now check to ensure this account is not on hold */
-       $sql = "SELECT ".TB_PREF."debtors_master.name, "
-                 .TB_PREF."debtors_master.address, "
-                 .TB_PREF."credit_status.dissallow_invoices, "
-                 .TB_PREF."debtors_master.sales_type AS salestype, "
-                 .TB_PREF."debtors_master.dimension_id, "
-                 .TB_PREF."debtors_master.dimension2_id, "
-                 .TB_PREF."sales_types.sales_type, "
-                 .TB_PREF."sales_types.tax_included, "
-                 .TB_PREF."sales_types.factor, "
-                 .TB_PREF."debtors_master.curr_code, "
-                 .TB_PREF."debtors_master.discount,"
-                 .TB_PREF."debtors_master.payment_terms,"
-                 .TB_PREF."debtors_master.pymt_discount
-               FROM ".TB_PREF."debtors_master, "
+       $sql = "SELECT cust.name, 
+                 cust.address, "
+                 .TB_PREF."credit_status.dissallow_invoices, 
+                 cust.sales_type AS salestype,
+                 cust.dimension_id,
+                 cust.dimension2_id,
+                 stype.sales_type,
+                 stype.tax_included,
+                 stype.factor,
+                 cust.curr_code,
+                 cust.discount,
+                 cust.payment_terms,
+                 cust.pymt_discount,
+                 cust.credit_limit - Sum(IFNULL(IF(trans.type=11 OR trans.type=12 OR trans.type=2,
+                       -1, 1) * (ov_amount + ov_gst + ov_freight + ov_freight_tax + ov_discount),0)) as cur_credit
+               FROM ".TB_PREF."debtors_master cust
+                 LEFT JOIN ".TB_PREF."debtor_trans trans ON trans.type!=".ST_CUSTDELIVERY." AND trans.debtor_no = cust.debtor_no,"
                  .TB_PREF."credit_status, "
-                 .TB_PREF."sales_types
-               WHERE ".TB_PREF."debtors_master.sales_type="
-                 .TB_PREF."sales_types.id
-               AND ".TB_PREF."debtors_master.credit_status=".TB_PREF."credit_status.id
-               AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($customer_id);
+                 .TB_PREF."sales_types stype
+               WHERE cust.sales_type=stype.id
+                       AND cust.credit_status=".TB_PREF."credit_status.id
+                       AND cust.debtor_no = ".db_escape($customer_id)
+               ." GROUP by cust.debtor_no";
 
        $result =db_query($sql,"Customer Record Retreive");
        return  db_fetch($result);
@@ -476,17 +493,17 @@ function get_branch_to_order($customer_id, $branch_id) {
            return db_query($sql,"Customer Branch Record Retreive");
 }
 
-function get_sql_for_sales_orders_view($selected_customer, $trans_type)
+function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_no, $filter, 
+       $stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT)
 {
-       global $selected_stock_item;
-       
+
        $sql = "SELECT 
                        sorder.order_no,
                        sorder.reference,
                        debtor.name,
                        branch.br_name,"
-                       .($_POST['order_view_mode']=='InvoiceTemplates' 
-                               || $_POST['order_view_mode']=='DeliveryTemplates' ?
+                       .($filter=='InvoiceTemplates' 
+                               || $filter=='DeliveryTemplates' ?
                         "sorder.comments, " : "sorder.customer_ref, ")
                        ."sorder.ord_date,
                        sorder.delivery_date,
@@ -502,58 +519,64 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type)
                        .TB_PREF."cust_branch as branch
                        WHERE sorder.order_no = line.order_no
                        AND sorder.trans_type = line.trans_type
-                       AND sorder.trans_type = $trans_type
+                       AND sorder.trans_type = ".db_escape($trans_type)."
                        AND sorder.debtor_no = debtor.debtor_no
                        AND sorder.branch_code = branch.branch_code
                        AND debtor.debtor_no = branch.debtor_no";
 
-       if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
+       if (isset($trans_no) && $trans_no != "")
        {
                // search orders with number like 
-               $number_like = "%".$_POST['OrderNumber'];
-               $sql .= " AND sorder.order_no LIKE ".db_escape($number_like)
-                               ." GROUP BY sorder.order_no";
+               $number_like = "%".$trans_no;
+               $sql .= " AND sorder.order_no LIKE ".db_escape($number_like);
+//                             ." GROUP BY sorder.order_no";
        }
-       elseif (isset($_POST['OrderReference']) && $_POST['OrderReference'] != "")
+       elseif ($ref != "")
        {
                // search orders with reference like 
-               $number_like = "%".$_POST['OrderReference']."%";
-               $sql .= " AND sorder.reference LIKE ".db_escape($number_like)
-                               ." GROUP BY sorder.order_no";
+               $number_like = "%".$ref."%";
+               $sql .= " AND sorder.reference LIKE ".db_escape($number_like);
+//                             ." GROUP BY sorder.order_no";
        }
        else    // ... or select inquiry constraints
        {
-               if ($_POST['order_view_mode']!='DeliveryTemplates' && $_POST['order_view_mode']!='InvoiceTemplates')
+               if ($filter!='DeliveryTemplates' && $filter!='InvoiceTemplates' && $filter!='OutstandingOnly')
                {
-                       $date_after = date2sql($_POST['OrdersAfterDate']);
-                       $date_before = date2sql($_POST['OrdersToDate']);
+                       $date_after = date2sql($from);
+                       $date_before = date2sql($to);
 
                        $sql .=  " AND sorder.ord_date >= '$date_after'"
                                        ." AND sorder.ord_date <= '$date_before'";
                }
+       }
                if ($trans_type == ST_SALESQUOTE && !check_value('show_all'))
-                       $sql .= " AND sorder.delivery_date >= '".date2sql(Today())."'";
+                       $sql .= " AND sorder.delivery_date >= '".date2sql(Today())."' AND line.qty_sent=0"; // show only outstanding, not realized quotes
+
                if ($selected_customer != -1)
                        $sql .= " AND sorder.debtor_no=".db_escape($selected_customer);
 
-               if (isset($selected_stock_item))
-                       $sql .= " AND line.stk_code=".db_escape($selected_stock_item);
+               if (isset($stock_item))
+                       $sql .= " AND line.stk_code=".db_escape($stock_item);
 
-               if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
-                       $sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation']);
+               if ($location)
+                       $sql .= " AND sorder.from_stk_loc = ".db_escape($location);
 
-               if ($_POST['order_view_mode']=='OutstandingOnly')
+               if ($filter=='OutstandingOnly')
                        $sql .= " AND line.qty_sent < line.quantity";
-               elseif ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
+
+               elseif ($filter=='InvoiceTemplates' || $filter=='DeliveryTemplates')
                        $sql .= " AND sorder.type=1";
 
+               //Chaiatanya : New Filter
+               if ($customer_id != ALL_TEXT)
+                       $sql .= " AND sorder.debtor_no = ".db_escape($customer_id);             
+
                $sql .= " GROUP BY sorder.order_no,
                                        sorder.debtor_no,
                                        sorder.branch_code,
                                        sorder.customer_ref,
                                        sorder.ord_date,
                                        sorder.deliver_to";
-       }
        return $sql;
 }
 ?>
\ No newline at end of file