get_standard_cost fixed again.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1cc580da7067d2c09f8feccda504901ad63e9a8e..b4287d0dbb7a4acd49b4f0af26c040ddbff25ef3 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+06-Feb-2010 Janusz Dobrowolski
+# Fixed get_standard_cost() for dummy items again.
+$ /includes/db/inventory_db.inc
+
 06-Feb-2010 Joe Hunt/Chaitanya
 ! Changed Balance Sheets/PL Statements to be recursive
 $ /gl/inquiry/balance_sheet.php
@@ -36,8 +40,9 @@ $ /includes/main.inc
 $ /gl/includes/db/gl_db_accounts.inc
   /gl/includes/db/gl_db_account_types.inc
   
+>>>>>>> 1.368
 05-Feb-2010 Janusz Dobrowolski
-# Fixed get_standard_cost()for dummy items
+# Fixed get_standard_cost() for dummy items
 $ /includes/db/inventory_db.inc
 # Prevent saving empty lines in invoices/delivery notes
 $ /sales/includes/db/sales_delivery_db.inc

diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc
index 2680f3ed42e8f2138dbd084691f68a41839d537f..9adb1621886dc4f0341ece63b9ffb1a6ff8741cf 100644 (file)
--- a/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@ -59,7 +59,7 @@ function get_item_edit_info($stock_id)
 
 function get_standard_cost($stock_id)
 {
-       $sql = "SELECT IF(s.type='D', 0, material_cost + labour_cost + overhead_cost) AS std_cost
+       $sql = "SELECT IF(s.mb_flag='D', 0, material_cost + labour_cost + overhead_cost) AS std_cost
                FROM ".TB_PREF."stock_master s WHERE stock_id=".db_escape($stock_id);
        $result = db_query($sql, "The standard cost cannot be retrieved");