X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=237d34b10c9d689af55e44ec0bc4fc00085ff66d;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=0104d2f329a1382b06fcb64ffb8fe2ab24aedab7;hpb=0b0690657989cd259e5966faaac7cacbfa89cee2;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 0104d2f3..237d34b1 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); // ------------------------------------------------------------------------------ @@ -31,7 +40,7 @@ function create_new_po() session_register("PO"); $_SESSION['PO'] = new purch_order; - $_POST['OrderDate'] = Today(); + $_POST['OrderDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['OrderDate'])) $_POST['OrderDate'] = end_fiscalyear(); $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; @@ -41,28 +50,19 @@ function create_new_po() function display_po_header(&$order) { - global $table_style2; + global $table_style2, $Ajax, $Refs; $editable = ($order->order_no == 0); - start_table("width=80% $table_style2"); - echo ""; // outer table - echo ""; + start_outer_table("width=80% $table_style2"); + table_section(1); if ($editable) { - if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all())) + if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT)) $_POST['supplier_id'] = get_global_supplier(); - supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true); - - if ($order->supplier_id != $_POST['supplier_id']) - { - // supplier has changed - // delete all the order items - drastic but necessary because of - // change of currency, etc - $order->clear_items(); - } + supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true); } else { @@ -70,9 +70,16 @@ function display_po_header(&$order) label_row(_("Supplier:"), $order->supplier_name); } - //if ($editable || ($order->supplier_id != $_POST['supplier_id'])) - get_supplier_details_to_order($order, $_POST['supplier_id']); - + if ($order->supplier_id != get_post('supplier_id',-1)) { + get_supplier_details_to_order($order, $_POST['supplier_id']); + // supplier default price update + foreach ($order->line_items as $line_no=>$item) { + $line = &$order->line_items[$line_no]; + $line->price = get_purchase_price ($order->supplier_id, $_POST['stock_id']); + $line->quantity = get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']); + } + $Ajax->activate('items_table'); + } set_global_supplier($_POST['supplier_id']); if (!is_company_currency($order->curr_code)) @@ -84,7 +91,7 @@ function display_po_header(&$order) if ($editable) { - ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po())); + ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_PURCHORDER)); } else { @@ -92,11 +99,8 @@ function display_po_header(&$order) label_row(_("Reference:"), $order->reference); } - echo "
"; - - echo ""; // outer table + table_section(2); - echo ""; // check this out????????? //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") // $_POST['OrderDate'] = $order->orig_order_date; @@ -106,25 +110,22 @@ function display_po_header(&$order) // if (!is_date_in_fiscalyear($_POST['OrderDate'])) // $_POST['OrderDate'] = end_fiscalyear(); //} - date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0); + date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed'])) { + $Ajax->activate('_ex_rate'); + } text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15); - echo "
"; - - echo ""; // outer table - - echo ""; - echo ""; echo ""; + table_section(3); + if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" || - isset($_POST['GetAddress']) || !isset($_POST['delivery_address']) || + isset($_POST['_StkLocation_update']) || !isset($_POST['delivery_address']) || $_POST['delivery_address'] == "") { /*If this is the first time the form loaded set up defaults */ @@ -137,21 +138,20 @@ function display_po_header(&$order) { $loc_row = db_fetch($result); $_POST['delivery_address'] = $loc_row["delivery_address"]; + $Ajax->activate('delivery_address'); $_SESSION['PO']->Location = $_POST['StkLocation']; $_SESSION['PO']->delivery_address = $_POST['delivery_address']; } else { /*The default location of the user is crook */ - echo "
" . _("The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record."); + display_error(_("The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record.")); } } textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4); - echo "
" . _("Receive Into:") . ""; - locations_list('StkLocation', null); - echo " "; - submit('GetAddress', _("Get Address")); + locations_list('StkLocation', null, false, true); echo "
"; - echo ""; - end_table(); // outer table + end_outer_table(); // outer table } //--------------------------------------------------------------------------------------------------- @@ -162,37 +162,43 @@ function display_po_items(&$order, $editable=true) display_heading(_("Order Items")); + div_start('items_table'); start_table("$table_style width=80%"); - $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), - _("Required Delivery Date"), _("Price"), _("Line Total")); + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), + _("Received"), _("Unit"), + _("Required Delivery Date"), _("Price"), _("Line Total"), ""); if (count($order->line_items)) $th[] = ''; table_header($th); + $id = find_submit('Edit'); $total = 0; $k = 0; - foreach ($order->line_items as $po_line) + foreach ($order->line_items as $line_no => $po_line) { if ($po_line->Deleted == false) { $line_total = round($po_line->quantity * $po_line->price, user_price_dec()); - if (!$editable || !isset($_GET['Edit']) || $_GET['Edit'] != $po_line->line_no) + if (!$editable || ($id != $line_no)) { alt_table_row_color($k); label_cell($po_line->stock_id); label_cell($po_line->item_description); - qty_cell($po_line->quantity); + qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id)); + qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id)); label_cell($po_line->units); label_cell($po_line->req_del_date); - amount_cell($po_line->price); + amount_decimal_cell($po_line->price); amount_cell($line_total); if ($editable) { - edit_link_cell(SID."Edit=" . $po_line->line_no); - delete_link_cell(SID."Delete=" . $po_line->line_no); + edit_button_cell("Edit$line_no", _("Edit"), + _('Edit document line')); + delete_button_cell("Delete$line_no", _("Delete"), + _('Remove line from document')); } end_row(); } @@ -204,7 +210,7 @@ function display_po_items(&$order, $editable=true) } } - if (!isset($_GET['Edit']) && $editable) + if ($id==-1 && $editable) po_item_controls($order); $display_total = price_format($total); @@ -212,6 +218,7 @@ function display_po_items(&$order, $editable=true) "nowrap align=right"); end_table(1); + div_end(); } //--------------------------------------------------------------------------------------------------- @@ -231,7 +238,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false) if (!$is_self) { - label_cells(_("Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no), + label_cells(_("Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no), "class='tableheader2'"); } end_row(); @@ -269,58 +276,76 @@ function display_po_summary(&$po, $is_self=false, $editable=false) function po_item_controls(&$order, $stock_id=null) { + global $Ajax; start_row(); - if (isset($_GET['Edit']) && $stock_id != null) + $dec2 = 0; + $id = find_submit('Edit'); + if (($id != -1) && $stock_id != null) { - hidden('line_no', $_GET['Edit']); + hidden('line_no', $id); - if (!isset($_POST['stock_id'])) - $_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id; - if (!isset($_POST['qty']) || ($_POST['qty'] == "")) - $_POST['qty'] = qty_format($order->line_items[$_GET['Edit']]->quantity); - if (!isset($_POST['price']) || ($_POST['price'] == "")) - $_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price); - if (!isset($_POST['req_del_date']) || ($_POST['req_del_date'] == "")) - $_POST['req_del_date'] = $order->line_items[$_GET['Edit']]->req_del_date; + $_POST['stock_id'] = $order->line_items[$id]->stock_id; + $dec = get_qty_dec($_POST['stock_id']); + $_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec); + //$_POST['price'] = price_format($order->line_items[$id]->price); + $_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2); + $_POST['req_del_date'] = $order->line_items[$id]->req_del_date; - $_POST['units'] = $order->line_items[$_GET['Edit']]->units; + $_POST['units'] = $order->line_items[$id]->units; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); - label_cell($order->line_items[$_GET['Edit']]->item_description); + label_cell($order->line_items[$id]->item_description); + $Ajax->activate('items_table'); + $qty_rcvd = $order->line_items[$id]->qty_received; } else { hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); - stock_purchasable_items_list_cells(null, 'stock_id', null, false, true); + stock_purchasable_items_list_cells(null, 'stock_id', null, false, false, true); + if (list_updated('stock_id')) { + $Ajax->activate('price'); + $Ajax->activate('units'); + $Ajax->activate('qty'); + $Ajax->activate('req_del_date'); + $Ajax->activate('line_total'); + } $item_info = get_item_edit_info($_POST['stock_id']); $_POST['units'] = $item_info["units"]; - $_POST['qty'] = qty_format(1); - $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id'])); + $dec = $item_info["decimals"]; + $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec); + //$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id'])); + $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2); $_POST['req_del_date'] = add_days(Today(), 10); + $qty_rcvd = ''; } - qty_cells(null, 'qty', null); + qty_cells(null, 'qty', null, null, null, $dec); + qty_cell($qty_rcvd, false, $dec); - label_cell($_POST['units']); + label_cell($_POST['units'], '', 'units'); date_cells(null, 'req_del_date', '', null, 0, 0, 0); - amount_cells(null, 'price', null); + amount_cells(null, 'price', null, null, null, $dec2); //$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100); $line_total = round(input_num('qty') * input_num('price'), user_price_dec()); - amount_cell($line_total); + amount_cell($line_total, false, '','line_total'); - if (isset($_GET['Edit'])) + if ($id!=-1) { - submit_cells('UpdateLine', _("Update")); - submit_cells('CancelUpdate', _("Cancel")); + button_cell('UpdateLine', _("Update"), + _('Confirm changes'), ICON_UPDATE); + button_cell('CancelUpdate', _("Cancel"), + _('Cancel changes'), ICON_CANCEL); + set_focus('qty'); } else { - submit_cells('EnterLine', _("Add Item"), "colspan=2"); + submit_cells('EnterLine', _("Add Item"), "colspan=2", + _('Add new item to document'), true); } end_row();