Bug 3585. 'Exclude from purchase' function not working in PO.

[fa-stable.git] / purchasing / includes / ui / po_ui.inc

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 9a9b716c7c876813e4f815c0d42817573b9217a9..44f2b3930b86a0bf75166d4e6581928a244850b6 100644 (file)
--- 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
     {
@@ -172,7 +172,7 @@ function display_po_header(&$order)
                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);
 
@@ -216,8 +216,9 @@ function display_po_items(&$order, $editable=true)
                _("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 (count($order->line_items)) $th[] = '';
+
        table_header($th);
 
        $id = find_submit('Edit');
@@ -231,7 +232,11 @@ 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));
+               if ($order->fixed_asset)
+                   label_cell(1);
+               else
+               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);
                        if ($order->trans_type == ST_PURCHORDER)
@@ -353,12 +358,10 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
        $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;
@@ -373,7 +376,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); 
                }
 
@@ -382,11 +384,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');
@@ -399,14 +403,18 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 
                $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);
+       if ($order->fixed_asset) {
+               label_cell(1, '', 'qty');
+               hidden('qty', 1);
+       } else
+               qty_cells(null, 'qty', null, null, null, $dec);
+
        qty_cell($qty_rcvd, false, $dec);
 
        label_cell($_POST['units'], '', 'units');
@@ -420,7 +428,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');