Global change in naming convention from std_cost to unit_cost.

[fa-stable.git] / manufacturing / includes / work_order_issue_ui.inc

diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc
index d5e8eb806ddae899dd65ca18757f0b634c8ae23c..a37ef0950aa97d16302ec763f7984f2c86ec8b0e 100644 (file)
--- a/manufacturing/includes/work_order_issue_ui.inc
+++ b/manufacturing/includes/work_order_issue_ui.inc
@@ -14,12 +14,12 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 //--------------------------------------------------------------------------------
 
-function add_to_issue(&$order, $new_item, $new_item_qty, $standard_cost)
+function add_to_issue(&$order, $new_item, $new_item_qty, $unit_cost)
 {
     if ($order->find_cart_item($new_item))
          display_error(_("For Part :") . $new_item . " " . "This item is already on this issue.  You can change the quantity issued of the existing line if necessary.");
        else
-         $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $standard_cost);
+         $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $unit_cost);
 }
 //---------------------------------------------------------------------------------
 
@@ -44,8 +44,6 @@ function display_issue_items($title, &$order)
        foreach ($order->line_items as $line_no=>$stock_item)
        {
 
-//             $total += ($stock_item->standard_cost * $stock_item->quantity);
-
                if ($id != $line_no)
                {
                        if (in_array($stock_item->stock_id, $low_stock))
@@ -57,8 +55,8 @@ function display_issue_items($title, &$order)
                        label_cell($stock_item->item_description);
                qty_cell($stock_item->quantity, false, get_qty_dec($stock_item->stock_id));
                        label_cell($stock_item->units);
-                       amount_cell($stock_item->standard_cost);
-//                     amount_cell($stock_item->standard_cost * $stock_item->quantity);
+                       amount_cell($stock_item->unit_cost);
+//                     amount_cell($stock_item->unit_cost * $stock_item->quantity);
 
                        edit_button_cell("Edit$line_no", _("Edit"),
                                _('Edit document line'));
@@ -75,8 +73,6 @@ function display_issue_items($title, &$order)
        if ($id == -1)
                issue_edit_item_controls($order);
 
-//     label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right");
-
     end_table();
        if (@$low_stock)
                display_note(_("Marked items have insufficient quantities in stock as on day of issue."), 0, 1, "class='stockmankofg'");
@@ -96,8 +92,7 @@ function issue_edit_item_controls(&$order, $line_no=-1)
                $_POST['stock_id'] = $order->line_items[$id]->stock_id;
                $_POST['qty'] = qty_format($order->line_items[$id]->quantity, 
                        $order->line_items[$id]->stock_id, $dec);
-               //$_POST['std_cost'] = price_format($order->line_items[$id]->standard_cost);
-               $std_cost = $order->line_items[$id]->standard_cost;
+               $std_cost = $order->line_items[$id]->unit_cost;
                $_POST['units'] = $order->line_items[$id]->units;
 
                hidden('stock_id', $_POST['stock_id']);
@@ -121,8 +116,7 @@ function issue_edit_item_controls(&$order, $line_no=-1)
 
                $dec = $item_info["decimals"];
                $_POST['qty'] = number_format2(0, $dec);
-               //$_POST['std_cost'] = price_format($item_info["standard_cost"]);
-               $std_cost = $item_info["standard_cost"];
+               $std_cost = $item_info["material_cost"];
                $_POST['units'] = $item_info["units"];
        }
 
@@ -160,7 +154,11 @@ function issue_options_controls()
 
        echo "<br>";
        start_table();
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(28));
+       date_row(_("Issue Date:"), 'date_');
+       locations_list_row(_("From Location:"), 'Location');
+       workcenter_list_row(_("To Work Centre:"), 'WorkCentre');
+
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_MANUISSUE, null, array('date'=> get_post('date_'), 'location' => get_post('Location'))));
  
        if (!isset($_POST['IssueType']))
                $_POST['IssueType'] = 0;
@@ -168,11 +166,6 @@ function issue_options_controls()
        yesno_list_row(_("Type:"), 'IssueType', $_POST['IssueType'],
                _("Return Items to Location"), _("Issue Items to Work order"));
  
-       locations_list_row(_("From Location:"), 'Location');
-       workcenter_list_row(_("To Work Centre:"), 'WorkCentre');
- 
-       date_row(_("Issue Date:"), 'date_');
-
        textarea_row(_("Memo"), 'memo_', null, 50, 3);
 
        end_table(1);