projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0005170] Fixed Assets Purchase: fixed error on items with long description, removed...
[fa-stable.git]
/
reporting
/
rep104.php
diff --git
a/reporting/rep104.php
b/reporting/rep104.php
index bea243a886b6e413e36b1237cd0f3ed437e20834..c2dc63a3716866014262e38a2c72eadb12a540e7 100644
(file)
--- a/
reporting/rep104.php
+++ b/
reporting/rep104.php
@@
-33,7
+33,7
@@
print_price_listing();
function fetch_items($category=0)
{
$sql = "SELECT item.stock_id, item.description AS name,
function fetch_items($category=0)
{
$sql = "SELECT item.stock_id, item.description AS name,
- item.material_cost
+item.labour_cost+item.overhead_cost
AS Standardcost,
+ item.material_cost AS Standardcost,
item.category_id,item.units,
category.description
FROM ".TB_PREF."stock_master item,
item.category_id,item.units,
category.description
FROM ".TB_PREF."stock_master item,
@@
-41,7
+41,7
@@
function fetch_items($category=0)
WHERE item.category_id=category.category_id AND NOT item.inactive";
if ($category != 0)
$sql .= " AND category.category_id = ".db_escape($category);
WHERE item.category_id=category.category_id AND NOT item.inactive";
if ($category != 0)
$sql .= " AND category.category_id = ".db_escape($category);
- $sql .= " ORDER BY item.category_id,
+ $sql .= "
AND item.mb_flag<> 'F'
ORDER BY item.category_id,
item.stock_id";
return db_query($sql,"No transactions were returned");
item.stock_id";
return db_query($sql,"No transactions were returned");