projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing field for bank charges in bank_trans, rewritten bank transaction views...
[fa-stable.git]
/
reporting
/
rep109.php
diff --git
a/reporting/rep109.php
b/reporting/rep109.php
index e5a92199682db4d12e371b83179d96fdc3ed03e0..e53d52a35125150b7a0ed6687a04bd748512ee1a 100644
(file)
--- a/
reporting/rep109.php
+++ b/
reporting/rep109.php
@@
-110,6
+110,10
@@
function print_sales_orders()
$result = get_sales_order_details($i, ST_SALESORDER);
$SubTotal = 0;
$items = $prices = array();
$result = get_sales_order_details($i, ST_SALESORDER);
$SubTotal = 0;
$items = $prices = array();
+ if ($myrow["ship_via"]) {
+ $items[] = $myrow["ship_via"];
+ $prices[] = $myrow["freight_cost"];
+ }
while ($myrow2=db_fetch($result))
{
$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
while ($myrow2=db_fetch($result))
{
$Net = round2(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
@@
-141,10
+145,11
@@
function print_sales_orders()
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$rep->NewPage();
}
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$rep->NewPage();
}
+
if ($myrow['comments'] != "")
{
$rep->NewLine();
if ($myrow['comments'] != "")
{
$rep->NewLine();
- $rep->TextColLines(1,
5
, $myrow['comments'], -2);
+ $rep->TextColLines(1,
3
, $myrow['comments'], -2);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
@@
-154,7
+159,7
@@
function print_sales_orders()
$rep->TextCol(3, 6, _("Sub-total"), -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
$rep->NewLine();
$rep->TextCol(3, 6, _("Sub-total"), -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
$rep->NewLine();
- if ($myrow['
ov_freigh
t'] != 0.0)
+ if ($myrow['
freight_cos
t'] != 0.0)
{
$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
$rep->TextCol(3, 6, _("Shipping"), -2);
{
$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
$rep->TextCol(3, 6, _("Shipping"), -2);
@@
-167,9
+172,7
@@
function print_sales_orders()
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->NewLine();
}
$rep->TextCol(6, 7, $DisplayTotal, -2);
$rep->NewLine();
}
-
- $tax_items = get_tax_for_items($items, $prices, $myrow["freight_cost"],
- $myrow['tax_group_id'], $myrow['tax_included'], null);
+ $tax_items = get_tax_for_items(ST_SALESINVOICE, $items, $prices, $myrow['tax_group_id'], $myrow['tax_included']);
$first = true;
foreach($tax_items as $tax_item)
{
$first = true;
foreach($tax_items as $tax_item)
{
@@
-186,7
+189,7
@@
function print_sales_orders()
if ($first)
{
$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
if ($first)
{
$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
- $rep->TextCol(6, 7, number_format2($
sign*$
tax_item['net_amount'], $dec), -2);
+ $rep->TextCol(6, 7, number_format2($tax_item['net_amount'], $dec), -2);
$rep->NewLine();
}
$rep->TextCol(3, 6, $tax_type_name, -2);
$rep->NewLine();
}
$rep->TextCol(3, 6, $tax_type_name, -2);