projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sales invoice voiding is blocked when sales credit was issued against the invoice.
[fa-stable.git]
/
reporting
/
rep107.php
diff --git
a/reporting/rep107.php
b/reporting/rep107.php
index a1d36e845e61ae3a0b6009562d26a1305410973d..a125995dce7b5a04d4818f0eadbc441cdca21de0 100644
(file)
--- a/
reporting/rep107.php
+++ b/
reporting/rep107.php
@@
-27,9
+27,9
@@
include_once($path_to_root . "/sales/includes/sales_db.inc");
//----------------------------------------------------------------------------------------------------
function get_invoice_range($from, $to)
{
//----------------------------------------------------------------------------------------------------
function get_invoice_range($from, $to)
{
- global $
print_invoice_no
;
+ global $
SysPrefs
;
- $ref = ($
print_invoice_no
== 1 ? "trans_no" : "reference");
+ $ref = ($
SysPrefs->print_invoice_no()
== 1 ? "trans_no" : "reference");
$sql = "SELECT trans.trans_no, trans.reference
FROM ".TB_PREF."debtor_trans trans
$sql = "SELECT trans.trans_no, trans.reference
FROM ".TB_PREF."debtor_trans trans
@@
-49,7
+49,7
@@
print_invoices();
function print_invoices()
{
function print_invoices()
{
- global $path_to_root, $
alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount
;
+ global $path_to_root, $
SysPrefs
;
$show_this_payment = true; // include payments invoiced here in summary
$show_this_payment = true; // include payments invoiced here in summary
@@
-61,7
+61,8
@@
function print_invoices()
$email = $_POST['PARAM_3'];
$pay_service = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
$email = $_POST['PARAM_3'];
$pay_service = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
- $orientation = $_POST['PARAM_6'];
+ $customer = $_POST['PARAM_6'];
+ $orientation = $_POST['PARAM_7'];
if (!$from || !$to) return;
if (!$from || !$to) return;
@@
-85,17
+86,23
@@
function print_invoices()
if ($email == 0)
$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
if ($email == 0)
$rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
- if ($orientation == 'L')
- recalculate_cols($cols);
+
if ($orientation == 'L')
+
recalculate_cols($cols);
$range = get_invoice_range($from, $to);
while($row = db_fetch($range))
{
$range = get_invoice_range($from, $to);
while($row = db_fetch($range))
{
- $i = $row['trans_no'];
- if (!exists_customer_trans(ST_SALESINVOICE, $i))
+ if (!exists_customer_trans(ST_SALESINVOICE, $row['trans_no']))
continue;
$sign = 1;
continue;
$sign = 1;
- $myrow = get_customer_trans($i, ST_SALESINVOICE);
+ $myrow = get_customer_trans($row['trans_no'], ST_SALESINVOICE);
+
+ if ($customer && $myrow['debtor_no'] != $customer) {
+ continue;
+ }
+ if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+ continue;
+ }
$baccount = get_default_bank_account($myrow['curr_code']);
$params['bankaccount'] = $baccount['id'];
$baccount = get_default_bank_account($myrow['curr_code']);
$params['bankaccount'] = $baccount['id'];
@@
-107,14
+114,14
@@
function print_invoices()
$rep->title = _('INVOICE');
$rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
}
$rep->title = _('INVOICE');
$rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
}
- $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);
- $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'],
fals
e);
+ $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'],
tru
e);
$baccount['payment_service'] = $pay_service;
$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
$baccount['payment_service'] = $pay_service;
$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
+ $rep->SetHeaderType('Header2');
$rep->NewPage();
// calculate summary start row for later use
$summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight);
$rep->NewPage();
// calculate summary start row for later use
$summary_start_row = $rep->bottomMargin + (15 * $rep->lineHeight);
@@
-126,7
+133,7
@@
function print_invoices()
while($inv = db_fetch($result))
{
$prepayments[] = $inv;
while($inv = db_fetch($result))
{
$prepayments[] = $inv;
- if ($inv['trans_no'] == $
i
)
+ if ($inv['trans_no'] == $
row['trans_no']
)
break;
}
break;
}
@@
-136,7
+143,7
@@
function print_invoices()
unset($prepayments);
}
unset($prepayments);
}
- $result = get_customer_trans_details(ST_SALESINVOICE, $
i
);
+ $result = get_customer_trans_details(ST_SALESINVOICE, $
row['trans_no']
);
$SubTotal = 0;
while ($myrow2=db_fetch($result))
{
$SubTotal = 0;
while ($myrow2=db_fetch($result))
{
@@
-159,7
+166,7
@@
function print_invoices()
$rep->TextColLines($c++, $c, $myrow2['StockDescription'], -2);
$newrow = $rep->row;
$rep->row = $oldrow;
$rep->TextColLines($c++, $c, $myrow2['StockDescription'], -2);
$newrow = $rep->row;
$rep->row = $oldrow;
- if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !
isset($no_zero_lines_amount) || $no_zero_lines_amount == 0
)
+ if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !
$SysPrefs->no_zero_lines_amount()
)
{
$rep->TextCol($c++, $c, $DisplayQty, -2);
$rep->TextCol($c++, $c, $myrow2['units'], -2);
{
$rep->TextCol($c++, $c, $DisplayQty, -2);
$rep->TextCol($c++, $c, $myrow2['units'], -2);
@@
-173,7
+180,7
@@
function print_invoices()
$rep->NewPage();
}
$rep->NewPage();
}
- $memo = get_comments_string(ST_SALESINVOICE, $
i
);
+ $memo = get_comments_string(ST_SALESINVOICE, $
row['trans_no']
);
if ($memo != "")
{
$rep->NewLine();
if ($memo != "")
{
$rep->NewLine();
@@
-230,7
+237,7
@@
function print_invoices()
$rep->TextCol(3, 6, _("Shipping"), -2);
$rep->TextCol(6, 7, $DisplayFreight, -2);
$rep->NewLine();
$rep->TextCol(3, 6, _("Shipping"), -2);
$rep->TextCol(6, 7, $DisplayFreight, -2);
$rep->NewLine();
- $tax_items = get_trans_tax_details(ST_SALESINVOICE, $
i
);
+ $tax_items = get_trans_tax_details(ST_SALESINVOICE, $
row['trans_no']
);
$first = true;
while ($tax_item = db_fetch($tax_items))
{
$first = true;
while ($tax_item = db_fetch($tax_items))
{
@@
-238,14
+245,14
@@
function print_invoices()
continue;
$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
continue;
$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
- if (
isset($suppress_tax_rates) && $suppress_tax_rates
== 1)
+ if (
$SysPrefs->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 ($myrow['tax_included'])
{
$tax_type_name = $tax_item['tax_type_name'];
else
$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
if ($myrow['tax_included'])
{
- if (
isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs
== 1)
+ if (
$SysPrefs->alternative_tax_include_on_docs()
== 1)
{
if ($first)
{
{
if ($first)
{
@@
-299,4
+306,3
@@
function print_invoices()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file