projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged last changes from stable.
[fa-stable.git]
/
reporting
/
rep109.php
diff --git
a/reporting/rep109.php
b/reporting/rep109.php
index 3251efcf5cc2bbc068b432eae3dc2e97e9680b0a..718f6f9d88c89387b221467a6c3d7ae133071676 100644
(file)
--- a/
reporting/rep109.php
+++ b/
reporting/rep109.php
@@
-61,6
+61,7
@@
function print_sales_orders()
if ($email == 0)
{
if ($email == 0)
{
+
if ($print_as_quote == 0)
$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize(), 9, $orientation);
else
if ($print_as_quote == 0)
$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize(), 9, $orientation);
else
@@
-129,7
+130,7
@@
function print_sales_orders()
$rep->TextCol(4, 5, $DisplayPrice, -2);
$rep->TextCol(5, 6, $DisplayDiscount, -2);
$rep->TextCol(6, 7, $DisplayNet, -2);
$rep->TextCol(4, 5, $DisplayPrice, -2);
$rep->TextCol(5, 6, $DisplayDiscount, -2);
$rep->TextCol(6, 7, $DisplayNet, -2);
- }
+ }
$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))