if (isset($_GET["trans_no"]))
{
$trans_id = $_GET["trans_no"];
-}
+}
elseif (isset($_POST["trans_no"]))
{
$trans_id = $_POST["trans_no"];
start_row();
label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
-label_cells(_("Our Order No"),
+label_cells(_("Our Order No"),
get_customer_trans_view_str(systypes::sales_order(),$sales_order["order_no"]), "class='tableheader2'");
end_row();
start_row();
{
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
_("Unit"), _("Price"), _("Discount %"), _("Total"));
- table_header($th);
+ table_header($th);
$k = 0; //row colour counter
$sub_total = 0;
if($myrow2['quantity']==0) continue;
alt_table_row_color($k);
- $value = ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]);
+ $value = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
+ user_price_dec());
$sub_total += $value;
if ($myrow2["discount_percent"] == 0)
{
$display_discount = "";
- }
- else
+ }
+ else
{
- $display_discount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
+ $display_discount = percent_format($myrow2["discount_percent"]*100) . "%";
}
- label_cell($myrow2["stock_id"]);
- label_cell($myrow2["StockDescription"]);
- qty_cell($myrow2["quantity"]);
+ label_cell($myrow2["stock_id"]);
+ label_cell($myrow2["StockDescription"]);
+ qty_cell($myrow2["quantity"], false, get_qty_dec($myrow2["stock_id"]));
label_cell($myrow2["units"], "align=right");
amount_cell($myrow2["unit_price"]);
label_cell($display_discount, "nowrap align=right");
end_row();
} //end while there are line items to print out
-}
+}
else
display_note(_("There are no line items on this dispatch."), 1, 2);
-$display_sub_tot = number_format2($sub_total,user_price_dec());
-$display_freight = number_format2($myrow["ov_freight"],user_price_dec());
+$display_sub_tot = price_format($sub_total);
+$display_freight = price_format($myrow["ov_freight"]);
/*Print out the delivery note text entered */
-label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
+label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
"nowrap align=right width=15%");
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
$tax_items = get_customer_trans_tax_details(13, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
-$display_total = number_format2($myrow["ov_freight"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"]+$myrow["ov_gst"],user_price_dec());
+$display_total = price_format($myrow["ov_freight"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"]+$myrow["ov_gst"]);
label_row(_("TOTAL VALUE"), $display_total, "colspan=6 align=right",
"nowrap align=right");