projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added confirmation js dialogs for deleting and restoring backup file.
[fa-stable.git]
/
reporting
/
rep203.php
diff --git
a/reporting/rep203.php
b/reporting/rep203.php
index c276188f8a6d0befbcb2cab9f91cb57c31c0fb85..3ad684adc96085c7afd7b27bdb3a8c530d900437 100644
(file)
--- a/
reporting/rep203.php
+++ b/
reporting/rep203.php
@@
-9,7
+9,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
2
;
+$page_security =
'SA_SUPPPAYMREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-31,8
+31,7
@@
function getTransactions($supplier, $date)
{
$date = date2sql($date);
{
$date = date2sql($date);
- $sql = "SELECT ".TB_PREF."sys_types.type_name,
- ".TB_PREF."supp_trans.supp_reference,
+ $sql = "SELECT ".TB_PREF."supp_trans.supp_reference,
".TB_PREF."supp_trans.tran_date,
".TB_PREF."supp_trans.due_date,
".TB_PREF."supp_trans.trans_no,
".TB_PREF."supp_trans.tran_date,
".TB_PREF."supp_trans.due_date,
".TB_PREF."supp_trans.trans_no,
@@
-40,10
+39,8
@@
function getTransactions($supplier, $date)
".TB_PREF."supp_trans.rate,
(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance,
(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal
".TB_PREF."supp_trans.rate,
(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance,
(ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal
- FROM ".TB_PREF."supp_trans,
- ".TB_PREF."sys_types
- WHERE ".TB_PREF."sys_types.type_id = ".TB_PREF."supp_trans.type
- AND ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
+ FROM ".TB_PREF."supp_trans
+ WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0
AND ".TB_PREF."supp_trans.tran_date <='" . $date . "'
ORDER BY ".TB_PREF."supp_trans.type,
AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0
AND ".TB_PREF."supp_trans.tran_date <='" . $date . "'
ORDER BY ".TB_PREF."supp_trans.type,
@@
-134,7
+131,7
@@
function print_payment_report()
else
$rate = 1.0;
$rep->NewLine(1, 2);
else
$rate = 1.0;
$rep->NewLine(1, 2);
- $rep->TextCol(0, 1,
$trans['type_name']
);
+ $rep->TextCol(0, 1,
systypes::name($trans['type'])
);
$rep->TextCol(1, 2, $trans['supp_reference']);
if ($trans['type'] == 20)
$rep->DateCol(2, 3, $trans['due_date'], true);
$rep->TextCol(1, 2, $trans['supp_reference']);
if ($trans['type'] == 20)
$rep->DateCol(2, 3, $trans['due_date'], true);