From aa6dffb4048d81aa2d387aa63641a5f52cf773be Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Fri, 28 Jul 2017 18:05:16 +0530
Subject: [PATCH] UI issues of listing

---
 application/logs/log-2017-07-28.php           |  15 +
 application/views/addemployee.php             |  24 ++
 application/views/capitalpurchaseorder.php    |  75 ++---
 application/views/editCapitalPo.php           | 264 +++++++++---------
 application/views/editimportpo.php            |   7 +-
 application/views/importpo.php                |   9 +-
 application/views/issueStoreRequistion.php    |  22 +-
 application/views/purchaseorder.php           |   2 +-
 application/views/requisitionform.php         |  43 +--
 application/views/serviceporeport.php         |   2 +-
 application/views/storerequisition.php        |  11 +-
 application/views/storerequisitionlisting.php |  23 +-
 application/views/storestatus.php             |  25 +-
 application/views/viewIGRDetails.php          |  34 +--
 application/views/viewinwardgateregister.php  |  17 +-
 .../views/viewmaterialinspectionreport.php    |  19 +-
 16 files changed, 312 insertions(+), 280 deletions(-)

diff --git a/application/logs/log-2017-07-28.php b/application/logs/log-2017-07-28.php
index 2575abbc..f6d9f1dc 100644
--- a/application/logs/log-2017-07-28.php
+++ b/application/logs/log-2017-07-28.php
@@ -3,3 +3,18 @@
 ERROR - 2017-07-28 16:26:12 --> Severity: Notice  --> Undefined variable: Deatail /opt/lampp/htdocs/listsi/siddharth_application/application/views/importpo.php 420
 ERROR - 2017-07-28 16:29:01 --> Severity: Notice  --> Undefined variable: Deatail /opt/lampp/htdocs/listsi/siddharth_application/application/views/importpo.php 420
 ERROR - 2017-07-28 08:32:16 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/listsi/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38
+ERROR - 2017-07-28 13:30:39 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_result.php 38
+ERROR - 2017-07-28 21:30:53 --> Severity: Notice  --> Undefined variable: Deatail C:\xampp\htdocs\siddharth_application\application\views\importpo.php 423
+ERROR - 2017-07-28 21:31:09 --> Severity: Notice  --> Undefined variable: Deatail C:\xampp\htdocs\siddharth_application\application\views\importpo.php 423
+ERROR - 2017-07-28 13:31:50 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_result.php 38
+ERROR - 2017-07-28 13:32:00 --> Severity: Notice  --> Undefined variable: Deatail C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 539
+ERROR - 2017-07-28 13:32:00 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 2372
+ERROR - 2017-07-28 13:32:49 --> Severity: Notice  --> Undefined variable: Deatail C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 540
+ERROR - 2017-07-28 13:32:49 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 2373
+ERROR - 2017-07-28 13:35:33 --> Severity: Notice  --> Undefined variable: Deatail C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 541
+ERROR - 2017-07-28 13:35:33 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 2374
+ERROR - 2017-07-28 13:36:39 --> Severity: Notice  --> Undefined variable: Deatail C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 541
+ERROR - 2017-07-28 13:36:39 --> Severity: Notice  --> Undefined property: stdClass::$AvlBudAmt C:\xampp\htdocs\siddharth_application\application\views\editimportpo.php 2374
+ERROR - 2017-07-28 13:37:19 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_result.php 38
+ERROR - 2017-07-28 13:42:48 --> Query error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 5
+ERROR - 2017-07-28 14:03:47 --> Severity: Warning  --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given C:\xampp\htdocs\siddharth_application\system\database\drivers\mysqli\mysqli_result.php 38
diff --git a/application/views/addemployee.php b/application/views/addemployee.php
index f36bb760..00709c0f 100755
--- a/application/views/addemployee.php
+++ b/application/views/addemployee.php
@@ -1,4 +1,28 @@
 <script>
