X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fview%2Fview_dispatch.php;h=7ed8c3041e58e8374923722f7fe25825b30f44ff;hb=9af96a2e461b905dbb20f2b87ffb5c28f9b3461c;hp=9e499eda7474c13d6d7f61ec76974ec81be12226;hpb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;p=fa-stable.git
diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index 9e499eda..7ed8c304 100644
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 600);
-page(_("View Sales Dispatch"), true, false, "", $js);
+page(_($help_context = "View Sales Dispatch"), true, false, "", $js);
if (isset($_GET["trans_no"]))
@@ -34,20 +34,20 @@ elseif (isset($_POST["trans_no"]))
// 3 different queries to get the information - what a JOKE !!!!
-$myrow = get_customer_trans($trans_id, 13);
+$myrow = get_customer_trans($trans_id, ST_CUSTDELIVERY);
$branch = get_branch($myrow["branch_code"]);
-$sales_order = get_sales_order_header($myrow["order_"], 30);
+$sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
display_heading(sprintf(_("DISPATCH NOTE #%d"),$trans_id));
echo "
";
-start_table("$table_style2 width=95%");
+start_table(TABLESTYLE2, "width=95%");
echo "
"; // outer table
/*Now the customer charged to details in a sub table*/
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
$th = array(_("Charge To"));
table_header($th);
@@ -61,7 +61,7 @@ echo " | "; // outer table
/*end of the main table showing the company name and charge to details */
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
$th = array(_("Charge Branch"));
table_header($th);
@@ -70,7 +70,7 @@ end_table();
echo " | "; // outer table
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
$th = array(_("Delivered To"));
table_header($th);
@@ -80,12 +80,12 @@ end_table();
echo " | "; // outer table
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
start_row();
label_cells(_("Reference"), $myrow["reference"], "class='tableheader2'");
label_cells(_("Currency"), $sales_order["curr_code"], "class='tableheader2'");
label_cells(_("Our Order No"),
- get_customer_trans_view_str(systypes::sales_order(),$sales_order["order_no"]), "class='tableheader2'");
+ get_customer_trans_view_str(ST_SALESORDER,$sales_order["order_no"]), "class='tableheader2'");
end_row();
start_row();
label_cells(_("Customer Order Ref."), $sales_order["customer_ref"], "class='tableheader2'");
@@ -96,16 +96,16 @@ start_row();
label_cells(_("Dispatch Date"), sql2date($myrow["tran_date"]), "class='tableheader2'", "nowrap");
label_cells(_("Due Date"), sql2date($myrow["due_date"]), "class='tableheader2'", "nowrap");
end_row();
-comments_display_row(13, $trans_id);
+comments_display_row(ST_CUSTDELIVERY, $trans_id);
end_table();
echo " |
";
end_table(1); // outer table
-$result = get_customer_trans_details(13, $trans_id);
+$result = get_customer_trans_details(ST_CUSTDELIVERY, $trans_id);
-start_table("$table_style width=95%");
+start_table(TABLESTYLE, "width=95%");
if (db_num_rows($result) > 0)
{
@@ -142,20 +142,19 @@ if (db_num_rows($result) > 0)
amount_cell($value);
end_row();
} //end while there are line items to print out
+ $display_sub_tot = price_format($sub_total);
+ label_row(_("Sub-total"), $display_sub_tot, "colspan=6 align=right",
+ "nowrap align=right width=15%");
}
else
display_note(_("There are no line items on this dispatch."), 1, 2);
-$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",
- "nowrap align=right width=15%");
label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right");
-$tax_items = get_trans_tax_details(13, $trans_id);
+$tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $trans_id);
display_customer_trans_tax_details($tax_items, 6);
$display_total = price_format($myrow["ov_freight"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"]+$myrow["ov_gst"]);
@@ -164,8 +163,8 @@ label_row(_("TOTAL VALUE"), $display_total, "colspan=6 align=right",
"nowrap align=right");
end_table(1);
-is_voided_display(13, $trans_id, _("This dispatch has been voided."));
+is_voided_display(ST_CUSTDELIVERY, $trans_id, _("This dispatch has been voided."));
-end_page(true);
+end_page(true, false, false, ST_CUSTDELIVERY, $trans_id);
?>
\ No newline at end of file