issues fixes

application/controllers/amendmentpurchaseorder.php

@@ -321,6 +321,24 @@ class amendmentpurchaseorder extends BaseController
 					
 				$LineItemStatus = REQITEM_NEW; 
 				
+				$igrvalue =  $this->purchaseorder_model->selectigrmaster($PONO);
+
+				$po = '';
+				$igrno ='';
+				
+				foreach ($igrvalue as  $value) {
+		
+						$igrno = $value->IGRNO;
+						$po =$value->PONO;
+						if($PONO == $po)
+						{
+							$NewPOno = array('PONO' =>$NewPO);
+							$this->purchaseorder_model->updateigrmaster($igrno,$NewPOno);
+						}
+
+
+				}	
+
 				for ($i = 1; $i <= $RowCount; $i++)
 				{	
 				
@@ -511,6 +529,23 @@ class amendmentpurchaseorder extends BaseController
 								
 								$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
 									
+					}
+					$ordqty ='';
+					$recqty ='';
+
+					$qty = $this->purchaseorder_model->getpolineqty($NewPO);
+
+			        $ordqty = $qty[0]->Qty;
+              		$recqty = $qty[0]->rec;
+              
+              	    if($ordqty == $recqty)
+                    {
+									
+            				$Newstatus = array('Status'=>IGR_CREATED);
+                    		$this->purchaseorder_model-> POLineItemsupdatestatus($NewPO,$Newstatus);
+                        	$Newstat = array('Status'=>IGR_CREATED);
+                 			$this->purchaseorder_model->pomasterupdatestatus($NewPO,$Newstat);
+
         			}								
 								
 					echo 'Purchase Order Amended Successfully! PO Number Is: '.$PONO .'- New PO Number is'.$NewPO; 
@@ -854,6 +889,24 @@ class amendmentpurchaseorder extends BaseController
 					
 				$LineItemStatus = REQITEM_NEW;
 
+				$igrvalue =  $this->purchaseorder_model->selectigrmaster($PONO);
+
+				$po = '';
+				$igrno ='';
+				
+				foreach ($igrvalue as  $value) {
+		
+						$igrno = $value->IGRNO;
+						$po =$value->PONO;
+						if($PONO == $po)
+						{
+							$NewPOno = array('PONO' =>$NewPO);
+							$this->purchaseorder_model->updateigrmaster($igrno,$NewPOno);
+						}
+
+
+				}	
+
 				for ($i = 1; $i <= $RowCount; $i++)
 				{	
 						
@@ -1076,6 +1129,24 @@ class amendmentpurchaseorder extends BaseController
 							
 					}							
 					
+					$ordqty ='';
+					$recqty ='';
+
+					$qty = $this->purchaseorder_model->getpolineqty($NewPO);
+
+			        $ordqty = $qty[0]->Qty;
+              		$recqty = $qty[0]->rec;
+              
+              	    if($ordqty == $recqty)
+                    {
+									
+            				$Newstatus = array('Status'=>IGR_CREATED);
+                    		$this->purchaseorder_model-> POLineItemsupdatestatus($NewPO,$Newstatus);
+                        	$Newstat = array('Status'=>IGR_CREATED);
+                 			$this->purchaseorder_model->pomasterupdatestatus($NewPO,$Newstat);
+
+					}
+					
 					echo 'Purchase Order'.$PONO.'Amended Successfully! New PO Number Is: '.$NewPO ;
     }	
 
@@ -1201,6 +1272,24 @@ class amendmentpurchaseorder extends BaseController
 					
 				$LineItemStatus = REQITEM_NEW;
 						
+				$igrvalue =  $this->purchaseorder_model->selectigrmaster($PONO);
+
+				$po = '';
+				$igrno ='';
+				
+				foreach ($igrvalue as  $value) {
+		
+						$igrno = $value->IGRNO;
+						$po =$value->PONO;
+						if($PONO == $po)
+						{
+							$NewPOno = array('PONO' =>$NewPO);
+							$this->purchaseorder_model->updateigrmaster($igrno,$NewPOno);
+						}
+
+
+				}	
+
 				for ($i = 1; $i <= $RowCount; $i++)
 				{	
 								$CAD='';
@@ -1403,6 +1492,24 @@ class amendmentpurchaseorder extends BaseController
 											
 							}							
 					
