projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed maximum nam length.
[fa-stable.git]
/
reporting
/
rep107.php
diff --git
a/reporting/rep107.php
b/reporting/rep107.php
index 11af3b832f90f83c7826ca50812cfc9a87761314..1f081ee2204be4cbf17923a039d7a069750b0b10 100644
(file)
--- a/
reporting/rep107.php
+++ b/
reporting/rep107.php
@@
-32,7
+32,7
@@
print_invoices();
function print_invoices()
{
function print_invoices()
{
- global $path_to_root, $alternative_tax_include_on_docs;
+ global $path_to_root, $alternative_tax_include_on_docs
, $suppress_tax_rates
;
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
@@
-109,7
+109,7
@@
function print_invoices()
}
else
$rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
}
else
$rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
- $contacts = get_branch_contacts($branch['branch_code'], '
order
', $branch['debtor_no']);
+ $contacts = get_branch_contacts($branch['branch_code'], '
invoice
', $branch['debtor_no']);
$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j, $contacts);
$rep->NewPage();
$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j, $contacts);
$rep->NewPage();
@@
-173,6
+173,11
@@
function print_invoices()
while ($tax_item = db_fetch($tax_items))
{
$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
while ($tax_item = db_fetch($tax_items))
{
$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
+
+ if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+ $tax_type_name = $tax_item['tax_type_name'];
+ else
+ $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
if ($tax_item['included_in_price'])
{
if ($tax_item['included_in_price'])
{
@@
-184,19
+189,16
@@
function print_invoices()
$rep->TextCol(6, 7, number_format2($sign*$tax_item['net_amount'], $dec), -2);
$rep->NewLine();
}
$rep->TextCol(6, 7, number_format2($sign*$tax_item['net_amount'], $dec), -2);
$rep->NewLine();
}
- $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
- $tax_item['rate'] . "%)", -2);
+ $rep->TextCol(3, 6, $tax_type_name, -2);
$rep->TextCol(6, 7, $DisplayTax, -2);
$first = false;
}
else
$rep->TextCol(6, 7, $DisplayTax, -2);
$first = false;
}
else
- $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
- " (" . $tax_item['rate'] . "%) " . $doc_Amount . ": " . $DisplayTax, -2);
+ $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
}
else
{
}
else
{
- $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
- $tax_item['rate'] . "%)", -2);
+ $rep->TextCol(3, 6, $tax_type_name, -2);
$rep->TextCol(6, 7, $DisplayTax, -2);
}
$rep->NewLine();
$rep->TextCol(6, 7, $DisplayTax, -2);
}
$rep->NewLine();
@@
-217,11
+219,6
@@
function print_invoices()
if ($email == 1)
{
$myrow['dimension_id'] = $paylink; // helper for pmt link
if ($email == 1)
{
$myrow['dimension_id'] = $paylink; // helper for pmt link
- if ($myrow['email'] == '')
- {
- $myrow['email'] = $branch['email'];
- $myrow['DebtorName'] = $branch['br_name'];
- }
$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow, $j);
}
}
$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow, $j);
}
}