diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index 566c069d..b28fbdf0 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -29,7 +29,7 @@ class batchcard_model extends CI_Model
 
 	function getStockValue()
 	{
-		$this->db->select('MaterialCode,stock');
+		$this->db->select('MaterialCode,stock,stockdate');
 		$this->db->from('T_MaterialMaster');
 		$supp = $this->db->get();
 		return $supp->result();
diff --git a/application/views/FinalProduct.php b/application/views/FinalProduct.php
index 0c585907..13b2e561 100644
--- a/application/views/FinalProduct.php
+++ b/application/views/FinalProduct.php
@@ -1,5 +1,5 @@
  <!-- <?php 
-echo $CId;
+//echo $CId;
  ?>   --> 
 
 
@@ -1841,6 +1841,27 @@ $('#EditrawSupplier').change(function()
 
 
 
+var today = new Date();
+var dd = today.getDate();
+var mm = today.getMonth()+1; //January is 0!
+var yyyy = today.getFullYear();
+
+if(dd<10) {
+    dd = '0'+dd
+} 
+
+if(mm<10) {
+    mm = '0'+mm
+} 
+
+today = yyyy + '-' + mm + '-' + dd;
+//alert(today);
+var today_split = today.split('-');
+var today_date = today_split[2];
+var today_month = today_split[1];
+var today_year = today_split[0];
+
+
 
 var rawresultqty = 0;
 var consuresultant = 0;
@@ -1858,6 +1879,10 @@ function ResultantQty(materialtype)
       var supplier =$('#rawSupplier').val();
       var editmaterialcode = $('#Editrawmaterialcode').val();
       var editsupplier = $('#EditrawSupplier').val();
+      var stock_date = '';
+      var stock_date_year = '';
+      var stock_date_month = '';
+      var stock_date_date = '';
 
        $.each(stock,function(j,fnobj)
        {
@@ -1865,6 +1890,11 @@ function ResultantQty(materialtype)
         { 
           
            openqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2]; 
            //console.log(openqty);
         }
      
@@ -1943,14 +1973,48 @@ function ResultantQty(materialtype)
           // console.log(addqty);
           //    console.log(reduceqty)
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+         // var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
           
           //console.log(resultantqty);
 
+
+
+           if(stock_date_year==today_year)
+          { 
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+
+          } 
+
+
+
+
           if(isNaN(resultantqty))
           {
-             // $('#rawqty').val(0); 
-             $('#rawqty').val(openqty); 
+             $('#rawqty').val(0); 
+             //$('#rawqty').val(openqty); 
              rawresultqty = 0;
           }
           else
@@ -1983,12 +2047,23 @@ function ResultantQty(materialtype)
        var supplier =$('#consuSupplier').val();
        var conopenqty = 0;
 
+       var stock_date = '';
+       var stock_date_year = '';
+       var stock_date_month = '';
+       var stock_date_date = '';
+
+
         $.each(stock,function(j,fnobj)
         {
         if(materialcode == fnobj.MaterialCode)
         { 
            conopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
            //console.log(openqty);
+           stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2]; 
         }
      
         })
@@ -2057,12 +2132,44 @@ function ResultantQty(materialtype)
               }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+          //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+
+         
+          if(stock_date_year==today_year)
+          { 
+                  
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+          }
+
+
+
+
           
           if(isNaN(resultantqty))
           {
-             // $('#consuqty').val(0); 
-              $('#consuqty').val(conopenqty); 
+             $('#consuqty').val(0); 
+             // $('#consuqty').val(conopenqty); 
              consuresultant =0;
 
           }
@@ -2097,6 +2204,10 @@ function ResultantQty(materialtype)
        var materialcode = $('#packumaterialcode').val();
        var supplier =$('#packSupplier').val();
        var packopenqty = 0;
+       var stock_date = '';
+       var stock_date_year = '';
+       var stock_date_month = '';
+       var stock_date_date = '';
 
         $.each(stock,function(j,fnobj)
        {
@@ -2104,6 +2215,11 @@ function ResultantQty(materialtype)
         { 
            packopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
            //console.log(openqty);
+           stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2];     
         }
      
        })
