Merging version 2.1 RC to main trunk.

[fa-stable.git] / purchasing / includes / ui / po_ui.inc

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index f9e820b9c97012d576db0020c41dc33950183dbe..2b3d639b5d81404ddf11cfde01ab1753d9366061 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -1,5 +1,14 @@
 <?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>.
+***********************************************************************/
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 
 // ------------------------------------------------------------------------------
@@ -45,10 +54,9 @@ function display_po_header(&$order)
 
        $editable = ($order->order_no == 0);
 
-       start_table("width=80% $table_style2");
-       echo "<tr><td valign=center>"; // outer table
-       echo "<table>";
+       start_outer_table("width=80% $table_style2");
 
+       table_section(1);
     if ($editable)
     {
         if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
@@ -90,11 +98,8 @@ function display_po_header(&$order)
        label_row(_("Reference:"), $order->reference);
     }
 
-       echo "</table>";
-
-       echo "</td><td valign=center>"; // outer table
+       table_section(2);
 
-       echo "<table height='5'>";
        // check this out?????????
        //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
        //      $_POST['OrderDate'] = $order->orig_order_date;
@@ -111,17 +116,13 @@ function display_po_header(&$order)
 
        text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15);
 
-       echo "</table>";
-
-       echo "</td><td valign=center>"; // outer table
-
-       echo "<table height='5'>";
-
        echo "<tr><td>" . _("Receive Into:") . "</td>";
        echo "<td>";
     locations_list('StkLocation', null, false, true);
        echo "</td></tr>";
 
+       table_section(3);
+
     if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" ||
        isset($_POST['_StkLocation_update']) || !isset($_POST['delivery_address']) ||
        $_POST['delivery_address'] == "")
@@ -148,10 +149,8 @@ function display_po_header(&$order)
     }
 
        textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4);
-       echo "</table>";
 
-       echo "</td></tr>";
-       end_table(); // outer table
+       end_outer_table(); // outer table
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -166,7 +165,7 @@ function display_po_items(&$order, $editable=true)
     start_table("$table_style width=80%");
 
        $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
-               _("Required Delivery Date"), _("Price"), _("Line Total"));
+               _("Required Delivery Date"), _("Price"), _("Line Total"), "");
 
        if (count($order->line_items)) $th[] = '';
        table_header($th);
@@ -195,7 +194,7 @@ function display_po_items(&$order, $editable=true)
                 {
                                        edit_button_cell("Edit$line_no", _("Edit"),
                                          _('Edit document line'));
-                                       edit_button_cell("Delete$line_no", _("Delete"),
+                                       delete_button_cell("Delete$line_no", _("Delete"),
                                          _('Remove line from document'));
                 }
                        end_row();
@@ -310,8 +309,8 @@ function po_item_controls(&$order, $stock_id=null)
        $item_info = get_item_edit_info($_POST['stock_id']);
                $_POST['units'] = $item_info["units"];
 
-               $dec = get_qty_dec($_POST['stock_id']);
-               $_POST['qty'] = qty_format(1, $_POST['stock_id'], $dec);
+               $dec = $item_info["decimals"];
+               $_POST['qty'] = number_format2(1, $dec);
                $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
                $_POST['req_del_date'] = add_days(Today(), 10);
        }
@@ -328,10 +327,10 @@ function po_item_controls(&$order, $stock_id=null)
 
        if ($id!=-1)
        {
-               edit_button_cell('UpdateLine', _("Update"),
-                               _('Confirm changes'));
-               edit_button_cell('CancelUpdate', _("Cancel"),
-                               _('Cancel changes'));
+               button_cell('UpdateLine', _("Update"),
+                               _('Confirm changes'), ICON_UPDATE);
+               button_cell('CancelUpdate', _("Cancel"),
+                               _('Cancel changes'), ICON_CANCEL);
                set_focus('qty');
        }
        else