+					$ordqty ='';
+					$recqty ='';
+
+					$qty = $this->purchaseorder_model->getpolineqty($NewPO);
+
+			        $ordqty = $qty[0]->Qty;
+              		$recqty = $qty[0]->rec;
+              
+              	    if($ordqty == $recqty)
+                    {
+									
+            				$Newstatus = array('Status'=>IGR_CREATED);
+                    		$this->purchaseorder_model-> POLineItemsupdatestatus($NewPO,$Newstatus);
+                        	$Newstat = array('Status'=>IGR_CREATED);
+                 			$this->purchaseorder_model->pomasterupdatestatus($NewPO,$Newstat);
+
+					}
+					
 					echo 'Purchase Order is'.$PONO.'Amended Successfully! New PO Number is: '.$NewPO ;   
 				}
 					

application/controllers/batchcard.php

@@ -86,6 +86,7 @@ class batchcard extends BaseController
 	{
 		$data['MaterialCode'] = $this->batchcard_model->getMaterial();
 		$data['Supplier'] = $this->batchcard_model->getSupplierlist();
+		$data['stock_value'] = $this->batchcard_model->getStockValue();
 		$this->global['pageTitle'] = $this->CompanyName.' : Material Adjustment';
         $this->loadViews("materialadjustment", $this->global,$data,NULL);
 	}

application/controllers/inwardgateregister.php

