Merging version 2.1 RC to main trunk.

[fa-stable.git] / purchasing / view / view_po.php

diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index 878c59af80d042939ddc7efb4f2c8dd2e30cee9c..57ff3a470bfc3a512f076a0601da6df39808a478 100644 (file)
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -1,27 +1,34 @@
 <?php
-
-
+/**********************************************************************
+    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 = 2;
 $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");
 
-if (!isset($_GET['trans_no'])) 
+$js = "";
+if ($use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+page(_("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."));
 }
 
 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);
@@ -41,7 +48,7 @@ table_header($th);
 $total = $k = 0;
 $overdue_items = false;
 
-foreach ($purchase_order->line_items as $stock_item) 
+foreach ($purchase_order->line_items as $stock_item)
 {
 
        $line_total = $stock_item->quantity * $stock_item->price;
@@ -52,21 +59,22 @@ foreach ($purchase_order->line_items as $stock_item)
        {
        start_row("class='overduebg'");
        $overdue_items = true;
-       } 
-       else 
+       }
+       else
        {
                alt_table_row_color($k);
        }
 
        label_cell($stock_item->stock_id);
        label_cell($stock_item->item_description);
-       qty_cell($stock_item->quantity);
+       $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);
        label_cell($stock_item->req_del_date);
-       qty_cell($stock_item->qty_received);
-       qty_cell($stock_item->qty_inv);
+       qty_cell($stock_item->qty_received, false, $dec);
+       qty_cell($stock_item->qty_inv, false, $dec);
        end_row();
 
        $total += $line_total;