X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=a9e780e22e2331f70bba43a7010ef45578418073;hb=98a185d9959e4e273142042b354d42f77e013cdf;hp=4529e1d421e1773db7b13ea1d4d0f79d3a4d388c;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php index 4529e1d4..a9e780e2 100644 --- a/sales/view/view_sales_order.php +++ b/sales/view/view_sales_order.php @@ -41,7 +41,7 @@ if (isset($_SESSION['View'])) $_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true); -start_table("$table_style2 width=95%", 5); +start_table(TABLESTYLE2, "width=95%", 5); echo ""; display_heading2(_("Order Information")); if ($_GET['trans_type'] != ST_SALESQUOTE) @@ -55,7 +55,7 @@ echo ""; echo ""; -start_table("$table_style width=95%"); +start_table(TABLESTYLE, "width=95%"); label_row(_("Customer Name"), $_SESSION['View']->customer_name, "class='tableheader2'", "colspan=3"); start_row(); @@ -87,103 +87,102 @@ if ($_GET['trans_type'] != ST_SALESQUOTE) { echo ""; - start_table($table_style); + start_table(TABLESTYLE); display_heading2(_("Delivery Notes")); $th = array(_("#"), _("Ref"), _("Date"), _("Total")); table_header($th); - $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_CUSTDELIVERY." AND order_=".db_escape($_GET['trans_no']); - $result = db_query($sql,"The related delivery notes could not be retreived"); - + $dn_numbers = array(); $delivery_total = 0; - $k = 0; - - while ($del_row = db_fetch($result)) - { - alt_table_row_color($k); + if ($result = get_sales_child_documents(ST_SALESORDER, $_GET['trans_no'])) { - $this_total = $del_row["ov_freight"]+ $del_row["ov_amount"] + $del_row["ov_freight_tax"] + $del_row["ov_gst"] ; - $delivery_total += $this_total; + $k = 0; + while ($del_row = db_fetch($result)) + { - label_cell(get_customer_trans_view_str($del_row["type"], $del_row["trans_no"])); - label_cell($del_row["reference"]); - label_cell(sql2date($del_row["tran_date"])); - amount_cell($this_total); - end_row(); + alt_table_row_color($k); + $dn_numbers[] = $del_row["trans_no"]; + $this_total = $del_row["ov_freight"]+ $del_row["ov_amount"] + $del_row["ov_freight_tax"] + $del_row["ov_gst"] ; + $delivery_total += $this_total; + label_cell(get_customer_trans_view_str($del_row["type"], $del_row["trans_no"])); + label_cell($del_row["reference"]); + label_cell(sql2date($del_row["tran_date"])); + amount_cell($this_total); + end_row(); + } } - label_row(null, price_format($delivery_total), "", "colspan=4 align=right"); + label_row(null, price_format($delivery_total), " ", "colspan=4 align=right"); end_table(); echo ""; - start_table($table_style); + start_table(TABLESTYLE); display_heading2(_("Sales Invoices")); $th = array(_("#"), _("Ref"), _("Date"), _("Total")); table_header($th); - - $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($_GET['trans_no']); - $result = db_query($sql,"The related invoices could not be retreived"); - + + $inv_numbers = array(); $invoices_total = 0; - $k = 0; - while ($inv_row = db_fetch($result)) - { + if ($result = get_sales_child_documents(ST_CUSTDELIVERY, $dn_numbers)) { - alt_table_row_color($k); + $k = 0; - $this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"] + $inv_row["ov_gst"] + $inv_row["ov_amount"]; - $invoices_total += $this_total; + while ($inv_row = db_fetch($result)) + { + alt_table_row_color($k); - label_cell(get_customer_trans_view_str($inv_row["type"], $inv_row["trans_no"])); - label_cell($inv_row["reference"]); - label_cell(sql2date($inv_row["tran_date"])); - amount_cell($this_total); - end_row(); + $this_total = $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"]; + label_cell(get_customer_trans_view_str($inv_row["type"], $inv_row["trans_no"])); + label_cell($inv_row["reference"]); + label_cell(sql2date($inv_row["tran_date"])); + amount_cell($this_total); + end_row(); + } } - - label_row(null, price_format($invoices_total), "", "colspan=4 align=right"); + label_row(null, price_format($invoices_total), " ", "colspan=4 align=right"); end_table(); display_heading2(_("Credit Notes")); - start_table($table_style); + start_table(TABLESTYLE); $th = array(_("#"), _("Ref"), _("Date"), _("Total")); table_header($th); - - $sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=".ST_CUSTCREDIT." AND order_=".db_escape($_GET['trans_no']); - $result = db_query($sql,"The related credit notes could not be retreived"); - + $credits_total = 0; - $k = 0; + + if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) { + $k = 0; - while ($credits_row = db_fetch($result)) - { + while ($credits_row = db_fetch($result)) + { - alt_table_row_color($k); + alt_table_row_color($k); - $this_total = $credits_row["ov_freight"] + $credits_row["ov_freight_tax"] + $credits_row["ov_gst"] + $credits_row["ov_amount"]; - $credits_total += $this_total; + $this_total = $credits_row["ov_freight"] + $credits_row["ov_freight_tax"] + $credits_row["ov_gst"] + $credits_row["ov_amount"]; + $credits_total += $this_total; - label_cell(get_customer_trans_view_str($credits_row["type"], $credits_row["trans_no"])); - label_cell($credits_row["reference"]); - label_cell(sql2date($credits_row["tran_date"])); - amount_cell(-$this_total); - end_row(); + label_cell(get_customer_trans_view_str($credits_row["type"], $credits_row["trans_no"])); + label_cell($credits_row["reference"]); + label_cell(sql2date($credits_row["tran_date"])); + amount_cell(-$this_total); + end_row(); - } + } + } label_row(null, "" . price_format(-$credits_total) . "", - "", "colspan=4 align=right"); - + " ", "colspan=4 align=right"); end_table(); @@ -196,7 +195,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("colspan=9 width=95% $table_style"); +start_table(TABLESTYLE, "colspan=9 width=95%"); $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"), _("Discount"), _("Total"), _("Quantity Delivered")); table_header($th); @@ -228,12 +227,12 @@ $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"); + "align=right colspan=6", "nowrap align=right", 1); label_row(_("Total Order Value"), $display_total, "align=right colspan=6", - "nowrap align=right"); + "nowrap align=right", 1); end_table(2); -end_page(true); +end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']); ?>