Bug 5106: Incorrect field length for inserting a kit. Also in Foreign Item Codes...

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

diff --git a/reporting/rep308.php b/reporting/rep308.php
index 2187717734cbf67c68ebca1f2c9a100eef630bcf..0981c2ad64276153b9e67943192ad18a9e34547a 100644 (file)
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -32,22 +32,23 @@ inventory_movements();
 
 function get_domestic_price($myrow, $stock_id)
 {
-       if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
-       {
-               $price = $myrow['price'];
-               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;
-               }       
-       }
-       else
-               $price = $myrow['standard_cost']; // Item Adjustments just have the real cost
-       return $price;
-}      
+    if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
+     {
+        $price = $myrow['price'];
+        if ($myrow['person_id'] > 0)
+        {
+            // Do we have foreign currency?
+            $supp = get_supplier($myrow['person_id']);
+            $currency = $supp['curr_code'];
+            $ex_rate = $myrow['ex_rate'];
+            $price *= $ex_rate;
+        }
+    }
+    else
+        $price = $myrow['standard_cost']; //pick standard_cost for sales deliveries
+
+    return $price;
+}
 
 function fetch_items($category=0)
 {
@@ -103,7 +104,7 @@ function avg_unit_cost($stock_id, $location=null, $to_date)
 
        $to_date = date2sql($to_date);
 
-       $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id
+       $sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate
                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
@@ -111,7 +112,7 @@ 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);
@@ -150,7 +151,7 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i
 
        $to_date = date2sql($to_date);
 
-       $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id
+       $sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate
                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
@@ -158,7 +159,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);
@@ -218,7 +219,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"));
@@ -265,7 +266,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);
@@ -301,10 +302,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);