diff --git a/application/config/constants.php b/application/config/constants.php
index 504eb56d..4964acf8 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -121,6 +121,14 @@ define('STORE_PARTIALLYISSUSED',                'ST055');
 define('STORE_ONHOLD',                          'ST038');
 define('STORE_REJECT',                          'ST039');
 
+/* OGR status */
+define('OGR_PARTIAL_COMPLETE',                  'ST064');
+define('OGR_COMPLETE',                  		'ST063');
+define('ST044',									'ST044');
+define('PO',									'PO');
+define('ST063',									'ST063');
+
+
 //pomaster status update//
 define('AMOUNT_PAID',                            'ST057');
 define('NO_PAID',                                'ST058');
diff --git a/application/config/routes.php b/application/config/routes.php
index 1da15401..a05ba3d1 100755
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -201,6 +201,13 @@ $route['ViewigrDetails'] = "inwardgateregister/viewIGRDetails";
 
 $route['ViewMRIRBilling'] = "MRIRcontroller/viewmrirforbilling";
 
+
+//<------------OGR Page------------------>
+$route['AddOgr'] = "inwardgateregister/addoutwardgateregister";
+$route['ViewOgr'] = "inwardgateregister/ViewOgr";
+$route['EditOGR']="inwardgateregister/EditOGR";
+
+
 //<-------------MRIR page----------------->
 $route['EditMRIR'] = "MRIRcontroller/editmaterialinspectionreport";
 $route['ViewMRIR'] = "MRIRcontroller/viewmaterialinspectionreport";
diff --git a/application/controllers/inwardgateregister.php b/application/controllers/inwardgateregister.php
index b8d28204..90ee79c5 100755
--- a/application/controllers/inwardgateregister.php
+++ b/application/controllers/inwardgateregister.php
@@ -61,6 +61,74 @@ class inwardgateregister extends BaseController
         $this->loadViews("inwardgateregister", $this->global, $data, NULL);
          
     }
+
+
+    function addoutwardgateregister()
+    {
+		
+		$this->load->model('inwardgateregister_model');
+        $this->global['pageTitle'] = 'Siddharth : Add Outward Gate Register';
+       
+		$data['Customer'] = $this->inwardgateregister_model->getCustomer();
+		$data['Supplier'] = $this->inwardgateregister_model->getSupplier();
+		//$data['Invoice'] = $this->inwardgateregister_model->getInvoice();
+
+
+		//print_r($data['PO_NO']);	 
+        $this->loadViews("ogr", $this->global, $data, NULL);
+         
+    }
+
+
+    function ViewOgr()
+    {
+    	$this->load->model('inwardgateregister_model');
+        $this->global['pageTitle'] = 'Siddharth : View Outward Gate Register';
+       
+		$data['OGR_Data'] = $this->inwardgateregister_model->getOGRData();
+
+		//print_r($data['OGR_Data']);
+	 
+        $this->loadViews("ogrlist", $this->global, $data, NULL);
+
+    }
+
+
+    function EditOGR()
+    {
+    	$OGRNO =  $_GET['OGRNO'];
+        $this->global['pageTitle'] = 'Siddharth : View Outward Gate Register';
+        $data['OGR_Data'] = $this->inwardgateregister_model->getOGRDataforedit($OGRNO);
+    	$data['OGR_line'] = $this->inwardgateregister_model->getOGRlineDataforedit($OGRNO);
+    	$this->loadViews("editogr", $this->global, $data, NULL);
+    }
+
+    function GetInvoices()
+    {
+
+    	$CustomerId = $this->input->post('customerId');
+
+    	$data = $this->inwardgateregister_model->getInvoice($CustomerId);
+    	echo json_encode($data);
+
+
+    }
+
+
+    function GetPO()
+    {
+    	$supplierId = $this->input->post('supplierId');
+
+    	$data = $this->inwardgateregister_model->getPO($supplierId);
+    	echo json_encode($data);
+    }
+
+    function getPODetails()
+    {
+    	$PONO = $this->input->post('PONO');
+    	$data = $this->inwardgateregister_model->getPODetails($PONO);
+    	echo json_encode($data);
+    }
 	
 	function getDateformat($Val)
 	{
@@ -116,9 +184,10 @@ class inwardgateregister extends BaseController
                         }
 	
 	}
-	  function addNewigr()
+   function addNewigr()
     {
-						
+			// echo "add";
+			// die();			
                 
                 $PONO = $this->input->post('PONO');                       
                 
@@ -260,6 +329,170 @@ class inwardgateregister extends BaseController
         
         $this->loadViews("404", $this->global, NULL, NULL);
     }
+
+
+
+
+    function AddOgr()
+    {
+    	//echo "string";
+    	$type=$this->input->post('type');
+    	$Supplier = $this->input->post('sup');
+    	$Date = $this->input->post('Date');
+    	$vehicle =$this->input->post('Vehicle');
+    	$driver = $this->input->post('drive');
+    	
+    	if($type == 1)
+    	{
+            $invoice =$this->input->post('invno');
+            $Otype='Invoice';
+            $Status ='ST063';
+            $ogrmaster = array('OgrType'=>$Otype,'CreatedDate'=>$Date,'Driver'=>$driver
+            	,'PONO_INV'=>$invoice,'VehicleNo'=>$vehicle,'Status'=>$Status);
+            $addogrmaster= $this->inwardgateregister_model->AddOGR($ogrmaster);
+            $OGRNO = '';
+
+			 if(count($addogrmaster)>0)
+			{  
+				foreach($addogrmaster as $add)
+				{
+
+                $OGRNO =  $add->OGRNO;
+                }
+		    }
+
+
+		    $itemcode =$this->input->post('itemcode');
+		    $Description = $this->input->post('Description');
+		    $invoutwardqty = $this->input->post('invoutwardqty');
+
+		    $Ogrline= array('OGRNO'=>$OGRNO,'MaterialCode'=>$itemcode,'OutwardQty'=>$invoutwardqty,'Status'=>$Status);
+		    $addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline);
+
+
+		    if((count($addogrmaster)>0)&&(count($addOgrline>0)))
+		    { 
+		    	echo "Saved Successfully OGR No is OGR".$OGRNO;
+
+		    }
+  
+    		
+    	}
+
+    	else if($type == 2)
+    	{
+    		
+    		//die();
+    		$pono =$this->input->post('pono');
+            //$type='PO';
+            $Otype='PO';
+            $Status='ST063';
+
+            $row= $this->input->post('rowcount');
+            $ogrmaster = array('OgrType'=>$Otype,'CreatedDate'=>$Date,'Driver'=>$driver
+            	,'PONO_INV'=>$pono,'VehicleNo'=>$vehicle,'Status'=>$Status);
+
+            //$Igr_Details= $this->inwardgateregister_model->GetIGR_Details($pono);
+
+            $addogrmaster= $this->inwardgateregister_model->AddOGR($ogrmaster);
+
+            //print_r($addogrmaster);
+
+           $OGRNO = '';
+
+           //echo count($addogrmaster);
+
+			 if(count($addogrmaster)>0)
+			{  
+				foreach($addogrmaster as $add)
+				{
+
+                $OGRNO =  $add->OGRNO;
+                }
+		    }
+
+
+		    for($i=1;$i<=$row;$i++)
+		    { 
+
+		    	$MaterialCode = $this->input->post('materialcode'.$i);
+		    	$OutwardQty = $this->input->post('outward'.$i);
+		    	$rejqty = $this->input->post('RejectedQty'.$i);
+		    	$balance_Qty= $rejqty-$OutwardQty;
+                
+                // if($OutwardQty==$rejqty)
+                // {
+                	$Status='ST063';
+                // }
+                // else
+                // {
+                // 	$Status='ST064';
+                // }
+
+		    	$Ogrline= array('OGRNO'=>$OGRNO,'MaterialCode'=>$MaterialCode,'OutwardQty'=>$OutwardQty,'Status'=>$Status,'balance_Qty'=>$balance_Qty);
+		    	$addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline);
+
+		    	$updateogrmaster = array('OgrType'=>$Otype,'CreatedDate'=>$Date,'Driver'=>$driver
+            	,'PONO_INV'=>$pono,'VehicleNo'=>$vehicle,'Status'=>$Status);
+
+                $updateogrmaster= $this->inwardgateregister_model->UpdateOGR($updateogrmaster,$OGRNO);
+ 
+
+
+		    } 
+
+		    if((count($addogrmaster)>0)&&(count($addOgrline)>0) && (count($updateogrmaster)>0))
+		    { 
+		    	echo "Saved Successfully OGR No is OGR".$OGRNO;
+
+		    }        
+
+    	}
+
+
+    	else if($type ==3)
+    	{
+    		 $Otype='SERVICE';
+    		 $Status ='ST063';
+    		 $ogrmaster = array('OgrType'=>$Otype,'CreatedDate'=>$Date,'Driver'=>$driver,'VehicleNo'=>$vehicle,'Status'=>$Status);
+
+            $addogrmaster= $this->inwardgateregister_model->AddOGR($ogrmaster);
+
+
+            //print_r($addogrmaster);
+
+           $OGRNO = '';
+
+           //echo count($addogrmaster);
+
+			 if(count($addogrmaster)>0)
+			{  
+				foreach($addogrmaster as $add)
+				{
+
+                $OGRNO =  $add->OGRNO;
+                }
+		    }
+
+		    $material= $this->input->post('material');
+		    $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);
+		    
+		    $addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline);
+
+		    if((count($addogrmaster)>0)&&(count($addOgrline>0)))
+		    { 
+		    	echo "Saved Successfully OGR No is OGR".$OGRNO;
+
+		    }
+
+
+    	}
+
+
+    }
 }
 
 ?>
