X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=a91360718b3d95c6987d0f4ba8fe167e4eb48852;hb=2a5c4dfc9b28b81fc858eddc7cfb42ad9b4bfdba;hp=e6e1965d417cc230e9f45c60ab45390640f2a0d1;hpb=ea92c9934c28216ef0a9f961228e79f6b57764cd;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index e6e1965d..a9136071 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -1,68 +1,111 @@ . +***********************************************************************/ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); -// ------------------------------------------------------------------------------ +//-------------------------------------------------------------------------------------------------- -function get_supplier_details_to_order(&$order, $supplier_id) +function copy_from_cart() { - $sql = "SELECT curr_code,supp_name FROM ".TB_PREF."suppliers - WHERE supplier_id = '$supplier_id'"; - $result = db_query($sql, "The supplier details could not be retreived"); + $cart = &$_SESSION['PO']; + + $_POST['supplier_id'] = $cart->supplier_id; + $_POST['OrderDate'] = $cart->orig_order_date; + if ($cart->trans_type == ST_SUPPINVOICE) + $_POST['due_date'] = $cart->due_date; + $_POST['supp_ref'] = $cart->supp_ref; + $_POST['ref'] = $cart->reference; + $_POST['Comments'] = $cart->Comments; + $_POST['StkLocation'] = $cart->Location; + $_POST['delivery_address'] = $cart->delivery_address; + $_POST['prep_amount'] = price_format($cart->prep_amount); + $_POST['_ex_rate'] = $cart->ex_rate; + $_POST['cash_account'] = $cart->cash_account; + $_POST['dimension'] = $cart->dimension; + $_POST['dimension2'] = $cart->dimension2; + foreach($cart->tax_overrides as $id => $value) + $_POST['mantax'][$id] = price_format($value); +} - $myrow = db_fetch($result); +function copy_to_cart() +{ + $cart = &$_SESSION['PO']; - $order->curr_code = $_POST['curr_code'] = $myrow["curr_code"]; - $order->supplier_name = $_POST['supplier_name'] = $myrow["supp_name"]; - $order->supplier_id = $_POST['supplier_id'] = $supplier_id; + $cart->supplier_id = $_POST['supplier_id']; + $cart->orig_order_date = $_POST['OrderDate']; + if ($cart->trans_type == ST_SUPPINVOICE) + { + $cart->due_date = $_POST['due_date']; + $cart->cash_account = get_post('cash_account'); + } + $cart->reference = $_POST['ref']; + $cart->supp_ref = $_POST['supp_ref']; + $cart->Comments = $_POST['Comments']; + $cart->Location = $_POST['StkLocation']; + $cart->delivery_address = $_POST['delivery_address']; + $cart->dimension = @$_POST['dimension']; + $cart->dimension2 = @$_POST['dimension2']; + $cart->prep_amount = input_num('prep_amount', 0); + $cart->ex_rate = input_num('_ex_rate', null); + + if (isset($_POST['mantax'])) { + foreach($_POST['mantax'] as $id => $tax) { + $cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); } + } } //--------------------------------------------------------------------------------------------------- -function create_new_po() +function create_new_po($trans_type, $trans_no) { - if (isset($_SESSION['PO'])) - { - unset ($_SESSION['PO']->line_items); - $_SESSION['PO']->lines_on_order = 0; - unset ($_SESSION['PO']); - } + global $Refs; - session_register("PO"); + if (isset($_SESSION['PO'])) + unset ($_SESSION['PO']->line_items, $_SESSION['PO']); - $_SESSION['PO'] = new purch_order; - $_POST['OrderDate'] = Today(); + $cart = new purch_order; + $_POST['OrderDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['OrderDate'])) $_POST['OrderDate'] = end_fiscalyear(); - $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; + $cart->due_date = $cart->orig_order_date = $_POST['OrderDate']; + + $cart->trans_type = $trans_type; + $cart->order_no = $trans_no; + /*read in all the selected order into the Items cart */ + if ($trans_no) { + read_po($trans_no, $cart); + $cart->order_no = $trans_no; + } else + $cart->reference = $Refs->get_next($trans_type, null, + array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate'))); + $_SESSION['PO'] = &$cart; } //--------------------------------------------------------------------------------------------------- function display_po_header(&$order) { - global $table_style2; + global $Ajax, $Refs; $editable = ($order->order_no == 0); - start_table("width=80% $table_style2"); - echo ""; // outer table - echo ""; + start_outer_table(TABLESTYLE2, "width='80%'"); + 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', $_POST['supplier_id'], 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,21 +113,47 @@ 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)) { + $old_supp = $order->supplier_id; + get_supplier_details_to_order($order, $_POST['supplier_id']); + get_duedate_from_terms($order); + $_POST['due_date'] = $order->due_date; + + // 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, $line->stock_id); + $line->quantity = + $line->quantity/get_purchase_conversion_factor ($old_supp, $line->stock_id) + *get_purchase_conversion_factor ($order->supplier_id, $line->stock_id); + } + $Ajax->activate('items_table'); + $Ajax->activate('due_date'); + } set_global_supplier($_POST['supplier_id']); + date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") : + ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")), + 'OrderDate', '', true, 0, 0, 0, null, true); + + if (isset($_POST['_OrderDate_changed'])) { + $order->orig_order_date = $_POST['OrderDate']; + get_duedate_from_terms($order); + $_POST['due_date'] = $order->due_date; + $Ajax->activate('due_date'); + } + supplier_credit_row($order->supplier_id, $order->credit); + if (!is_company_currency($order->curr_code)) { label_row(_("Supplier Currency:"), $order->curr_code); - exchange_rate_display($order->curr_code, get_company_currency(), + exchange_rate_display(get_company_currency(), $order->curr_code, $_POST['OrderDate']); } if ($editable) { - ref_row(_("Reference:"), 'ref', references::get_next(systypes::po())); + ref_row(_("Reference:"), 'ref', '', null, false, $order->trans_type, array('date'=> @$_POST['OrderDate'])); } else { @@ -92,134 +161,142 @@ function display_po_header(&$order) label_row(_("Reference:"), $order->reference); } - echo "
"; - - echo ""; // outer table - - echo ""; - // check this out????????? - //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - // $_POST['OrderDate'] = $order->orig_order_date; - //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "") - //{ - // $_POST['OrderDate'] = Today(); - // if (!is_date_in_fiscalyear($_POST['OrderDate'])) - // $_POST['OrderDate'] = end_fiscalyear(); - //} - date_row(_("Order Date:"), 'OrderDate', $_POST['OrderDate'], 0, 0, 0); - - text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15); + table_section(2); - echo "
"; + if ($order->trans_type==ST_SUPPINVOICE) + date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true); - echo ""; // outer table + text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60); - echo ""; + if (get_company_pref('use_dimension')) + dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1); + if (get_company_pref('use_dimension') == 2) + dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2); + locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true, $order->fixed_asset); - 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 */ - //$_POST['StkLocation'] = $_SESSION['UserStockLocation']; - $sql = "SELECT delivery_address, phone FROM ".TB_PREF."locations WHERE loc_code='" . $_POST['StkLocation'] . "'"; - $result = db_query($sql,"could not get location info"); - - if (db_num_rows($result) == 1) + $loc_row = get_item_location(get_post('StkLocation')); + if ($loc_row) { - $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")); - echo "
"; - echo ""; - end_table(); // outer table + end_outer_table(); // outer table } //--------------------------------------------------------------------------------------------------- function display_po_items(&$order, $editable=true) { - global $table_style; - display_heading(_("Order Items")); - start_table("$table_style width=80%"); + div_start('items_table'); + start_table(TABLESTYLE, "width='80%'"); + + $new = $order->order_no == 0; + + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Received"), + _("Unit"), _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), ""); - $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"), - _("Required Delivery Date"), _("Price"), _("Line Total")); + if ($order->trans_type != ST_PURCHORDER) + array_remove($th, 5); + if ($new) + array_remove($th, 3); 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 || ($id != $line_no)) { - $line_total = round($po_line->quantity * $po_line->price, user_price_dec()); - if (!$editable || !isset($_GET['Edit']) || $_GET['Edit'] != $po_line->line_no) - { - alt_table_row_color($k); - label_cell($po_line->stock_id); - label_cell($po_line->item_description); - qty_cell($po_line->quantity); - label_cell($po_line->units); - label_cell($po_line->req_del_date); - amount_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); - } - end_row(); - } - else + alt_table_row_color($k); + label_cell($po_line->stock_id); + label_cell($po_line->item_description); + if ($order->fixed_asset) + label_cell(1); + else + qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id)); + if (!$new) + qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id)); + label_cell($po_line->units); + if ($order->trans_type == ST_PURCHORDER) + label_cell($po_line->req_del_date); + amount_decimal_cell($po_line->price); + amount_cell($line_total); + + if ($editable) { - po_item_controls($order, $po_line->stock_id); + edit_button_cell("Edit$line_no", _("Edit"), + _('Edit document line')); + delete_button_cell("Delete$line_no", _("Delete"), + _('Remove line from document')); } - $total += $line_total; + end_row(); + } + else + { + po_item_controls($order, $k, $line_no); } + $total += $line_total; } - if (!isset($_GET['Edit']) && $editable) - po_item_controls($order); + if ($id==-1 && $editable) + po_item_controls($order, $k); - $display_total = price_format($total); - label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right", - "nowrap align=right"); + $colspan = count($th)-2; + if (count($order->line_items)) + $colspan--; + + $display_sub_total = price_format($total); + + label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2); + + $taxes = $order->get_taxes(input_num('freight_cost')); + + $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE); + + $display_total = price_format(($total + input_num('freight_cost') + $tax_total)); + + start_row(); + label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'"); + $order->trans_type == ST_SUPPINVOICE + ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true) + : label_cell('', "colspan=2"); + end_row(); end_table(1); + div_end(); } //--------------------------------------------------------------------------------------------------- function display_po_summary(&$po, $is_self=false, $editable=false) { - global $table_style2; - start_table("$table_style2 width=90%"); + start_table(TABLESTYLE, "width='90%'"); start_row(); label_cells(_("Reference"), $po->reference, "class='tableheader2'"); @@ -231,7 +308,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(); @@ -251,14 +328,22 @@ function display_po_summary(&$po, $is_self=false, $editable=false) "class='tableheader2'"); } - if ($po->requisition_no != "") - label_cells(_("Supplier's Reference"), $po->requisition_no, "class='tableheader2'"); + if ($po->supp_ref != "") + label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'"); end_row(); if (!$editable) label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'", "colspan=9"); + if (!$editable && ($po->prep_amount > 0)) + { + start_row(); + label_cells(_("Required Pre-Payment"), price_format($po->prep_amount), "class='tableheader2'"); + label_cells(_("Pre-Payments Allocated"), price_format($po->alloc), "class='tableheader2'"); + end_row(); + } + if ($po->Comments != "") label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9"); @@ -267,71 +352,107 @@ function display_po_summary(&$po, $is_self=false, $editable=false) //-------------------------------------------------------------------------------- -function po_item_controls(&$order, $stock_id=null) +function po_item_controls(&$order, &$rowcounter, $line_no=-1) { - start_row(); + global $Ajax, $SysPrefs; + + alt_table_row_color($rowcounter); + $new = $order->order_no == 0; - if (isset($_GET['Edit']) && $stock_id != null) + $dec2 = 6; + $id = find_submit('Edit'); + if (($id != -1) && $line_no == $id) { - hidden('line_no', $_GET['Edit']); - 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_decimal_format($order->line_items[$id]->price, $dec2); + if ($order->trans_type == ST_PURCHORDER) + $_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; + $_POST['item_description'] = $order->line_items[$id]->item_description; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); - label_cell($order->line_items[$_GET['Edit']]->item_description); + + if ($order->line_items[$id]->descr_editable) + text_cells(null,'item_description', null, 45, 150); + else { + hidden('item_description', $_POST['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)); - $no_item_list = get_company_pref('no_item_list'); - if ($no_item_list) - { - echo "\n"; - stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true); - echo "\n"; - } + // Manufactured item can be purchased + if ($order->fixed_asset) + stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items); else - { - text_cells(null, "StockID2", "", 12, 10, "", "", "class='combo' rel='stock_id' onblur='submit()'"); - stock_purchasable_items_list_cells(null, 'stock_id', $_POST['stock_id'], false, true, "class='combo' rel='StockID2'"); + stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase"))); + + 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'])); - $_POST['req_del_date'] = add_days(Today(), 10); + $dec = 0; $_POST['units'] = ''; + $item_info = get_item_edit_info($_POST['stock_id']); + if ($item_info) { + $_POST['units'] = $item_info["units"]; + $dec = $item_info["decimals"]; + } + $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec); + $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2); + if ($order->trans_type == ST_PURCHORDER) + $_POST['req_del_date'] = add_days(Today(), $SysPrefs->default_receival_required_by()); + $qty_rcvd = ''; } - qty_cells(null, 'qty', null); + if ($order->fixed_asset) { + label_cell(1, '', 'qty'); + hidden('qty', 1); + } else + qty_cells(null, 'qty', null, null, null, $dec); + + if (!$new) + qty_cell($qty_rcvd, false, $dec); - label_cell($_POST['units']); - date_cells(null, 'req_del_date', null, 0, 0, 0); - amount_cells(null, 'price', null); + label_cell($_POST['units'], '', 'units'); + if ($order->trans_type == ST_PURCHORDER) + date_cells(null, 'req_del_date', '', null, 0, 0, 0); + if ($qty_rcvd > 0) + { + amount_decimal_cell($_POST['price']); + hidden('price', $_POST['price']); + } + else + unit_amount_cells(null, 'price'); - //$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); + hidden('line_no', $line_no); + set_focus('qty'); } else { - submit_cells('EnterLine', _("Add Item"), "colspan=2"); + submit_cells('EnterLine', _("Add Item"), "colspan=2 align='center'", + _('Add new item to document'), true); } end_row(); @@ -339,6 +460,22 @@ function po_item_controls(&$order, $stock_id=null) //--------------------------------------------------------------------------------------------------- +function display_po_footer(&$trans) +{ + global $Ajax; + +start_table(TABLESTYLE2); + +if ($trans->trans_type == ST_SUPPINVOICE) { + cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed')); +} elseif ($trans->trans_type == ST_PURCHORDER) + amount_row(_("Pre-Payment Required:"), 'prep_amount'); + +textarea_row(_("Memo:"), 'Comments', null, 70, 4); + +end_table(); +} +//--------------------------------------------------------------------------------------------------- + -?> \ No newline at end of file