projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aeef2bf
)
Fixed double calculation of tax free price for an item.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 23 Nov 2011 00:40:39 +0000
(
01:40
+0100)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Wed, 23 Nov 2011 00:40:39 +0000
(
01:40
+0100)
purchasing/includes/db/grn_db.inc
patch
|
blob
|
history
diff --git
a/purchasing/includes/db/grn_db.inc
b/purchasing/includes/db/grn_db.inc
index df35e23db60577bda56800421bfbcc337bf679e1..a31bc2ec83665bc9ebe9ff0a3dcfa47c7f96889f 100644
(file)
--- a/
purchasing/includes/db/grn_db.inc
+++ b/
purchasing/includes/db/grn_db.inc
@@
-117,8
+117,8
@@
function add_grn(&$po)
if ($clearing_act)
$total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $stock_gl_code["inventory_account"],
$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
if ($clearing_act)
$total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $stock_gl_code["inventory_account"],
$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
- $order_line->receive_qty * $order_line->taxfree_charge_price($po), $po->supplier_id
);
- update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->
taxfree_charge_price($po),
+ $order_line->receive_qty * $order_line->taxfree_charge_price($po), $po->supplier_id
, '', 0, $order_line->stock_id);
\r
+ update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->
price,
\r
$order_line->receive_qty, $date_);
}
//----------------------------------------------------------------------------------------------------------------
$order_line->receive_qty, $date_);
}
//----------------------------------------------------------------------------------------------------------------
@@
-143,7
+143,7
@@
function add_grn(&$po)
/* Update location stock records - NB a po cannot be entered for a service/kit parts done automatically */
add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
$order_line->receive_qty, $order_line->standard_cost,
/* Update location stock records - NB a po cannot be entered for a service/kit parts done automatically */
add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
$order_line->receive_qty, $order_line->standard_cost,
- $po->supplier_id, 1, $order_line->
price);
+ $po->supplier_id, 1, $order_line->
taxfree_charge_price($po));
\r
} /*quantity received is != 0 */
} /*end of order_line loop */
} /*quantity received is != 0 */
} /*end of order_line loop */