@@ -2171,7 +2287,46 @@ function ResultantQty(materialtype)
               }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+          //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+
+
+           if(stock_date_year==today_year)
+          { 
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+          } 
+
+
+
+
+
+
+
+
+
+
+
+
 
           if(isNaN(resultantqty))
           {
diff --git a/application/views/editFinalProduct.php b/application/views/editFinalProduct.php
index a76a1ffe..e5d1b30e 100644
--- a/application/views/editFinalProduct.php
+++ b/application/views/editFinalProduct.php
@@ -1860,6 +1860,31 @@ $('#EditrawSupplier').change(function()
 
 
 
+
+
+var today = new Date();
+var dd = today.getDate();
+var mm = today.getMonth()+1; //January is 0!
+var yyyy = today.getFullYear();
+
+if(dd<10) {
+    dd = '0'+dd
+} 
+
+if(mm<10) {
+    mm = '0'+mm
+} 
+
+today = yyyy + '-' + mm + '-' + dd;
+//alert(today);
+var today_split = today.split('-');
+var today_date = today_split[2];
+var today_month = today_split[1];
+var today_year = today_split[0];
+
+
+
+
 var rawresultqty = 0;
 var consuresultant = 0;
 var packresultant = 0;
@@ -1876,6 +1901,10 @@ function ResultantQty(materialtype)
       var supplier =$('#rawSupplier').val();
       var editmaterialcode = $('#Editrawmaterialcode').val();
       var editsupplier = $('#EditrawSupplier').val();
+      var stock_date = '';
+      var stock_date_year = '';
+      var stock_date_month = '';
+      var stock_date_date = '';
 
        $.each(stock,function(j,fnobj)
        {
@@ -1883,6 +1912,11 @@ function ResultantQty(materialtype)
         { 
           
            openqty = fnobj.stock == '' ? '0' : fnobj.stock;
+            stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2]; 
            //console.log(openqty);
         }
      
@@ -1958,14 +1992,48 @@ function ResultantQty(materialtype)
           // console.log(addqty);
           //    console.log(reduceqty)
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+         // var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
           
+
+
+         if(stock_date_year==today_year)
+          { 
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+
+          } 
+
+
+
+
           //console.log(resultantqty);
 
           if(isNaN(resultantqty))
           {
-            // $('#rawqty').val(0); 
-             $('#rawqty').val(openqty); 
+            $('#rawqty').val(0); 
+             //$('#rawqty').val(openqty); 
              rawresultqty =0;
           }
           else
@@ -1999,12 +2067,23 @@ function ResultantQty(materialtype)
        var conopenqty = 0;
 
 
+       var stock_date = '';
+       var stock_date_year = '';
+       var stock_date_month = '';
+       var stock_date_date = '';
+
+
         $.each(stock,function(j,fnobj)
         {
         if(materialcode == fnobj.MaterialCode)
         { 
            conopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
            //console.log(openqty);
+           stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2]; 
         }
      
         })
@@ -2072,12 +2151,45 @@ function ResultantQty(materialtype)
               }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+          //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
        
+
+
+          if(stock_date_year==today_year)
+          { 
+                  
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
+          }
+
+
+
+
+
           if(isNaN(resultantqty))
           {
-             //$('#consuqty').val(0); 
-                $('#consuqty').val(conopenqty); 
+             $('#consuqty').val(0); 
+                //$('#consuqty').val(conopenqty); 
                 consuresultant = 0;
           }
           else
@@ -2112,12 +2224,22 @@ function ResultantQty(materialtype)
        var supplier =$('#packSupplier').val();
        var packopenqty = 0;
 
+       var stock_date = '';
+       var stock_date_year = '';
+       var stock_date_month = '';
+       var stock_date_date = '';
+
         $.each(stock,function(j,fnobj)
        {
         if(materialcode == fnobj.MaterialCode)
         { 
            packopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
            //console.log(openqty);
+           stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2];  
         }
      
        })
