diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php
index b721915f..54b419de 100755
--- a/application/controllers/inwardgateregister.php
+++ b/application/controllers/inwardgateregister.php
@@ -482,14 +482,14 @@ class inwardgateregister extends BaseController
                  
                   
                    
-                // if($OutwardQty==$allowed)
-                //  {
+                if($OutwardQty==$allowed)
+                 {
                 	$Status='ST063';
-                 // }
-                 // else
-                 // {
-                 // 	$Status='ST064';
-                 // }
+                 }
+                 else
+                 {
+                  	$Status='ST064';
+                 }
 
 
 
@@ -507,9 +507,13 @@ class inwardgateregister extends BaseController
             	,'PONO_INV'=>$pono,'VehicleNo'=>$vehicle,'Status'=>$Status);
 
                 $updateogrmaster= $this->inwardgateregister_model->UpdateOGR($updateogrmaster,$OGRNO);
-            $postatus=array('Status'=>$Status);
+            $postatus=array('Status'=>OGR_COMPLETE);
 
-               $this->inwardgateregister_model->UpdatePOMasterOGR($postatus,$pono);
+
+
+            //$this->inwardgateregister_model->UpdatePOLineItem($POLineItem,$PONO,$MaterialCode);
+
+                $this->inwardgateregister_model->UpdatePOMasterOGR($postatus,$pono);
 
 
                } 
@@ -517,6 +521,9 @@ class inwardgateregister extends BaseController
 
 		    } 
 
+//$this->inwardgateregister_model->UpdatePOMaster($PONO,$CreatedBy); 
+		    //$this->inwardgateregister_model->updateogrpomaster($pono);
+
 		    if((count($addogrmaster)>0)&&(count($addOgrline)>0) && (count($updateogrmaster)>0))
 		    { 
 		    	echo "Saved Successfully OGR No is OGR".$OGRNO;
@@ -554,7 +561,7 @@ class inwardgateregister extends BaseController
 		    $name= $this->input->post('name');
 		    $pooutward= $this->input->post('pooutward');
 		    $destination= $this->input->post('destination');
-		    $Ogrline= array('OGRNO'=>$OGRNO,'MaterialCode'=>$material,'OutwardQty'=>$pooutward,'Destination'=>$destination,'Status'=>$Status);
+		    $Ogrline= array('OGRNO'=>$OGRNO,'MaterialCode'=>$material,'OutwardQty'=>$pooutward,'Destination'=>$destination,'Status'=>$Status,'Material_Name'=>$name);
 		    
 		    $addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline);
 
diff --git a/application/models/inwardgateregister_model.php b/application/models/inwardgateregister_model.php
index 6dadfb47..ab31658f 100755
--- a/application/models/inwardgateregister_model.php
+++ b/application/models/inwardgateregister_model.php
@@ -183,6 +183,28 @@ class inwardgateregister_model extends CI_Model
 		}   
 		
 	}
