X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_invoice.php;h=4bd251fa870c7457fa1a64bc2e2d5b77481d9054;hb=805b766842402a275c6bd0526df5278af03138ed;hp=1d90396bf42de7ff9d96e651ce19a4891f818b2f;hpb=21a54e6ceb2149d31ab7738af30f731f6fe10251;p=fa-stable.git diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php index 1d90396b..4bd251fa 100644 --- a/sales/view/view_invoice.php +++ b/sales/view/view_invoice.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_SALESTRANSVIEW'; +$path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); @@ -11,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc"); $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); -page(_("View Sales Invoice"), true, false, "", $js); +page(_($help_context = "View Sales Invoice"), true, false, "", $js); if (isset($_GET["trans_no"])) @@ -25,20 +34,20 @@ elseif (isset($_POST["trans_no"])) // 3 different queries to get the information - what a JOKE !!!! -$myrow = get_customer_trans($trans_id, 10); +$myrow = get_customer_trans($trans_id, ST_SALESINVOICE); $branch = get_branch($myrow["branch_code"]); -$sales_order = get_sales_order_header($myrow["order_"]); +$sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER); display_heading(sprintf(_("SALES INVOICE #%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); @@ -52,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); @@ -61,22 +70,21 @@ end_table(); echo ""; // outer table -start_table("$table_style width=100%"); -$th = array(_("Delivered To")); -table_header($th); - -label_row(null, $sales_order["deliver_to"] . "
" . nl2br($sales_order["delivery_address"]), - "nowrap"); +start_table(TABLESTYLE, "width='100%'"); +$th = array(_("Payment Terms")); +table_header($th); +$paym = get_payment_terms($myrow['payment_terms']); +label_row(null, $paym["terms"], "nowrap"); 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'"); label_cells(_("Our Order No"), - get_customer_trans_view_str(systypes::sales_order(),$sales_order["order_no"]), "class='tableheader2'"); + get_customer_trans_view_str(ST_SALESORDER,$sales_order["order_no"]), "class='tableheader2'"); end_row(); start_row(); label_cells(_("Customer Order Ref."), $sales_order["customer_ref"], "class='tableheader2'"); @@ -86,17 +94,19 @@ end_row(); start_row(); label_cells(_("Invoice Date"), sql2date($myrow["tran_date"]), "class='tableheader2'", "nowrap"); label_cells(_("Due Date"), sql2date($myrow["due_date"]), "class='tableheader2'", "nowrap"); +label_cells(_("Deliveries"), get_customer_trans_view_str(ST_CUSTDELIVERY, + get_sales_parent_numbers(ST_SALESINVOICE, $trans_id)), "class='tableheader2'"); end_row(); -comments_display_row(10, $trans_id); +comments_display_row(ST_SALESINVOICE, $trans_id); end_table(); echo ""; end_table(1); // outer table -$result = get_customer_trans_details(10, $trans_id); +$result = get_customer_trans_details(ST_SALESINVOICE, $trans_id); -start_table("$table_style width=95%"); +start_table(TABLESTYLE, "width='95%'"); if (db_num_rows($result) > 0) { @@ -134,19 +144,21 @@ if (db_num_rows($result) > 0) 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 invoice."), 1, 2); -$display_sub_tot = price_format($sub_total); -$display_freight = price_format($myrow["ov_freight"]); /*Print out the invoice 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_customer_trans_tax_details(10, $trans_id); +if ($myrow['ov_freight'] != 0.0) +{ + $display_freight = price_format($myrow["ov_freight"]); + label_row(_("Shipping"), $display_freight, "colspan=6 align=right", "nowrap align=right"); +} +$tax_items = get_trans_tax_details(ST_SALESINVOICE, $trans_id); display_customer_trans_tax_details($tax_items, 6); $display_total = price_format($myrow["ov_freight"]+$myrow["ov_gst"]+$myrow["ov_amount"]+$myrow["ov_freight_tax"]); @@ -155,8 +167,13 @@ label_row(_("TOTAL INVOICE"), $display_total, "colspan=6 align=right", "nowrap align=right"); end_table(1); -is_voided_display(10, $trans_id, _("This invoice has been voided.")); +$voided = is_voided_display(ST_SALESINVOICE, $trans_id, _("This invoice has been voided.")); + +if (!$voided) +{ + display_allocations_to(PT_CUSTOMER, $myrow['debtor_no'], ST_SALESINVOICE, $trans_id, $myrow['Total']); +} -end_page(true); +end_page(true, false, false, ST_SALESINVOICE, $trans_id); ?> \ No newline at end of file