projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dimensions not utilized in Direct Invoice/Delivery
[fa-stable.git]
/
reporting
/
rep112.php
diff --git
a/reporting/rep112.php
b/reporting/rep112.php
index f04ee1d77f5cd1df851782269101da5492f0504d..ba6c94653b4571ccf24f83b4ff94a1294ad7efd4 100644
(file)
--- a/
reporting/rep112.php
+++ b/
reporting/rep112.php
@@
-97,8
+97,8
@@
function print_receipts()
for ($i = $from; $i <= $to; $i++)
{
for ($i = $from; $i <= $to; $i++)
{
- if ($f
rom == $to
)
- $types = array($f
rom
);
+ if ($f
no[0] == $tno[0]
)
+ $types = array($f
no[1]
);
else
$types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT);
foreach ($types as $j)
else
$types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT);
foreach ($types as $j)
@@
-106,8
+106,9
@@
function print_receipts()
$myrow = get_receipt($j, $i);
if (!$myrow)
continue;
$myrow = get_receipt($j, $i);
if (!$myrow)
continue;
- $baccount = get_default_bank_account($myrow['curr_code']);
- $params['bankaccount'] = $baccount['id'];
+ $res = get_bank_trans($j, $i);
+ $baccount = db_fetch($res);
+ $params['bankaccount'] = $baccount['bank_act'];
$rep->title = _('RECEIPT');
$contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
$rep->title = _('RECEIPT');
$contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
@@
-137,6
+138,13
@@
function print_receipts()
$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);