Missing Changelog

[fa-stable.git] / reporting / rep309.php

diff --git a/reporting/rep309.php b/reporting/rep309.php
index 1bb9ba06a7df49c8abd83794b3da93cd48c800a0..2e3dfa6707028d4a24bacd98cbe05d5e6afba5c9 100644 (file)
--- a/reporting/rep309.php
+++ b/reporting/rep309.php
@@ -38,7 +38,7 @@ function getTransactions($category, $from, $to)
                        item.stock_id,
                        item.description,
                        line.unit_price * trans.rate AS unit_price,
-                       SUM(line.quantity) as quantity
+                       SUM(IF(line.debtor_trans_type = ".ST_CUSTCREDIT.", -line.quantity, line.quantity)) AS quantity
                FROM ".TB_PREF."stock_master item,
                        ".TB_PREF."stock_category category,
                        ".TB_PREF."debtor_trans trans,
@@ -50,7 +50,7 @@ function getTransactions($category, $from, $to)
                AND trans.tran_date>='$from'
                AND trans.tran_date<='$to'
                AND line.quantity<>0
-               AND line.debtor_trans_type = ".ST_SALESINVOICE;
+               AND (line.debtor_trans_type = ".ST_SALESINVOICE." OR line.debtor_trans_type = ".ST_CUSTCREDIT.")";
                if ($category != 0)
                        $sql .= " AND item.category_id = ".db_escape($category);
                $sql .= " GROUP BY item.category_id,