projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 5694: Request Various Attachment Changes. Fixed the most.
[fa-stable.git]
/
reporting
/
rep111.php
diff --git
a/reporting/rep111.php
b/reporting/rep111.php
index 241d7edd9883a62b925288ea8369d59002cf7027..273e7c421d4b0c477f653bc78f39a0b144aea029 100644
(file)
--- a/
reporting/rep111.php
+++ b/
reporting/rep111.php
@@
-111,6
+111,8
@@
function print_sales_quotations()
$rep->TextCol(0, 1, $myrow2['stk_code'], -2);
$oldrow = $rep->row;
$rep->TextColLines(1, 2, $myrow2['description'], -2);
$rep->TextCol(0, 1, $myrow2['stk_code'], -2);
$oldrow = $rep->row;
$rep->TextColLines(1, 2, $myrow2['description'], -2);
+ if (!empty($SysPrefs->prefs['long_description_invoice']) && !empty($myrow2['long_description']))
+ $rep->TextColLines(1, 2, $myrow2['long_description'], -2);
$newrow = $rep->row;
$rep->row = $oldrow;
if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())
$newrow = $rep->row;
$rep->row = $oldrow;
if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())
@@
-141,7
+143,7
@@
function print_sales_quotations()
if ($myrow['comments'] != "")
{
$rep->NewLine();
if ($myrow['comments'] != "")
{
$rep->NewLine();
- $rep->TextColLines(1,
5
, $myrow['comments'], -2);
+ $rep->TextColLines(1,
3
, $myrow['comments'], -2);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
@@
-183,7
+185,7
@@
function print_sales_quotations()
if ($first)
{
$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
if ($first)
{
$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
- $rep->TextCol(6, 7, number_format2($
sign*$
tax_item['net_amount'], $dec), -2);
+ $rep->TextCol(6, 7, number_format2($tax_item['net_amount'], $dec), -2);
$rep->NewLine();
}
$rep->TextCol(3, 6, $tax_type_name, -2);
$rep->NewLine();
}
$rep->TextCol(3, 6, $tax_type_name, -2);