projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from stable branch up to 2.3.23.
[fa-stable.git]
/
reporting
/
rep108.php
diff --git
a/reporting/rep108.php
b/reporting/rep108.php
index 7f2d6069bade395ef321c7ead7cff0fea3ed3065..84a80ca18279d32172ecd5e6cafa3c1a3ef0affd 100644
(file)
--- a/
reporting/rep108.php
+++ b/
reporting/rep108.php
@@
-37,15
+37,15
@@
function getTransactions($debtorno, $date, $show_also_allocated)
".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
-
AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue
- FROM ".TB_PREF."debtor_trans
- WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
+ AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue
+
FROM ".TB_PREF."debtor_trans
+
WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
-
AND
(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
- ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
!= 0
";
+
AND ABS
(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
+ ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
> 1e-6
";
if (!$show_also_allocated)
if (!$show_also_allocated)
- $sql .= " AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
- ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc
<> 0
";
+ $sql .= " AND ABS(
ABS(
".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
+ ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc
) > 1e-6
";
$sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
return db_query($sql,"No transactions were returned");
$sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
return db_query($sql,"No transactions were returned");
@@
-84,7
+84,8
@@
function print_statements()
if ($email == 0)
$rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
if ($orientation == 'L')
if ($email == 0)
$rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
if ($orientation == 'L')
- $rep->recalculate_cols($cols);
+ recalculate_cols($cols);
+
$sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
if ($customer != ALL_TEXT)
$sql .= " WHERE debtor_no = ".db_escape($customer);
$sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
if ($customer != ALL_TEXT)
$sql .= " WHERE debtor_no = ".db_escape($customer);
@@
-94,6
+95,9
@@
function print_statements()
while ($myrow=db_fetch($result))
{
while ($myrow=db_fetch($result))
{
+ if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+ continue;
+ }
$date = date('Y-m-d');
$myrow['order_'] = "";
$date = date('Y-m-d');
$myrow['order_'] = "";
@@
-104,17
+108,21
@@
function print_statements()
if (db_num_rows($TransResult) == 0)
continue;
if ($email == 1)
if (db_num_rows($TransResult) == 0)
continue;
if ($email == 1)
+ {
$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
- $rep->SetHeaderType('Header2');
+ $rep->title = _('STATEMENT');
+ $rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf";
+ $rep->Info($params, $cols, null, $aligns);
+ }
+
+ $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
$rep->currency = $cur;
$rep->Font();
$rep->currency = $cur;
$rep->Font();
- $rep->title = _('STATEMENT');
- $rep->filename = "Statement" . $myrow['debtor_no'] . ".pdf";
$rep->Info($params, $cols, null, $aligns);
$rep->Info($params, $cols, null, $aligns);
- $contacts = get_customer_contacts($myrow['debtor_no'], 'invoice');
//= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
$rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts);
//= get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
$rep->SetCommonData($myrow, null, null, $baccount, ST_STATEMENT, $contacts);
+ $rep->SetHeaderType('Header2');
$rep->NewPage();
$rep->NewLine();
$doctype = ST_STATEMENT;
$rep->NewPage();
$rep->NewLine();
$doctype = ST_STATEMENT;
@@
-169,4
+177,3
@@
function print_statements()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file