projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes in hotkeys system for tas support.
[fa-stable.git]
/
reporting
/
rep109.php
diff --git
a/reporting/rep109.php
b/reporting/rep109.php
index 5b049c111ce799fd0a4be400fe0b6a03ab392320..acb0e2e6c2bafea4fcd3e745b75b713aa84689e4 100644
(file)
--- a/
reporting/rep109.php
+++ b/
reporting/rep109.php
@@
-64,6
+64,7
@@
function print_sales_orders()
$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
else
$rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize());
$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
else
$rep = new FrontReport(_("QUOTE"), "QuoteBulk", 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);
@@
-78,6
+79,7
@@
function print_sales_orders()
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 ($print_as_quote == 1)
$rep->currency = $cur;
$rep->Font();
if ($print_as_quote == 1)
@@
-94,7
+96,8
@@
function print_sales_orders()
}
else
$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
}
else
$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
- $rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
+ $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
+ $rep->NewPage();
$result = get_sales_order_details($i, ST_SALESORDER);
$SubTotal = 0;
$result = get_sales_order_details($i, ST_SALESORDER);
$SubTotal = 0;
@@
-123,7
+126,7
@@
function print_sales_orders()
$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, $myrow, $baccount, ST_SALESORDER
);
+ $rep->
NewPage(
);
}
if ($myrow['comments'] != "")
{
}
if ($myrow['comments'] != "")
{
@@
-136,14
+139,7
@@
function print_sales_orders()
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$linetype = true;
$doctype = ST_SALESORDER;
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$linetype = true;
$doctype = ST_SALESORDER;
- if ($rep->currency != $myrow['curr_code'])
- {
- include($path_to_root . "/reporting/includes/doctext2.inc");
- }
- else
- {
- include($path_to_root . "/reporting/includes/doctext.inc");
- }
+ include($path_to_root . "/reporting/includes/doctext.inc");
$rep->TextCol(3, 6, $doc_Sub_total, -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
$rep->TextCol(3, 6, $doc_Sub_total, -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
@@
-158,6
+154,12
@@
function print_sales_orders()
else
$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
else
$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
$rep->TextCol(6, 7, $DisplayTotal, -2);
+ $words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
+ if ($words != "")
+ {
+ $rep->NewLine(1);
+ $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+ }
$rep->Font();
if ($email == 1)
{
$rep->Font();
if ($email == 1)
{