projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reorganized work order costing to make corect registration of costs in journal.
[fa-stable.git]
/
includes
/
db
/
inventory_db.inc
diff --git
a/includes/db/inventory_db.inc
b/includes/db/inventory_db.inc
index fec16092b152ef7c799d007ebaff1b0450015e2b..5bc37a75300055bae0ff95252ed78310d9932b3f 100644
(file)
--- a/
includes/db/inventory_db.inc
+++ b/
includes/db/inventory_db.inc
@@
-201,7
+201,7
@@
function get_purchases_from_trans($stock_id, $from)
}
//-------------------------------------------------------------------
}
//-------------------------------------------------------------------
-/
/ Original Code V0
+/
* Original Code V0 Leave as is a while
function adjust_deliveries_v0($stock_id, $material_cost, $to)
{
if (!is_inventory_item($stock_id))
function adjust_deliveries_v0($stock_id, $material_cost, $to)
{
if (!is_inventory_item($stock_id))
@@
-224,16
+224,17
@@
function adjust_deliveries_v0($stock_id, $material_cost, $to)
$stock_gl_code = get_stock_gl_code($stock_id);
$stock_gl_code = get_stock_gl_code($stock_id);
- $memo_ = _("Cost was ") . $old_cost . _(" changed to ") . $new_cost . _(" for item ")."'$stock_id'";
+ $memo_ = sprintf(_("Cost was %s changed to %s for item '%s'"),
+ $old_cost, $new_cost, $stock_id);
add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["cogs_account"],
add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["cogs_account"],
- $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, $diff);
+ $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, $diff);
- add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["inventory_account"],
0, 0, $memo_,
- -$diff);
+ add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["inventory_account"],
+
0, 0, $memo_,
-$diff);
add_audit_trail(ST_COSTUPDATE, $update_no, $to);
}
}
add_audit_trail(ST_COSTUPDATE, $update_no, $to);
}
}
-
+*/
//New written function
function adjust_deliveries($stock_id, $material_cost, $to)
{
//New written function
function adjust_deliveries($stock_id, $material_cost, $to)
{
@@
-264,11
+265,6
@@
function adjust_deliveries($stock_id, $material_cost, $to)
$diff = $sales_diff - $purchase_diff;
$diff = $sales_diff - $purchase_diff;
- display_notification('Sales Diff - '.$sales_diff.' Purchase Diff - '.$purchase_diff);
-
- $sql = "INSERT INTO trace values ('Diff', ".db_escape($diff).", '')";
- $result = db_query($sql, "The dstock moves could not be retrieved");
-
if ($diff != 0)
{
$update_no = get_next_trans_no(ST_COSTUPDATE);
if ($diff != 0)
{
$update_no = get_next_trans_no(ST_COSTUPDATE);