X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep308.php;h=53f8195eecdb1b57db556fc89e809c4fd312efaa;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=e0286c63bc31e3f90cc6cf7040dd3d11a059fced;hpb=9145f42a983ab1e8119092c1bb225c060e29e97a;p=fa-stable.git diff --git a/reporting/rep308.php b/reporting/rep308.php index e0286c63..53f8195e 100644 --- a/reporting/rep308.php +++ b/reporting/rep308.php @@ -30,6 +30,37 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc"); inventory_movements(); +function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty) +{ + if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT) + { + $price = $myrow['price']; + if ($myrow['type'] == ST_SUPPRECEIVE) + { + // Has the supplier invoice increased the receival price? + $sql = "SELECT DISTINCT act_price FROM ".TB_PREF."purch_order_details pod INNER JOIN ".TB_PREF."grn_batch grn ON pod.order_no = + grn.purch_order_no WHERE grn.id = ".$myrow['trans_no']." AND pod.item_code = '$stock_id'"; + $result = db_query($sql, "Could not retrieve act_price from purch_order_details"); + $row = db_fetch_row($result); + if ($row[0] > 0 AND $row[0] <> $myrow['price']) + $price = $row[0]; + } + if ($myrow['person_id'] > 0) + { + // Do we have foreign currency? + $supp = get_supplier($myrow['person_id']); + $currency = $supp['curr_code']; + $ex_rate = get_exchange_rate_to_home_currency($currency, sql2date($myrow['tran_date'])); + $price /= $ex_rate; + } + } + elseif ($myrow['type'] != ST_INVADJUST) // calcutale the price from avg. price + $price = ($myrow['standard_cost'] * $qty - $old_std_cost * $old_qty) / $myrow['qty']; + else + $price = $myrow['standard_cost']; // Item Adjustments just have the real cost + return $price; +} + function fetch_items($category=0) { $sql = "SELECT stock_id, stock.description AS name, @@ -59,7 +90,7 @@ function trans_qty($stock_id, $location=null, $from_date, $to_date, $inward = tr $sql = "SELECT ".($inward ? '' : '-')."SUM(qty) FROM ".TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id)." AND tran_date >= '$from_date' - AND tran_date <= '$to_date'"; + AND tran_date <= '$to_date' AND type <> ".ST_LOCTRANSFER; if ($location != '') $sql .= " AND loc_code = ".db_escape($location); @@ -84,19 +115,38 @@ function avg_unit_cost($stock_id, $location=null, $to_date) $to_date = date2sql($to_date); - $sql = "SELECT AVG (standard_cost) FROM ".TB_PREF."stock_moves - WHERE stock_id=".db_escape($stock_id)." - AND tran_date < '$to_date'"; + $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id + FROM ".TB_PREF."stock_moves move + LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type + LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type + LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id + LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type + LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no + WHERE stock_id=".db_escape($stock_id)." + AND move.tran_date < '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER; if ($location != '') - $sql .= " AND loc_code = ".db_escape($location); - - $result = db_query($sql, "QOH calculation failed"); - - $myrow = db_fetch_row($result); - - return $myrow[0]; - + $sql .= " AND move.loc_code = ".db_escape($location); + $sql .= " ORDER BY tran_date"; + + $result = db_query($sql, "No standard cost transactions were returned"); + if ($result == false) + return 0; + $qty = $old_qty = $count = $old_std_cost = $tot_cost = 0; + while ($row=db_fetch($result)) + { + $qty += $row['qty']; + + $price = get_domestic_price($row, $stock_id, $qty, $old_std_cost, $old_qty); + + $old_std_cost = $row['standard_cost']; + $tot_cost += $price; + $count++; + $old_qty = $qty; + } + if ($count == 0) + return 0; + return $tot_cost / $count; } //---------------------------------------------------------------------------------------------------- @@ -113,24 +163,46 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i $to_date = date2sql($to_date); - $sql = "SELECT AVG (standard_cost) FROM ".TB_PREF."stock_moves + $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id + FROM ".TB_PREF."stock_moves move + LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type + LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type + LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id + LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type + LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no WHERE stock_id=".db_escape($stock_id)." - AND tran_date >= '$from_date' - AND tran_date <= '$to_date'"; + AND move.tran_date <= '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER; if ($location != '') - $sql .= " AND loc_code = ".db_escape($location); + $sql .= " AND move.loc_code = ".db_escape($location); if ($inward) $sql .= " AND qty > 0 "; else $sql .= " AND qty < 0 "; + $sql .= " ORDER BY tran_date"; + $result = db_query($sql, "No standard cost transactions were returned"); + if ($result == false) + return 0; + $qty = $count = $old_qty = $old_std_cost = $tot_cost = 0; + while ($row=db_fetch($result)) + { + $qty += $row['qty']; - $result = db_query($sql, "QOH calculation failed"); - - $myrow = db_fetch_row($result); - - return $myrow[0]; + $price = get_domestic_price($row, $stock_id, $qty, $old_std_cost, $old_qty); + + if (strncmp($row['tran_date'], $from_date,10) >= 0) + { + $tot_cost += $price; + $count++; + } + + $old_std_cost = $row['standard_cost']; + $old_qty = $qty; + } + if ($count == 0) + return 0; + return $tot_cost / $count; } @@ -201,11 +273,6 @@ function inventory_movements() $rep->fontSize -= 2; $rep->NewLine(); } - $rep->NewLine(); - $rep->TextCol(0, 1, $myrow['stock_id']); - $rep->TextCol(1, 2, $myrow['name']); - $rep->TextCol(2, 3, $myrow['units']); - $qoh_start = get_qoh_on_date($myrow['stock_id'], $location, add_days($from_date, -1)); $qoh_end = get_qoh_on_date($myrow['stock_id'], $location, $to_date); @@ -213,6 +280,12 @@ function inventory_movements() $outward = trans_qty($myrow['stock_id'], $location, $from_date, $to_date, false); $openCost = avg_unit_cost($myrow['stock_id'], $location, $from_date); $unitCost = avg_unit_cost($myrow['stock_id'], $location, add_days($to_date, 1)); + if ($qoh_start == 0 && $inward == 0 && $outward == 0 && $qoh_end == 0) + continue; + $rep->NewLine(); + $rep->TextCol(0, 1, $myrow['stock_id']); + $rep->TextCol(1, 2, $myrow['name']); + $rep->TextCol(2, 3, $myrow['units']); $rep->AmountCol(3, 4, $qoh_start, get_qty_dec($myrow['stock_id'])); $rep->AmountCol(4, 5, $openCost, $dec); $openCost *= $qoh_start; @@ -257,4 +330,3 @@ function inventory_movements() $rep->End(); } -?> \ No newline at end of file