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
/
rep113.php
diff --git
a/reporting/rep113.php
b/reporting/rep113.php
index 4a110745cd02180823c77ce2fc423c1c526d1d69..aec634e25f3da7d65e1b562d3766d7451011240a 100644
(file)
--- a/
reporting/rep113.php
+++ b/
reporting/rep113.php
@@
-43,14
+43,14
@@
function print_credits()
$paylink = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
$paylink = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
- if ($from == null)
- $from = 0;
- if ($to == null)
- $to = 0;
+ if (!$from || !$to) return;
+
$dec = user_price_dec();
$fno = explode("-", $from);
$tno = explode("-", $to);
$dec = user_price_dec();
$fno = explode("-", $from);
$tno = explode("-", $to);
+ $from = min($fno[0], $tno[0]);
+ $to = max($fno[0], $tno[0]);
$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
@@
-70,7
+70,7
@@
function print_credits()
$rep->Info($params, $cols, null, $aligns);
}
$rep->Info($params, $cols, null, $aligns);
}
- for ($i = $f
no[0]; $i <= $tno[0]
; $i++)
+ for ($i = $f
rom; $i <= $to
; $i++)
{
if (!exists_customer_trans(ST_CUSTCREDIT, $i))
continue;
{
if (!exists_customer_trans(ST_CUSTCREDIT, $i))
continue;
@@
-94,7
+94,7
@@
function print_credits()
}
else
$rep->title = _('CREDIT NOTE');
}
else
$rep->title = _('CREDIT NOTE');
- $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+ $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']
, false
);
$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
$rep->NewPage();
$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
$rep->NewPage();
@@
-131,12
+131,11
@@
function print_credits()
$rep->NewPage();
}
$rep->NewPage();
}
- $
comments = get_comments
(ST_CUSTCREDIT, $i);
- if ($
comments && db_num_rows($comments)
)
+ $
memo = get_comments_string
(ST_CUSTCREDIT, $i);
+ if ($
memo != ""
)
{
$rep->NewLine();
{
$rep->NewLine();
- while ($comment=db_fetch($comments))
- $rep->TextColLines(0, 6, $comment['memo_'], -2);
+ $rep->TextColLines(1, 5, $memo, -2);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
@@
-204,7
+203,7
@@
function print_credits()
if ($email == 1)
{
$myrow['dimension_id'] = $paylink; // helper for pmt link
if ($email == 1)
{
$myrow['dimension_id'] = $paylink; // helper for pmt link
- $rep->End($email
, '', $myrow, ST_CUSTCREDIT
);
+ $rep->End($email);
}
}
if ($email == 0)
}
}
if ($email == 0)