Changed the GL accounts in Manufacturing to go from Cost accounts to Assembly Account...

[fa-stable.git] / manufacturing / includes / db / work_orders_db.inc

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index d8894401ce1de2a93e98be17324bafc695c46324..431743a9f6793a6ff1541048378d0a8d1035a443 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -45,7 +45,7 @@ function add_material_cost($stock_id, $qty, $date_, $advanced=false)
        if ($qoh + $qty != 0)
        {
                if ($qoh == 0) // 27.10.2014 apmuthu and dz.
-                       $material_cost += $m_cost;
+                       $material_cost = $m_cost;
                else    
                        $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
        }
@@ -91,7 +91,7 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                -$costs);
                        //GL Posting to inventory adjustment account
                        add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-                               $stock_gl_code["adjustment_account"],
+                               $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
@@ -146,7 +146,7 @@ function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                -$costs);
                        //GL Posting to inventory adjustment account
                        add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-                               $stock_gl_code["adjustment_account"],
+                               $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
@@ -201,7 +201,7 @@ function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
                                -$costs);
                        //GL Posting to inventory adjustment account
                        add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-                               $stock_gl_code["adjustment_account"],
+                               $stock_gl_code["assembly_account"], // changed 2015.10.14 from adjustment to assembly account. Petros.
                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                $costs);
                                
@@ -443,7 +443,6 @@ function void_work_order($woid)
                $date = sql2date($work_order['date_']);
                
                $result = get_work_order_productions($woid); // check the produced quantity
-               $qty = 0;
                while ($row = db_fetch($result))
                {
                        void_work_order_produce($row['id']);
@@ -459,7 +458,6 @@ function void_work_order($woid)
 
                $result = get_work_order_issues($woid);
                $cost = 0;
-               $issue_no = 0;
                while ($row = db_fetch($result))
                {
                        void_work_order_issue($row['issue_no']);
@@ -555,6 +553,7 @@ function get_sql_for_work_orders($outstanding_only, $all_items)
 
                $sql .= " AND workorder.required_by < '$Today' ";
        }
+       $sql .= " ORDER BY workorder.id DESC";
        return $sql;
 }