Merged changes form main trunk up to 2.2.4

[fa-stable.git] / inventory / includes / item_adjustments_ui.inc

diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc
index 5740eec07d3e928a7e8d7bf15908ee98402e6fe4..cfe697fa1c30efd813e678766ed6efd38d39c7fe 100644 (file)
--- a/inventory/includes/item_adjustments_ui.inc
+++ b/inventory/includes/item_adjustments_ui.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    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");
@@ -26,17 +26,17 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
 
 function display_order_header(&$order)
 {
-       global $table_style2;
+       global $table_style2, $Refs;
 
        start_outer_table("width=70% $table_style2"); // outer table
        table_section(1);
 
        locations_list_row(_("Location:"), 'StockLocation', null);
-       ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::inventory_adjustment()));
+       ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST));
 
        table_section(2, "33%");
 
-    date_row(_("Date:"), 'AdjDate');
+    date_row(_("Date:"), 'AdjDate', '', true);
 
        table_section(3, "33%");
 
@@ -81,7 +81,7 @@ function display_adjustment_items($title, &$order)
                        label_cell($stock_item->item_description);
                qty_cell($stock_item->quantity, false, get_qty_dec($stock_item->stock_id));
                        label_cell($stock_item->units);
-                       amount_cell($stock_item->standard_cost);
+                       amount_decimal_cell($stock_item->standard_cost);
                        amount_cell($stock_item->standard_cost * $stock_item->quantity);
 
                        edit_button_cell("Edit$line_no", _("Edit"),
@@ -99,7 +99,7 @@ function display_adjustment_items($title, &$order)
        if ($id == -1)
                adjustment_edit_item_controls($order);
 
-       label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right");
+       label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2);
 
     end_table();
        div_end();
@@ -112,13 +112,15 @@ function adjustment_edit_item_controls(&$order, $line_no=-1)
        global $Ajax;
        start_row();
 
+       $dec2 = 0;
        $id = find_submit('Edit');
        if ($line_no != -1 && $line_no == $id)
        {
                $_POST['stock_id'] = $order->line_items[$id]->stock_id;
                $_POST['qty'] = qty_format($order->line_items[$id]->quantity, 
                        $order->line_items[$id]->stock_id, $dec);
-               $_POST['std_cost'] = price_format($order->line_items[$id]->standard_cost);
+               //$_POST['std_cost'] = price_format($order->line_items[$id]->standard_cost);
+               $_POST['std_cost'] = price_decimal_format($order->line_items[$id]->standard_cost, $dec2);
                $_POST['units'] = $order->line_items[$id]->units;
 
                hidden('stock_id', $_POST['stock_id']);
@@ -138,14 +140,16 @@ function adjustment_edit_item_controls(&$order, $line_no=-1)
        $item_info = get_item_edit_info($_POST['stock_id']);
                $dec = $item_info['decimals'];
                $_POST['qty'] = number_format2(0, $dec);
-               $_POST['std_cost'] = price_format($item_info["standard_cost"]);
+               //$_POST['std_cost'] = price_format($item_info["standard_cost"]);
+               $_POST['std_cost'] = price_decimal_format($item_info["standard_cost"], $dec2);
                $_POST['units'] = $item_info["units"];
        }
 
        qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
        label_cell($_POST['units'], '', 'units');
 
-       amount_cells(null, 'std_cost', $_POST['std_cost']);
+       //amount_cells(null, 'std_cost', $_POST['std_cost']);
+       amount_cells(null, 'std_cost', null, null, null, $dec2);
        label_cell("&nbsp;");
 
        if ($id != -1)