[0004212] Work Order Entry: fixed error when voided WO refence is reused.

[fa-stable.git] / reporting / rep308.php

diff --git a/reporting/rep308.php b/reporting/rep308.php
index 08b8e89806914046e52c25bdb642b90cd1bac28d..ba546b214a82ae4fd102430a04a07219e7cefc8d 100644 (file)
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -11,10 +11,10 @@
 ***********************************************************************/
 $page_security = 'SA_ITEMSVALREP';
 // ----------------------------------------------------------------
-// $ Revision: 2.0 $
-// Creator:    Jujuk, Joe Hunt
-// date_:      2011-05-24
-// Title:      Stock Movements
+// $ Revision: 2.4 $
+// Creator:            boxygen, Joe Hunt
+// date_:              2017-05-14
+// Title:              Costed Inventory Movements
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -30,21 +30,11 @@ 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)
+function get_domestic_price($myrow, $stock_id)
 {
        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?
@@ -54,8 +44,6 @@ function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty)
                        $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;
@@ -123,30 +111,29 @@ function avg_unit_cost($stock_id, $location=null, $to_date)
                                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;
+                       AND move.tran_date < '$to_date' AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
        if ($location != '')
                $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;
+
+       $qty = $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;
+               $price = get_domestic_price($row, $stock_id);
+        $tran_cost = $price * $row['qty'];
+        $tot_cost += $tran_cost;
        }
-       if ($count == 0)
+       if ($qty == 0)
                return 0;
-       return $tot_cost / $count;
+       return $tot_cost / $qty;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -171,7 +158,7 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i
                                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;
+               AND move.tran_date >= '$from_date' AND move.tran_date <= '$to_date' AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER;
 
        if ($location != '')
                $sql .= " AND move.loc_code = ".db_escape($location);
@@ -181,29 +168,23 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i
        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;
+       
+       $qty = $tot_cost = 0;
        while ($row=db_fetch($result))
        {
-               $qty += $row['qty'];
-
-               $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;
+        $qty += $row['qty'];
+        $price = get_domestic_price($row, $stock_id); 
+        $tran_cost = $row['qty'] * $price;
+        $tot_cost += $tran_cost;
        }       
-       if ($count == 0)
+       if ($qty == 0)
                return 0;
-       return $tot_cost / $count;
-
+       return $tot_cost / $qty;
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -237,7 +218,7 @@ function inventory_movements()
        else
                $loc = get_location_name($location);
 
-       $cols = array(0, 60, 130, 160, 185, 215, 250, 275, 305, 340, 365, 395, 430, 455, 485, 520);
+       $cols = array(0, 60, 134, 160, 185, 215, 250, 275, 305, 340, 365, 395, 430, 455, 485, 520);
 
        $headers = array(_('Category'), _('Description'),       _('UOM'), '', '', _('OpeningStock'), '', '',_('StockIn'), '', '', _('Delivery'), '', '', _('ClosingStock'));
        $headers2 = array("", "", "", _("QTY"), _("Rate"), _("Value"), _("QTY"), _("Rate"), _("Value"), _("QTY"), _("Rate"), _("Value"), _("QTY"), _("Rate"), _("Value"));
@@ -284,7 +265,7 @@ function inventory_movements()
                        continue;
                $rep->NewLine();
                $rep->TextCol(0, 1,     $myrow['stock_id']);
-               $rep->TextCol(1, 2, $myrow['name']);
+               $rep->TextCol(1, 2, substr($myrow['name'], 0, 24) . ' ');
                $rep->TextCol(2, 3, $myrow['units']);
                $rep->AmountCol(3, 4, $qoh_start, get_qty_dec($myrow['stock_id']));
                $rep->AmountCol(4, 5, $openCost, $dec);
@@ -320,10 +301,13 @@ function inventory_movements()
        }
        $rep->Line($rep->row  - 4);
        $rep->NewLine(2);
-       $rep->TextCol(0, 1,     _("Total"));
+       $rep->TextCol(0, 1,     _("Total Movement"));
        $rep->AmountCol(5, 6, $totval_open);
        $rep->AmountCol(8, 9, $totval_in);
        $rep->AmountCol(11, 12, $totval_out);
+       $rep->AmountCol(14, 15, $totval_open + $totval_in - $totval_out);
+       $rep->NewLine(1);
+       $rep->TextCol(0, 1,     _("Total Out"));
        $rep->AmountCol(14, 15, $totval_close);
        $rep->Line($rep->row  - 4);