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
/
rep110.php
diff --git
a/reporting/rep110.php
b/reporting/rep110.php
index 69457665fa19911d929f2afb9ac8ba2d8c6d458d..7044153d33f20877235aabcb9be0ca10020430d0 100644
(file)
--- a/
reporting/rep110.php
+++ b/
reporting/rep110.php
@@
-25,7
+25,6
@@
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
-$packing_slip = 0;
//----------------------------------------------------------------------------------------------------
print_deliveries();
//----------------------------------------------------------------------------------------------------
print_deliveries();
@@
-34,7
+33,7
@@
print_deliveries();
function print_deliveries()
{
function print_deliveries()
{
- global $path_to_root, $
packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount
;
+ global $path_to_root, $
SysPrefs
;
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
@@
-94,13
+93,13
@@
function print_deliveries()
$rep->filename = "Packing_slip" . $myrow['reference'] . ".pdf";
}
}
$rep->filename = "Packing_slip" . $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'], 'delivery', $branch['debtor_no'],
fals
e);
+ $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no'],
tru
e);
$rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
$rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
+ $rep->SetHeaderType('Header2');
$rep->NewPage();
$result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
$rep->NewPage();
$result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
@@
-109,7
+108,7
@@
function print_deliveries()
{
if ($myrow2["quantity"] == 0)
continue;
{
if ($myrow2["quantity"] == 0)
continue;
-
+
$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
user_price_dec());
$SubTotal += $Net;
$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
user_price_dec());
$SubTotal += $Net;
@@
-125,8
+124,8
@@
function print_deliveries()
$rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
$newrow = $rep->row;
$rep->row = $oldrow;
$rep->TextColLines(1, 2, $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(2, 3, $DisplayQty, -2);
$rep->TextCol(3, 4, $myrow2['units'], -2);
if ($packing_slip == 0)
$rep->TextCol(2, 3, $DisplayQty, -2);
$rep->TextCol(3, 4, $myrow2['units'], -2);
if ($packing_slip == 0)
@@
-135,7
+134,7
@@
function print_deliveries()
$rep->TextCol(5, 6, $DisplayDiscount, -2);
$rep->TextCol(6, 7, $DisplayNet, -2);
}
$rep->TextCol(5, 6, $DisplayDiscount, -2);
$rep->TextCol(6, 7, $DisplayNet, -2);
}
- }
+ }
$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))
@@
-170,14
+169,14
@@
function print_deliveries()
continue;
$DisplayTax = number_format2($tax_item['amount'], $dec);
continue;
$DisplayTax = number_format2($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']."%) ";
$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 ($
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)
{
@@
-222,4
+221,3
@@
function print_deliveries()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file