X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fview%2Fview_sales_order.php;h=5aa606d91f06744b0ca9fb450478f9a3c5c4fddf;hb=161bba0a7475c63af6951cb1fc465747926f51bf;hp=ff88393cf4c5b86e9f2fae197397ee7f0efaba14;hpb=d1cd5dabeecbbfd09cf28c4710f0ba44f2adcf13;p=fa-stable.git
diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index ff88393c..5aa606d9 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -20,7 +20,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);
if ($_GET['trans_type'] == ST_SALESQUOTE)
@@ -41,21 +41,22 @@ if (isset($_SESSION['View']))
$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
-start_table(TABLESTYLE2, "width=95%", 5);
-echo "
";
-start_table(TABLESTYLE, "width=95%");
+start_table(TABLESTYLE, "width='95%'");
label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'",
"colspan=3");
start_row();
@@ -74,14 +75,27 @@ label_cells(_("Order Currency"), $_SESSION['View']->customer_currency, "class='t
label_cells(_("Deliver From Location"), $_SESSION['View']->location_name, "class='tableheader2'");
end_row();
-label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
+
+if ($_SESSION['View']->payment_terms['days_before_due']<0)
+{
+start_row();
+label_cells(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'");
+label_cells(_("Required Pre-Payment"), price_format($_SESSION['View']->prep_amount), "class='tableheader2'");
+end_row();
+start_row();
+label_cells(_("Non-Invoiced Prepayments"), price_format($_SESSION['View']->alloc), "class='tableheader2'");
+label_cells(_("All Payments Allocated"), price_format($_SESSION['View']->sum_paid), "class='tableheader2'");
+end_row();
+} else
+ label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
+
label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
"class='tableheader2'", "colspan=3");
label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3");
label_row(_("Telephone"), $_SESSION['View']->phone, "class='tableheader2'", "colspan=3");
-label_row(_("E-mail"), "email . "'>" . $_SESSION['View']->email . "",
+;label_row(_("E-mail"), "email . "'>" . $_SESSION['View']->email . "",
"class='tableheader2'", "colspan=3");
-label_row(_("Comments"), $_SESSION['View']->Comments, "class='tableheader2'", "colspan=3");
+label_row(_("Comments"), nl2br($_SESSION['View']->Comments), "class='tableheader2'", "colspan=3");
end_table();
if ($_GET['trans_type'] != ST_SALESQUOTE)
@@ -131,15 +145,20 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
$inv_numbers = array();
$invoices_total = 0;
- if ($result = get_sales_child_documents(ST_CUSTDELIVERY, $dn_numbers)) {
+ if ($_SESSION['View']->prepaid)
+ $result = get_sales_order_invoices($_GET['trans_no']);
+ else
+ $result = get_sales_child_documents(ST_CUSTDELIVERY, $dn_numbers);
+ if ($result) {
$k = 0;
while ($inv_row = db_fetch($result))
{
alt_table_row_color($k);
- $this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"] + $inv_row["ov_gst"] + $inv_row["ov_amount"];
+ $this_total = $_SESSION['View']->prepaid ? $inv_row["prep_amount"] :
+ $inv_row["ov_freight"] + $inv_row["ov_freight_tax"] + $inv_row["ov_gst"] + $inv_row["ov_amount"];
$invoices_total += $this_total;
$inv_numbers[] = $inv_row["trans_no"];
@@ -159,10 +178,10 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
start_table(TABLESTYLE);
$th = array(_("#"), _("Ref"), _("Date"), _("Total"));
table_header($th);
-
+
$credits_total = 0;
-
- if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
+
+ if (get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
$k = 0;
while ($credits_row = db_fetch($result))
@@ -196,7 +215,7 @@ if ($_SESSION['View']->so_type == 1)
display_note(_("This Sales Order is used as a Template."), 0, 0, "class='currentfg'");
display_heading2(_("Line Details"));
-start_table(TABLESTYLE, "colspan=9 width=95%");
+start_table(TABLESTYLE, "width='95%'");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
_("Price"), _("Discount"), _("Total"), _("Quantity Delivered"));
table_header($th);
@@ -223,8 +242,9 @@ foreach ($_SESSION['View']->line_items as $stock_item) {
end_row();
}
-label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
- "align=right colspan=6", "nowrap align=right", 1);
+if ($_SESSION['View']->freight_cost != 0.0)
+ label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
+ "align=right colspan=6", "nowrap align=right", 1);
$sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost;
@@ -243,8 +263,9 @@ start_row();
label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
label_cell('', "colspan=2");
end_row();
-end_table(2);
+end_table();
+
+display_allocations_to(PT_CUSTOMER, $_SESSION['View']->customer_id, $_GET['trans_type'], $_GET['trans_no'], $sub_tot + $tax_total);
end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']);
-?>
|