X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=1c3d95b43f68c6d901f8943f48ef35d4ab300289;hb=4fb55e726607d40a22272c0c432c3df8b422b447;hp=a9e780e22e2331f70bba43a7010ef45578418073;hpb=1481d782477692fd972cc1c13b6585a95971769f;p=fa-stable.git diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php index a9e780e2..1c3d95b4 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) @@ -39,23 +39,24 @@ if (isset($_SESSION['View'])) unset ($_SESSION['View']); } -$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true); +$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no']); + +start_table(TABLESTYLE2, "width='95%'", 5); -start_table(TABLESTYLE2, "width=95%", 5); -echo ""; -display_heading2(_("Order Information")); if ($_GET['trans_type'] != ST_SALESQUOTE) { + echo ""; + display_heading2(_("Order Information")); echo ""; display_heading2(_("Deliveries")); echo ""; display_heading2(_("Invoices/Credits")); + echo ""; } -echo ""; 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,13 +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(); + +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 . "", "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) @@ -130,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"]; @@ -158,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)) @@ -195,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); @@ -222,17 +242,30 @@ foreach ($_SESSION['View']->line_items as $stock_item) { end_row(); } -$items_total = $_SESSION['View']->get_items_total(); +if ($_SESSION['View']->freight_cost != 0.0) + label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost), + "align=right colspan=6", "nowrap align=right", 1); -$display_total = price_format($items_total + $_SESSION['View']->freight_cost); +$sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost; -label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost), - "align=right colspan=6", "nowrap align=right", 1); -label_row(_("Total Order Value"), $display_total, "align=right colspan=6", +$display_sub_tot = price_format($sub_tot); + +label_row(_("Sub Total"), $display_sub_tot, "align=right colspan=6", "nowrap align=right", 1); -end_table(2); +$taxes = $_SESSION['View']->get_taxes(); + +$tax_total = display_edit_tax_items($taxes, 6, $_SESSION['View']->tax_included,2); + +$display_total = price_format($sub_tot + $tax_total); + +start_row(); +label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'"); +label_cell('', "colspan=2"); +end_row(); +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']); -?>