+$(document).ready(function(){
+         $("#gender").select2();
+         $("#bloodgroup").select2();
+         $("#MartialStatus").select2();
+         $("#desigination").select2();
+         $("#departmentname").select2();
+         $("#eduqualifaction").select2();
+       });
+    function driver_designition()
+    {
+    //  alert('i am in driver_designition function');
+   //$('#desigination').on('change', function () {
+     var opt = $("#desigination").val();
+     if(opt == 'DRIVER')
+     {
+      $("#Driverlicense").attr("required", "true");
+      $("#LicenseExpiryDate").attr("required", "true");
+      //alert(opt);
+     }
+     else
+     {
+     // alert('else statement');
+     }
+   }
      function readURL(input) {
             if (input.files && input.files[0]) {
                 var reader = new FileReader();
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index 0bc880b7..ca7f7a39 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -166,12 +166,12 @@ function vaildateBeforeOpenModal()
 		$('#currencytype').focus();
 		return false;
 	}
-	else if($('#ExchangeRt').val() == '')
+	/* else if($('#ExchangeRt').val() == '')
 	{
 		 alert('Please Enter the Exchange Rate');
 		$('#ExchangeRt').focus();
 		return false;
-	}
+	} */
 
     
 	else 
@@ -195,7 +195,7 @@ function vaildateBeforeOpenModal()
                                      <center><b><h2>Siddharth Industries - Capital Purchase Order</h2></b></center>
 
                                     <!-- <div class="col-md-1"><br/>
-                                     <a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
+                                     <a class="btn btn-primary" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
                                     </div> -->
                             </div>
              <div class="container-fluid">
@@ -349,7 +349,7 @@ function vaildateBeforeOpenModal()
 										</tr>
 									</div>
 
-											<div class="col-md-12" id="Schedulediv"><br/>
+											<div class="col-md-12" id="Schedulediv"> 
 															<label >Schedule </label>
 
 															<?php
@@ -358,7 +358,7 @@ function vaildateBeforeOpenModal()
 															?>
 
 											</div>
-										<div class="col-md-12" id="Deliverydtdiv" style="display:none;"><br/>
+										<div class="col-md-12" id="Deliverydtdiv" style="display:none;"> 
                             <label>Dispatch Instruction</label>
                              
             <?php
@@ -370,7 +370,7 @@ function vaildateBeforeOpenModal()
             ?>
                              
         </div>
-		      <div class="col-md-12" id="deliverydateby" style="display:none;"><br/>
+		      <div class="col-md-12" id="deliverydateby" style="display:none;"> 
                 <label>Delivery Date</label>
                         <div class="form-group">
                                     <?php
@@ -610,7 +610,7 @@ function vaildateBeforeOpenModal()
                               </div>
                            </div>
 		                    
-                           <div class="col-md-3">
+                           <div class="col-md-2">
                               <label>Quantity</label>
                                 <div class="form-group">
                                   <?php
@@ -619,7 +619,7 @@ function vaildateBeforeOpenModal()
                                    ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="col-md-2">
                                <label id="RateIn">Rate(In INR /UOM)</label>
                                   <div class="form-group">
                                     <?php
@@ -628,7 +628,7 @@ function vaildateBeforeOpenModal()
                                     ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-3">
+                                                    <div class="col-md-2">
                                                         <label id="TotalAmount">Basic value in INR</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1076,8 +1076,8 @@ function vaildateBeforeOpenModal()
 
            </div>
               <div class="modal-footer">
-                 <a class="btn btn-info font AddCapital"  ID="AddCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
-                 <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                 <a class="btn btn-primary font AddCapital"  ID="AddCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
+                 <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                </div>
               </div>
@@ -1101,8 +1101,8 @@ function vaildateBeforeOpenModal()
      <div align="left">
         <div class="col-md-12">											 
 			<div class="col-md-12">
-				<div class="col-md-5" style="padding:0px;">
-					<div class="col-md-6">
+				 
+					<div class="col-md-3">
 						<label>Req No</label>
 					<div>
 
@@ -1122,7 +1122,8 @@ function vaildateBeforeOpenModal()
                         ?>	
 
                    </div>
-                   <div class="col-md-6">
+				   </div>
+                   <div class="col-md-2">
                         <label>Department Name</label>
                     <div>
                         <?php
@@ -1131,9 +1132,9 @@ function vaildateBeforeOpenModal()
                         ?>
                     </div>
                     </div>
-                    </div>
-                    <div class="col-md-5">
-                    <div class="col-md-6">
+                   
+                     
+                    <div class="col-md-2">
                         <label>Cost Center Name</label>
                     <div>
                         <?php
@@ -1144,17 +1145,17 @@ function vaildateBeforeOpenModal()
                         ?>
                     </div>
                     </div>
-                    <div class="col-md-6">
-                                                                                                                            <label>Avail Bud Amount</label>
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                    $data = array('name' => 'EditCapitalbudAmt','value' => set_value('EditCapitalbudAmt'),'id'=>'EditCapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>
-                                                                                                                            </div>
-                                                                                                                    </div>
+                    <div class="col-md-3">
+																																					<label>Avail Bud Amount</label>
+																																					<div class="form-group">
+																																							<?php
+																																							$data = array('name' => 'EditCapitalbudAmt','value' => set_value('EditCapitalbudAmt'),'id'=>'EditCapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+																																							echo form_input($data);
+																																							?>
+																																					</div>
+						  </div>
                     
-                    </div>
+                     
                     <div class="col-md-2" id="hideModalExchangeEdit">
                         <label> Exchange Rate</label> 
                     <div class="form-group">
@@ -1164,8 +1165,9 @@ function vaildateBeforeOpenModal()
                         ?>
                     </div>
                     </div>
-                    </div>
-                    </div>
+				</div>
+              </div>
+            
                     <div class="col-md-12">
                     <div class="col-md-12">
                     <div class="col-md-2">
@@ -1186,7 +1188,7 @@ function vaildateBeforeOpenModal()
                                                             ?>
                                                         </div>
                                                     </div>
-														 
+														 <div class="col-md-2"> 
                                                         <label>UOM</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1196,7 +1198,7 @@ function vaildateBeforeOpenModal()
                                                         </div>
                                                     </div>
 													
-                                                    <div class="col-md-3">
+                                                    <div class="col-md-2">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1205,7 +1207,7 @@ function vaildateBeforeOpenModal()
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-3">
+                                                    <div class="col-md-2">
                                                         <label id="EditRateIn">Rate(in INR/UOM)</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1214,7 +1216,7 @@ function vaildateBeforeOpenModal()
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-3">
+                                                    <div class="col-md-2">
                                                         <label id="EditTotalAmount">Basic value in INR</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1225,6 +1227,7 @@ function vaildateBeforeOpenModal()
                                                     </div>
                                                       </div>
                                                 </div>
+												</div>
                                                 <div class="col-md-12">											
                   <div class="col-md-12"  style="border:1px solid #000;padding:5px;" id="EDITCAPdiv">
                                                 <div class="col-md-12">
@@ -1659,15 +1662,15 @@ function vaildateBeforeOpenModal()
                                                     </div>
 
 
-                                                </div>
+                                                
 
 
 
 
 
                                             <div class="modal-footer">
-                                                <a class="btn btn-info font EditCapital"  ID="UpdateCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
-                                                <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                                <a class="btn btn-primary font EditCapital"  ID="UpdateCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                                <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
                                         </div>
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 859cc728..25e8d7c6 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -292,7 +292,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                      <center><b><h2>Siddharth Industries - Edit Capital Purchase Order</h2></b></center>
 
                                     <!-- <div class="col-md-1"><br/>
-                                     <a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
+                                     <a class="btn btn-primary" href="<?php echo base_url(); ?>purchaseorder/CreatecapitalPOPrint" target="_blank">Print</a>
                                     </div> -->
                             </div>
              <div class="container-fluid">
@@ -516,7 +516,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 		  <legend>Payment Details</legend>
           <!-- Text input-->
 		    <div class="col-md-3">
-			    <span for="payablefrom">Payable Terms</span>
+			    <label for="payablefrom">Payable Terms</label>
 				    
                            <?php
                                                        
@@ -883,33 +883,33 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                 </div>
                 </div>
 				
-                                                    <div class="col-md-3">
-                                                        <label>Quantity</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label id="RateIn">Rate(In INR /UOM)</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label id="TotalAmount">Basic value in INR</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'CPTotalAmount','value' => set_value('CPTotalAmount'),'id'=>'CPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
+					<div class="col-md-2">
+						<label>Quantity</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'CPQuantity','value' => set_value('CPQuantity'),'id'=>'CPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					<div class="col-md-2">
+						<label id="RateIn">Rate(In INR /UOM)</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					<div class="col-md-2">
+						<label id="TotalAmount">Basic value in INR</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'CPTotalAmount','value' => set_value('CPTotalAmount'),'id'=>'CPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
                                                 </div>
                                                 </div>
                                                 <div class="col-md-12">		
@@ -1352,8 +1352,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
 
                                             <div class="modal-footer">
-                                                <a class="btn btn-info font AddCapital"  ID="AddCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
-                                                <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                                <a class="btn btn-primary font AddCapital"  ID="AddCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
+                                                <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
                                         </div>
@@ -1367,7 +1367,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                 <div class="modal-dialog">
                                     <!-- Modal content-->
                                     <form>
-                                        <div class="modal-content" style="width:900px;">
+                                        <div class="modal-content" style="width:1100px;">
                                             <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                                                 <center><h4>Edit Capital Purchase Order Item </h4></center>
@@ -1460,43 +1460,43 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
         ?>
         </div>
       </div>
-                                                    <div class="col-md-2">
-                                                        <label>UOM</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'EditCPUOM','value' => set_value('EditCPUOM'),'id'=>'EditCPUOM',  'class' => 'form-control' ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-													 
-                                                    <div class="col-md-3">
-                                                        <label>Quantity</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label id="EditRateIn">Rate(in INR/UOM)</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label id="EditTotalAmount">Basic value in INR</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'EditCPTotalAmount','value' => set_value('EditCPTotalAmount'),'id'=>'EditCPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
+				<div class="col-md-2">
+					<label>UOM</label>
+					<div class="form-group">
+						<?php
+						$data = array('name' => 'EditCPUOM','value' => set_value('EditCPUOM'),'id'=>'EditCPUOM',  'class' => 'form-control' ,'readonly' => 'true');
+						echo form_input($data);
+						?>
+					</div>
+				</div>
+				 
+				<div class="col-md-2">
+					<label>Quantity</label>
+					<div class="form-group">
+						<?php
+						$data = array('name' => 'EditCPQuantity','value' => set_value('EditCPQuantity'),'id'=>'EditCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
+						echo form_input($data);
+						?>
+					</div>
+				</div>
+				<div class="col-md-2">
+					<label id="EditRateIn">Rate(in INR/UOM)</label>
+					<div class="form-group">
+						<?php
+						$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
+						echo form_input($data);
+						?>
+					</div>
+				</div>
+				<div class="col-md-2">
+					<label id="EditTotalAmount">Basic value in INR</label>
+					<div class="form-group">
+						<?php
+						$data = array('name' => 'EditCPTotalAmount','value' => set_value('EditCPTotalAmount'),'id'=>'EditCPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+						echo form_input($data);
+						?>
+					</div>
+				</div>
                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">											
@@ -1940,8 +1940,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
 
                                             <div class="modal-footer">
-                                                <a class="btn btn-info font EditCapital"  ID="UpdateCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
-                                                <a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+                                                <a class="btn btn-primary font EditCapital"  ID="UpdateCapital"  ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
+                                                <a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 
                                             </div>
                                         </div>
@@ -1957,7 +1957,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                 <div class="modal-dialog">
                                     <!-- Modal content-->
                                    <form>
-                                        <div class="modal-content" style="width:900px;">
+                                        <div class="modal-content" style="width:1100px;">
                                             <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
                                                 <button type="button" class="close" data-dismiss="modal">&times;</button>
                                                 <center><h4>View Capital Purchase Order Item </h4></center>
@@ -1965,8 +1965,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                             <div align="left">
 							<div class="col-md-12">											 
 																				  <div class="col-md-12">
-																		<div class="col-md-5" style="padding:0px;">
-																				<div class="col-md-6">
+																	
+																				<div class="col-md-3">
 																						<label>Req No</label>
 																						<div>
 
@@ -1981,7 +1981,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
 					</div>
 					</div>
-			<div class="col-md-6">
+			<div class="col-md-3">
 		<label>Department Name</label>
 		<div>
 		<?php
@@ -1990,9 +1990,9 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 		?>
 		</div>
 		</div>
-		</div>
-		<div class="col-md-5">
-		<div class="col-md-6">
+		 
+		<div class="col-md-3">
+		 
 		<label>Cost Center Name</label>
 		<div>
 		<?php
@@ -2002,10 +2002,10 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
 		?>
 		</div>
-		</div>
+		 
 		
 		</div>
-		<div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;">
+		<div class="col-md-3" id="ExchangeRateModalViewDiv" style="display:none;">
 		<label> Exchange Rate</label> 
 		<div class="form-group">
 		<?php
@@ -2028,55 +2028,55 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 						echo form_input($data);
              ?>
          </div> 
-                                                    </div>
-                                                    <div class="col-md-2">
-                                                        <label>Item Name</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ViewCapitalItemName','value' => set_value('ViewCapitalItemName'),'id'=>'ViewCapitalItemName',  'class' => 'form-control' ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-														 
-                                                    <div class="col-md-2">
-                                                        <label>UOM</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ViewCPUOM','value' => set_value('ViewCPUOM'),'id'=>'ViewCPUOM',  'class' => 'form-control' ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-													 
-                                                    <div class="col-md-3">
-                                                        <label>Quantity</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ViewCPQuantity','value' => set_value('ViewCPQuantity'),'id'=>'ViewCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label id="EditRateIn">Rate(in INR/UOM)</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ViewCPRate','value' => set_value('ViewCPRate'),'id'=>'ViewCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3">
-                                                        <label id="EditTotalAmount">Basic value in INR</label>
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ViewCPTotalAmount','value' => set_value('ViewCPTotalAmount'),'id'=>'ViewCPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                    </div>
-                                                  </div>
+					</div>
+					<div class="col-md-2">
+						<label>Item Name</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'ViewCapitalItemName','value' => set_value('ViewCapitalItemName'),'id'=>'ViewCapitalItemName',  'class' => 'form-control' ,'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+						 
+					<div class="col-md-2">
+						<label>UOM</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'ViewCPUOM','value' => set_value('ViewCPUOM'),'id'=>'ViewCPUOM',  'class' => 'form-control' ,'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					 
+					<div class="col-md-2">
+						<label>Quantity</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'ViewCPQuantity','value' => set_value('ViewCPQuantity'),'id'=>'ViewCPQuantity',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					<div class="col-md-2">
+						<label id="EditRateIn">Rate(in INR/UOM)</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'ViewCPRate','value' => set_value('ViewCPRate'),'id'=>'ViewCPRate',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					<div class="col-md-2">
+						<label id="EditTotalAmount">Basic value in INR</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'ViewCPTotalAmount','value' => set_value('ViewCPTotalAmount'),'id'=>'ViewCPTotalAmount',  'class' => 'form-control'  ,'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+				  </div>
                                                 </div>
                                                 <div class="col-md-12">											
                                             <div class="col-md-12" id="VIEWCAPdiv">
@@ -2719,21 +2719,21 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                           </div>
 		 <div class="col-md-12" style="padding:1% 0%;">
 							<div class="col-md-4">
-								<span>Request On</span>								  
+								<label>Request On</label>								  
 								  <?php
 											 $data = array('name' => 'Requeston','value' => set_value('Requeston',$UpdatedOn),'id'=>'Requeston',  'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
 											echo form_input($data);
 											?>   
 							</div>
 							<div class="col-md-4">
-								<span>Request By</span>								  
+								<label>Request By</label>								  
 								  <?php
 									 $data = array('name' => 'RequestBy','value' => set_value('RequestBy',$requestedBy),'id'=>'RequestBy',  'class' => 'form-control' ,'required' => 'true');
 									echo form_input($data);
 									?> 
 							</div>
 							<div class="col-md-4">
-								<span>Status</span>								  
+								<label>Status</label>								  
 								 <?php
                                                                     
 									   $data = array('name' => 'Status','value' => set_value('Status',$PoStatusName),'id'=>'Status',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
diff --git a/application/views/editimportpo.php b/application/views/editimportpo.php
index f8dc20ef..88e95ce6 100755
--- a/application/views/editimportpo.php
+++ b/application/views/editimportpo.php
@@ -193,6 +193,7 @@ body {
 
 </style>
 
+<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>
@@ -209,6 +210,7 @@ body {
         });
         //Initialize Select2 Elements
         //$("#drpSupplier").select2();
+		 $("#currencytype").select2();
      var POMaxDate = '<?php echo $MaxPoDate;?>';
   var d = new Date(POMaxDate);
 
@@ -2683,8 +2685,7 @@ if($PONOStatus == PO_RELEASED)
   </div>
          <br/>
      </div>
-            </div> 
-        <div class="col-md-12">
+	   <div class="col-md-12">
                             <div class="col-md-4">
                                 <span>Request On</span>                                  
                                   <?php
@@ -2710,6 +2711,8 @@ if($PONOStatus == PO_RELEASED)
                                 ?>
                             </div><br/>
                 </div>
+            </div> 
+      
          </div>
 		 </div>
     </section>   
diff --git a/application/views/importpo.php b/application/views/importpo.php
index b05bdcc4..ae4fcf13 100755
--- a/application/views/importpo.php
+++ b/application/views/importpo.php
@@ -74,16 +74,13 @@ if(!empty($AvlimportBudAmt))
     padding-bottom: 0px;
 }
 </style>
-
-<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript">
-    
-</script>
-
+<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>
  $(document).ready(function(){  
  tinymce.init({
-          selector: "textarea#ScopeOfWork",
+          selector: "textarea#txtSpcialInstruction",
           
             menubar: false,
            statusbar: false,
diff --git a/application/views/issueStoreRequistion.php b/application/views/issueStoreRequistion.php
index 2bc062ce..4a30f293 100755
--- a/application/views/issueStoreRequistion.php
+++ b/application/views/issueStoreRequistion.php
@@ -67,7 +67,7 @@ $(function() {
       </h1>
     </section>
     <section class="content">
-    <div class="row" style="border:2px dotted; padding:2% 5%">
+    <div class="row" style="padding:2% 5%">
      <?php
                       $attributes = array('class' => 'form-label-left requistion ','name'  => 'requistion','id'  => 'requistion');
                         
@@ -78,6 +78,7 @@ $(function() {
     
 <!--     <form method="post" role="form" > -->
     <div class="row"> 
+    <div class="col-md-12">
     <input type="hidden" name="txtReqNo" id="txtReqNo"  value="<?php echo $StoreReqNo?>"/>
 	
     
@@ -117,15 +118,21 @@ $(function() {
 				?>
         </div>
     
-     
+     </div>
 </div>
 
 						<br>
-						<br>
+					 
 
-      
 
- <div class="row">
+
+ <div class="row ">
+   <div class=" box ">
+ <div class="  container-fluid">
+  <div class="box-header">
+                 <CENTER><h3 class="box-title"> </h3></CENTER>
+                   
+                </div>
 			 <table id="Items" class="table table-bordered table-hover editableTable"  style="background-color:#fff;font-size:12px;"> 
                 <thead style="background-color: #CFCFCF;">
 					<th>SNO</th>                   
@@ -176,11 +183,10 @@ $(function() {
 					
 				</tbody>
 			</table>
+			</div>
+			</div>
 			</div>
 
-
-
-			<br>
 				<div  class="col-md-3 col-md-offset-9" align = "right">
                 <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $RowCount;?>" />
                
diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php
index c9711565..2fa14040 100755
--- a/application/views/purchaseorder.php
+++ b/application/views/purchaseorder.php
@@ -3073,7 +3073,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 		$('#EditUOM').val($('#uom'+userid).val());
 		$('#EditQuantity').val($('#quantity'+userid).val());
 		$('#EditRate').val($('#itemRate'+userid).val());
-		$('#txtEditBasicValue').val(cellval[6].innerHTML);
+		$('#txtEditBasicValue').val(cellval[7].innerHTML);
 		RequistQuantity = $('#quantity'+userid).val();
 		$('#txtEditDiscount').val($('#DisVal'+userid).val());
 		$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php
index 67d6f731..61e548d6 100755
--- a/application/views/requisitionform.php
+++ b/application/views/requisitionform.php
@@ -17,12 +17,11 @@ if(!empty($Emp))
 }
 ?>
  
-<div class="content-wrapper">
+<div class="content-wrapper" style="min-height:537px;">
     
  
 	 <section class="content">
-	  
-	 <div>
+	 
          <center><b><h2>Siddharth Industries - Requisition Form</h2></b></center>
          <div class="container-fluid">
 		  <div id="content"></div>
@@ -32,7 +31,7 @@ if(!empty($Emp))
                         echo form_open($this->config->base_url().'requisitionform/SearchRequistList',$attributes); ?>
 	 <div class="row">
 	 <div class="col-md-12">
-		 <div class="col-md-3">
+		 <div class="col-md-2">
 		 <label>Request Type</label>
 			<div>
 				 <?php
@@ -56,7 +55,7 @@ if(!empty($Emp))
 				 
 			</div>
 		 </div>
-		 <div class="col-md-3">
+		 <div class="col-md-2">
 		 <label>Requested By</label>
 			<div>
 				
@@ -67,7 +66,7 @@ if(!empty($Emp))
  <input type="hidden" name="EmpID" id="EmpID" value=<?php echo $EmpID?> />										
 			</div>
 		 </div>
-		 <div class="col-md-3">
+		 <div class="col-md-2">
 		 <label>Department Name</label>
 		 	<div class="form-group">
 									<?php
@@ -76,7 +75,7 @@ if(!empty($Emp))
                                         ?>   
                                 </div>
 		 </div>
-		 <div class="col-md-3">
+		 <div class="col-md-2">
 		 <label>Designation</label>
 		 	<div class="form-group">
 									<?php
@@ -85,10 +84,9 @@ if(!empty($Emp))
                                         ?>   
                                 </div>
 		 </div>
-	 </div>
-	 <div class="col-md-12">
+	  
 	
-	  <div class="col-md-3">
+	  <div class="col-md-2">
 		 <label>Cost Center Name</label>
 		 <div>
 				 <?php
@@ -110,7 +108,7 @@ if(!empty($Emp))
 				 
 			</div>
 		 </div>
-	 <div class="col-md-3">
+		<div class="col-md-2">
 		 <label>Available Budget Amount</label>&nbsp;<img id="AlertImg"  src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px"  style="display:none"/>
 		 	<div class="form-group">
 				<?php
@@ -119,7 +117,10 @@ if(!empty($Emp))
 					?>   
 			</div>
 		 </div>
-            <div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
+</div>
+<div class="col-md-12">
+
+            <div class="col-md-2" id="DisplayScheduleDiv" style="display:none;">
 		 <label>Select Service Schedule Type</label>
 		 	<div class="form-group">
 				 <?php
@@ -140,7 +141,7 @@ if(!empty($Emp))
 		?>  
 			</div>
 		 </div>
-    <div class="col-md-3" id="ServicePeriodOption" style="display:none;">
+    <div class="col-md-2" id="ServicePeriodOption" style="display:none;">
 		 <label>Select Service Period Option</label>
 		 	<div class="form-group">
 				 <?php
@@ -161,12 +162,12 @@ if(!empty($Emp))
 		?>  
 			</div>
 		 </div>
-<div class="col-md-3" id="NoServices" style="display:none;">
+<div class="col-md-2" id="NoServices" style="display:none;">
 		 <label>Number of Services</label>
 		 	<div class="form-group">
 				 <?php
                                      
-                                                            $data = array('name' => 'ServiceNo','value' => set_value('ServiceNo'),'id'=>'ServiceNo',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
+                    $data = array('name' => 'ServiceNo','value' => set_value('ServiceNo'),'id'=>'ServiceNo',  'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
                                                             echo form_input($data);
                                                             ?>
 			</div>
@@ -179,7 +180,7 @@ if(!empty($Emp))
 	  
 		 	
 	 </div>
-	 </div>
+	 
          
 	 
           <div class="container-fluid">    
@@ -264,7 +265,7 @@ if(!empty($Emp))
 					  </div>
    
   
-  </div><br/> <div class="modal fade" id="EditItem" role="dialog">
+  </div> <div class="modal fade" id="EditItem" role="dialog">
 		<div class="modal-dialog">
 		
 		  <!-- Modal content-->
@@ -327,10 +328,10 @@ if(!empty($Emp))
 					  </div>
    
   
-  </div></br>
-  
+  </div> 
+ 
    <table id="Items" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                <thead style="background-color:#ddf">
+      <thead style="background-color:#ddf">
         <tr>
         <th>SNo</th>
         <th>Material Code</th>
@@ -346,7 +347,7 @@ if(!empty($Emp))
     </tbody>
 	
   </table>
-         
+        
  <div align="right" style="padding-right:10px">
    <input type="hidden" name="txtRowCount" id="txtRowCount" />
    <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
diff --git a/application/views/serviceporeport.php b/application/views/serviceporeport.php
index 1d94fbf2..4e3e57e1 100755
--- a/application/views/serviceporeport.php
+++ b/application/views/serviceporeport.php
@@ -13,7 +13,7 @@
         <div class="col-xs-12">
           <div class="box">
             <div class="box-header">
-              <center><h3 class="box-title"><b>Service Purchase Order Report  </b></h3></center>
+              <center><h3 class="box-title"> Service Purchase Order Report</h3></center>
             </div>
 			<div class="box-body">
               <table id="example1" class="table table-bordered table-hover editableTable" style="font-size:12px;">
diff --git a/application/views/storerequisition.php b/application/views/storerequisition.php
index 279b9a05..847af69b 100755
--- a/application/views/storerequisition.php
+++ b/application/views/storerequisition.php
@@ -31,11 +31,12 @@ span.highlight {
      
         <div class="row">
             <div class="col-xs-12">
-              <div class="box">
+              <div class="box">    
+                <div class="  container-fluid">
                 <div class="box-header">
                  <CENTER><h3 class="box-title">Siddharth Industries - Requisition Listing</h3></CENTER>                   
                 </div>
-                <?php if($DraftCount > 0 ) {?><p>
+                <?php if($DraftCount > 0 ) { ?><p>
 <span class="highlight">The Store Requisition No <b><?php echo $StoreReqNo;?></b> is in Draft status.</span>  Please act on the requisition.<span class="highlight">Then only you can raise New StoreRequisition. </span>
 				</p> <?php } ?>
                 	  <div class="row">
@@ -49,8 +50,8 @@ span.highlight {
                 </div>
             </div>
         </div>
-				 <table id="Requisition"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-                   <thead style="background-color:#ddf">
+		<table id="Requisition"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+                <thead style="background-color:#ddf">
 				    <tr>
 						<th>Store Requisition No</th>
 						<th>Tot No.OfLineItem </th>
@@ -101,7 +102,7 @@ $ReqDate =  $dt->format('d-m-y');  echo $ReqDate  ?>
                 </div>
                 </div>
                 </div>
-
+</div>
 
      </section>
 </div>
diff --git a/application/views/storerequisitionlisting.php b/application/views/storerequisitionlisting.php
index 67feb35c..7fa7ea09 100755
--- a/application/views/storerequisitionlisting.php
+++ b/application/views/storerequisitionlisting.php
@@ -19,12 +19,7 @@ span.highlight {
 }
 </style>
 <div class="content-wrapper">
- <section class="content-header">
-      <h1>
-        <CENTER>Siddharth Industries - Store Requisition Listing</CENTER>
-       
-      </h1>
-    </section>
+ 
      <section class="content">
       
 			 <div class="row">
@@ -45,13 +40,9 @@ span.highlight {
                                            
 			</div>
 		</div>
-		<div class="col-md-3">
-		 <div class="form-group">
-                
-              </div>
-	   </div>
+		 
 	
-		<div class="col-md-3">
+		<div class="col-md-3 col-md-offset-3">
 		<label>&nbsp;&nbsp;</label>
 					<div class="form-group">
 					 <input type="hidden" name="FromDate" id="FromDate" />
@@ -67,7 +58,7 @@ span.highlight {
 			
 	   </div>	 
 	 </div>
-         </div><br/>
+         </div> 
 		 <!-- model to show Store requisition detail -->
 		 <div class="modal fade" id="storereqdetail" role="dialog">
 		<div class="modal-dialog">
@@ -189,9 +180,10 @@ span.highlight {
         <div class="row">
             <div class="col-xs-12">
               <div class="box">
+               <div class="  container-fluid">
                 <div class="box-header">
-                 <CENTER><h3 class="box-title"></h3></CENTER>
-                   <div class="box-tools"></div>
+                 <CENTER><h3 class="box-title">Siddharth Industries - Store Requisition Listing</h3></CENTER>
+                   
                 </div>
                 	 
 				 <table id="Requisition"  class="table table-bordered table-hover editabletable" style="background-color:#fff;font-size:12px;">
@@ -246,6 +238,7 @@ span.highlight {
 					</tbody>
                   </table>
 				  <div id="content"></div>
+				  </div>
                 </div>
                 </div>
                 </div>
diff --git a/application/views/storestatus.php b/application/views/storestatus.php
index 62144ceb..795c8012 100755
--- a/application/views/storestatus.php
+++ b/application/views/storestatus.php
@@ -11,11 +11,15 @@
                         echo form_open($this->config->base_url().'purchaseorderform/purchaseorder',$attributes); ?>
  
 	<section class="content">
-	    <center><b><h2>Siddharth Industries - Stock Details </h2></b></center>        
+	<div class="box"> 
+	 		          
         <div class="container-fluid">  
+		<div class="box-header">
+                 <CENTER><h3 class="box-title">Siddharth Industries - Stock Details</h3></CENTER>                   
+                </div>
 			<div align="right">
 				<!-- Trigger the modal with a button  to add Item-->
-				<button type="button" class="btn btn-info" data-toggle="modal" data-target="#AddItemModel">Add Item</button>
+				<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#AddItemModel">Add Stock Item</button>
 				</div>
 				<!-- Start of Modal -->
 				<div id="AddItemModel" class="modal fade" role="dialog">
@@ -117,8 +121,8 @@
 			</div>
 			
 			<div class="modal-footer">
-			<a class="btn btn-info font EditItem"  onclick="AddStock();"  ID="AddItem"  ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span 	class="bold">Add</span></a>
-						<a  class="btn btn-info" data-dismiss="modal"  onclick="cancel();" value="Cancel">cancel</a>
+			<a class="btn btn-primary font EditItem"  onclick="AddStock();"  ID="AddItem"  ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span 	class="bold">Add</span></a>
+						<a  class="btn btn-primary" data-dismiss="modal"  onclick="cancel();" value="Cancel">cancel</a>
 			</div>
 		  </div></div>		
 				</div>
@@ -224,8 +228,8 @@
 			</div>
 			
 			<div class="modal-footer">
-			<a class="btn btn-info font EditItem"  onclick="EditStock();"  ID="EditItem"  ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span 	class="bold">Edit</span></a>
-						<a  class="btn btn-info" data-dismiss="modal"  onclick="cancel();" value="Cancel">cancel</a>
+			<a class="btn btn-primary font EditItem"  onclick="EditStock();"  ID="EditItem"  ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span 	class="bold">Edit</span></a>
+						<a  class="btn btn-primary" data-dismiss="modal"  onclick="cancel();" value="Cancel">cancel</a>
 			</div>
 		  </div></div>		
 				</div>
@@ -286,15 +290,10 @@ $updatedOn =  $dt->format('d-m-y');
 				</tbody>
 				
 			</table>
-         
-         
-				 <div align="right" style="padding-right:10px">
-				   
-				 				
-				  </div>  
+          
           
 			</div>
-			          
+			   </div>       
 		</div>
 <div id="content"></div>		
 	</section>
diff --git a/application/views/viewIGRDetails.php b/application/views/viewIGRDetails.php
index 20dc13f0..a644a964 100755
--- a/application/views/viewIGRDetails.php
+++ b/application/views/viewIGRDetails.php
@@ -14,14 +14,13 @@
 	}
  </style>
 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Siddharth Industries - View Inward Gate Register </center>        
-      </h1>	  	  	 
-    </section>    
+         
     <section class="content"><br/>  
-	 		
+	 		 <div class="box">
+			 <div class="  container-fluid">
+                <div class="box-header">
+                 <CENTER><h3 class="box-title">Siddharth Industries -View Inward Gate Register</h3></CENTER>                   
+                </div>
         <div class="row"> 
 		<div class="col-md-12">
             									
@@ -75,7 +74,8 @@
 					</tbody>					
 				</table>
 			</div> 
-			 
+			 </div>
+			 </div>
 		</div>
         </div>  
 <div class="modal fade" id="Igrshow" role="dialog">
@@ -118,21 +118,13 @@
 							 <br/>
 							<div class="col-md-12">								
 								<div class="col-md-3">
-								<label>Supplier and Address :</label> 
+								<label>Supplier Name :</label> 
 								</div>
 								<div class="col-md-3">
 									<input type="text" id="Supplier" readonly>
-									<textarea rows="3" cols="21" id="Add1" readonly>
-									</textarea><br/>
-
-								</div>
-								<div class="col-md-3">
-								<label>Comments Of Special Instructions :</label>
-								</div>
-								<div class="col-md-3">
-									 <textarea rows="4" cols="21" id="ser" readonly>
-										</textarea>
+								 
 								</div>
+								 
 							</div>
 							<!-- Table to show the line item of po -->
 							  <div id="content" > </div> 
@@ -162,7 +154,7 @@
   							</table>
 							 
 							<div class="modal-footer">
-								<a class="btn btn-info" data-dismiss="modal"  value="Cancel">Cancel</a>
+								<a class="btn btn-primary" data-dismiss="modal"  value="Cancel">Cancel</a>
 							</div>
 						</div>
 					</form>
@@ -238,4 +230,4 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
 });
 
 </script>
-Add Comment
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/application/views/viewinwardgateregister.php b/application/views/viewinwardgateregister.php
index d0c537e9..d1c3f6e0 100755
--- a/application/views/viewinwardgateregister.php
+++ b/application/views/viewinwardgateregister.php
@@ -14,14 +14,13 @@
 	}
  </style>
 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Siddharth Industries - View Inward Gate Register </center>        
-      </h1>	  	  	 
-    </section>    
+         
     <section class="content"><br/>  
-	 		
+	   <div class="box"> 
+	 		<div class="  container-fluid">
+                <div class="box-header">
+                 <CENTER><h3 class="box-title">Siddharth Industries - View Inward Gate Register</h3></CENTER>                   
+                </div>
         <div class="row"> 
 		<div class="col-md-12">
             									
@@ -77,7 +76,7 @@
 					</tbody>					
 				</table>
 			</div> 
-			 
+			</div></div> 
 		</div>
         </div>  
 <div class="modal fade" id="Igrshow" role="dialog">
@@ -120,7 +119,7 @@
 							 <br/>
 							<div class="col-md-12">								
 								<div class="col-md-3">
-								<label>Supplier and Address :</label> 
+								<label>Supplier Name :</label> 
 								</div>
 								<div class="col-md-3">
 									<input type="text" id="Supplier" readonly>
diff --git a/application/views/viewmaterialinspectionreport.php b/application/views/viewmaterialinspectionreport.php
index 1426de43..4664cb78 100755
--- a/application/views/viewmaterialinspectionreport.php
+++ b/application/views/viewmaterialinspectionreport.php
@@ -10,16 +10,14 @@
 	}
  </style>
 <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <center>Siddharth Industries - View Material Receipt And Inspection Report</center>        
-      </h1>	  	  	 
-    </section>    
-    <section class="content"><br/>  
-	<div class="row" style="padding-bottom:5%">
-		 
-	</div>		
+      
+    <section class="content"><br/>
+<div class="box"> 
+	 		<div class="  container-fluid">
+                <div class="box-header">
+                 <CENTER><h3 class="box-title">Siddharth Industries - View Material Receipt And Inspection Report</h3></CENTER>                   
+                </div>	
+	 		
         <div class="row"> 
 		<div class="col-md-12">
             								
@@ -79,6 +77,7 @@
 				</table>
 			</div> 
 		</div>
+		</div></div>
         </div>  
 			  		 
 		</section>