From 43acff29e6b932dffbfe6b75898fe8ff53da9995 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 28 Nov 2018 16:20:15 +0530
Subject: [PATCH] stock

---
 application/models/batchcard_model.php    | 26 +++++++++++++++++++----
 application/views/materialStockReport.php | 24 ++++++++++-----------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index 7b013318..5dd5fb01 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -1356,6 +1356,8 @@ where MaterialCode = ? and SupplierID=?';
   $tdate = $search['to_date'];
   $todate = date("Y-m-d", strtotime($tdate) );
 
+  $currentyr = date("Y");
+
   //echo $todate;die();
 
   $finyear = $search['year'];
@@ -1417,6 +1419,20 @@ GROUP BY pq.MaterialCode
 
 }
 
+else if($search['month']!='' && $startyr =='' && $endyr =='')
+{
+    
+
+     $subquery.=" left join (select StockId,pq.MaterialCode mc,
+SUM((IF(pq.Transaction_type='Add',Quantity,0))-(IF(pq.Transaction_type='Reduce',Quantity,0))) 
+AS OpeningStock
+FROM T_Material_stock_history AS pq 
+where date(pq.CreatedOn) < '".$currentyr.'-'.$search['month']."-01'
+GROUP BY pq.MaterialCode
+)  as opens on opens.mc = p.MaterialCode";
+
+}
+
 
 else if($search['month']=='' && $startyr !='' && $endyr !='' )
 {
@@ -1461,10 +1477,12 @@ if($search['month']=='' && $startyr =='' && $endyr =='')
 else
 {
 
- // if($search['month']!='' && $startyr !='' && $endyr !='')
- // {
- //     $subquery.=" where month(p.CreatedOn)= '".$search['month']."'";
- // }
+ if($search['month']!='' && $startyr =='' && $endyr =='')
+ {
+     $subquery.=" where date(p.CreatedOn)>= '".$currentyr.'-'.$search['month']."-01' and 
+
+      date(p.CreatedOn)<='".$currentyr.'-'.$search['month']."-31'";
+ }
 
 
  if($search['month']!='' && $startyr !='' && $endyr !='')
diff --git a/application/views/materialStockReport.php b/application/views/materialStockReport.php
index 38d26bc7..4f116df4 100644
--- a/application/views/materialStockReport.php
+++ b/application/views/materialStockReport.php
@@ -307,21 +307,21 @@ $(function() {
                   }
                 }
 
-                else if($data2 == $curyear)
-                {
-                     if($stockmonth>'3')
-                     {
-                          $OpeningTotalStock = $ge->OpeningStock+$ge->stock;
+                // else if($data2 == $curyear)
+                // {
+                //      if($stockmonth>'3')
+                //      {
+                //           $OpeningTotalStock = $ge->OpeningStock+$ge->stock;
 
-                          //$dat ='else if if';
+                //           //$dat ='else if if';
            
-                     }
+                //      }
 
-                     else
-                     {
-                         $OpeningTotalStock = $ge->OpeningStock;
-                     }
-                }
+                //      else
+                //      {
+                //          $OpeningTotalStock = $ge->OpeningStock;
+                //      }
+                // }
 
                 else
                 {