projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main CVS up to 2.1.5
[fa-stable.git]
/
reporting
/
rep109.php
diff --git
a/reporting/rep109.php
b/reporting/rep109.php
index 9c99ff037e3ab964eb5e9377085a6ae320388cee..31a769df1114bb1ff4dc68558119897c2bd8d621 100644
(file)
--- a/
reporting/rep109.php
+++ b/
reporting/rep109.php
@@
-25,7
+25,6
@@
include_once($path_to_root . "/sales/includes/sales_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_sales_orders();
$print_as_quote = 0;
print_sales_orders();
$print_as_quote = 0;
@@
-64,9
+63,9
@@
function print_sales_orders()
if ($email == 0)
{
if ($print_as_quote == 0)
if ($email == 0)
{
if ($print_as_quote == 0)
- $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk
.pdf
", user_pagesize());
+ $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
else
else
- $rep = new FrontReport(_("QUOTE"), "QuoteBulk
.pdf
", user_pagesize());
+ $rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize());
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
@@
-162,9
+161,12
@@
function print_sales_orders()
if ($myrow['contact_email'] == '')
{
$myrow['contact_email'] = $branch['email'];
if ($myrow['contact_email'] == '')
{
$myrow['contact_email'] = $branch['email'];
+ if ($myrow['contact_email'] == '')
+ $myrow['contact_email'] = $myrow['master_email'];
$myrow['DebtorName'] = $branch['br_name'];
}
$myrow['DebtorName'] = $branch['br_name'];
}
- $rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow);
+ $myrow['reference'] = $i;
+ $rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
}
}
if ($email == 0)
}
}
if ($email == 0)