$date = date2sql($date);
$dec = user_price_dec();
- $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.type,
- ".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
+ $sql = "SELECT supp_reference, tran_date, due_date, trans_no, type, rate,
+ (ABS( ov_amount) + ABS( ov_gst) - alloc) AS Balance,
+ (ABS( ov_amount) + ABS( ov_gst) ) AS TranTotal
FROM ".TB_PREF."supp_trans
- WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
- AND ROUND(ABS(".TB_PREF."supp_trans.ov_amount),$dec) + ROUND(ABS(".TB_PREF."supp_trans.ov_gst),$dec) -
- ROUND(".TB_PREF."supp_trans.alloc,$dec) != 0
- AND ".TB_PREF."supp_trans.tran_date <='" . $date . "'
- ORDER BY ".TB_PREF."supp_trans.type,
- ".TB_PREF."supp_trans.trans_no";
+ WHERE supplier_id = '$supplier'
+ AND ROUND(ABS( ov_amount),$dec) + ROUND(ABS( ov_gst),$dec) -
+ ROUND( alloc,$dec) != 0
+ AND tran_date <='$date'
+ ORDER BY type,
+ trans_no";
return db_query($sql, "No transactions were returned");
}
function print_payment_report()
{
- global $path_to_root, $systypes_array;
-
- $to = $_POST['PARAM_0'];
- $fromsupp = $_POST['PARAM_1'];
- $currency = $_POST['PARAM_2'];
- $no_zeros = $_POST['PARAM_3'];
- $comments = $_POST['PARAM_4'];
- $destination = $_POST['PARAM_5'];
+ global $path_to_root, $systypes_array;
+
+ $to = $_POST['PARAM_0'];
+ $fromsupp = $_POST['PARAM_1'];
+ $currency = $_POST['PARAM_2'];
+ $no_zeros = $_POST['PARAM_3'];
+ $comments = $_POST['PARAM_4'];
+ $orientation = $_POST['PARAM_5'];
+ $destination = $_POST['PARAM_6'];
if ($destination)
include_once($path_to_root . "/reporting/includes/excel_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- if ($fromsupp == ALL_NUMERIC)
+ $orientation = ($orientation ? 'L' : 'P');
+ if ($fromsupp == ALL_TEXT)
$from = _('All');
else
$from = get_supplier_name($fromsupp);
if ($no_zeros) $nozeros = _('Yes');
else $nozeros = _('No');
- $cols = array(0, 100, 130, 190, 250, 320, 385, 450, 515);
+ $cols = array(0, 100, 160, 210, 250, 320, 385, 450, 515);
$headers = array(_('Trans Type'), _('#'), _('Due Date'), '', '',
'', _('Total'), _('Balance'));
1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
3 => array( 'text' => _('Currency'),'from' => $currency, 'to' => ''),
- 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
+ 4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
- $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize());
+ $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize(), 9, $orientation);
+ if ($orientation == 'L')
+ recalculate_cols($cols);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms
WHERE ";
- if ($fromsupp != ALL_NUMERIC)
+ if ($fromsupp != ALL_TEXT)
$sql .= "supplier_id=".db_escape($fromsupp)." AND ";
- $sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
+ $sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.id
ORDER BY supp_name";
$result = db_query($sql, "The customers could not be retrieved");
$rep->End();
}
-?>