\ No newline at end of file
diff --git a/application/models/inwardgateregister_model.php b/application/models/inwardgateregister_model.php
index 42f1a753..c6f125bc 100755
--- a/application/models/inwardgateregister_model.php
+++ b/application/models/inwardgateregister_model.php
@@ -34,10 +34,11 @@ class inwardgateregister_model extends CI_Model
 	function getpurchaseorder()
     {
 		$this->db->distinct();
-	   $this->db->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address,POM.status');
+	   $this->db->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address,POM.status,OGM.Status as Ostatus');
        $this->db->from('T_PurchaseOrder_Master POM');
 	    $this->db->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO');
 	   $this->db->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID');
+	   $this->db->join('T_OGR_Master OGM ', 'POM.PONO = OGM.PONO_INV','left');
 		$this->db->where('POM.Status',PO_RELEASED);
 		$this->db->where('POM.POType !=',SERVICE);
 	    $this->db->or_where('POM.Status',IGR_CREATED);
@@ -54,13 +55,15 @@ class inwardgateregister_model extends CI_Model
 	function viewpurchaseorder($PO)
     {
 		
-		$subQuery ='SELECT distinct POM.PONO,POL.MaterialCode,POL.Quantity,POL.ReceivedQuantity,(POL.Quantity -POL.ReceivedQuantity ) as 	PendingQty,POL.PONO,MM.MaterialName,MM.UOM
+		$subQuery ='SELECT distinct POM.PONO,POL.MaterialCode,POL.Quantity,POL.ReceivedQuantity,(POL.Quantity -POL.ReceivedQuantity ) as PendingQty,QuantityRejected,POL.PONO,MM.MaterialName,MM.UOM
 				from T_PurchaseOrder_Master POM   
 				 left join  T_PurchaseOrder_LineItem POL on POL.PONO = POM.PONO 
 				 left join  T_IGR_Master IGM on IGM.PONO =POL.PONO 
 				 left join T_IGR_Details igr on  igr.MaterialCode = POL.MaterialCode and  IGM.PONO =POL.PONO 
-				left join T_MaterialMaster MM
-				on  MM.MaterialCode = POL.MaterialCode where POM.PONO=? ';// and POM.Status not in(?)	';
+				left join T_MaterialMaster MM on  MM.MaterialCode = POL.MaterialCode 
+                left join T_MRIR_Master MRM on POM.PONO=MRM.PONO
+				left join T_MRIR_Details MRD on MRM.MRIRNO=MRD.MRIRNO and POL.MaterialCode=MRD.MaterialCode
+				where POM.PONO=? ';// and POM.Status not in(?)	';
 							
 			 $query = $this->db->query($subQuery, array($PO,IGR_CREATED));	
 		 
@@ -173,4 +176,203 @@ class inwardgateregister_model extends CI_Model
         $result = $query->result();        
         return $result;
 	}
+
+
+	function getCustomer()
+	{
+        $subQuery='select client_id,client_name from ip_clients';	
+         $query = $this->db->query($subQuery);	
+         //print_r( $this->db->last_query());
+		 return $query->result();
+
+	}
+
+
+	function getSupplier()
+	{
+        $subQuery='select SupplierID,SupplierName from T_SupplierDetailsN';	
+         $query = $this->db->query($subQuery);	
+         //print_r( $this->db->last_query());
+		 return $query->result();
+
+	}
+
+
+
+	function getOGRData()
+	{
+		$this->db->select('T_OGR_Master.*,T_OGR_Details.*,SupplierName');
+		$this->db->from('T_OGR_Master');
+		$this->db->join('T_OGR_Details','T_OGR_Details.OGRNO=T_OGR_Master.OGRNO');
+		$this->db->join('T_PurchaseOrder_Master','T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV','left');
+		$this->db->join('T_SupplierDetailsN','T_SupplierDetailsN.SupplierID=T_PurchaseOrder_Master.SupplierID','left');
+		$this->db->group_by('T_OGR_Master.OGRNO');
+		//$this->db->where();
+		$query = $this->db->get();
+        //print_r( $this->db->last_query());
+        $result = $query->result();        
+        return $result;	
+	}
+
+
+	function getOGRDataforedit($OGRNO)
+	{
+		$this->db->select('T_OGR_Master.*,SupplierName,T_OGR_Details.*');
+		$this->db->from('T_OGR_Master');
+		$this->db->join('T_OGR_Details','T_OGR_Details.OGRNO=T_OGR_Master.OGRNO');
+		$this->db->join('T_PurchaseOrder_Master','T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV','left');
+		$this->db->join('T_SupplierDetailsN','T_SupplierDetailsN.SupplierID=T_PurchaseOrder_Master.SupplierID','left');
+		$this->db->where('T_OGR_Master.OGRNO',$OGRNO);
+		//$this->db->group_by('T_OGR_Master.OGRNO');
+		
+		$query = $this->db->get();
+        //print_r( $this->db->last_query());
+        $result = $query->result();        
+        return $result;	
+	}
+
+
+
+	function getOGRlineDataforedit($OGRNO)
+	{
+        $this->db->select('T_OGR_Details.*,MaterialName,ActualQuantityReceived,Quantity,QuantityRejected');
+        $this->db->from('T_OGR_Details');
+        $this->db->join('T_MaterialMaster','T_MaterialMaster.MaterialCode=T_OGR_Details.MaterialCode');
+        $this->db->join('T_OGR_Master','T_OGR_Master.OGRNO=T_OGR_Details.OGRNO');
+        $this->db->join('T_MRIR_Master','T_MRIR_Master.PONO=T_OGR_Master.PONO_INV','left');
+        $this->db->join('T_MRIR_Details','T_MRIR_Details.MRIRNO=T_MRIR_Master.MRIRNO and T_MRIR_Details.MaterialCode=T_OGR_Details.MaterialCode');
+        $this->db->join('T_PurchaseOrder_Master','T_PurchaseOrder_Master.PONO=T_MRIR_Master.PONO');
+        $this->db->join('T_PurchaseOrder_LineItem','T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO and T_OGR_Details.MaterialCode=T_PurchaseOrder_LineItem.MaterialCode');
+        $this->db->where('T_OGR_Details.OGRNO',$OGRNO);
+
+		$query = $this->db->get();
+       // print_r( $this->db->last_query());
+        $result = $query->result();        
+        return $result;	
+	}
+
+	function getInvoice($CustomerId)
+	{
+	 
+	   $this->db->select('ip_invoices.invoice_id,invoice_number,item_product_id,item_name,item_quantity');
+       $this->db->from('ip_invoices');
+       $this->db->join('ip_invoice_items','ip_invoice_items.invoice_id = ip_invoices.invoice_id');
+       $this->db->join('ip_clients','ip_invoices.client_id = ip_clients.client_id');
+
+       $this->db->where('ip_invoices.client_id',$CustomerId);
+		
+	   $query = $this->db->get();
+        //print_r( $this->db->last_query());
+        $result = $query->result();        
+        return $result;	
+	}
+
+
+
+	function getPO($supplierId)
+    {
+    //    $this->db->select('T_PurchaseOrder_Master.PONO');
+    //    $this->db->from('T_PurchaseOrder_Master');
+    //    $this->db->join('T_MRIR_Master','T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO');
+    //    $this->db->where('T_PurchaseOrder_Master.SupplierID',$supplierId);
+    //    $this->db->where('T_MRIR_Master.MRIRStatus','ST044');
+
+    //    $this->db->group_by('T_PurchaseOrder_Master.PONO');
+		
+	   // $query = $this->db->get();
+    //    // print_r( $this->db->last_query());
+    //     $result = $query->result();        
+    //     return $result;	
+
+
+
+    	$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=? and Status=?) group by T_PurchaseOrder_Master.PONO';
+
+    	$query= $this->db->query($subQuery, array($supplierId,ST044,PO,ST063));
+        return $query->result();
+        
+    } 
+
+	function getPODetails($PONO)
+	{
+	   
+      $subQuery ='select T_PurchaseOrder_Master.PONO,T_PurchaseOrder_LineItem.MaterialCode,
+T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,
+T_MRIR_Details.QuantityRejected,MaterialName,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
+join T_MRIR_Details on T_MRIR_Master.MRIRNO = T_MRIR_Details.MRIRNO and T_PurchaseOrder_LineItem.MaterialCode=T_MRIR_Details.MaterialCode
+join T_MaterialMaster on T_MRIR_Details.MaterialCode=T_MaterialMaster.MaterialCode
+left join T_OGR_Master on T_PurchaseOrder_Master.PONO=T_OGR_Master.PONO_INV
+left join T_OGR_Details on T_OGR_Master.OGRNO=T_OGR_Details.OGRNO and T_PurchaseOrder_LineItem.MaterialCode= T_OGR_Details.MaterialCode
+where T_PurchaseOrder_Master.PONO=? and T_PurchaseOrder_LineItem.MaterialCode not in 
+(select T_OGR_Details.MaterialCode from T_OGR_Details  
+join T_OGR_Master on T_OGR_Details.OGRNO=T_OGR_Master.OGRNO where PONO_INV=? and T_OGR_Details.Status=?)';
+							
+	  $query = $this->db->query($subQuery, array($PONO,$PONO,OGR_COMPLETE));	
+	 // print_r($this->db->last_query());
+	  return $query->result();
+    
+       
+	}
+
+
+
+	function AddOGR($ogrmaster)
+	{
+		 	$this->db->trans_start();
+			$this->db->insert('T_OGR_Master', $ogrmaster);        
+			$insert_id = $this->db->affected_rows();         
+			$this->db->trans_complete();
+			// print_r($this->db->last_query());		
+		//print_r($insert_id);
+			if($insert_id>0)
+			{
+				$subQuery = 'select max(OGRNO) as OGRNO from T_OGR_Master';   
+          
+				$query = $this->db->query($subQuery);
+        
+				return $query->result();
+			}
+	}
+
+
+	function UpdateOGR($updateogrmaster,$OGRNO)
+	{
+		$this->db->where('OGRNO',$OGRNO);
+		//$this->db->where('MaterialCode', $MaterialCode);
+        $this->db->update('T_OGR_Master', $updateogrmaster);
+        
+        return TRUE;
+	}
+
+
+	function AddOgrLine($Ogrline)
+	{
+		$this->db->trans_start();
+ 		$this->db->insert('T_OGR_Details',$Ogrline);        
+    	$insert_id = $this->db->affected_rows();         
+    	$this->db->trans_complete();
+    	return $insert_id;
+	}
+
+
+	// function GetIGR_Details($pono)
+	// {
+	// 	 $this->db->select('IGRNO,MRIRNO,MaterialCode,');
+ //       $this->db->from('ip_invoices');
+ //       $this->db->join('ip_invoice_items','ip_invoice_items.invoice_id = ip_invoices.invoice_id');
+ //       $this->db->join('ip_clients','ip_invoices.client_id = ip_clients.client_id');
+
+ //       $this->db->where('ip_invoices.client_id',$CustomerId);
+		
+	//    $query = $this->db->get();
+ //        //print_r( $this->db->last_query());
+ //        $result = $query->result();        
+ //        return $result;	
+	// }
+
 }
