projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Report fixed according to changed headers API in FrontReport class.
[fa-stable.git]
/
reporting
/
rep107.php
diff --git
a/reporting/rep107.php
b/reporting/rep107.php
index 54aefe044b6a0eae4b6078fa2da5fd17be5113bb..91c7a8d34bc887b0807cecf1d6bd236848f16009 100644
(file)
--- a/
reporting/rep107.php
+++ b/
reporting/rep107.php
@@
-64,6
+64,7
@@
function print_invoices()
if ($email == 0)
{
$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
if ($email == 0)
{
$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
+ $rep->SetHeaderType('Header2');
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
@@
-91,6
+92,7
@@
function print_invoices()
if ($email == 1)
{
$rep = new FrontReport("", "", user_pagesize());
if ($email == 1)
{
$rep = new FrontReport("", "", user_pagesize());
+ $rep->SetHeaderType('Header2');
$rep->currency = $cur;
$rep->Font();
if ($j == ST_SALESINVOICE)
$rep->currency = $cur;
$rep->Font();
if ($j == ST_SALESINVOICE)
@@
-107,12
+109,16
@@
function print_invoices()
}
else
$rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
}
else
$rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
- $rep->Header2($myrow, $branch, $sales_order, $baccount, $j);
+ $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j);
+ $rep->NewPage();
$result = get_customer_trans_details($j, $i);
$SubTotal = 0;
while ($myrow2=db_fetch($result))
{
$result = get_customer_trans_details($j, $i);
$SubTotal = 0;
while ($myrow2=db_fetch($result))
{
+ if ($myrow2["quantity"] == 0)
+ continue;
+
$Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
user_price_dec());
$SubTotal += $Net;
$Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
user_price_dec());
$SubTotal += $Net;
@@
-136,7
+142,7
@@
function print_invoices()
$rep->row = $newrow;
//$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$rep->row = $newrow;
//$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
- $rep->
Header2($myrow, $branch, $sales_order, $baccount,$j
);
+ $rep->
NewPage(
);
}
$comments = get_comments($j, $i);
}
$comments = get_comments($j, $i);