Fixed fixed assets stright line depreciation.

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

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 05dbe246550d2b0d0d04b86f0ae0b1183f43594d..710a5300523ea16ce54be40df16d1df0ad73c80c 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -72,7 +72,7 @@ function add_sales_order(&$order)
        } /* 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);
+       $Refs->save($order->trans_type, $order_no, $order->reference, null, $order->fixed_asset);
 
        hook_db_postwrite($order, $order->trans_type);
        commit_transaction();
@@ -209,7 +209,7 @@ function update_sales_order($order)
        if ($order->trans_type == ST_SALESORDER)
                reallocate_payments($order_no, ST_SALESORDER, $ord_date, $total, $allocs);
        add_audit_trail($order->trans_type, $order_no, $order->document_date, _("Updated."));
-       $Refs->save($order->trans_type, $order_no, $order->reference);
+       $Refs->save($order->trans_type, $order_no, $order->reference, null, $order->fixed_asset);
 
        hook_db_postwrite($order, $order->trans_type);
        commit_transaction();
@@ -285,7 +285,7 @@ function get_sales_order_details($order_no, $trans_type) {
                                qty_sent as qty_done,
                                item.units,
                                item.mb_flag,
-                               item.material_cost + item.labour_cost + item.overhead_cost AS standard_cost
+                               item.material_cost
                        FROM ".TB_PREF."sales_order_details line,"
                                .TB_PREF."stock_master item
                        WHERE line.stk_code = item.stock_id
@@ -340,7 +340,7 @@ function read_sales_order($order_no, &$order, $trans_type)
                {
                        $order->add_to_cart($line_no,$myrow["stk_code"],$myrow["quantity"],
                                $myrow["unit_price"], $myrow["discount_percent"],
-                               $myrow["qty_done"], $myrow["standard_cost"], $myrow["description"], $myrow["id"] );
+                               $myrow["qty_done"], $myrow["material_cost"], $myrow["description"], $myrow["id"] );
                $line_no++;
                }
        }