GL Account Transactions Report: improved layout when dimension 2 is not used.

[fa-stable.git] / manufacturing / work_order_costs.php

diff --git a/manufacturing/work_order_costs.php b/manufacturing/work_order_costs.php
index 244c4a17c6b4894122b7b1cc306cf4039e017ee1..07efe640b339af563932e2edc0fb97d4a4911c50 100644 (file)
--- a/manufacturing/work_order_costs.php
+++ b/manufacturing/work_order_costs.php
@@ -56,9 +56,9 @@ if (isset($_GET['AddedID']))
 
 //--------------------------------------------------------------------------------------------------
 
-$wo_details = get_work_order($_POST['selected_id']);
+$wo_details = get_work_order($_POST['selected_id'], true);
 
-if (strlen($wo_details[0]) == 0)
+if ($wo_details === false)
 {
        display_error(_("The order number sent is not valid."));
        exit;
@@ -68,7 +68,7 @@ if (strlen($wo_details[0]) == 0)
 
 function can_process($wo_details)
 {
-       if (!check_num('costs', 0))
+       if (input_num('costs')<=0)
        {
                display_error(_("The amount entered is not a valid number or less then zero."));
                set_focus('costs');
@@ -106,7 +106,7 @@ if (isset($_POST['process']) && can_process($wo_details) == true)
        $ref  = $_POST['ref'];
 
        add_wo_costs_journal($_POST['selected_id'], input_num('costs'), $_POST['PaymentType'], 
-               $_POST['cr_acc'], $_POST['db_acc'], $date, $_POST['dim1'], $_POST['dim2'], $memo, $ref);
+               $_POST['cr_acc'], $date, $_POST['dim1'], $_POST['dim2'], $memo, $ref);
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=".$_POST['selected_id']);
 }
@@ -118,7 +118,7 @@ display_wo_details($_POST['selected_id']);
 //-------------------------------------------------------------------------------------
 
 if (!isset($_POST['ref']))
-       $_POST['ref'] = $Refs->get_next(ST_JOURNAL, null, get_post('date_'));
+       $_POST['ref'] = $Refs->get_next(ST_JOURNAL, null, Today());
 
 start_form();
 
@@ -138,13 +138,11 @@ if (list_updated('PaymentType'))
        $Ajax->activate('costs');
 
 $item = get_item($wo_details['stock_id']);
-$_POST['db_acc'] = $item['assembly_account'];
 $r = get_default_bank_account(get_company_pref('curr_default'));
-$_POST['cr_acc'] = $r[0];
+$_POST['cr_acc'] = $r['account_code'];
 $_POST['costs'] = price_format(get_post('PaymentType')==WO_OVERHEAD ? $item['overhead_cost'] : $item['labour_cost']);
 
 amount_row(_("Additional Costs:"), 'costs');
-gl_all_accounts_list_row(_("Debit Account"), 'db_acc', null);
 gl_all_accounts_list_row(_("Credit Account"), 'cr_acc', null);
 textarea_row(_("Memo:"), 'memo', null, 40, 5);
 end_table(1);