Fixed costs display in work order view.

diff --git a/manufacturing/includes/db/work_order_costing_db.inc b/manufacturing/includes/db/work_order_costing_db.inc
index 2502be7640281964d3833c885518da0010d0c9e5..3cb605cb5c6620fd8d3f50eaf993aae938830140 100644 (file)
--- a/manufacturing/includes/db/work_order_costing_db.inc
+++ b/manufacturing/includes/db/work_order_costing_db.inc
@@ -23,7 +23,12 @@ function add_wo_costing($workorder_id, $cost_type, $trans_type, $trans_no, $fact
 
 function get_wo_costing($workorder_id)
 {
-       $sql="SELECT * FROM ".TB_PREF."wo_costing WHERE workorder_id=".db_escape($workorder_id);
+       $sql="SELECT * 
+               FROM ".TB_PREF."wo_costing cost,
+                       ".TB_PREF."journal gl
+               WHERE
+                       cost.trans_type=gl.type AND cost.trans_no=gl.trans_no
+                       AND workorder_id=".db_escape($workorder_id);
 
        return db_query($sql, "could not get work order costing");
 }

diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc
index b980781acefa6f194089dd8194f777c18b81497b..4c6b4612abeee18c009ba41ace6a1ddb45c6deca 100644 (file)
--- a/manufacturing/includes/db/work_order_issues_db.inc
+++ b/manufacturing/includes/db/work_order_issues_db.inc
@@ -102,9 +102,10 @@ function get_work_order_issues($woid)
 
 function get_additional_issues($woid)
 {
-       $sql = "SELECT issue.*, item.*
+       $sql = "SELECT issue.*, item.*, stock.mb_flag
                FROM ".TB_PREF."wo_issues issue, "
                        .TB_PREF."wo_issue_items item
+                       LEFT JOIN ".TB_PREF."stock_master stock ON stock.stock_id=item.stock_id
                WHERE issue.issue_no=item.issue_id
                AND issue.workorder_id=".db_escape($woid)
                ." ORDER BY item.id";

diff --git a/manufacturing/includes/manufacturing_ui.inc b/manufacturing/includes/manufacturing_ui.inc
index 71997576d292b6c16e00e7941f5072fdb5d7f037..ad27d03a864099c26833ac1adb1fffe4f02d5a21 100644 (file)
--- a/manufacturing/includes/manufacturing_ui.inc
+++ b/manufacturing/includes/manufacturing_ui.inc
@@ -239,7 +239,7 @@ function display_wo_payments($woid)
 {
        global $path_to_root, $wo_cost_types;
 
-    $result = get_gl_wo_cost_trans($woid);
+    $result = get_wo_costing($woid);
 
     if (db_num_rows($result) == 0)
     {
@@ -252,14 +252,12 @@ function display_wo_payments($woid)
 
         table_header($th);
 
-        $k = 0; //row colour counter
-               
+        $k = 0;
         while ($myrow = db_fetch($result))
         {
-
                        alt_table_row_color($k);
 
-               label_cell(get_gl_view_str( $myrow["type"], $myrow["type_no"], $myrow["type_no"]));
+               label_cell(get_gl_view_str( $myrow["trans_type"], $myrow["trans_no"], $myrow["trans_no"]));
                label_cell($wo_cost_types[$myrow['cost_type']]);
                $date = sql2date($myrow["tran_date"]);
                label_cell($date);