projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed broken html enities handling in longer TextWrap fields in reports.
[fa-stable.git]
/
reporting
/
rep309.php
diff --git
a/reporting/rep309.php
b/reporting/rep309.php
index a306a4330fab62e4a630f95fbf31b7a97d04c2c9..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);
@@
-113,8
+114,6
@@
function print_inventory_sales()
$res = getTransactions($category, $from, $to);
$total = $grandtotal = 0.0;
$res = getTransactions($category, $from, $to);
$total = $grandtotal = 0.0;
- $total1 = $grandtotal1 = 0.0;
- $total2 = $grandtotal2 = 0.0;
$catt = '';
while ($trans=db_fetch($res))
{
$catt = '';
while ($trans=db_fetch($res))
{
@@
-128,7
+127,7
@@
function print_inventory_sales()
$rep->Line($rep->row - 2);
$rep->NewLine();
$rep->NewLine();
$rep->Line($rep->row - 2);
$rep->NewLine();
$rep->NewLine();
- $total =
$total1 = $total2 =
0.0;
+ $total = 0.0;
}
$rep->TextCol(0, 1, $trans['category_id']);
$rep->TextCol(1, 7, $trans['cat_description']);
}
$rep->TextCol(0, 1, $trans['category_id']);
$rep->TextCol(1, 7, $trans['cat_description']);