projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes in payment/deposit allocations.
[fa-stable.git]
/
includes
/
db
/
manufacturing_db.inc
diff --git
a/includes/db/manufacturing_db.inc
b/includes/db/manufacturing_db.inc
index ca1841d2570e131fa017b44a193f79e123982090..396fe3b138d287adca7e9a520a1cd095f52c2d78 100644
(file)
--- a/
includes/db/manufacturing_db.inc
+++ b/
includes/db/manufacturing_db.inc
@@
-64,7
+64,7
@@
function stock_demand_manufacture($stock_id, $qty, $demand_id, $location, $level
$stock_qty = $qoh_stock[$stock_id];
if ($stock_qty == NULL) $stock_qty = 0;
if ($qty <= $stock_qty) return $demand;
$stock_qty = $qoh_stock[$stock_id];
if ($stock_qty == NULL) $stock_qty = 0;
if ($qty <= $stock_qty) return $demand;
- $bom = $bom_list[$stock_id];
+ $bom =
@
$bom_list[$stock_id];
if ($bom == NULL) {
$sql = "SELECT parent, component, quantity FROM "
.TB_PREF."bom WHERE parent = ".db_escape($stock_id);
if ($bom == NULL) {
$sql = "SELECT parent, component, quantity FROM "
.TB_PREF."bom WHERE parent = ".db_escape($stock_id);
@@
-102,7
+102,9
@@
function get_demand_asm_qty($stock_id, $location)
FROM ".TB_PREF."sales_order_details,
".TB_PREF."sales_orders,
".TB_PREF."stock_master
FROM ".TB_PREF."sales_order_details,
".TB_PREF."sales_orders,
".TB_PREF."stock_master
- WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND ";
+ WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND
+ ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." AND
+ ".TB_PREF."sales_orders.trans_type=".TB_PREF."sales_order_details.trans_type AND ";
if ($location != "")
$sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND ";
$sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
if ($location != "")
$sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND ";
$sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND