diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index f8677c52..27b751dd 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1684,8 +1684,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="row">
 						<div class="form-group col-md-6" align="right">
-
-							CGST In %
+                          <label> CGST In % </label>
+							
 						</div>
 
 						<div class="form-group col-md-3">
@@ -1706,8 +1706,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="row">
 						<div class="form-group col-md-6" align="right">
-
-							SGST In %
+                          <label> SGST In % </label>
+							
 						</div>
 
 						<div class="form-group col-md-3">
@@ -1728,8 +1728,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="row">
 						<div class="form-group col-md-6" align="right">
-
-							IGST In %
+                          <label> IGST In %  </label>
+							
 						</div>
 
 						<div class="form-group col-md-3">
@@ -1969,8 +1969,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-6" align="right">
-
-							CGST In %
+                           <label> CGST In % </label>
+							
 						</div>
 
 						<div class="form-group col-md-3">
@@ -1993,8 +1993,8 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-6" align="right">
-
-							SGST In %
+                          <label>  SGST In % </label>
+							
 						</div>
 						<div class="form-group col-md-3">
 							<div>
@@ -2019,7 +2019,7 @@ if (!empty($getlogpodtl)) {
 					</div>
 					<div class="form-row">
 						<div class="form-group col-md-6" align="right">
-							IGST In %
+							<label> IGST In % </label> 
 						</div>
 						<div class="form-group col-md-3">
 							<div>
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index a9bc4709..4d31a392 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -1586,7 +1586,7 @@ if (!empty($getlogpodtl)) {
 </div>
 <div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-  <div class="modal-dialog modal-full-width">
+  <div class="modal-dialog modal-full-width" style="width :1060px !important ;">
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title">Add Capital Purchase Order Item</h4>
@@ -1596,7 +1596,7 @@ if (!empty($getlogpodtl)) {
       <form>
         <div class="modal-body p-4">
           <div class="form-row">
-            <div class="form-group col-md-2" style="padding:0px">
+            <div class="form-group col-md-3" style="padding:0px">
               <label>Req No<span class="text-danger">*</span></label>
               <div>
 
@@ -1616,7 +1616,7 @@ if (!empty($getlogpodtl)) {
 
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Department Name</label>
               <div>
                 <?php
@@ -1625,7 +1625,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Cost Center Code</label>
               <div>
                 <?php
@@ -1636,7 +1636,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Avail Bud Amount<?php echo "($INR)" ?></label>
               <div class="form-group">
                 <?php
@@ -1644,8 +1644,12 @@ if (!empty($getlogpodtl)) {
                 echo form_input($data);
                 ?>
               </div>
-            </div>
-            <div class="form-group col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
+            </div>           
+          </div>
+
+          <div class="form-row">
+            <div class="form-group col-md-9"></div>
+            <div class="form-group col-md-3" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
               <label> Exchange Rate</label>
               <div class="form-group">
                 <?php
@@ -1657,7 +1661,7 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row">
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Item Code<span class="text-danger">*</span></label>
               <div>
                 <?php
@@ -1666,7 +1670,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Item Name</label>
               <div class="form-group">
                 <?php
@@ -1675,7 +1679,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-1">
+            <div class="form-group col-md-3">
               <label>UOM</label>
               <div class="form-group">
                 <?php
@@ -1684,7 +1688,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Quantity<span class="text-danger">*</span></label>
               <div class="form-group">
                 <?php
@@ -1693,7 +1697,12 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2" style="padding: 0px;">
+           
+          </div>
+
+          <div class="form-row">
+            <div class="form-group col-md-3"></div>
+            <div class="form-group col-md-3" style="padding: 0px;">
               <label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span>
               <div class="form-group">
                 <?php
@@ -1702,12 +1711,12 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-1">
+            <div class="form-group col-md-3">
               <label>Per</label> <?php
                                   $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
                                   echo form_input($data); ?>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
               <div class="form-group">
                 <?php
@@ -1716,6 +1725,8 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
+
+            
           </div>
 
           <div class="form-row" id="ADDCAPdiv" style="padding:0px;">
@@ -1791,7 +1802,7 @@ if (!empty($getlogpodtl)) {
               ?>
             </div>
             <div class="form-group col-md-6" align="right">
-              CGST In %
+             <label> CGST In % </label>
             </div>
 
             <div class="form-group col-md-3">
@@ -1816,8 +1827,8 @@ if (!empty($getlogpodtl)) {
 
           <div class="form-row" id="ADDCAPdiv3" style="padding:0px">
             <div class="form-group col-md-6" align="right">
-
-              SGST In %
+            <label> SGST In % </label> 
+              
             </div>
 
             <div class="form-group col-md-3">
@@ -1845,7 +1856,7 @@ if (!empty($getlogpodtl)) {
 
           <div class="form-row" id="ADDCAPdiv2" style="padding:0px">
             <div class="form-group col-md-6" align="right">
-              IGST In %
+            <label> IGST In % </label> 
             </div>
 
             <div class="form-group col-md-3">
@@ -2229,7 +2240,7 @@ if (!empty($getlogpodtl)) {
 
           </div>
 
-          <div class="form-row" style="padding: 20px 30px 10px 30px;text-align: left;">
+          <div class="form-row" >
             <div class="form-group col-md-12">
               <label>Capital Description </label>
               <?php
@@ -2248,7 +2259,7 @@ if (!empty($getlogpodtl)) {
 </div><!-- /.modal -->
 <div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog"
   aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-  <div class="modal-dialog modal-full-width">
+  <div class="modal-dialog modal-full-width" style="width: 1060px !important;">
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title">Edit Capital Purchase Order Item</h4>
@@ -2258,7 +2269,7 @@ if (!empty($getlogpodtl)) {
       <form>
         <div class="modal-body p-4">
           <div class="form-row">
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Req No<span class="text-danger">*</span></label>
               <div>
                 <?php
@@ -2277,7 +2288,7 @@ if (!empty($getlogpodtl)) {
 
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Department Name</label>
               <div>
                 <?php
@@ -2287,7 +2298,7 @@ if (!empty($getlogpodtl)) {
               </div>
             </div>
 
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Cost Center Code</label>
               <div>
                 <?php
@@ -2298,7 +2309,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Avail Bud Amount<?php echo "($INR)" ?></label>
               <div class="form-group">
                 <?php
@@ -2307,7 +2318,12 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
+           
+          </div>
+
+          <div class="form-row">
+             <div class="form-group col-md-9"></div>
+             <div class="form-group col-md-3" id="ExchangeRateModalEditDiv" style="display:none;">
               <label> Exchange Rate</label>
               <div class="form-group">
                 <?php
@@ -2319,7 +2335,7 @@ if (!empty($getlogpodtl)) {
           </div>
 
           <div class="form-row" style="padding: 0px;">
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Item Code<span class="text-danger">*</span></label>
               <div>
                 <?php
@@ -2328,7 +2344,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Item Name</label>
               <div class="form-group">
                 <?php
@@ -2337,7 +2353,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-1">
+            <div class="form-group col-md-3">
               <label>UOM</label>
               <div class="form-group">
                 <?php
@@ -2346,7 +2362,7 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2">
+            <div class="form-group col-md-3">
               <label>Quantity<span class="text-danger">*</span></label>
               <div class="form-group">
                 <?php
@@ -2355,29 +2371,37 @@ if (!empty($getlogpodtl)) {
                 ?>
               </div>
             </div>
-            <div class="form-group col-md-2" style="padding: 0px;">
-              <label id="EditRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
-              <div class="form-group">
-                <?php
-                $data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
-                echo form_input($data);
-                ?>
+          </div>
+
+          <div class="form-row">
+
+              <div class="form-group col-md-3"></div>
+              <div class="form-group col-md-3" style="padding: 0px;">
+                <label id="EditRateIn">Rate(in INR/UOM)</label><span class="text-danger">*</span>
+                <div class="form-group">
+                  <?php
+                  $data = array('name' => 'EditCPRate', 'value' => set_value('EditCPRate'), 'id' => 'EditCPRate',  'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();calculateFreight(4);calculateFreightloceditper()');
+                  echo form_input($data);
+                  ?>
+                </div>
               </div>
-            </div>
-            <div class="form-group col-md-1">
-              <label>Per</label> <?php
-                                  $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-                                  echo form_input($data); ?>
-            </div>
-            <div class="form-group col-md-2" style="padding-right: 0px;">
-              <label id="EditTotalAmount">Basic value <?php echo "($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 class="form-group col-md-3">
+                <label>Per</label> <?php
+                                    $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+                                    echo form_input($data); ?>
               </div>
-            </div>
+
+              <div class="form-group col-md-3" style="padding-right: 0px;">
+                <label id="EditTotalAmount">Basic value <?php echo "($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 class="form-row" style="padding:0px;" id="EDITCAPdiv">
@@ -2457,8 +2481,9 @@ if (!empty($getlogpodtl)) {
               echo form_input($data);
               ?>
             </div>
-            <div class="form-group col-md-6" align="right">
-              CGST In %
+
+            <div class="form-group col-md-6" align="right"> 
+             <label> CGST In % <label>
             </div>
 
             <div class="form-group col-md-3">
@@ -2482,7 +2507,7 @@ if (!empty($getlogpodtl)) {
           </div>
           <div class="form-row" id="EDITCAPdiv1">
             <div class="form-group col-md-6" align="right">
-              SGST In %
+             <label> SGST In % </label>
             </div>
             <div class="form-group col-md-3">
               <div class="form-group">
@@ -2507,7 +2532,7 @@ if (!empty($getlogpodtl)) {
 
           <div class="form-row" id="EDITCAPdiv2">
             <div class="form-group col-md-6" align="right">
-              IGST In %
+             <label> IGST In % </label>
             </div>
 
             <div class="form-group col-md-3">
@@ -2881,8 +2906,8 @@ if (!empty($getlogpodtl)) {
 
             </div>
           </div>
-          <div class="form-row" style="padding: 0px 30px 10px 30px;text-align: left;">
-            <div class="form-group col-md-11">
+          <div class="form-row" >
+            <div class="form-group col-md-12">
               <label>Capital Description </label>
               <?php
               $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 0bf198c2..20806dce 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -696,6 +696,7 @@ if (!empty($getlogpodtl)) {
 				$('#EDITREVENUE').modal('show');
 			}
 		});
+		EditservicePurchaseorder
 		$('#drpEditFreight').change(function() {
 			var FreightType = $("#drpEditFreight").val();