X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fview%2Fview_po.php;h=be8826440cf41ee4f5109c31933861e6a494f8de;hb=efa2530a7c385a329c3fc76f4560b28ba97c3efe;hp=fe1648222a364cecd5cb8fa08093dd76f30a199b;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git

diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index fe164822..be882644 100644
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -1,15 +1,27 @@
 <?php
-
-
-$page_security = 2;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 include($path_to_root . "/purchasing/includes/po_class.inc");
 
 include($path_to_root . "/includes/session.inc");
-page(_("View Purchase Order"), true);
-
 include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
+$js = "";
+if ($SysPrefs->use_popup_windows)
+	$js .= get_js_open_window(900, 500);
+page(_($help_context = "View Purchase Order"), true, false, "", $js);
+
+
 if (!isset($_GET['trans_no']))
 {
 	die ("<br>" . _("This page must be called with a purchase order number to review."));
@@ -17,26 +29,21 @@ if (!isset($_GET['trans_no']))
 
 display_heading(_("Purchase Order") . " #" . $_GET['trans_no']);
 
-if (isset($_SESSION['Items']))
-{
-	unset ($_SESSION['Items']);
-}
-
 $purchase_order = new purch_order;
 
 read_po($_GET['trans_no'], $purchase_order);
 echo "<br>";
 display_po_summary($purchase_order, true);
 
-start_table("$table_style width=90%", 6);
+start_table(TABLESTYLE, "width='90%'", 6);
 echo "<tr><td valign=top>"; // outer table
 
 display_heading2(_("Line Details"));
 
-start_table("colspan=9 $table_style width=100%");
+start_table(TABLESTYLE, "width='100%'");
 
 $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), _("Price"),
-	_("Line Total"), _("Requested By"), _("Quantity Received"), _("Quantity Invoiced"));
+	_("Requested By"), _("Line Total"), _("Quantity Received"), _("Quantity Invoiced"));
 table_header($th);
 $total = $k = 0;
 $overdue_items = false;
@@ -63,9 +70,9 @@ foreach ($purchase_order->line_items as $stock_item)
 	$dec = get_qty_dec($stock_item->stock_id);
 	qty_cell($stock_item->quantity, false, $dec);
 	label_cell($stock_item->units);
-	amount_cell($stock_item->price);
-	amount_cell($line_total);
+	amount_decimal_cell($stock_item->price);
 	label_cell($stock_item->req_del_date);
+	amount_cell($line_total);
 	qty_cell($stock_item->qty_received, false, $dec);
 	qty_cell($stock_item->qty_inv, false, $dec);
 	end_row();
@@ -73,9 +80,19 @@ foreach ($purchase_order->line_items as $stock_item)
 	$total += $line_total;
 }
 
-$display_total = number_format2($total,user_price_dec());
-label_row(_("Total Excluding Tax/Shipping"), $display_total,
-	"align=right colspan=5", "nowrap align=right");
+$display_sub_tot = number_format2($total,user_price_dec());
+label_row(_("Sub Total"), $display_sub_tot,
+	"align=right colspan=6", "nowrap align=right",2);
+
+$taxes = $purchase_order->get_taxes();
+$tax_total = display_edit_tax_items($taxes, 6, $purchase_order->tax_included,2);
+
+$display_total = price_format(($total + $tax_total));
+
+start_row();
+label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
+label_cell('', "colspan=2");
+end_row();
 
 end_table();
 
@@ -94,19 +111,19 @@ if (db_num_rows($grns_result) > 0)
     echo "</td><td valign=top>"; // outer table
 
     display_heading2(_("Deliveries"));
-    start_table($table_style);
+    start_table(TABLESTYLE);
     $th = array(_("#"), _("Reference"), _("Delivered On"));
     table_header($th);
     while ($myrow = db_fetch($grns_result))
     {
 		alt_table_row_color($k);
 
-    	label_cell(get_trans_view_str(25,$myrow["id"]));
+    	label_cell(get_trans_view_str(ST_SUPPRECEIVE,$myrow["id"]));
     	label_cell($myrow["reference"]);
     	label_cell(sql2date($myrow["delivery_date"]));
     	end_row();
     }
-    end_table();;
+    end_table();
 }
 
 $invoice_result = get_po_invoices_credits($_GET['trans_no']);
@@ -119,7 +136,7 @@ if (db_num_rows($invoice_result) > 0)
     echo "</td><td valign=top>"; // outer table
 
     display_heading2(_("Invoices/Credits"));
-    start_table($table_style);
+    start_table(TABLESTYLE);
     $th = array(_("#"), _("Date"), _("Total"));
     table_header($th);
     while ($myrow = db_fetch($invoice_result))
@@ -138,8 +155,9 @@ echo "</td></tr>";
 
 end_table(1); // outer table
 
+display_allocations_to(PT_SUPPLIER, $purchase_order->supplier_id, ST_PURCHORDER, $purchase_order->order_no, $total + $tax_total);
+
 //----------------------------------------------------------------------------------------------------
 
-end_page(true);
+end_page(true, false, false, ST_PURCHORDER, $_GET['trans_no']);
 
-?>