X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fstock_transfers_ui.inc;h=474fc9df31c692df9d9ee1fbf493365a47797190;hb=2ae4762cbcd0479ecdf8f13317a7d76da08f114f;hp=05b7304f228ef113dfee1396afc05a2b17d77e76;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc
index 05b7304f..474fc9df 100644
--- a/inventory/includes/stock_transfers_ui.inc
+++ b/inventory/includes/stock_transfers_ui.inc
@@ -1,5 +1,14 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/ui/items_cart.inc");
@@ -7,144 +16,135 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
{
- $already_on_order = 0;
-
- foreach ($order->line_items as $order_item)
- {
- if (strcasecmp($order_item->stock_id, $new_item) == 0)
- {
- $already_on_order = 1;
- display_error(_("For Part :") . $new_item . " " . "This item is already on this order. You can change the quantity ordered of the existing line if necessary.");
- }
- }
-
- if ($already_on_order != 1)
- {
- $order->add_to_cart ($new_item, $new_item_qty, $standard_cost);
- } /* end of if not already on the order */
+ if ($order->find_cart_item($new_item))
+ display_error(_("For Part :") . $new_item . " " . "This item is already on this order. You can change the quantity ordered of the existing line if necessary.");
+ else
+ $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $standard_cost);
}
//--------------------------------------------------------------------------------
function display_order_header(&$order)
{
- global $table_style;
+ global $Refs;
- start_table("width=70% $table_style");
- echo "
"; // outer table
- echo "";
+ start_outer_table(TABLESTYLE, "width=70%");
+ table_section(1);
+
locations_list_row(_("From Location:"), 'FromStockLocation', null);
locations_list_row(_("To Location:"), 'ToStockLocation', null);
- echo " ";
-
- echo " | "; // outer table
-
- echo "";
+ table_section(2, "33%");
- ref_row(_("Reference:"), 'ref', references::get_next(systypes::location_transfer()));
+ ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_LOCTRANSFER));
- date_row(_("Date:"), 'AdjDate');
+ date_row(_("Date:"), 'AdjDate', '', true);
- echo " ";
+ table_section(3, "33%");
- echo " | "; // outer table
-
- echo "";
movement_types_list_row(_("Transfer Type:"), 'type', null);
- echo " ";
- echo " |
";
- end_table(1); // outer table
+ end_outer_table(1); // outer table
}
//---------------------------------------------------------------------------------
function display_transfer_items($title, &$order)
{
- global $table_style, $path_to_root;
+ global $path_to_root;
display_heading($title);
- start_table("$table_style width=80%");
- $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"));
+ div_start('items_table');
+ start_table(TABLESTYLE, "width=80%");
+ $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), '');
+ if ( count($order->line_items)) $th[] = '';
table_header($th);
$subtotal = 0;
$k = 0; //row colour counter
- foreach ($order->line_items as $stock_item)
+ $id = find_submit('Edit');
+ foreach ($order->line_items as $line_no=>$stock_item)
{
- $quantity = number_format2($stock_item->quantity,user_qty_dec());
-
- if (!isset($_GET['Edit']) || $_GET['Edit'] != $stock_item->stock_id)
+ if ($id != $line_no)
{
alt_table_row_color($k);
- label_cell("$stock_item->stock_id");
+ view_stock_status_cell($stock_item->stock_id);
label_cell($stock_item->item_description);
- label_cell($quantity, "nowrap align=right");
+ qty_cell($stock_item->quantity, false, get_qty_dec($stock_item->stock_id));
label_cell($stock_item->units);
- edit_link_cell(SID . "Edit=$stock_item->stock_id");
- delete_link_cell(SID . "Delete=$stock_item->stock_id");
+ edit_button_cell("Edit$line_no", _("Edit"),
+ _('Edit document line'));
+ delete_button_cell("Delete$line_no", _("Delete"),
+ _('Remove line from document'));
end_row();
- }
- else
+ }
+ else
{
- transfer_edit_item_controls($order, $stock_item->stock_id);
+ transfer_edit_item_controls($order, $line_no);
}
}
- if (!isset($_GET['Edit']))
+ if ($id == -1)
transfer_edit_item_controls($order);
end_table();
+ div_end();
}
//---------------------------------------------------------------------------------
-function transfer_edit_item_controls(&$order, $stock_id=null)
+function transfer_edit_item_controls(&$order, $line_no=-1)
{
+ global $Ajax;
start_row();
- if (isset($_GET['Edit']) and $stock_id!=null)
+ $id = find_submit('Edit');
+ if ($line_no != -1 && $line_no == $id)
{
- if (!isset($_POST['stock_id']))
- $_POST['stock_id'] = $order->line_items[$stock_id]->stock_id;
- if (!isset($_POST['qty']) || ($_POST['qty']==""))
- $_POST['qty'] = $order->line_items[$stock_id]->quantity;
-
- $_POST['units'] = $order->line_items[$stock_id]->units;
+ $_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['units'] = $order->line_items[$id]->units;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
- label_cell($order->line_items[$stock_id]->item_description);
+ label_cell($order->line_items[$id]->item_description);
+ $Ajax->activate('items_table');
}
else
{
- echo "";
- stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
- echo " | ";
+ stock_costable_items_list_cells(null, 'stock_id', null, false, true);
+ if (list_updated('stock_id')) {
+ $Ajax->activate('units');
+ $Ajax->activate('qty');
+ }
$item_info = get_item_edit_info($_POST['stock_id']);
- $_POST['qty'] = 0;
+ $dec = $item_info['decimals'];
+ $_POST['qty'] = number_format2(0, $dec);
$_POST['units'] = $item_info["units"];
}
+ small_qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
+ label_cell($_POST['units'], '', 'units');
- text_cells(null, 'qty', $_POST['qty'], 13, 15);
- label_cell($_POST['units']);
-
- if (isset($_GET['Edit']))
+ if ($id != -1)
{
- submit_cells('UpdateItem', _("Update"));
- submit_cells('CancelItemChanges', _("Cancel"));
- }
- else
+ button_cell('UpdateItem', _("Update"),
+ _('Confirm changes'), ICON_UPDATE);
+ button_cell('CancelItemChanges', _("Cancel"),
+ _('Cancel changes'), ICON_CANCEL);
+ hidden('LineNo', $line_no);
+ set_focus('qty');
+ }
+ else
{
- submit_cells('AddItem', _("Add Item"), "colspan=2");
+ submit_cells('AddItem', _("Add Item"), "colspan=2",
+ _('Add new item to document'), true);
}
end_row();