+
+
+
+	function updateogrpomaster($pono)
+	{
+        $this->db->select('*');
+        $this->db->from('T_PurchaseOrder_LineItem');
+		$this->db->where('PONO',$pono);
+		$this->db->where('OGR_Status !=','ST064');
+	    
+		$query = $this->db->get();
+		
+		
+        if ($query->num_rows == 0) {
+			$this->db->where('PONO',$pono);
+			$POStatus = array('status'=>'ST063');
+		    $this->db->update('T_PurchaseOrder_Master', $POStatus);
+		}   
+	}
+
+
+
 	function getPOLineItemReceivedQty($PONO,$MaterialCode)
 	{
 		 $this->db->select('ReceivedQuantity');
@@ -305,13 +327,15 @@ class inwardgateregister_model extends CI_Model
 
 
 
-    	 $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
-    	 join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
-    	 where T_PurchaseOrder_Master.SupplierID=? and T_MRIR_Master.MRIRStatus=? and T_PurchaseOrder_Master.PONO not in(select PONO_INV from T_OGR_Master where OgrType=?) group by T_PurchaseOrder_Master.PONO';
+    	 // $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
+    	 // join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
+    	 // where T_PurchaseOrder_Master.SupplierID=? and T_MRIR_Master.MRIRStatus=? and T_PurchaseOrder_Master.PONO not in(select PONO_INV from T_OGR_Master where OgrType=?) group by T_PurchaseOrder_Master.PONO';
 
-    	// $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
-    	// join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
-    	// where T_PurchaseOrder_Master.SupplierID=? and T_MRIR_Master.MRIRStatus=? group by T_PurchaseOrder_Master.PONO';
+     $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
+    	 join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
+    	 where T_PurchaseOrder_Master.SupplierID=? and T_PurchaseOrder_Master.Status=? and T_PurchaseOrder_Master.PONO not in(select PONO_INV from T_OGR_Master where OgrType=?) group by T_PurchaseOrder_Master.PONO';
+
+    	
 
     	//$query= $this->db->query($subQuery, array($supplierId,ST044,PO,ST063));
     	$query= $this->db->query($subQuery, array($supplierId,ST044,PO));
@@ -346,7 +370,7 @@ where T_PurchaseOrder_Master.PONO=?';
 
 	function getPOmaterialDetails($PONO,$materialcode)
 	{
-	$subQuery='select distinct T_PurchaseOrder_LineItem.MaterialCode,MaterialName,T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,T_MRIR_Details.QuantityRejected,balance_Qty 
+	$subQuery='select distinct T_PurchaseOrder_LineItem.MaterialCode,MaterialName,T_PurchaseOrder_LineItem.Quantity as Oqty,sum( T_MRIR_Details.ActualQuantityReceived) as ActualQuantityReceived,sum( T_MRIR_Details.QuantityRejected) as QuantityRejected,balance_Qty 
 		from T_PurchaseOrder_Master
 join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO
 join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO
diff --git a/application/views/editogr.php b/application/views/editogr.php
index 9443aebb..fedaac0a 100644
--- a/application/views/editogr.php
+++ b/application/views/editogr.php
@@ -42,6 +42,7 @@ if(!empty($OGR_Data))
 		$driver=$dt->Driver;
 		$PONO=$dt->PONO_INV;
 		$MaterialCode=$dt->MaterialCode;
+		$MaterialName=$dt->Material_Name;
 		//$name=$dt->;
 		$outqty=$dt->OutwardQty;
 	}
@@ -175,18 +176,32 @@ if(!empty($OGR_Data))
 
 	<div class="col-md-12">
 	<div class="col-md-3">
-	 
+
+
+
+	<div class="col-md-12">
+	 		
+				<label>OGR Type</label>
+					 
+						 <?php
+						$data = array('name' => 'type','value' => set_value('type',$type),'id'=>'type',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                  echo form_input($data);
+						?>
+			 
+	   </div>
+
+     
+ 
 	 	<div class="col-md-12">
+	 		
 				<label>Supplier/Customer</label>
 					 
 						 <?php
 						$data = array('name' => 'supplier','value' => set_value('supplier',$sup),'id'=>'supplier',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
                   echo form_input($data);
 						?>
-
-						 					 
-					 
-			</div>	 			 
+			 
+	   </div>	 			 
 	</div>
 	<div class="col-md-9" style="padding: 0px;">
 	<div class="col-md-12" style="padding: 0px;">
@@ -248,6 +263,8 @@ if(!empty($OGR_Data))
 						 					 
 					 
 			</div>
+
+			
 	</div>
 	</div>
 </div>
@@ -405,12 +422,12 @@ if(!empty($OGR_Data))
 						 					 
 					 
 			</div>
-			<div class="col-md-3" style="display: none">
+			<div class="col-md-3">
 			 <label>Name</label>
 						<div class="form-group">
 						
 									<?php
-							 $data = array('name' => 'name','value' => set_value('name'),'id'=>'name',  'class' => 'form-control');
+							 $data = array('name' => 'name','value' => set_value('name',$MaterialName),'id'=>'name',  'class' => 'form-control');
 							echo form_input($data);
 							?>   
 						</div>
diff --git a/application/views/ogr.php b/application/views/ogr.php
index 235493a3..0c138d58 100644
--- a/application/views/ogr.php
+++ b/application/views/ogr.php
@@ -70,6 +70,7 @@ $Value="&#8377;";
 	  $('#saveinv').hide();
 	  $('#savepo').hide();
 	  $('#saveservice').hide();
+	 $('#supplierselect').hide(); 
 
 	   $("#date").datepicker({
           
@@ -141,7 +142,7 @@ $Value="&#8377;";
 	<div class="col-md-12">
 	<div class="col-md-3">
 	 
-	 	<div class="col-md-12">
+	<!--  <div class="col-md-12">
 				<label>Supplier/Customer</label>
 					 
 						 <?php
@@ -155,7 +156,23 @@ $Value="&#8377;";
 
 						 					 
 					 
-			</div>	 			 
+			</div>	
+ -->
+
+
+				<div class="col-md-12">
+				 
+				 <div class="form-group">
+                   <label>OGR TYPE</label>
+                      <select id="ogrtype"  >
+                       <option value="0">select option</option>
+                   
+                      <option value="2">PO</option>
+                      <option value="3">Service</option>
+                       
+                    </select>
+                    </div>
+             </div>	 				 
 	</div>
 	<div class="col-md-9" style="padding: 0px;">
 	<div class="col-md-12" style="padding: 0px;">
@@ -225,21 +242,39 @@ $Value="&#8377;";
    <!--mv/po/ser starting-->
  <div class="row">
 	<div class="col-md-12">
-<div class="col-md-3">
+<div class="col-md-3" id="supplierselect">
 	 
-	 	<div class="col-md-12">
+	 <!-- 	<div class="col-md-12">
 				 
 				 <div class="form-group">
                    <label>OGR TYPE</label>
                       <select id="ogrtype"  >
                        <option value="0">select option</option>
-                      <!-- <option value="1">INVOICE</option> -->
+                   
                       <option value="2">PO</option>
                       <option value="3">Service</option>
                        
                     </select>
                     </div>
-             </div>	 			 
+             </div>	 	 -->	
+
+
+              <div class="col-md-12">
+				<label>Supplier/Customer</label>
+					 
+						 <?php
+						$options = array("0"=>'Select');     
+						//print_r(  $options);
+
+					 									
+			
+						echo form_dropdown('sup', $options,set_value('sup'),'id="sup"'  ,'required="true"' ,'class="form-control select2');
+						?>
+
+						 					 
+					 
+			</div>	
+	 
 	</div>
 	<div id="mv">
 	<div class="col-md-9" style="padding: 0px;">
@@ -559,6 +594,8 @@ $("#ogrtype").change(function()
         $('#saveinv').hide();
         $('#savepo').show();
         $('#saveservice').hide();
+        
+        $('#supplierselect').show();
        // alert("po")
        // document.getElementById("sup").options.length = 0;
        $('#sup').find('option:not(:first)').remove();
@@ -581,6 +618,8 @@ $("#ogrtype").change(function()
         $('#potable').hide();
         $('#saveservice').show();
         $('#savepo').hide();
+        $('#supplierselect').hide();
+
 
 
       }
@@ -981,8 +1020,16 @@ function QtyCheck(row)
     if(outwardqty>allowed)
     {
       alert("Exceeding allowed amount");
+      $('#outward'+row).val(''); 
       return false;
     }
+
+    else if((outwardqty == ''))
+    {
+       alert("Please Enter Valid Quantity");
+       $('#outward'+row).val(''); 
+       return false;
+    }
     
     else
     {   
@@ -1069,7 +1116,7 @@ function validateOutward()
     {
         if($('#outward'+j).val()=='')
         {
-        	alert("enter");
+        	alert("Please Enter Values");
         	che =1;
         	break;
 
@@ -1139,9 +1186,12 @@ function Save(type)
    {
    	//alert()
 
-    if(validatepo() && validateOutward())
+    if(validatepo() && validateOutward() && QtyCheck())
     {
 
+    	// alert('if');
+    	// die();
+
     	$('#content').loader('show'); 
    	var date= $('#date').val();
    	var newdate = date.split("-").reverse().join("-");