X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=80d6a3b5a803396c549e09f363d8cfd33a4b5e9b;hb=78e85d9a746e57dd04989bd7a889e6dee79301e0;hp=ae063b6ec4977e510b1d9dbb40db7b10db2fda62;hpb=19dce8c7be29e4cc8e7be92d044259348373d456;p=fa-stable.git diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index ae063b6e..80d6a3b5 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -153,7 +153,7 @@ function display_po_header(&$order) if ($editable) { - ref_row(_("Reference:"), 'ref'); + ref_row(_("Reference:"), 'ref', '', null, false, $order->trans_type, array('date'=> @$_POST['OrderDate'])); } else { @@ -166,13 +166,13 @@ function display_po_header(&$order) if ($order->trans_type==ST_SUPPINVOICE) date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true); - text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15); + text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60); 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); + locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true, $order->fixed_asset); table_section(3); @@ -211,13 +211,18 @@ function display_po_items(&$order, $editable=true) div_start('items_table'); start_table(TABLESTYLE, "width='80%'"); - $th = array(_("Item Code"), _("Item Description"), _("Quantity"), - _("Received"), _("Unit"), - _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), ""); + $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"), ""); + 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'); @@ -231,8 +236,12 @@ function display_po_items(&$order, $editable=true) alt_table_row_color($k); label_cell($po_line->stock_id); label_cell($po_line->item_description); - 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)); + 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); @@ -274,7 +283,8 @@ function display_po_items(&$order, $editable=true) start_row(); label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'"); - $order->order_no ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true) + $order->trans_type == ST_SUPPINVOICE + ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true) : label_cell('', "colspan=2"); end_row(); @@ -347,17 +357,16 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) global $Ajax, $SysPrefs; alt_table_row_color($rowcounter); + $new = $order->order_no == 0; $dec2 = 0; $id = find_submit('Edit'); if (($id != -1) && $line_no == $id) { -// hidden('line_no', $id); $_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); if ($order->trans_type == ST_PURCHORDER) $_POST['req_del_date'] = $order->line_items[$id]->req_del_date; @@ -372,7 +381,6 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) text_cells(null,'item_description', null, 45, 150); else { hidden('item_description', $_POST['item_description']); -// label_cell($_POST['item_description']); label_cell($order->line_items[$id]->item_description); } @@ -381,11 +389,13 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) } else { -// hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); - //Chaitanya : Manufcatured item can be purchased - stock_items_list_cells(null, 'stock_id', null, false, true, false, true); - //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true); + // 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 + 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'); @@ -393,20 +403,28 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) $Ajax->activate('req_del_date'); $Ajax->activate('line_total'); } - $item_info = get_item_edit_info($_POST['stock_id']); - $_POST['units'] = $item_info["units"]; - $dec = $item_info["decimals"]; + $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_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); 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, null, null, $dec); - qty_cell($qty_rcvd, false, $dec); + 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'], '', 'units'); if ($order->trans_type == ST_PURCHORDER) @@ -419,7 +437,6 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) else 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, false, '','line_total');