projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0001503: Request - fee account included in bank account table
[fa-stable.git]
/
reporting
/
rep210.php
diff --git
a/reporting/rep210.php
b/reporting/rep210.php
index 1b80b72e8368814d54efb411a981ce736be07519..9d8b8d7ddfbf9b0a0c71d3a3115fcf38631a7412 100644
(file)
--- a/
reporting/rep210.php
+++ b/
reporting/rep210.php
@@
-108,9
+108,10
@@
function print_remittances()
{
$myrow = get_remittance($j, $i);
if (!$myrow)
{
$myrow = get_remittance($j, $i);
if (!$myrow)
- continue;
- $baccount = get_default_bank_account($myrow['curr_code']);
- $params['bankaccount'] = $baccount['id'];
+ continue;
+ $res = get_bank_trans($j, $i);
+ $baccount = db_fetch($res);
+ $params['bankaccount'] = $baccount['bank_act'];
if ($email == 1)
{
if ($email == 1)
{
@@
-134,7
+135,7
@@
function print_remittances()
$total_allocated = 0;
$rep->TextCol(0, 4, _("As advance / full / part / payment towards:"), -2);
$rep->NewLine(2);
$total_allocated = 0;
$rep->TextCol(0, 4, _("As advance / full / part / payment towards:"), -2);
$rep->NewLine(2);
-
+
while ($myrow2=db_fetch($result))
{
$rep->TextCol(0, 1, $systypes_array[$myrow2['type']], -2);
while ($myrow2=db_fetch($result))
{
$rep->TextCol(0, 1, $systypes_array[$myrow2['type']], -2);
@@
-151,6
+152,12
@@
function print_remittances()
$rep->NewPage();
}
$rep->NewPage();
}
+ $memo = get_comments_string($j, $i);
+ if ($memo != "")
+ {
+ $rep->NewLine();
+ $rep->TextColLines(1, 5, $memo, -2);
+ }
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$rep->TextCol(3, 6, _("Total Allocated"), -2);
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$rep->TextCol(3, 6, _("Total Allocated"), -2);
@@
-168,14
+175,14
@@
function print_remittances()
{
$rep->NewLine(2);
$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
{
$rep->NewLine(2);
$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
- }
+ }
$rep->Font();
if ($email == 1)
{
$myrow['DebtorName'] = $myrow['supp_name'];
$rep->End($email);
}
$rep->Font();
if ($email == 1)
{
$myrow['DebtorName'] = $myrow['supp_name'];
$rep->End($email);
}
- }
+ }
}
if ($email == 0)
$rep->End();
}
if ($email == 0)
$rep->End();