Merging version 2.1 RC to main trunk.

[fa-stable.git] / manufacturing / includes / work_order_issue_ui.inc

diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc
index 8508364eb62f12674d5484ccaf9460d42e3378fe..dad39a9ce849605776ddc38efe3ebd2bc2ad7a07 100644 (file)
--- a/manufacturing/includes/work_order_issue_ui.inc
+++ b/manufacturing/includes/work_order_issue_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 . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
@@ -48,7 +57,7 @@ function display_issue_items($title, &$order)
 
                        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();
                }
@@ -102,7 +111,8 @@ function issue_edit_item_controls(&$order, $line_no=-1)
 
        $item_info = get_item_edit_info($_POST['stock_id']);
 
-               $_POST['qty'] = qty_format(0, $_POST['stock_id'], $dec);
+               $dec = $item_info["decimals"];
+               $_POST['qty'] = number_format2(0, $dec);
                $_POST['std_cost'] = price_format($item_info["standard_cost"]);
                $_POST['units'] = $item_info["units"];
        }
@@ -114,10 +124,10 @@ function issue_edit_item_controls(&$order, $line_no=-1)
 
        if ($id != -1)
        {
-               edit_button_cell('UpdateItem', _("Update"),
-                               _('Confirm changes'));
-               edit_button_cell('CancelItemChanges', _("Cancel"),
-                               _('Cancel changes'));
+               button_cell('UpdateItem', _("Update"),
+                               _('Confirm changes'), ICON_UPDATE);
+               button_cell('CancelItemChanges', _("Cancel"),
+                               _('Cancel changes'), ICON_CANCEL);
                hidden('LineNo', $line_no);
                set_focus('qty');
        }