Function line misplaced.

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 7b91967b97ab7bb734e393d297781c7496f53c17..72ad103b1ebe6237b13ef88ba37062e38c85ec21 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -499,13 +499,17 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
        }
        else    // prepare new line
        {
-               sales_items_list_cells(null,'stock_id', null, false, true, true);
+               if ($order->fixed_asset)
+                       stock_disposable_fa_list_cells(null,'stock_id', null, _('[Select item]'), true, $order->line_items);
+               else
+            sales_items_list_cells(null,'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');
                            $Ajax->activate('qty');
                            $Ajax->activate('line_total');
-               }
+               } else
+                        sales_items_list_cells(null,'stock_id', last_sales_order_detail($order, 'stk_code'), false, true, true);
 
                $item_info = get_item_edit_info($_POST['stock_id']);
                $units = $item_info["units"];
@@ -519,7 +523,11 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
                $_POST['Disc'] = percent_format($order->default_discount * 100);
        }
 
-       qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
+       if ($order->fixed_asset) {
+               label_cell(1, '', 'qty');
+               hidden('qty', 1);
+       } else 
+               qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
 
        if ($order->trans_no!=0) {
                qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec);
@@ -599,8 +607,8 @@ function display_delivery_details(&$order)
                start_outer_table(TABLESTYLE2, "width='90%'");
                table_section(1);
 
-               locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
-               if ($order->payment_terms['days_before_due'] < 0)
+               locations_list_row(_("Deliver from Location:"), 'Location', null, false, true, $order->fixed_asset);
+               if ($order->payment_terms['days_before_due'] == -1)
                {
                        $Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update
                        if (!$order->is_started())