\ No newline at end of file
diff --git a/application/views/editogr.php b/application/views/editogr.php
new file mode 100644
index 00000000..9443aebb
--- /dev/null
+++ b/application/views/editogr.php
@@ -0,0 +1,600 @@
+<?php 
+$insuranceStatus = array(
+array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
+);
+
+
+$ReqType =''; 
+$CompanyAddress = '';
+$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
+$CurrentDate =  $dt->format('d-m-Y');
+$MaxPoDate = '';
+$AvlAmount = 0;
+$Value="&#8377;";
+
+
+$sup='';
+$date ='';
+$Vehicle='';
+$driver='';
+$PONO='';
+$type='';
+$MaterialCode='';
+$name='';
+$outqty='';
+
+
+if(!empty($OGR_Data))
+{
+	foreach($OGR_Data as $dt)
+	{
+		$type=$dt->OgrType;
+		if($type=='SERVICE')
+		{
+           $sup=$dt->Destination;
+		}
+		else
+		{
+        $sup=$dt->SupplierName;
+        }
+	    $date =$dt->CreatedDate;
+		$Vehicle=$dt->VehicleNo;
+		$driver=$dt->Driver;
+		$PONO=$dt->PONO_INV;
+		$MaterialCode=$dt->MaterialCode;
+		//$name=$dt->;
+		$outqty=$dt->OutwardQty;
+	}
+}
+
+
+
+
+
+
+
+?>
+<script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
+<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
+<script type="text/javascript">
+       tinymce.init({
+          selector: "textarea#ScopeOfWork",   
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+       tinymce.init({
+          selector: "textarea#txtSpcialInstruction", // Add model SpcialInstruction
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+        tinymce.init({
+          selector: "textarea#EdittxtSpcialInstruction", // Edit model edit SpcialInstruction
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+      tinymce.init({
+          selector: "textarea#descofpo",  //main screen description PO
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+       </script>
+
+ 
+<script>
+
+
+
+
+//document.getElementById("Date").checked = true;
+
+	
+
+ $(document).ready(function () 
+ {
+
+	  // $('#mv').hide();
+			// 		   $('#po').hide();
+			// 		    $('#service').hide();
+			// 		    $('#potable').hide();
+	  // $("#PaymentTerms").select2();
+	  // $('#saveinv').hide();
+	  // $('#savepo').hide();
+	  // $('#saveservice').hide();
+
+	   $("#date").datepicker({
+          
+            maxDate : 'now',
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+        });
+
+
+                // $('#Date').click(function () {
+                //     //for Date range selection
+                //     $('#Schedulediv').hide();
+                //     $('#Deliverydtdiv').show();
+                // });
+                // $('#Schedule').click(function () {
+                //     //for schedule range selection
+                //     $('#Deliverydtdiv').hide();
+                //     $('#Schedulediv').show();
+                // });
+
+                
+   Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#Vehicle"));
+               
+  }); 
+  
+
+
+            
+</script>
+<style>
+.modal
+{
+	padding-right:25% ! important;
+}
+.dataTables_paginate
+{
+	    margin-top: -5%;
+}
+.dataTables_wrapper {
+    padding-bottom: 0px;
+}
+.num {
+	text-align:right;
+}
+</style>
+<div class="content-wrapper">
+        <?php
+
+         $attributes = array('class' => 'form-label-left Ogradd ','name'  => 'Ogradd','id'  => 'Ogradd');
+                        
+                        echo form_open($this->config->base_url().'/inwardgateregister/AddOgr/',$attributes);
+        ?>
+ 
+	 <section class="content">
+	  
+	  <div id="content"></div>
+
+	 <div class="box">
+            <div class="box-header">
+              <center><h3 class="box-title">Siddharth Industries - Outward Gate Register(OGR)Entry </h3></center>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+        
+ <div class="container-fluid">
+		
+	<div class="row">
+     
+
+	<div class="col-md-12">
+	<div class="col-md-3">
+	 
+	 	<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 class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	<div class="col-md-3">
+			 <label>Date</label>
+						<div class="form-group">
+						<!-- 
+									<?php
+							 $data = array('name' => 'date','value' => set_value('date',$date),'id'=>'date',  'class' => 'form-control');
+							echo form_input($data);
+							?>  --> 
+
+
+							<?php
+                  $data = array('name' => 'date','value' => set_value('date',$date),'id'=>'date',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                  echo form_input($data);
+              ?>   
+						</div>
+
+						 					 
+					 
+			</div>
+		<div class="col-md-3">
+			 <label>Vehicle No</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'Vehicle','value' => set_value('Vehicle',$Vehicle),'id'=>'Vehicle',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>	
+	<div class="col-md-3" style="display: none">
+			 <label>Time</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'time','value' => set_value('timetime'),'id'=>'time',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Driver</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'drive','value' => set_value('drive',$driver),'id'=>'drive',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+	</div>
+	</div>
+</div>
+   </div>
+
+   <!--mv/po/ser starting-->
+ <div class="row">
+	<div class="col-md-12">
+<div class="col-md-3">
+	 
+	 	<div class="col-md-12">
+				 
+				 <div class="form-group">
+                 <!-- <input type="text" name="invoice">  -->
+                 </div>
+             </div>	 			 
+	</div>
+	<div id="mv">
+	<div class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	 <div class="col-md-3">
+
+				<label>Invoice NO</label>
+					 
+						 <?php
+						 $data = array('name' => 'invno','value' => set_value('qtyorder'),'id'=>'qtyorder',  'class' => 'form-control');
+							echo form_input($data);
+						?>
+ 
+			</div>
+			<div class="col-md-3">
+			 <label>Item Code</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'itemcode','value' => set_value('itemcode'),'id'=>'itemcode',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Description</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Ordered Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'qtyorder','value' => set_value('qtyorder'),'id'=>'qtyorder',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Outward Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'invoutwardqty','value' => set_value('invoutwardqty'),'id'=>'invoutwardqty',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			 
+			<div class="col-md-3" style="display: none;">
+			 <label>Date</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'invdate','value' => set_value('invdate'),'id'=>'invdate',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+	</div>
+	</div>
+	</div>
+	<!--inv/po/ser End-->
+
+
+	<!--po starting-->
+	<div id="po">
+	<div class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	 <div class="col-md-3">
+
+				<label>PO NO</label>
+					 
+						 <?php
+						 $data = array('name' => 'pono','value' => set_value('pono',$PONO),'id'=>'pono',  'class' => 'form-control');
+							echo form_input($data);
+						?>
+ 
+			</div>
+			<!-- <div class="col-md-3">
+			 <label>Material Code</label>
+					 
+					 
+						 <?php
+						 $data = array('name' => 'materialcode','value' => set_value('materialcode'),'id'=>'materialcode',  'class' => 'form-control');
+							echo form_input($data);
+						?>
+
+						 					 
+					 
+			</div> -->
+			 
+			 
+			 
+			 
+		 
+	</div>
+	</div>
+	</div>
+	<!-- po end -->
+
+
+	<!--ser starting-->
+	<div id="service">
+	<div class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	 
+			<div class="col-md-3">
+			 <label>Material Code</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'material','value' => set_value('material',$MaterialCode),'id'=>'material',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3" style="display: none">
+			 <label>Name</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'name','value' => set_value('name'),'id'=>'name',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3" style="display: none;">
+			 <label>Order Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'orderqty','value' => set_value('orderqty'),'id'=>'orderqty',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3" style="display: none;">
+			 <label>Reject Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'Rejectqty','value' => set_value('Rejectqty'),'id'=>'Rejectqty',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Outward Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'pooutward','value' => set_value('pooutward',$outqty),'id'=>'pooutward',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Destination</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'destination','value' => set_value('destination',$sup),'id'=>'destination',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+	</div>
+	</div>
+	</div>
+
+
+	<!-- <div class="col-md-1 col-md-offset-8" id="saveservice"><br><br><br>
+            <a class="btn btn-primary Save"  ID="Save" onclick="Save(3)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+            </div>
+ -->
+
+
+	<!-- <div class="col-md-1 col-md-offset-8" id="saveinv"><br><br><br>
+            <a class="btn btn-primary Save"  ID="Save" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+            </div>
+	<!-- ser end -->
+	<!-- </div> --> 
+	</div>
+
+
+	 
+    
+	 
+     
+	<div class="box-body">
+              <table id="potable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+                <thead style="background-color:#ddf">
+                <tr>
+					<th>SNo</th>
+					<th>Material Code</th>
+                    <th>Description</th>
+					<th>Order Qty</th>
+					<th>Received</th>
+					<th>Reject</th>
+					<th>Outward Qty </th>
+					<!-- <th>Action</th> -->
+					
+                </tr>
+                </thead>				
+               
+             <tbody id="poappend">  
+             <?php if(!empty($OGR_line)){ 
+             	//$index=1;
+             	foreach($OGR_line as $index =>$line){
+$index = $index+1;
+             		?>
+             <tr>	
+             <td><?php echo $index;?></td>
+             <td><?php echo $line->MaterialCode;?></td>	
+             <td><?php echo $line->MaterialName;?></td>	
+             <td><?php echo $line->Quantity?></td>	
+             <td><?php echo $line->ActualQuantityReceived;?></td>
+             <td><?php echo $line->QuantityRejected?></td>	
+             <td><?php echo $line->OutwardQty;?></td>	
+             </tr>
+
+
+
+             <?php } } ?>   
+    
+			</tbody>
+              </table>
+
+           <input type="hidden" name="rowcount" id="rowcount">
+               <!-- <div class="col-md-1 col-md-offset-8" id="savepo"><br><br><br>
+            <a class="btn btn-primary Save"  ID="Savepo" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+            </div> -->
+            </div>
+            </div>
+            </div>
+            </div>
+            </section>
+            </div>
+   
+	<!-- ser end -->
+	</div>
+
+	   
+   
+
+<script>
+
+var invoicedetails='';
+var type='';
+ 
+var Details= <?php echo json_encode($OGR_Data, JSON_PRETTY_PRINT) ?>;
+//alert(Details)
+ 
+ $.each(Details,function(det,detobj)
+ {
+
+   type= detobj.OgrType;
+
+ });
+
+ //alert(type)
+
+if(type =='PO')
+{
+   $('#po').show();
+   $('#potable').show();
+   $('#mv').hide();
+   $('#service').hide();
+   $('#saveinv').hide();
+   $('#savepo').show();
+   $('#saveservice').hide();
+
+}
+
+else if(type =='SERVICE')
+{
+  $('#service').show();
+  $('#mv').hide();
+  $('#po').hide();
+  $('#potable').hide();
+  $('#saveservice').show();
+  $('#savepo').hide();
+}
+
+
+
+
+
+
+</script>
+
+
+
+
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 062b1fbd..7d5b7352 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -1244,6 +1244,21 @@ $(function() {
 							  </a>
 				            </li> 
 
+
+				            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>AddOgr">
+								<i class="fa fa-upload"></i>
+								<span>Outward Gate Register Entry</span>
+							  </a>
+				            </li>
+
+				             <li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewOgr">
+								<i class="fa fa-upload"></i>
+								<span>View Outward Gate Register</span>
+							  </a>
+				            </li> 
+
                     <?php if($DEPCode != SECURITY){?>
 
                           
@@ -1262,6 +1277,20 @@ $(function() {
 							  </a>
 							</li>
 
+							<!-- <li class="treeview">
+							  <a href="<?php echo base_url(); ?>AddOgr">
+								<i class="fa fa-upload"></i>
+								<span>Outward Gate Register Entry</span>
+							  </a>
+				            </li>
+
+				             <li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewOgr">
+								<i class="fa fa-upload"></i>
+								<span>View Outward Gate Register</span>
+							  </a>
+				            </li> 
+ -->
 							  <?php }?>
 
 							   <?php if($DEPCode == QUALITY){?>
@@ -1388,6 +1417,20 @@ $(function() {
 								<span>View Inward Gate Register</span>
 							  </a>
 				            </li>
+
+				            <li class="treeview">
+							  <a href="<?php echo base_url(); ?>AddOgr">
+								<i class="fa fa-upload"></i>
+								<span>Outward Gate Register Entry</span>
+							  </a>
+				            </li>
+
+				             <li class="treeview">
+							  <a href="<?php echo base_url(); ?>ViewOgr">
+								<i class="fa fa-upload"></i>
+								<span>View Outward Gate Register</span>
+							  </a>
+				            </li> 
                     
 
                         </ul>
diff --git a/application/views/ogr.php b/application/views/ogr.php
new file mode 100644
index 00000000..fa7ba52b
--- /dev/null
+++ b/application/views/ogr.php
@@ -0,0 +1,1105 @@
+<?php 
+$insuranceStatus = array(
+array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
+);
+
+
+$ReqType =''; 
+$CompanyAddress = '';
+$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));				
+$CurrentDate =  $dt->format('d-m-Y');
+$MaxPoDate = '';
+$AvlAmount = 0;
+$Value="&#8377;";
+
+
+
+
+
+
+
+?>
+<script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
+<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
+<script type="text/javascript">
+       tinymce.init({
+          selector: "textarea#ScopeOfWork",   
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+       tinymce.init({
+          selector: "textarea#txtSpcialInstruction", // Add model SpcialInstruction
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+        tinymce.init({
+          selector: "textarea#EdittxtSpcialInstruction", // Edit model edit SpcialInstruction
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+      tinymce.init({
+          selector: "textarea#descofpo",  //main screen description PO
+          menubar: false,
+           statusbar: false,
+           toolbar: false
+        });
+       </script>
+
+ 
+<script>
+
+
+
+
+//document.getElementById("Date").checked = true;
+
+	
+
+ $(document).ready(function () 
+ {
+
+	  $('#mv').hide();
+					   $('#po').hide();
+					    $('#service').hide();
+					    $('#potable').hide();
+	  $("#PaymentTerms").select2();
+	  $('#saveinv').hide();
+	  $('#savepo').hide();
+	  $('#saveservice').hide();
+
+	   $("#date").datepicker({
+          
+            maxDate : 'now',
+            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+        });
+
+
+                // $('#Date').click(function () {
+                //     //for Date range selection
+                //     $('#Schedulediv').hide();
+                //     $('#Deliverydtdiv').show();
+                // });
+                // $('#Schedule').click(function () {
+                //     //for schedule range selection
+                //     $('#Deliverydtdiv').hide();
+                //     $('#Schedulediv').show();
+                // });
+
+                
+   Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#Vehicle"));
+               
+  }); 
+  
+
+
+            
+</script>
+<style>
+.modal
+{
+	padding-right:25% ! important;
+}
+.dataTables_paginate
+{
+	    margin-top: -5%;
+}
+.dataTables_wrapper {
+    padding-bottom: 0px;
+}
+.num {
+	text-align:right;
+}
+</style>
+<div class="content-wrapper">
+        <?php
+
+         $attributes = array('class' => 'form-label-left Ogradd ','name'  => 'Ogradd','id'  => 'Ogradd');
+                        
+                        echo form_open($this->config->base_url().'/inwardgateregister/AddOgr/',$attributes);
+        ?>
+ 
+	 <section class="content">
+	  
+	  <div id="content"></div>
+
+	 <div class="box">
+            <div class="box-header">
+              <center><h3 class="box-title">Siddharth Industries - Outward Gate Register(OGR)Entry </h3></center>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+        
+ <div class="container-fluid">
+		
+	<div class="row">
+     
+
+	<div class="col-md-12">
+	<div class="col-md-3">
+	 
+	 	<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 class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	<div class="col-md-3">
+			 <label>Date</label>
+						<div class="form-group">
+						<!-- 
+									<?php
+							 $data = array('name' => 'date','value' => set_value('date'),'id'=>'date',  'class' => 'form-control');
+							echo form_input($data);
+							?>  --> 
+
+
+							<?php
+                  $data = array('name' => 'date','value' => set_value('date',$CurrentDate),'id'=>'date',  'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+                  echo form_input($data);
+              ?>   
+						</div>
+
+						 					 
+					 
+			</div>
+		<div class="col-md-3">
+			 <label>Vehicle No</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'Vehicle','value' => set_value('Vehicle'),'id'=>'Vehicle',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>	
+	<div class="col-md-3" style="display: none">
+			 <label>Time</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'time','value' => set_value('timetime'),'id'=>'time',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Driver</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'drive','value' => set_value('drive'),'id'=>'drive',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+	</div>
+	</div>
+</div>
+   </div>
+
+   <!--mv/po/ser starting-->
+ <div class="row">
+	<div class="col-md-12">
+<div class="col-md-3">
+	 
+	 	<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 id="mv">
+	<div class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	 <div class="col-md-3">
+
+				<label>Invoice NO</label>
+					 
+						 <?php
+						$options = array("0"=>'Select Invoice No');     
+						//print_r(  $options);
+					 									
+			
+						echo form_dropdown('invno', $options,set_value(''),'id="invno"'  ,'required="true"' ,'class="form-control select2');
+						?>
+ 
+			</div>
+			<div class="col-md-3">
+			 <label>Item Code</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'itemcode','value' => set_value('itemcode'),'id'=>'itemcode',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Description</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'Description','value' => set_value('Description'),'id'=>'Description',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Ordered Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'qtyorder','value' => set_value('qtyorder'),'id'=>'qtyorder',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Outward Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'invoutwardqty','value' => set_value('invoutwardqty'),'id'=>'invoutwardqty',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			 
+			<div class="col-md-3" style="display: none;">
+			 <label>Date</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'invdate','value' => set_value('invdate'),'id'=>'invdate',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+	</div>
+	</div>
+	</div>
+	<!--inv/po/ser End-->
+
+
+	<!--po starting-->
+	<div id="po">
+	<div class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	 <div class="col-md-3">
+
+				<label>PO NO</label>
+					 
+						 <?php
+						$options = array("0"=>'Select PONO');     
+						//print_r(  $options);
+					 									
+			
+						echo form_dropdown('pono', $options,set_value('pono'),'id="pono"'  ,'required="true"' ,'class="form-control select2');
+						?>
+ 
+			</div>
+			<div class="col-md-3">
+			 <label>Material Code</label>
+					 
+					 
+						 <?php
+						$options = array("0"=>'Select');     
+						//print_r(  $options);
+					 									
+			
+						echo form_dropdown('materialcode', $options,set_value('materialcode'),'id="materialcode"'  ,'required="true"' ,'class="form-control select2');
+						?>
+
+						 					 
+					 
+			</div>
+			 
+			 
+			 
+			 
+		 
+	</div>
+	</div>
+	</div>
+	<!-- po end -->
+
+
+	<!--ser starting-->
+	<div id="service">
+	<div class="col-md-9" style="padding: 0px;">
+	<div class="col-md-12" style="padding: 0px;">
+	 
+			<div class="col-md-3">
+			 <label>Material Code</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'material','value' => set_value('material'),'id'=>'material',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<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');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3" style="display: none;">
+			 <label>Order Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'orderqty','value' => set_value('orderqty'),'id'=>'orderqty',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3" style="display: none;">
+			 <label>Reject Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'Rejectqty','value' => set_value('Rejectqty'),'id'=>'Rejectqty',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Outward Qty</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'pooutward','value' => set_value('pooutward'),'id'=>'pooutward',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+			<div class="col-md-3">
+			 <label>Destination</label>
+						<div class="form-group">
+						
+									<?php
+							 $data = array('name' => 'destination','value' => set_value('destination'),'id'=>'destination',  'class' => 'form-control');
+							echo form_input($data);
+							?>   
+						</div>
+
+						 					 
+					 
+			</div>
+	</div>
+	</div>
+	</div>
+
+
+	<div class="col-md-1 col-md-offset-8" id="saveservice"><br><br><br>
+            <a class="btn btn-primary Save"  ID="Save" onclick="Save(3)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+            </div>
+
+
+
+	<div class="col-md-1 col-md-offset-8" id="saveinv"><br><br><br>
+            <a class="btn btn-primary Save"  ID="Save" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+            </div>
+	<!-- ser end -->
+	</div>
+	</div>
+
+
+	 
+    
+	 
+     
+	<div class="box-body">
+              <table id="potable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+                <thead style="background-color:#ddf">
+                <tr>
+					<th>SNo</th>
+					<th>Material Code</th>
+                    <th>Description</th>
+					<th>Order Qty</th>
+					<th>Received</th>
+					<th>Reject</th>
+					<th>Outward Allowed Qty </th>
+					<th>Outward Qty </th>
+					<!-- <th>Action</th> -->
+					
+                </tr>
+                </thead>				
+               
+             <tbody id="poappend">     
+    
+			</tbody>
+              </table>
+
+           <input type="hidden" name="rowcount" id="rowcount">
+               <div class="col-md-1 col-md-offset-8" id="savepo"><br><br><br>
+            <a class="btn btn-primary Save"  ID="Savepo" onclick="Save(2)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
+            </div>
+            </div>
+            </div>
+            </div>
+            </div>
+            </section>
+            </div>
+   
+	<!-- ser end -->
+	</div>
+
+	   
+   
+
+<script>
+
+var invoicedetails='';
+ 
+$("#ogrtype").change(function() 
+{
+	
+    if ($('#ogrtype').val()=="1")
+      {
+
+        $('#mv').show();
+		$('#po').hide();
+		$('#service').hide();
+		$('#potable').hide();
+		$('#saveinv').show();
+		$('#saveservice').hide();
+		//document.getElementById("sup").options.length = 0;
+        $('#sup').find('option:not(:first)').remove(); 
+		var customer= <?php echo json_encode($Customer, JSON_PRETTY_PRINT) ?>;
+		
+		 $.each(customer, function(cu, cuobj) 
+
+          {
+              
+             $("#sup").append( $('<option></option>').val(cuobj.client_id).html(cuobj.client_name));    
+      
+          });
+
+		
+
+
+      }
+           
+      else if ($('#ogrtype').val()=="2")
+      {
+        $('#po').show();
+        $('#potable').show();
+        $('#mv').hide();
+        $('#service').hide();
+        $('#saveinv').hide();
+        $('#savepo').show();
+        $('#saveservice').hide();
+       // alert("po")
+       // document.getElementById("sup").options.length = 0;
+       $('#sup').find('option:not(:first)').remove();
+        var supplier= <?php echo json_encode($Supplier, JSON_PRETTY_PRINT) ?>;
+		 $.each(supplier, function(su, supobj) 
+
+          {
+              
+             $("#sup").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierName));    
+      
+          });
+
+      }  
+
+      else if ($('#ogrtype').val()=="3") 
+      {
+        $('#service').show();
+        $('#mv').hide();
+        $('#po').hide();
+        $('#potable').hide();
+        $('#saveservice').show();
+        $('#savepo').hide();
+
+
+      }
+       
+      else
+      {
+        $('#mv').hide();
+		$('#po').hide();
+		$('#service').hide();
+		$('#potable').hide();
+      }
+});
+
+$("#sup").change(function()
+{
+
+	if ($('#ogrtype').val()=="1")
+	{
+		var customer= $('#sup').val();
+		$('#invno').find('option:not(:first)').remove();
+
+		$.ajax({
+
+
+			data:{customerId:customer},
+			type:"POST",
+			url:"<?php echo base_url();?>inwardgateregister/GetInvoices",
+        	success:function(data) 
+        	{ 
+           
+           		//$('#content').loader('hide'); 
+
+           		if(data)
+          		{
+          		 	var html = ''; 
+          		 	
+
+          		 	invoicedetails= JSON.parse(data);
+          		 	//console.log(invoicedetails);
+                    $.each(JSON.parse(data), function (inv, invobj)
+                    {
+                    			//console.log(invobj.invoice_id);
+                      html +="<option value="+invobj.invoice_id+">"+invobj.invoice_number+"</option>";
+
+                    });
+                    	$("#invno").append(html);
+         	    }
+
+          		else  
+          		{
+            		alert("Error");
+          		}
+        	}
+			})
+		
+
+	}
+    
+    else if($('#ogrtype').val()=="2")
+    {
+        var supplier= $('#sup').val();
+        $('#pono').find('option:not(:first)').remove();
+        $('#materialcode').find('option:not(:first)').remove();
+
+		$.ajax({
+   		
+   			data:{supplierId:supplier},
+			type:"POST",
+			url:"<?php echo base_url();?>inwardgateregister/GetPO",
+        	success:function(data) 
+        	{ 
+           
+           		//$('#content').loader('hide'); 
+
+           		if(data)
+          		{
+          		 	var html = ''; 
+          		 	
+
+          		 	PO = JSON.parse(data);
+          		 	//console.log(PO);
+                    $.each(JSON.parse(data), function (POno,POobj)
+                    {
+                    			//console.log(invobj.invoice_id);
+                      html +="<option value="+POobj.PONO+">"+POobj.PONO+"</option>";
+
+                    });
+                    	$("#pono").append(html);
+         	    }
+
+          		else  
+          		{
+            		alert("Error");
+          		}
+        	}
+			})
+        
+    }
+
+});
+
+
+
+$("#invno").change(function()
+{
+   var invid=$('#invno').val();
+   var materialcode ='';
+   var itemname = '';
+   var invqty = '';
+   var outqty = '';
+   
+   $.each(invoicedetails,function(invdet,invdetobj){
+      
+     //console.log(invdetobj.invoice_id);
+
+     if(invid == invdetobj.invoice_id)
+     {
+       materialcode = invdetobj.item_product_id;
+       itemname = invdetobj.item_name;
+       invqty = invdetobj.item_quantity;
+     }
+     
+
+     $('#itemcode').val(materialcode);
+     $('#Description').val(itemname);
+     $('#qtyorder').val(invqty);
+
+   });   
+
+	
+});
+
+
+$("#pono").change(function()
+{
+   var PONO=$('#pono').val();
+
+   $('#materialcode').find('option:not(:first)').remove();
+   
+   $.ajax({
+
+   			data:{PONO:PONO},
+   			type:"POST",
+   			url:"<?php echo base_url();?>inwardgateregister/getPODetails",
+        	success:function(data) 
+        	{ 
+           
+           		//$('#content').loader('hide'); 
+
+           		if(data)
+          		{
+          		 	var html = ''; 
+          		 	
+
+          		 	PODetails = JSON.parse(data);
+          		 	//console.log(PODetails);
+                    $.each(JSON.parse(data), function (PODet, POdetobj)
+                    {
+                    			//console.log(invobj.invoice_id);
+                      html +="<option value="+POdetobj.MaterialCode+">"+POdetobj.MaterialCode+"</option>";
+
+                    });
+                    	$("#materialcode").append(html);
+         	    }
+
+          		else  
+          		{
+            		alert("Error");
+          		}
+        	}
+   })
+
+});
+
+
+function addHidden(theForm, key, value) 
+{
+    // Create a hidden input element, and append it to the form:
+    var input = document.createElement('input');
+    input.type = 'hidden';
+    input.name = key;'name-as-seen-at-the-server';
+    input.id = key;'name-as-seen-at-the-server';
+    input.value = value;
+    theForm.append(input);
+}
+
+
+var rw=0;
+$('#materialcode').change(function()
+{
+	var materialcode=$('#materialcode').val();
+	
+	if(materialcode!=0)
+	{
+	// rw= parseFloat(rw)+1;
+    var tble='';
+    var bal=0;
+    var che =0;
+    var x = document.getElementById("potable").rows.length;
+    for(var i=1;i<=x;i++)
+    {
+    	var mat= $('#materialcode'+i).val();
+    	if(mat == materialcode)
+    	{
+    		che = 1;
+    		break;
+    	}
+
+
+    }
+
+
+    if(che==0)
+    { 
+    rw= parseFloat(rw)+1;
+   $.each(PODetails,function(po,poobj)
+      {
+        if(materialcode == poobj.MaterialCode)
+        {
+
+           if(poobj.balance_Qty == null)
+           {  
+               bal = poobj.QuantityRejected;  
+           }
+           else
+           {
+           	bal =poobj.balance_Qty;
+           }
+           tble += '<tr class="amount">'+
+                    '<td>' + rw + '</td>' +
+                    '<td name="MaterialCode" id="MaterialCode'+rw+'" >' + poobj.MaterialCode + '</td>' +
+                    '<td id="MaterialName'+rw+'">' + poobj.MaterialName + '</td>' +
+                    '<td id="OrderQty'+rw+'">' + poobj.Oqty + '</td>' +
+                    '<td id="ActualQty'+rw+'">' + poobj.ActualQuantityReceived + '</td>' +
+                    '<td id="RejQty'+rw+'">' + poobj.QuantityRejected + '</td>' +
+                    '<td id="allowedQty'+rw+'">' + bal + '</td>' + 
+                    '<td><input type="text" id="outward'+rw+'" onchange="QtyCheck('+rw+');"> </td>' +
+                   
+                    '</tr>';
+
+           $('#poappend').append(tble);
+
+      var theForm = $(".Ogradd");
+
+      addHidden(theForm,"materialcode"+rw,poobj.MaterialCode);
+      addHidden(theForm,"materialname"+rw,poobj.MaterialName);
+      addHidden(theForm,"Orderqty"+rw,poobj.Oqty);
+      addHidden(theForm,"ReceivedQty"+rw,poobj.ActualQuantityReceived);
+      addHidden(theForm,"RejectedQty"+rw,poobj.QuantityRejected);
+
+      $('#rowcount').val(rw)
+     
+
+        }
+
+
+      });
+
+   }
+
+   else
+   {
+   	alert("Already added")
+      // document.getElementById("materialcode").options[600068].disabled = true;
+   }
+      
+
+    }
+
+     $("materialcode[value='" + materialcode + "']", $(this)).hide();
+});
+
+
+function QtyCheck(row)
+{
+
+	var outwardqty= $('#outward'+row).val();
+	var reject= parseFloat($('#RejQty'+row).text()==''?'0.00':$('#RejQty'+row).text());
+	var allowed = parseFloat($('#allowedQty'+row).text()==''?'0.00':$('#allowedQty'+row).text());
+	//alert("out"+outwardqty)
+	//alert("allowed"+allowed)
+    if(outwardqty>allowed)
+    {
+      alert("Exceeding allowed amount");
+      return false;
+    }
+    
+    else
+    {   
+    	var theForm = $(".Ogradd");
+    	addHidden(theForm,"outward"+row,outwardqty);
+    	return true;
+    }
+}
+
+
+function validateinv()
+{
+
+   if($('#invno').val()=='')
+   {
+   	 alert("Select invoice number");
+   	 return false;
+   	 $('#content').loader('hide'); 
+   }
+
+   else if($('#itemcode').val()=="")
+   {
+   	 alert("Select Material Code");
+   	 return false;
+   	 $('#content').loader('hide'); 
+   }
+
+   else if($('#Description').val()=="")
+   {
+   	 alert("Select Material Description");
+   	 return false;
+   	 $('#content').loader('hide'); 
+   }
+
+   else if ($('#qtyorder').val()=='')
+   {
+   	 alert("Select Material Qty");
+   	 return false;
+   	 $('#content').loader('hide'); 
+   }
+
+   else if ($('#invoutwardqty').val()=='')
+   {
+   	 alert("Enter Outward Qty");
+   	 return false;
+   	 $('#content').loader('hide'); 
+   }
+
+   else
+   {
+   	return true;
+   }
+
+
+}
+
+
+function validatepo()
+{
+	var row=$('#rowcount').val();
+	var length = document.getElementById("materialcode").length;
+    var actlen=parseFloat(length)-1;
+    if(parseFloat(row)==parseFloat(actlen))
+    {
+    	return true;
+    }
+    else
+    {
+    	alert('You have to add all the material Details');
+    	return false;
+    	$('#content').loader('hide'); 
+
+    }
+
+    
+}
+
+
+function validateOutward()
+{
+	var che=0;
+	var row=$('#rowcount').val();
+	for(var j=1;j<=row;j++)
+    {
+        if($('#outward'+j).val()=='')
+        {
+        	alert("enter");
+        	che =1;
+        	break;
+
+        }
+    }
+
+    if(che == 0)
+    {
+    	return true;
+    }
+
+    else
+    {
+    	return false;
+    }
+}
+
+
+
+
+function Save(type)
+{
+	// $('#content').loader('show'); 
+   if(type==1)
+   {
+    
+    if(validateinv())
+    {
+
+  $('#content').loader('show'); 
+   	var date= $('#date').val();
+   	var newdate = date.split("-").reverse().join("-");
+   	var ogrtype= $('#ogrtype').val();
+      $.ajax({
+
+         
+            data:$('.Ogradd').serialize()+"&type="+type+"&Date="+newdate,
+            type:"POST",
+            url:"<?php echo base_url() ?>inwardgateregister/AddOgr", 
+            success:function(data) {
+
+            if(data)
+            {
+                $('#content').loader('hide'); 
+                alert(data);
+                location.reload();
+            
+            }
+            
+            else
+            {
+                    alert("Error"); 
+             }           
+        
+            }
+
+
+
+      });
+
+    }
+
+    
+   }
+
+   if(type == 2)
+   {
+   	//alert()
+
+    if(validatepo() && validateOutward())
+    {
+
+    	$('#content').loader('show'); 
+   	var date= $('#date').val();
+   	var newdate = date.split("-").reverse().join("-");
+
+   	 $.ajax({
+
+         
+            data:$('.Ogradd').serialize()+"&type="+type+"&Date="+newdate,
+            type:"POST",
+            url:"<?php echo base_url() ?>inwardgateregister/AddOgr", 
+            success:function(data) {
+            if(data)
+            {
+                $('#content').loader('hide'); 
+                alert(data);
+                location.reload();
+            
+            }
+            
+            else
+            {
+                    alert("Error"); 
+             }           
+        
+            }
+
+
+
+      });
+   	}
+   }
+
+
+   if(type==3)
+   {
+
+    $('#content').loader('show'); 
+   	 var date= $('#date').val();
+   	 var newdate = date.split("-").reverse().join("-");
+
+   	 $.ajax({
+
+         
+            data:$('.Ogradd').serialize()+"&type="+type+"&Date="+newdate,
+            type:"POST",
+            url:"<?php echo base_url() ?>inwardgateregister/AddOgr", 
+            success:function(data) {
+            if(data)
+            {
+                $('#content').loader('hide'); 
+                alert(data);
+                location.reload();
+            
+            }
+            
+            else
+            {
+                    alert("Error"); 
+             }           
+        
+            }
+
+
+
+      });
+   }
+}
+
+
+
+
+
+</script>
+
+
+
+
diff --git a/application/views/ogrlist.php b/application/views/ogrlist.php
new file mode 100644
index 00000000..bfee605f
--- /dev/null
+++ b/application/views/ogrlist.php
@@ -0,0 +1,145 @@
+ 
+<style>
+   .pagination {
+   margin:0px !important;
+   }
+   
+</style>  
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+ 
+    <!-- Main content -->
+    <section class="content">
+      <div class="row">
+        <div class="col-xs-12">
+          <div class="box">
+            <div class="box-header">
+              <center><h3 class="box-title">Siddharth Industries-Outward Gate Entry List</h3></center>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+              <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
+                <thead>
+                <tr style="background-color:#ddf">
+				<th>#</th>
+        <th>OGR No</th>
+        <th>Type</th>
+        <th>PO/INVOICE No</th> 
+        <th>Supplier/Customer Name</th>
+        <th>Date</th>
+        <th>Vehicle</th>
+        <th>Actions</th>
+        
+                </tr>
+                </thead>
+                <tbody><?php
+                    
+                    if(!empty($OGR_Data)){
+						            $index = 0;
+                    foreach($OGR_Data as $ogr)
+                    {
+                         $index =$index+1;
+                         //$dt= $nc->Created_Date;
+                         $Ddt =  new DateTime($ogr->CreatedDate);
+                         $dt =  $Ddt->format('d-m-Y');
+
+
+                    ?>
+                   
+               <tr id="<?php echo $index ; ?>">
+					     <td><?php echo $index;?></td>
+               <td><?php echo "OGR".$ogr->OGRNO;?></td>
+               <td><?php echo $ogr->OgrType;?></td>
+               <td><?php echo $ogr->PONO_INV;?></td>
+               <?php if($ogr->OgrType == 'PO'){?>
+               <td><?php echo $ogr->SupplierName?></td>
+               <? } else{ ?>
+               <td><?php echo $ogr->Destination?></td> 
+               <?php }?>
+                
+               <td><?php echo $dt;?></td>
+               <td><?php echo $ogr->VehicleNo?></td>
+               <td><a   data-toggle="tooltip" href="<?php echo base_url().'EditOGR?OGRNO='.$ogr->OGRNO ;?>"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $ogr->OGRNO; ?>  -  Click here to View details"></i></a></td>
+                                          
+              </tr>
+             
+
+
+           <?php } }?>
+					
+                </tbody>
+               
+              </table>
+            </div>
+            <!-- /.box-body -->
+          </div>
+          <!-- /.box -->
+ 
+        </div>
+        <!-- /.col -->
+      </div>
+      <!-- /.row -->
+    </section>
+    <!-- /.content -->
+  </div>
+  <!-- /.content-wrapper -->
+		  <script>
+  $(function () {
+    
+    $('#example1').DataTable({
+      "paging": true,
+      "lengthChange": true,
+      "searching": true,
+      "ordering": true,
+      "info": true,
+      "autoWidth": false
+    });
+  });
+</script>
+
+<script type="text/javascript">
+  function saveToDatabase(editableObj,Index) 
+  {
+    //alert(Index)
+    var tr= document.getElementById(Index);
+    var cellval = tr.cells; 
+    var date= cellval[1].innerHTML;
+    var cname=cellval[2].innerHTML;
+    var servicedetails=cellval[3].innerHTML;
+    var detailsofcoplaint=cellval[4].innerHTML;
+    var modeofcommunication=cellval[5].innerHTML;
+    var actiontaken=cellval[6].innerHTML;
+    var actioncardno=cellval[7].innerHTML;
+    var remark=cellval[8].innerHTML;
+     $.ajax(
+      {
+
+      data:{date:date,cname:cname,servicedetails:servicedetails,detailsofcoplaint:detailsofcoplaint,modeofcommunication:modeofcommunication,actiontaken:actiontaken,actioncardno,actioncardno,remark:remark},
+       // dataType:'json',
+        type:"POST",
+        url:"<?php echo base_url();?>purchaseorder/Savencrlist",
+        success:function(data) 
+        { 
+           
+           $('#content').loader('hide'); 
+
+           if(data)
+          {
+           alert(data);
+           //window.location ="enquirylisting";
+             
+
+          }
+
+          else  
+          {
+            alert("Error");
+          }
+        }
+     
+
+
+      });   
+ 
+  }
+</script>
\ No newline at end of file