@@ -2185,13 +2307,43 @@ function ResultantQty(materialtype)
               }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+          //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+
+
+         if(stock_date_year==today_year)
+          { 
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
+          } 
+
+
+
 
           if(isNaN(resultantqty))
           {
-             //$('#packqty').val(0); 
+             $('#packqty').val(0); 
 
-             $('#packqty').val(packopenqty);
+             //$('#packqty').val(packopenqty);
              packresultant =0;
           }
           else
diff --git a/application/views/materialadjustment.php b/application/views/materialadjustment.php
index aa3182c5..c10f660a 100644
--- a/application/views/materialadjustment.php
+++ b/application/views/materialadjustment.php
@@ -1,5 +1,21 @@
 <?php 
-//print_r($stock_value);
+$stock_date='';
+$stock_month = '';
+$stock_year = '';
+$sdate= '';
+if(!empty($stock_value))
+{
+foreach($stock_value as $st)
+{ 
+   $sdate = $st->stockdate;
+}
+}
+
+  $stock_year = date('Y', strtotime($sdate));
+  $parts = explode('-',$sdate);
+  $stock_month = $parts[1];
+  $stock_date = $parts[2];
+
 ?>
 
 <script> 
@@ -264,6 +280,31 @@ $(function() {
 <script type="text/javascript">
 
 var stock = <?php echo json_encode($stock_value, JSON_PRETTY_PRINT) ?>;
+
+var today = new Date();
+var dd = today.getDate();
+var mm = today.getMonth()+1; //January is 0!
+var yyyy = today.getFullYear();
+
+if(dd<10) {
+    dd = '0'+dd
+} 
+
+if(mm<10) {
+    mm = '0'+mm
+} 
+
+today = yyyy + '-' + mm + '-' + dd;
+//alert(today);
+var today_split = today.split('-');
+var today_date = today_split[2];
+var today_month = today_split[1];
+var today_year = today_split[0];
+
+// console.log(today_date);
+// console.log(today_month);
+// console.log(today_year);
+
 //sconsole.log(stock);
 
 
@@ -275,16 +316,21 @@ $('.getdetails').click(function()
    var date = $('#date').val();
    var Supplier = $('#supplier').val();
    var openqty = '';
+   var stock_date = '';
+   var stock_date_year = '';
+   var stock_date_month = '';
+   var stock_date_date = '';
 
    $.each(stock,function(j,fnobj)
    {
         if(materialcode == fnobj.MaterialCode)
         { 
-           //console.log(materialcode);
-           //console.log(fnobj.MaterialCode);
-           //console.log(fnobj.stock);
            openqty = fnobj.stock == '' ? '0' : fnobj.stock;
-           //console.log(openqty);
+           stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
+           var split = stock_date.split('-');
+           stock_date_year = split[0];
+           stock_date_month = split[1];
+           stock_date_date  = split[2];     
         }
      
    })
@@ -326,14 +372,46 @@ $('.getdetails').click(function()
               }
    	   	  });
 
-   	   	  var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+   	   	  //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+
+            
+         
+          if(stock_date_year==today_year)
+          { 
+                    if(stock_date_month<=03)
+                    {
+                        var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+
+                        
+                    }
+
+                    else
+                    {
+                         var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+
+                    }
+
+          }
+          else if(stock_date_year<today_year)
+          {
+                    //$total= $y;
+            var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
+          }
+          else if(stock_date_year>today_year)
+          {
+              var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
+          } 
+                 
+
+
+
           //console.log(resultantqty);
           //console.log(openqty);
 
    	   	  if(isNaN(resultantqty))
    	   	  {
-             //$('#Qty_aspersystem').val(0);
-              $('#Qty_aspersystem').val(openqty); 
+             $('#Qty_aspersystem').val(0);
+              //$('#Qty_aspersystem').val(openqty); 
    	   	  }
    	   	  else
    	   	  {