$result = get_sales_order_details($i, ST_SALESQUOTE);
$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"]),
$image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg";
if (file_exists($image))
{
- //$rep->NewLine();
if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
$rep->NewPage();
$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
$rep->NewLine();
}
}
- //$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$rep->NewPage();
}
if ($myrow['comments'] != "")
{
$rep->NewLine();
- $rep->TextColLines(1, 5, $myrow['comments'], -2);
+ $rep->TextColLines(1, 3, $myrow['comments'], -2);
}
$DisplaySubTot = number_format2($SubTotal,$dec);
- $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
$doctype = ST_SALESQUOTE;
$rep->TextCol(3, 6, _("Sub-total"), -2);
$rep->TextCol(6, 7, $DisplaySubTot, -2);
$rep->NewLine();
- $rep->TextCol(3, 6, _("Shipping"), -2);
- $rep->TextCol(6, 7, $DisplayFreight, -2);
- $rep->NewLine();
-
+ if ($myrow['freight_cost'] != 0.0)
+ {
+ $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
+ $rep->TextCol(3, 6, _("Shipping"), -2);
+ $rep->TextCol(6, 7, $DisplayFreight, -2);
+ $rep->NewLine();
+ }
$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
if ($myrow['tax_included'] == 0) {
$rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 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_SALESORDER, $items, $prices, $myrow['tax_group_id'], $myrow['tax_included']);
$first = true;
foreach($tax_items as $tax_item)
{
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);