projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed language modules locale.inc integration.
[fa-stable.git]
/
manufacturing
/
includes
/
db
/
work_order_costing_db.inc
diff --git
a/manufacturing/includes/db/work_order_costing_db.inc
b/manufacturing/includes/db/work_order_costing_db.inc
index 5d39a8a9ea3bb8630676f6cafefe703b0ba5ff2d..5aab70e9eda3c37bd2dbe8ddce735b3f0f67af49 100644
(file)
--- a/
manufacturing/includes/db/work_order_costing_db.inc
+++ b/
manufacturing/includes/db/work_order_costing_db.inc
@@
-81,7
+81,6
@@
function update_material_cost($stock_id, $qty, $unit_cost, $date)
{
// post $qty_delayed*($avg_cost-$unit_cost)
$diff = $qty_delayed*($unit_cost-$avg_cost);
{
// post $qty_delayed*($avg_cost-$unit_cost)
$diff = $qty_delayed*($unit_cost-$avg_cost);
- $stock_gl_code = get_item($stock_id);
$dec = user_price_dec();
$old_cost = -round2($avg_cost, $dec);
$dec = user_price_dec();
$old_cost = -round2($avg_cost, $dec);
@@
-129,7
+128,7
@@
function add_wo_costs_journal($wo_id, $amount, $cost_type, $cr_acc, $date, $dim1
if (!$ref) $ref = $Refs->get_next(ST_JOURNAL, null, $date);
add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $cr_acc,
if (!$ref) $ref = $Refs->get_next(ST_JOURNAL, null, $date);
add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $cr_acc,
-
0, 0
, $wo_cost_types[$cost_type], -$amount);
+
$dim1, $dim2
, $wo_cost_types[$cost_type], -$amount);
$is_bank_to = is_bank_account($cr_acc);
if ($is_bank_to)
$is_bank_to = is_bank_account($cr_acc);
if ($is_bank_to)
@@
-229,6
+228,10
@@
function void_wo_costing($wo_id)
while($row = db_fetch($res))
{
while($row = db_fetch($res))
{
+ $is_bank_to = is_bank_account($row['account']);
+ if ($is_bank_to)
+ void_bank_trans($row['trans_type'], $row['trans_no']);
+
// void any related gl trans
$date = Today();
$type = $row['trans_type'];
// void any related gl trans
$date = Today();
$type = $row['trans_type'];