@@ -77,6 +77,23 @@ class inwardgateregister extends BaseController
 	{
 		$PO = $this->input->post('id');
 		$CreatedBy = $this->session->userdata('userId');
+
+		$ordqty ='';
+		$recqty ='';
+   
+		$qty = $this->inwardgateregister_model->getpolineqty($PO);
+
+		$ordqty = $qty[0]->Qty;
+		$recqty = $qty[0]->rec;
+		  
+		if($ordqty == $recqty)
+		{
+			     $Newstatus = array('Status'=>IGR_CREATED);
+				 $this->inwardgateregister_model-> POLineItemsupdatestatus($PO,$Newstatus);
+				 $Newstat = array('Status'=>IGR_CREATED);
+			     $this->inwardgateregister_model->pomasterupdatestatus($PO,$Newstat);
+		}
+
 		$this->inwardgateregister_model->UpdatePOMaster($PO,$CreatedBy); 
 		$data = $this->inwardgateregister_model->viewpurchaseorder($PO);
         echo json_encode($data);		

application/models/batchcard_model.php

@@ -18,6 +18,16 @@ class batchcard_model extends CI_Model
 			$supp = $this->db->get();
 			return $supp->result();
 			
+		}
+
+		function getStockValue()
+		{
+
+			$this->db->select('MaterialCode,stock');
+			$this->db->from('T_MaterialMaster');
+			$supp = $this->db->get();
+			return $supp->result();
+
 		}
 	
 		   /* 		

application/models/dahsboard_model.php

@@ -2847,10 +2847,6 @@ function INRSymbol()
   left join ip_tax_rates cgst on cgst.tax_rate_id = iit.cgst_item_tax_rate_id 
   left join ip_tax_rates igst on igst.tax_rate_id = iit.igst_item_tax_rate_id 
   where icf.invoice_custom_fieldid = '8' and ii.invoice_status_id != 1 ";  
-          
-          
-          
-          
   if ($m!= ''){
 
     $sql.="and monthname(ii.invoice_date_created) = '".$m."'";
@@ -2924,7 +2920,6 @@ function INRSymbol()
     $sql.=" and (ii.invoice_date_created >= '".$fa."-04-01' and ii.invoice_date_created <= '".$aa."-03-31')";
   
   }
-          
   $sql.="group by doc_no,product_description";
   $query = $this->db->query($sql);
   return $query->result();
@@ -2994,6 +2989,5 @@ function INRSymbol()
   $query = $this->db->query($sql);
   return $query->result();    
 }
-
 }
 ?>

application/models/inwardgateregister_model.php

@@ -214,6 +214,34 @@ class inwardgateregister_model extends CI_Model
 				return $query->result();
 			}
 		}
+			function getpolineqty($PO)
+			{
+				$this->db->select('sum(Quantity)as Qty,sum(ReceivedQuantity)as rec');
+				$this->db->from('T_PurchaseOrder_LineItem');
+				$this->db->where('PONO',$PO);
+
+				$query = $this->db->get();
+				return $query->result();
+			}
+
+			function POLineItemsupdatestatus($PO,$Newstatus)
+			{
+					$this->db->where('PONO',$PO);
+					$this->db->update('T_PurchaseOrder_LineItem',$Newstatus);
+						$update = $this->db->affected_rows();
+					return $update;
+
+			}
+
+			function pomasterupdatestatus($PO,$Newstat)
+			{
+					$this->db->where('PONO',$PO);
+					$this->db->update('T_PurchaseOrder_Master',$Newstat);
+					$update = $this->db->affected_rows();
+					return $update;
+			}
+
+	
 			function addmaterialhistory($historydetails)
 			{
 
@@ -544,10 +572,8 @@ class inwardgateregister_model extends CI_Model
 	   $this->db->from('T_MRIR_Master');
 	   $this->db->where('T_MRIR_Master.PONO',$PONO);
 	   $this->db->where('T_MRIR_Master.OGRstatus !=',OGR_COMPLETE);
-	   //$this->db->where('Status !=',IGR_CREATED);
 	   $query = $this->db->get();
-	   //print_r( $this->db->last_query());
+	   
-	   //die();
        $result = $query->result();        
        return $result;		 
 

application/models/purchaseorder_model.php

@@ -92,6 +92,51 @@ $myfile=$this->db->affected_rows();
 return $myfile;
 }
 
+function updateigrmaster($igrno,$NewPOno)
+{	
+		 $this->db->where('IGRNO',$igrno);
+         $this->db->update('T_IGR_Master',$NewPOno);
+         $insert_id = $this->db->affected_rows();
+         return $insert_id;
+}
+function selectigrmaster($PONO)
+{
+
+$this->db->select('*');
+$this->db->from('T_IGR_Master');
+$this->db->where('PONO',$PONO);
+	$query = $this->db->get();
+    return $query->result();
+
+}
+
+function getpolineqty($NewPO)
+{
+	$this->db->select('sum(Quantity)as Qty,sum(ReceivedQuantity)as rec');
+	$this->db->from('T_PurchaseOrder_LineItem');
+	$this->db->where('PONO',$NewPO);
+
+	$query = $this->db->get();
+    return $query->result();
+}
+
+
+function POLineItemsupdatestatus($POno,$Newstatus)
+{
+         $this->db->where('PONO',$POno);
+         $this->db->update('T_PurchaseOrder_LineItem',$Newstatus);
+        $update = $this->db->affected_rows();
+         return $update;
+
+}
+
+function pomasterupdatestatus($POno,$Newstat)
+{
+     $this->db->where('PONO',$POno);
+         $this->db->update('T_PurchaseOrder_Master',$Newstat);
+         $update = $this->db->affected_rows();
+         return $update;
+}
 
 
 function getfunction($pono)

application/views/Report_monthly_gst_table.php

@@ -230,27 +230,33 @@
                         <td style="text-align:center"><span><?php echo $rel->doc_type;?></span></td>
 						<td style="text-align:center"><span><?php echo $rel->hsn_code;?></span></td>
 						 <td style="text-align:right"><span><?php 
-						$tot_val= $tot_val + round($rel->value,2);
+						//$tot_val= $tot_val + round($rel->value,2);
+						$tot_val= $tot_val + $rel->value;
 						echo $rel->value;
 						?></span></td>
 						 <td style="text-align:right"><span><?php 
-						$tot_oth= $tot_oth + round($rel->others,2);
+						//$tot_oth= $tot_oth + round($rel->others,2);
+						$tot_oth= $tot_oth + $rel->others;
 						echo $rel->others;
 						?></span></td>
 						 <td style="text-align:right"><span><?php 
-						$tot_sgst= $tot_sgst + round($rel->sgst,2);
+						//$tot_sgst= $tot_sgst + round($rel->sgst,2);
+						$tot_sgst= $tot_sgst + $rel->sgst;
 						echo $rel->sgst;
 						?></span></td>
 				        <td style="text-align:right"><span><?php 
-						$tot_cgst= $tot_cgst + round($rel->cgst,2);
+						//$tot_cgst= $tot_cgst + round($rel->cgst,2);
+						$tot_cgst= $tot_cgst + $rel->cgst;
 						echo $rel->cgst;
 						?></span></td>
 					 	<td style="text-align:right"><span><?php 
-						$tot_igst= $tot_igst + round($rel->igst,2);
+						//$tot_igst= $tot_igst + round($rel->igst,2);
+						$tot_igst= $tot_igst + $rel->igst;
 						echo $rel->igst;
 						?></span></td>
 						<td style="text-align:right"><span><?php 
-						$tot_tot= $tot_tot + round($rel->total,2);
+						//$tot_tot= $tot_tot + round($rel->total,2);
+						$tot_tot= $tot_tot + $rel->total;
 						echo $rel->total;
 						?></span></td>
 					   
@@ -294,7 +300,8 @@
 												<strong>
 												<?php 
 												 {
-												 echo number_format($tot_sgst,2,'.','');
+												 //echo number_format($tot_sgst,2,'.','');
+												 echo $tot_sgst;
 												
 												  } 
 												  

application/views/editogr.php

@@ -168,7 +168,8 @@ if(!empty($OGR_Data))
 	  <div id="content"></div>
 
 	 <div class="box">
-            <div class="box-header"><?php echo $pageTitle; ?></h3></center>
+            <div class="box-header">
+			<center><h3><?php echo $pageTitle; ?></h3></center>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
@@ -207,7 +208,7 @@ if(!empty($OGR_Data))
 			 
 	   </div>	 			 
 	</div>
-	<? print_r($OGR_Data); ?>
+	
 	<div class="col-md-9" style="padding: 0px;">
 	<div class="col-md-12" style="padding: 0px;">
 	<div class="col-md-3">

application/views/includes/header.php

@@ -449,13 +449,13 @@
 
  			<li>
         <a href="<?php echo base_url(); ?>FinalProduct">
-        <i class="fa fa-dashboard"></i> <span>Final Product</span> 
+        <i class="fa fa-bar-chart"></i> <span>Final Product</span> 
         </a>
  			</li>
 
  			<li>
         <a href="<?php echo base_url(); ?>FinalProductHistory">
-        <i class="fa fa-dashboard"></i> <span>Finished Product  History</span> 
+        <i class="fa fa-bar-chart"></i> <span>Finished Product  History</span> 
         </a>
  			</li>
 
@@ -463,20 +463,20 @@
 
  			<li>
         <a href="<?php echo base_url(); ?>FinalProduct">
-        <i class="fa fa-dashboard"></i> <span>Final Product Listing</span> 
+        <i class="fa fa-bar-chart"></i> <span>Final Product Listing</span> 
         </a>
  			</li>
 
 
  			<li>
         <a href="<?php echo base_url(); ?>MaterailAdjustment">
-        <i class="fa fa-dashboard"></i> <span>Material Adjustment</span> 
+        <i class="fa fa-adjust"></i> <span>Material Adjustment</span> 
         </a>
  			</li>
 
  			<li>
         <a href="<?php echo base_url(); ?>MaterailAdjustmentlist">
-        <i class="fa fa-dashboard"></i> <span>Material Adjustment List</span> 
+        <i class="fa fa-adjust"></i> <span>Material Adjustment List</span> 
         </a>
  			</li>
 </ul></li>
@@ -502,7 +502,7 @@ else{
 
 		<li>
         <a href="<?php echo base_url(); ?>FinalProduct">
-        <i class="fa fa-dashboard"></i> <span>Final Product</span> 
+        <i class="fa fa-bar-chart"></i> <span>Final Product</span> 
         </a>
     </li>
 
@@ -510,32 +510,32 @@ else{
 
        <li>
         <a href="<?php echo base_url(); ?>FinalProductHistory">
-        <i class="fa fa-dashboard"></i> <span>Finished Product  History</span> 
+        <i class="fa fa-bar-chart"></i> <span>Finished Product  History</span> 
         </a>
       </li>
 
 
        <li>
         <a href="<?php echo base_url(); ?>FinalProductlisting">
-        <i class="fa fa-dashboard"></i> <span>Final Product Listing</span> 
+        <i class="fa fa-bar-chart"></i> <span>Final Product Listing</span> 
         </a>
        </li>
        
        <li>
         <a href="<?php echo base_url(); ?>MaterailAdjustment">
-        <i class="fa fa-dashboard"></i> <span>Material Adjustment</span> 
+        <i class="fa fa-adjust"></i> <span>Material Adjustment</span> 
         </a>
        </li>
 
 
        <li>
         <a href="<?php echo base_url(); ?>MaterailAdjustmentlist">
-        <i class="fa fa-dashboard"></i> <span>Material Adjustment List</span> 
+        <i class="fa fa-adjust"></i> <span>Material Adjustment List</span> 
         </a>
        </li>
 	    <li>
 			<a href="<?php echo base_url(); ?>MaterialHistory">
-				<i class="fa fa-dashboard"></i> <span>Material History</span> 
+				<i class="fa fa-history"></i> <span>Material History</span> 
 			</a>
 		</li>
 </ul></li>

application/views/inwardgateregister.php

@@ -399,6 +399,7 @@ function validate()
 				$("#del").val(obj.DeliveryDate);
 				//$("#ser").val(obj.ServiceDescription);
 				status = obj.status;
+				ostatus= obj.OGR_Status;
 			 }		
 		});
 		
@@ -415,12 +416,13 @@ function validate()
 				$('#content').loader('hide'); 
 		               //alert(data);
 						var trHTML = '';
-						
+						var j=0;
 							$.each(JSON.parse(data), function (i, item) {
 								if(item.PendingQty !=0){
 								i=i+1;
+								j=j+1;
 									trHTML += '<tr>' +
-										'<td align="right">' + i + '</td>' +
+									'<td align="right">' + j + '</td>' +
 										'<td name="MaterialName" id="MaterialCode" >' + item.MaterialCode + '</td>' +
 										'<td>' + item.MaterialName + '</td>' +
 										'<td name="UOM">' + item.UOM + '</td>' +
@@ -480,7 +482,10 @@ $('<input>').attr({
 	}
 	$("#IGRLink").show();
 	}else{							
+		if(JSON.parse(data).length == 1 && item.PendingQty == 0){
 				$("#IGRLink").hide();
+				alert('The Order is completed!!');
+		}
 	}					
 							});
 

application/views/materialadjustment.php

@@ -7,7 +7,10 @@ $(function() {
     $("#date").datepicker({
           
             //maxDate : 'now',
-            dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+            dateFormat: 'dd-mm-yy',
+            changeMonth: true, 
+            changeYear: true,
+            yearRange: '-100:+0'
         });
    
  });     
@@ -256,12 +259,29 @@ $(function() {
 
 <script type="text/javascript">
 
+var stock = <?php echo json_encode($stock_value, JSON_PRETTY_PRINT) ?>;
 
 $('.getdetails').click(function()
 {
    var materialcode =$('#materialcode').val();
    var date = $('#date').val();
    var Supplier = $('#supplier').val();
+   var openqty = '';
+
+   $.each(stock,function(j,fnobj)
+  {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+
+           openqty = fnobj.stock == '' ? '0' : fnobj.stock;
+
+           console.log(openqty);
+
+        }
+
+   });
+
+
    $('#content').loader('show');
    	$.ajax({
 
@@ -291,11 +311,13 @@ $('.getdetails').click(function()
               }
    	   	  });
 
-   	   	  var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+   	   	  //var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+            var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
 
    	   	  if(isNaN(resultantqty))
    	   	  {
-             $('#Qty_aspersystem').val(0); 
+             //$('#Qty_aspersystem').val(0); 
+             $('#Qty_aspersystem').val(openqty); 
    	   	  }
    	   	  else
    	   	  {

application/views/ogrlist.php

@@ -14,13 +14,13 @@
         <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>
+            <center><h3 class="box-title"><?php echo $pageTitle; ?></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">
+                <tr>
 				<!-- <th>#</th> -->
         <th>OGR No</th>
         <th>Type</th>