diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php
index 8d868b83..e97d1521 100755
--- a/application/controllers/batchcard.php
+++ b/application/controllers/batchcard.php
@@ -1372,6 +1372,10 @@ class batchcard extends BaseController
 
 
 
+
+
+
+
 	function getFinishedProduct()
 	{
 	    $starting_date = $this->input->post('from_date');
@@ -2114,6 +2118,7 @@ class batchcard extends BaseController
 		}
 	 //$this->loadViews("editmaterialadjustment", $this->global,$data,NULL);
 	}
+
 	function Deletequantity()
 	{
 	$AdjustmentId =  $_GET['AdjustmentId'];
@@ -2124,6 +2129,17 @@ class batchcard extends BaseController
 	$this->loadViews("editmaterialadjustment", $this->global,$data,NULL);
 	}
 
+     function getAvgPrice()
+	{
+		$MaterialCode = $this->input->post('materialcode');
+		$date = $this->input->post('date');
+		$Supplier = $this->input->post('Supplier');
+
+		$pricearray = $this->batchcard_model->GetAvgPrice($MaterialCode,$date,$Supplier);
+       
+         echo json_encode($pricearray);
+		
+	}
 
 }
 ?>
\ No newline at end of file
diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index 83cbf5cb..8a6ad69e 100755
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -323,7 +323,9 @@ else
             $data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM);
             $data['costcentercode'] =$this->rawmaterialdetails_model->getCostCenterCode(); 
             $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM();    
-            $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode();    
+            $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode(); 
+            $data['avg_price'] = $this->rawmaterialdetails_model->getMaterialAvg($RawMaterialID);
+//print_r($data['avg_price']);die();
             $this->global['pageTitle'] = 'Siddharth : Edit Material Master';
             $this->loadViews("editOldRawmaterial", $this->global,$data, NULL);
     }
diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index b28fbdf0..5cce4c7c 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -1205,8 +1205,18 @@ where ProductCode=? and Transactiondate >= ? and Transactiondate <= ?';
         //print_r($this->db->last_query());
         return TRUE;
 	}
-		
-	
+
+  function GetAvgPrice($MaterialCode,$date,$Supplier)
+  {
+  	 $subQuery='select AVG(Rate) as avg_rate from T_PurchaseOrder_LineItem 
+join T_PurchaseOrder_Master on T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO
+where MaterialCode = ? and SupplierID=?';
+
+          $query = $this->db->query($subQuery,array($MaterialCode,$Supplier));			 
+		//print_r($this->db->last_query());
+        return $query->result_array();
+  }
+
 }	
 
 ?>
\ No newline at end of file
diff --git a/application/models/rawmaterialdetails_model.php b/application/models/rawmaterialdetails_model.php
index 507cd066..73d470fd 100755
--- a/application/models/rawmaterialdetails_model.php
+++ b/application/models/rawmaterialdetails_model.php
@@ -284,6 +284,18 @@ WHERE MaterialCode=? AND CreatedOn >=? AND CreatedOn <=? ";
 
        return $query->result();
     }
+
+
+    function getMaterialAvg($RawMaterialID)
+    {
+       $subQuery='select AVG(Rate) as avg_rate from T_PurchaseOrder_LineItem 
+       join T_PurchaseOrder_Master on T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO
+       where MaterialCode = ?';
+
+          $query = $this->db->query($subQuery,array($RawMaterialID));       
+    //print_r($this->db->last_query());
+        return $query->result_array();
+    }
     
 }
 ?>
\ No newline at end of file
diff --git a/application/views/FinalProduct.php b/application/views/FinalProduct.php
index 13351d39..eb9c4ecf 100644
--- a/application/views/FinalProduct.php
+++ b/application/views/FinalProduct.php
@@ -1841,6 +1841,39 @@ $('#EditrawSupplier').change(function()
 
 
 
+$('#EditconsuSupplier').change(function() 
+{
+  var type = "consumables";
+    EditResultantQty(type);
+
+});
+
+$('#Editconsumaterialcode').change(function() 
+{
+  var type = "consumables";
+    EditResultantQty(type);
+
+});
+
+
+
+$('#EditpackSupplier').change(function() 
+{
+  var type = "packing";
+    EditResultantQty(type);
+
+});
+
+$('#Editpackumaterialcode').change(function() 
+{
+  var type = "packing";
+    EditResultantQty(type);
+
+});
+
+
+
+
 var today = new Date();
 var dd = today.getDate();
 var mm = today.getMonth()+1; //January is 0!
@@ -2036,6 +2069,40 @@ function ResultantQty(materialtype)
   
             });
 
+
+       $.ajax({ 
+
+        data:{materialcode:materialcode,Supplier:supplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#rawprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#rawprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
+
+
      }
 
    }
@@ -2192,6 +2259,40 @@ function ResultantQty(materialtype)
   
             });
 
+
+
+            $.ajax({ 
+
+        data:{materialcode:materialcode,Supplier:supplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#consuprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#consuprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
+
      }
 
    }
@@ -2353,6 +2454,42 @@ function ResultantQty(materialtype)
   
             });
 
+
+
+
+
+
+            $.ajax({ 
+
+        data:{materialcode:materialcode,Supplier:supplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#packprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#packprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
      }
 
    }
@@ -2399,6 +2536,28 @@ function EditResultantQty(materialtype)
 
       today = yyyy+'-'+mm+'-'+dd;
 
+
+       var stock_date = '';
+      var stock_date_year = '';
+      var stock_date_month = '';
+      var stock_date_date = '';
+
+       $.each(stock,function(j,fnobj)
+       {
+        if(editmaterialcode == fnobj.MaterialCode)
+        { 
+          
+           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);
+        }
+     
+      })
+
       //alert(today)
       //today = mm+'-'+dd+'-'+yyyy;
 
