X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=inventory%2Fincludes%2Fitem_adjustments_ui.inc;h=f7af3dadcae60659f001def954399693757bd789;hb=bac6bc5d595dab716bb3c65e451e81d724b8de2d;hp=30e56103bb6407b0d30f98ee37da48644a62e8b7;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc
index 30e56103..f7af3dad 100644
--- a/inventory/includes/item_adjustments_ui.inc
+++ b/inventory/includes/item_adjustments_ui.inc
@@ -1,5 +1,14 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -17,28 +26,20 @@ function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
function display_order_header(&$order)
{
- global $table_style2;
+ global $Refs;
- start_table("width=70% $table_style2"); // outer table
- echo "
";
- echo ""; // inner table
+ start_outer_table(TABLESTYLE2, "width=70%"); // outer table
+ table_section(1);
locations_list_row(_("Location:"), 'StockLocation', null);
- ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::inventory_adjustment()));
-
- echo " "; // inner table
-
- echo " | ";
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST));
- echo ""; // inner table
+ table_section(2, "33%");
- date_row(_("Date:"), 'AdjDate');
+ date_row(_("Date:"), 'AdjDate', '', true);
- echo " "; // inner table
+ table_section(3, "33%");
- echo " | ";
-
- echo ""; // inner table
movement_types_list_row(_("Detail:"), 'type', null);
if (!isset($_POST['Increase']))
@@ -46,23 +47,20 @@ function display_order_header(&$order)
yesno_list_row(_("Type:"), 'Increase', $_POST['Increase'],
_("Positive Adjustment"), _("Negative Adjustment"));
- echo " "; // inner table
-
- echo " |
";
- end_table(1); // outer table
+ end_outer_table(1); // outer table
}
//---------------------------------------------------------------------------------
function display_adjustment_items($title, &$order)
{
- global $table_style, $path_to_root;
+ global $path_to_root;
display_heading($title);
div_start('items_table');
- start_table("$table_style width=80%");
+ start_table(TABLESTYLE, "width=80%");
$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
- _("Unit"), _("Unit Cost"), _("Total"));
+ _("Unit"), _("Unit Cost"), _("Total"), "");
if ( count($order->line_items)) $th[] = '';
table_header($th);
@@ -83,12 +81,12 @@ 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"),
_('Edit document line'));
- edit_button_cell("Delete$line_no", _("Delete"),
+ delete_button_cell("Delete$line_no", _("Delete"),
_('Remove line from document'));
end_row();
}
@@ -101,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();
@@ -114,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,24 +138,26 @@ function adjustment_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);
- $_POST['std_cost'] = price_format($item_info["standard_cost"]);
+ $dec = $item_info['decimals'];
+ $_POST['qty'] = number_format2(0, $dec);
+ //$_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(" ");
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');
}