projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
493b4f9
)
Fixed inventory reports that didn't know about our new Fixed Asset flag.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 9 Dec 2015 13:52:45 +0000
(14:52 +0100)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 9 Dec 2015 13:52:45 +0000
(14:52 +0100)
reporting/rep104.php
patch
|
blob
|
history
reporting/rep301.php
patch
|
blob
|
history
reporting/rep304.php
patch
|
blob
|
history
reporting/rep305.php
patch
|
blob
|
history
reporting/rep307.php
patch
|
blob
|
history
reporting/rep308.php
patch
|
blob
|
history
reporting/rep309.php
patch
|
blob
|
history
diff --git
a/reporting/rep104.php
b/reporting/rep104.php
index bea243a886b6e413e36b1237cd0f3ed437e20834..4246e8e01c298a5dfe3ebfd76e27ad1e1a87313a 100644
(file)
--- a/
reporting/rep104.php
+++ b/
reporting/rep104.php
@@
-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");
diff --git
a/reporting/rep301.php
b/reporting/rep301.php
index 0c8ce806551d3fa839741ea3f2a7faccb4f0ab35..403e4b4ba28c89ccf5947a29a870d4b589b4989b 100644
(file)
--- a/
reporting/rep301.php
+++ b/
reporting/rep301.php
@@
-113,7
+113,7
@@
function getTransactions($category, $location, $date)
.TB_PREF."stock_moves move
WHERE item.stock_id=move.stock_id
AND item.category_id=category.category_id
.TB_PREF."stock_moves move
WHERE item.stock_id=move.stock_id
AND item.category_id=category.category_id
- AND item.mb_flag<>'D'
+ AND item.mb_flag<>'D'
AND mb_flag <> 'F'
AND move.tran_date <= '$date'
GROUP BY item.category_id,
category.description, ";
AND move.tran_date <= '$date'
GROUP BY item.category_id,
category.description, ";
diff --git
a/reporting/rep304.php
b/reporting/rep304.php
index a3a87daefbdd25d584b11c98c19662c8704fbade..28297c5825f23c33a37840afd9b0a0b2cb27469f 100644
(file)
--- a/
reporting/rep304.php
+++ b/
reporting/rep304.php
@@
-62,7
+62,8
@@
function getTransactions($category, $location, $fromcust, $from, $to, $show_serv
if (!$show_service)
$sql .= " AND (item.mb_flag='B' OR item.mb_flag='M')";
if (!$show_service)
$sql .= " AND (item.mb_flag='B' OR item.mb_flag='M')";
-
+ else
+ $sql .= " AND item.mb_flag<>'F'";
if ($category != 0)
$sql .= " AND item.category_id = ".db_escape($category);
if ($category != 0)
$sql .= " AND item.category_id = ".db_escape($category);
diff --git
a/reporting/rep305.php
b/reporting/rep305.php
index 4cd9229d2384d90adab65d2c88cea52dd2a1d29c..a6f8a9bc6a57ca4635cc1c09a7149309ef59f5b7 100644
(file)
--- a/
reporting/rep305.php
+++ b/
reporting/rep305.php
@@
-53,6
+53,7
@@
function getTransactions($from, $to)
AND grn_line.qty_recd>0
AND grn.delivery_date>='$from'
AND grn.delivery_date<='$to'
AND grn_line.qty_recd>0
AND grn.delivery_date>='$from'
AND grn.delivery_date<='$to'
+ AND item.mb_flag <>'F'
ORDER BY item.stock_id, grn.delivery_date";
return db_query($sql,"No transactions were returned");
ORDER BY item.stock_id, grn.delivery_date";
return db_query($sql,"No transactions were returned");
diff --git
a/reporting/rep307.php
b/reporting/rep307.php
index 19db40997a4ba6b9485a043a695be1afe9548f91..aee04a26db9231d8d90921acb1d194b07e1b4b6d 100644
(file)
--- a/
reporting/rep307.php
+++ b/
reporting/rep307.php
@@
-37,7
+37,7
@@
function fetch_items($category=0)
units,
cat.description
FROM ".TB_PREF."stock_master stock LEFT JOIN ".TB_PREF."stock_category cat ON stock.category_id=cat.category_id
units,
cat.description
FROM ".TB_PREF."stock_master stock LEFT JOIN ".TB_PREF."stock_category cat ON stock.category_id=cat.category_id
- WHERE mb_flag <> 'D'";
+ WHERE mb_flag <> 'D'
AND mb_flag <>'F'
";
if ($category != 0)
$sql .= " AND cat.category_id = ".db_escape($category);
$sql .= " ORDER BY stock.category_id, stock_id";
if ($category != 0)
$sql .= " AND cat.category_id = ".db_escape($category);
$sql .= " ORDER BY stock.category_id, stock_id";
diff --git
a/reporting/rep308.php
b/reporting/rep308.php
index 53f8195eecdb1b57db556fc89e809c4fd312efaa..08b8e89806914046e52c25bdb642b90cd1bac28d 100644
(file)
--- a/
reporting/rep308.php
+++ b/
reporting/rep308.php
@@
-67,7
+67,7
@@
function fetch_items($category=0)
stock.category_id,units,
cat.description
FROM ".TB_PREF."stock_master stock LEFT JOIN ".TB_PREF."stock_category cat ON stock.category_id=cat.category_id
stock.category_id,units,
cat.description
FROM ".TB_PREF."stock_master stock LEFT JOIN ".TB_PREF."stock_category cat ON stock.category_id=cat.category_id
- WHERE mb_flag <> 'D'";
+ WHERE mb_flag <> 'D'
AND mb_flag <> 'F'
";
if ($category != 0)
$sql .= " AND cat.category_id = ".db_escape($category);
$sql .= " ORDER BY stock.category_id, stock_id";
if ($category != 0)
$sql .= " AND cat.category_id = ".db_escape($category);
$sql .= " ORDER BY stock.category_id, stock_id";
diff --git
a/reporting/rep309.php
b/reporting/rep309.php
index b9c90bc46a7b0866ccc0a84fd793a6fc0e8e3da0..f52dc22aa2cbd4a39c7e9bad6c28e4cdb156f32e 100644
(file)
--- a/
reporting/rep309.php
+++ b/
reporting/rep309.php
@@
-50,6
+50,7
@@
function getTransactions($category, $from, $to)
AND trans.tran_date>='$from'
AND trans.tran_date<='$to'
AND line.quantity<>0
AND trans.tran_date>='$from'
AND trans.tran_date<='$to'
AND line.quantity<>0
+ AND item.mb_flag <>'F'
AND line.debtor_trans_type = ".ST_SALESINVOICE;
if ($category != 0)
$sql .= " AND item.category_id = ".db_escape($category);
AND line.debtor_trans_type = ".ST_SALESINVOICE;
if ($category != 0)
$sql .= " AND item.category_id = ".db_escape($category);