X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_dispatch.php;h=d8a7cc95e54b21f6163d699bdd7115fffd30811b;hb=7561718ee5113232ce917f63085d272884b0929c;hp=a5a1481316ab330df3585d55c61ec719543a9569;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git
diff --git a/sales/view/view_dispatch.php b/sales/view/view_dispatch.php
index a5a14813..d8a7cc95 100644
--- a/sales/view/view_dispatch.php
+++ b/sales/view/view_dispatch.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 600);
page(_($help_context = "View Sales Dispatch"), true, false, "", $js);
@@ -43,11 +43,11 @@ $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,7 +80,7 @@ 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'");
@@ -105,7 +105,7 @@ end_table(1); // outer table
$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,17 +142,16 @@ 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(ST_CUSTDELIVERY, $trans_id);
@@ -166,6 +165,5 @@ end_table(1);
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
|