@@ -2433,9 +2592,50 @@ function EditResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+               if(openqty == null)    
+              {   
+                openqty=0;    
+               }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+
+
+
+
+          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);
+
+          } 
+
+
+
+
+          //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
 
           if(isNaN(resultantqty))
           {
@@ -2459,6 +2659,38 @@ function EditResultantQty(materialtype)
   
             });
 
+
+         $.ajax({ 
+
+        data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#Editrawprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#Editrawprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
      }
 
    }
@@ -2469,6 +2701,28 @@ function EditResultantQty(materialtype)
        var editmaterialcode = $('#Editconsumaterialcode').val();
        var editsupplier =$('#EditconsuSupplier').val();
 
+
+        var stock_date = '';
+       var stock_date_year = '';
+       var stock_date_month = '';
+       var stock_date_date = '';
+
+
+        $.each(stock,function(j,fnobj)
+        {
+        if(editmaterialcode == 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]; 
+        }
+     
+        })
+
         if(((editmaterialcode != 0)&&(editsupplier != 0)))
       {
 
@@ -2524,9 +2778,44 @@ function EditResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+                if(conopenqty == null)
+              {
+                conopenqty=0;
+              }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+         // var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+
+
+          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))
           {
@@ -2550,6 +2839,40 @@ function EditResultantQty(materialtype)
   
             });
 
+
+
+         $.ajax({ 
+
+        data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#Editconsuprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#Editconsuprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
+
      }
 
    }
@@ -2562,6 +2885,27 @@ function EditResultantQty(materialtype)
        var editmaterialcode = $('#Editpackumaterialcode').val();
        var editsupplier =$('#EditpackSupplier').val();
 
+        var stock_date = '';
+       var stock_date_year = '';
+       var stock_date_month = '';
+       var stock_date_date = '';
+
+        $.each(stock,function(j,fnobj)
+       {
+        if(editmaterialcode == 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];     
+        }
+     
+       })
+
+
         if(((editmaterialcode != 0)&&(editsupplier != 0)))
       {
 
@@ -2617,9 +2961,41 @@ function EditResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+               if(packopenqty == null)
+              {
+                packopenqty=0;
+              }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+         // var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+
+         
+           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))
           {
@@ -2643,6 +3019,40 @@ function EditResultantQty(materialtype)
   
             });
 
+
+
+
+        $.ajax({ 
+
+        data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#Editpackprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#Editpackprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
      }
 
    }
diff --git a/application/views/editFinalProduct.php b/application/views/editFinalProduct.php
index 5835c1e3..023fdc18 100644
--- a/application/views/editFinalProduct.php
+++ b/application/views/editFinalProduct.php
@@ -2065,6 +2065,40 @@ function ResultantQty(materialtype)
   
             });
 
+
+
+
+       $.ajax({ 
+
+        data:{materialcode:materialcode,Supplier:supplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#rawprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#rawprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
      }
 
    }
@@ -2221,6 +2255,39 @@ function ResultantQty(materialtype)
   
             });
 
+
+
+            $.ajax({ 
+
+        data:{materialcode:materialcode,Supplier:supplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#consuprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#consuprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
      }
 
    }
@@ -2375,6 +2442,43 @@ function ResultantQty(materialtype)
   
             });
 
+
+
+       
+            $.ajax({ 
+
+        data:{materialcode:materialcode,Supplier:supplier,date:today},
+        type:"POST",
+        url:"<?php echo base_url() ?>batchcard/getAvgPrice",
+        success:function(data) {
+
+          if(data)
+            {
+                var avg_price = 0;
+                $.each(JSON.parse(data),function(i,obj)
+               {
+                   avg_price = parseFloat(obj.avg_rate);
+                    if(isNaN(avg_price))
+                   {
+                       $('#packprice').val(parseFloat(0).toFixed(2))
+                   }
+
+                   else
+                   {
+
+                   $('#packprice').val(parseFloat(avg_price).toFixed(2))
+                    }
+
+               });
+
+            }
+
+        }
+       });
+
+
+
+
      }
 
    }
diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php
index fd1f3c31..71ac0249 100755
--- a/application/views/editOldRawmaterial.php
+++ b/application/views/editOldRawmaterial.php
@@ -56,6 +56,17 @@ if(!empty($materialDetails))
     }
 }
 
+//print_r($avg_price);
+
+$Average_Price =$avg_price[0]['avg_rate'];
+
+$Average_Value = number_format( $Average_Price,2, '.', ''); 
+
+
+
+//number_format( $TotalLanding,2, '.', ''); 
+
+
 
 
 if(!empty($currentstock))
@@ -337,6 +348,19 @@ $("#Date").datepicker({
                                     </div>
                                 </div>
 
+
+
+                             <div class="col-md-3">
+                                    <div class="form-group">
+                                        <label for="conversionfactor">Average Price</label>
+                                        <input type="text" class="form-control" id="avg_price" readonly value="<?php echo $Average_Value?>"  name="avg_price" maxlength="255">
+                                    </div>
+                                </div>
+
+
+
+
+
                                     <div class="col-md-4">
                                      <div class="form-group">
                                         <label for="remarks">Remarks</label>