X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=a31f4399574bacaf153e579a6848dc8c17ec6276;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;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..a31f4399 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -42,16 +42,17 @@ if (isset($_SESSION['View']))
$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
start_table(TABLESTYLE2, "width=95%", 5);
-echo "
";
@@ -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 . "",
+;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))
@@ -222,16 +242,29 @@ foreach ($_SESSION['View']->line_items as $stock_item) {
end_row();
}
-$items_total = $_SESSION['View']->get_items_total();
-
-$display_total = price_format($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",
+
+$sub_tot = $_SESSION['View']->get_items_total() + $_SESSION['View']->freight_cost;
+
+$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']);
|