diff --git a/application/logs/log-2017-07-21.php b/application/logs/log-2017-07-21.php
new file mode 100644
index 00000000..deef1bd2
--- /dev/null
+++ b/application/logs/log-2017-07-21.php
@@ -0,0 +1,63 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-07-21 08:27: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
+ERROR - 2017-07-21 08:28:02 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:02 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:02 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:02 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:28:03 --> Severity: Warning  --> number_format() expects parameter 1 to be float, string given C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 2480
+ERROR - 2017-07-21 08:28:03 --> Severity: Warning  --> number_format() expects parameter 1 to be float, string given C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 2489
+ERROR - 2017-07-21 08:28:03 --> Severity: Warning  --> number_format() expects parameter 1 to be float, string given C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 2496
+ERROR - 2017-07-21 08:28:03 --> Severity: Notice  --> Undefined variable: OtherAmt C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 2504
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 448
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 462
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
+ERROR - 2017-07-21 08:31:22 --> Severity: Notice  --> Undefined property: stdClass::$ConfigValue C:\xampp\htdocs\siddharth_application\application\views\editCapitalPo.php 463
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php
index bf4af873..40394163 100755
--- a/application/views/capitalpurchaseorder.php
+++ b/application/views/capitalpurchaseorder.php
@@ -49,8 +49,16 @@
 	z-index: 1080 !important;
 }
     </style>
-
+<script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
+ 
+ 
+      
     <script>
+	 tinymce.init({
+          selector: "textarea#txtSpcialInstruction",
+          
+           plugins: "link image"
+        });
      $(document).ready(function(){
 
             //Initialize Select2 Elements
@@ -315,27 +323,7 @@ document.getElementById("Date").checked = true;
 					
             </div>
 			
-            <div class="col-md-3">
-			  <span>Payable AT</span>
-               <?php
-				 $data = array('name' => 'PayableAT','value' => set_value('PayableAT'),'id'=>'PayableAT',  'class' => 'form-control' ,'required' => 'true');
-				echo form_input($data);
-				?>   
-					
-            </div>
-			
-           <div class="col-md-6">
-				  Payment Date <br/>
-                            <tr>
-                                
-                                     <td>
-                                    <?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"Before", 'checked'=>set_radio('Payment', 'Before', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-                                <td>
-                                    <?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"After", 'checked'=>set_radio('Payment', 'After', FALSE))); ?>
-
-                                </td>
-                            </tr>
-			</div>
+           
 			 
 	</div>
 			</div>	   
@@ -358,7 +346,7 @@ document.getElementById("Date").checked = true;
                                             <th>UOM</th>
                                             <th>Rate</th>
                                             <th>Basic Amount</th>
-                                        <th>Tax Amount</th>
+											<th>Tax Amount</th>
                                             <th>Total Order Amount</th>
                                             <th>Action</th>
                     </tr>
@@ -379,78 +367,78 @@ document.getElementById("Date").checked = true;
                                 <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>Add Capital Purchase Order Item </h4></center>
                                             </div>
                                             <div align="left">
                                                 <div class="col-md-12">											 
-                                                                                                    <div class="col-md-12">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Req No</label>
-                                                                                                                            <div>
+												<div class="col-md-12">
+														<div class="col-md-5" style="padding:0px;">
+																<div class="col-md-6">
+																		<label>Req No</label>
+																		<div>
 
-                                                                                        <?php
-                                                                                            $RL = array("0"=>'Select Req No');     
-                                                                                            if(!empty($RequistionDetails))
-                                                                                            {
-                                                                                            foreach ($RequistionDetails as $SID):			   
-                                                                                                    $RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
-                                                                                            endforeach;
-                                                                                            }
+									<?php
+										$RL = array("0"=>'Select Req No');     
+										if(!empty($RequistionDetails))
+										{
+										foreach ($RequistionDetails as $SID):			   
+												$RL[$SID->ReqNo] =  $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+										endforeach;
+										}
 
-                                                                                            echo form_dropdown('Reqnumber', $RL,set_value('Reqnumber'),'id="Reqnumber"' ,'class="form-control select2 required"');
+										echo form_dropdown('Reqnumber', $RL,set_value('Reqnumber'),'id="Reqnumber"' ,'class="form-control select2 required"');
 
-                                                                                    ?>	
+								?>	
 
 
 
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Department Name</label>
-                                                                                                                                    <div>
-                                                                                                                                            <?php
-                                                                                                                                            $data = array('name' => 'CapitalDepartmentName','value' => set_value('CapitalDepartmentName'),'id'=>'CapitalDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Cost Center Name</label>
-                                                                                                                                    <div>
-                                                                                                                                            <?php
+																		</div>
+																</div>
+																<div class="col-md-6">
+																		<label>Department Name</label>
+																				<div>
+																						<?php
+																						$data = array('name' => 'CapitalDepartmentName','value' => set_value('CapitalDepartmentName'),'id'=>'CapitalDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
+																						echo form_input($data);
+																						?>
+																				</div>
+																</div>
+														</div>
+														<div class="col-md-5">
+																<div class="col-md-6">
+																		<label>Cost Center Name</label>
+																				<div>
+																						<?php
 
-                                                                                                                                             $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                            echo form_input($data);
+																						 $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+																						echo form_input($data);
 
-                                                                                                                                            ?>
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Avail Bud Amount</label>
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                    $data = array('name' => 'CapitalbudAmt','value' => set_value('CapitalbudAmt'),'id'=>'CapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2" id="hideModalExchange">
-                                                                                                                    <label> Exchange Rate</label> 
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ExchangeRtModal','value' => set_value('ExchangeRtModal'),'id'=>'ExchangeRtModal',  'class' => 'form-control' ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                                                                            </div>
-                                                                                                    </div>
+																						?>
+																				</div>
+																</div>
+																<div class="col-md-6">
+																		<label>Avail Bud Amount</label>
+																		<div class="form-group">
+																				<?php
+																				$data = array('name' => 'CapitalbudAmt','value' => set_value('CapitalbudAmt'),'id'=>'CapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+																				echo form_input($data);
+																				?>
+																		</div>
+																</div>
+														</div>
+														<div class="col-md-2" id="hideModalExchange">
+																<label> Exchange Rate</label> 
+						<div class="form-group">
+						<?php
+						$data = array('name' => 'ExchangeRtModal','value' => set_value('ExchangeRtModal'),'id'=>'ExchangeRtModal',  'class' => 'form-control' ,'readonly' => 'true');
+						echo form_input($data);
+						?>
+						</div>
+														</div>
+												</div>
                                                 </div>
                                                 <div class="col-md-12">
                                                                                             <div class="col-md-12">
@@ -472,6 +460,11 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
+													 <div class="col-md-6">
+							<label>Service Description </label>	<?php
+							$data = array('name' => 'txtservicedescription','value' => set_value('txtservicedescription'),'id'=>'txtservicedescription',  'class' => 'form-control');
+							echo form_input($data); ?>
+						</div>
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -481,7 +474,17 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+													 <div class="col-md-3">
+						  <label>Frequency</label>
+									<div>
+										<?php
+										 $data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency',  'class' => 'form-control' ,'readonly' => 'true');
+										echo form_input($data);
+										?> 
+                                             <input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
+									</div>
+					   </div>
+                                                    <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
                                                             <?php
@@ -490,7 +493,7 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="col-md-3">
                                                         <label id="RateIn">Rate(In INR /UOM)</label>
                                                         <div class="form-group">
                                                             <?php
@@ -499,7 +502,7 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="col-md-3">
                                                         <label id="TotalAmount">Basic value in INR</label>
                                                         <div class="form-group">
                                                             <?php
@@ -511,58 +514,108 @@ document.getElementById("Date").checked = true;
                                                                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">											
-                                                                                                    <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Service Tax ( ST ) @ 14% :
-                                                                                                                             <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>	
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Education cess @2% on ST : 
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Sec. & Higher Edu. cess @1 % on ST  :			  
-                                                                                                                            <div class="form-group">
-                                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Krishi Kalyan tax  @.5 % on Basic Account(BA):			  
-                                                                                                                                    <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2">
-                                                                                                             Swachh Bharat tax @.5 % on BA:			  
-                                                                                                                    <div class="form-group">
-                                                                                                                                            <?php
-                                                                                                                             $data = array('name' => 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                                                                                            echo form_input($data);
-                                                                                                                            ?>   
-                                                                                                                    </div>	
-                                                                                                            </div>
-                                                                                                    </div>
-                                                                                                    <div class="col-md-12" style="padding:1%;" ></div>
+                        <div class="col-md-12"  style="border:1px solid #000;padding:5px;">
+                        <div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				CGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				SGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				IGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+				<div class="col-md-12">
+				<div class="col-md-5 col-md-offset-4" align="right">
+							<label>Other Allowances In INR</label>			 
+					</div>	
+		<div class="col-md-3">
+							 <div class="form-group">
+													<?php
+											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances'),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+				</div>
+				 
+                                             </div>
+                                                    <div class="col-md-12" style="padding:1%;" ></div>
                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide">
                                                         <br/>
                                                         <div class="col-md-6" style="padding:0px;">
@@ -918,18 +971,18 @@ document.getElementById("Date").checked = true;
                                 <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>
                                             </div>
                                             <div align="left">
                                                 <div class="col-md-12">											 
-                                                                                                    <div class="col-md-12">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Req No</label>
-                                                                                                                            <div>
+																		<div class="col-md-12">
+																				<div class="col-md-5" style="padding:0px;">
+																						<div class="col-md-6">
+																								<label>Req No</label>
+																								<div>
 
                                                                                         <?php
                                                                                             $RL = array("0"=>'Select Req No');     
@@ -1013,6 +1066,11 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
+														 <div class="col-md-6">
+															<label>Service Description </label>	<?php
+																	 $data = array('name' => 'Edittxtservicedescription','value' => set_value('Edittxtservicedescription'),'id'=>'Edittxtservicedescription',  'class' => 'form-control');
+																	echo form_input($data); ?>
+														</div>
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -1022,7 +1080,17 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+													 <div class="col-md-3">
+						  <label>Frequency</label>
+							   <div>
+								<?php
+								$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control','readonly' => 'true' );
+									echo form_input($data);
+							   ?> 
+							<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />  					 
+							  </div>
+					   </div>
+                                                    <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1031,7 +1099,7 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="col-md-3">
                                                         <label id="EditRateIn">Rate(in INR/UOM)</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1040,7 +1108,7 @@ document.getElementById("Date").checked = true;
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="col-md-3">
                                                         <label id="EditTotalAmount">Basic value in INR</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1052,56 +1120,106 @@ document.getElementById("Date").checked = true;
                                                                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">											
-                                                                                                    <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Service Tax ( ST ) @ 14% :
-                                                                                                                             <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>	
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Education cess @2% on ST : 
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Sec. & Higher Edu. cess @1 % on ST  :			  
-                                                                                                                            <div class="form-group">
-                                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Krishi Kalyan tax  @.5 % on Basic Account(BA):			  
-                                                                                                                                    <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2">
-                                                                                                             Swachh Bharat tax @.5 % on BA:			  
-                                                                                                                    <div class="form-group">
-                                                                                                                                            <?php
-                                                                                                                             $data = array('name' => 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                                                                                            echo form_input($data);
-                                                                                                                            ?>   
-                                                                                                                    </div>	
-                                                                                                            </div>
+                                                    <div class="col-md-12"  style="border:1px solid #000;padding:5px;">
+                                                <div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				CGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				SGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				IGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+				<div class="col-md-12">
+				 <div class="col-md-5 col-md-offset-4" align="right">
+							<label>Other Allowances In INR</label>			 
+					</div>	
+		<div class="col-md-3">
+							 <div class="form-group">
+													<?php
+											 $data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+							 </div>
+				
                                                                                                     </div>
                                                                                                     <div class="col-md-12" style="padding:1%;" ></div>
                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide">
@@ -1464,69 +1582,46 @@ document.getElementById("Date").checked = true;
 
       </table>
 
-                                    <div class="col-md-12"  style="border: 1px solid;">			
-                                            <div class="col-md-4">
-                                                     Service Tax @14% :					  
-                                                     <div class="form-group">
-                                                                                            <?php
-                                                                             $data = array('name' => 'TotalAfterServiceTax','value' => set_value('TotalAfterServiceTax'),'id'=>'TotalAfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>   
-                                                                    </div>			  
-                                            </div>			  
-                                            <div class="col-md-4">
-                                                    Education cess @2% on service Tax : 
-                                                    <div class="form-group">
-                                                            <?php
-                                                             $data = array('name' => 'TotalAfterEduCess','value' => set_value('TotalAfterEduCess'),'id'=>'TotalAfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                    Sec. & Higher Edu. cess @1 % on service Tax  :			  
-                                                    <div class="form-group">
-                                                                            <?php
-                                                             $data = array('name' => 'TotalAfterSecHighTax','value' => set_value('TotalAfterSecHighTax'),'id'=>'TotalAfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                            Krishi Kalyan tax  @.5 % on Basic Amount:			  
-                                                            <div class="form-group">
-                                                                                    <?php
-                                                                     $data = array('name' => 'TotalAfterKrishiTax','value' => set_value('TotalAfterKrishiTax'),'id'=>'TotalAfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>   
-                                                            </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                    Swachh Bharat tax @.5 % on Basic Amount:			  
-                                                    <div class="form-group">
-                                                                            <?php
-                                                             $data = array('name' => 'TotalAfterSwachhTax','value' => set_value('TotalAfterSwachhTax'),'id'=>'TotalAfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>			 
-                                            </div>
-   <div class="col-md-4">
-                                                    Total Tax Amount:			  
-                                                    <div class="form-group">
-                                                                            <?php
-                             $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder'),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>			 
-                                            </div>
+             <div class="col-md-12"  style="border: 1px solid;padding:4px;">			
+                  <div class="col-md-3">
+					 <label>CGST In INR</label> 
+					 <?php
+							 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
+							echo form_input($data);				
+							?>   
+				</div>
+			 
+			 
+				<div class="col-md-3">
+					 <label>SGST In INR </label> 
+					 <?php
+							 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
+							echo form_input($data);				
+							?>   
+				</div>
+				<div class="col-md-3">
+					<label>IGST  In INR  </label> 
+					<?php
+							 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
+							echo form_input($data);
+							?>   
+				</div>
+				<div class="col-md-3">
+				<label>Other Allowances In INR   </label> 			
+				<?php
+				 $data = array('name' => 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances'),'id'=>'TotalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
+				echo form_input($data);
+				?>   
+					
+			</div>
                                     </div>
                                     </div>
 
-                                            <div class="col-md-12" style="padding:1%;" ></div>
+                         <div class="col-md-12" style="padding:1%;" ></div>
                     <div class="col-md-12" style="border: 1px solid;padding:1% 0%;" id="HideImportTaxTotal">
 
                 <div class="col-md-4">
-                  <label >Total Landing Charge  :</label> 
+                  <label >Total Landing Charge   </label> 
 
                                 <?php
                              $data = array('name' => 'txttotallanding','value' => set_value('txttotallanding'),'id'=>'txttotallanding',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1535,7 +1630,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total High seas sales Charge  :</label> 
+                  <label >Total High seas sales Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalhighseas','value' => set_value('txttotalhighseas'),'id'=>'txttotalhighseas',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1544,7 +1639,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total Custom Duty Charge  :</label> 
+                  <label >Total Custom Duty Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalcustom','value' => set_value('txttotalcustom'),'id'=>'txttotalcustom',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1553,7 +1648,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total Excise duty  Charge  :</label> 
+                  <label >Total Excise duty  Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalexcise','value' => set_value('txttotalexcise'),'id'=>'txttotalexcise',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1562,7 +1657,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total Excise duty ED_cess Charge  :</label> 
+                  <label >Total Excise duty ED_cess Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalexciseED','value' => set_value('txttotalexciseED'),'id'=>'txttotalexciseED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1572,7 +1667,7 @@ document.getElementById("Date").checked = true;
 
 
                 <div class="col-md-4">
-                  <label >Total Excise duty S & H cess  Charge  :</label> 
+                  <label >Total Excise duty S & H cess  Charge   </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalexciseSH','value' => set_value('txttotalexciseSH'),'id'=>'txttotalexciseSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1581,7 +1676,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total Custom ED_cess Charge  :</label> 
+                  <label >Total Custom ED_cess Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalcustomED','value' => set_value('txttotalcustomED'),'id'=>'txttotalcustomED',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1590,7 +1685,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total Custom S & H cess Charge  :</label> 
+                  <label >Total Custom S & H cess Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalcustomSH','value' => set_value('txttotalcustomSH'),'id'=>'txttotalcustomSH',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1599,7 +1694,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                 <div class="col-md-4">
-                  <label >Total Additional Excise duty Charge  :</label> 
+                  <label >Total Additional Excise duty Charge   </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalAdditionalExciseduty','value' => set_value('txttotalAdditionalExciseduty'),'id'=>'txttotalAdditionalExciseduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1609,7 +1704,7 @@ document.getElementById("Date").checked = true;
 
 
                 <div class="col-md-4">
-                  <label >Total Gross duty payable Charge  :</label> 
+                  <label >Total Gross duty payable Charge   </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalgrossduty','value' => set_value('txttotalgrossduty'),'id'=>'txttotalgrossduty',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1618,7 +1713,7 @@ document.getElementById("Date").checked = true;
                 </div>
 
                  <div class="col-md-4">
-                  <label >Total Available Modvat set-off on import Charge  :</label> 
+                  <label >Total Available Modvat set-off on import Charge   </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalavlmodvat','value' => set_value('txttotalavlmodvat'),'id'=>'txttotalavlmodvat',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1628,7 +1723,7 @@ document.getElementById("Date").checked = true;
 
 
                 <div class="col-md-4">
-                  <label >Total Gross expenses due to custom duty Charge  :</label> 
+                  <label >Total Gross expenses due to custom duty Charge  </label> 
 
                                 <?php
                              $data = array('name' => 'txttotalgrossexpense','value' => set_value('txttotalgrossexpense'),'id'=>'txttotalgrossexpense',  'class' => 'form-control'   ,'readonly' => 'true','style'=>'text-align:right;');
@@ -1642,26 +1737,13 @@ document.getElementById("Date").checked = true;
                   
 
                           <div class="col-md-12">
-                                <label>Special Instructions :</label>  <?php
+                                <label>Special Instructions  </label>  <?php
                              $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction',  'class' => 'form-control','rows' => '10', 'cols' => '40' );
                             echo form_textarea($data);
                             ?>   
                           </div>   
 
-                                            <!-- <div align="right" style="padding-right:10px">
-
-                                            <div class="col-md-3 col-md-offset-9"><br/>
-                                                            <input type="hidden" name="txtPoRange" id="txtPoRange" /> 
-                                                            <input type="hidden" name="isEdit" id="isEdit" value="0" /> 
-                                                            <input type="hidden" name="txtStatus" id="txtStatus" /> 
-                                                            <input type="hidden" name="txtRowCount" id="txtRowCount1" />
-                                                            <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />   
-                                                            <a class="btn btn-primary Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> 
-                                                            <a class="btn btn-primary Submit"  ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> 
-                                                    <input type="reset" class="btn btn-primary" value="Reset">
-
-                                              </div>
-                </div>  -->
+                               
 
 
                     </div>
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php
index 67c3e81d..821d58c9 100755
--- a/application/views/editCapitalPo.php
+++ b/application/views/editCapitalPo.php
@@ -9,7 +9,9 @@
         $SupName = '';
 		$Address = '';
 		$PODate = '';
-        
+        $TotalCgst='';
+		$TotalSgst='';
+		$TotalIgst='';
 		$DeliveryAddress ='';
 		$POStatus	 = 	'';
 		$PONO =  	'';
@@ -120,7 +122,14 @@ if(!empty($AvlBudAmt))
             width:100% ! important;
     }
     </style>
+	<script src="<?php echo base_url()  ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
 <script type="text/javascript">
+
+ tinymce.init({
+          selector: "textarea#txtSpcialInstruction",
+          
+           plugins: "link image"
+        });
     var DelOpt = '<?php echo $DeliverOption; ?>';
     var SchName = <?php echo json_encode($DeliverSchedule); ?>;
 var DelDt = '<?php echo $Deliverydt; ?>';
@@ -465,31 +474,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
             </div>
 			
-            <div class="col-md-3">
-			  <span>Payable AT</span>
-               <?php
-				 $data = array('name' => 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT',  'class' => 'form-control' ,'required' => 'true');
-				echo form_input($data);
-				?>   
-					
-            </div>
-			
-           <div class="col-md-6">
-				  Payment Date <br/>
-                            <tr>
-                                
-
-
-                                        <td>
-									  <?php echo form_label('Before', 'Before') . "&nbsp;&nbsp;". form_radio(array('name' => 'Before', 'value' => 'Before', 'checked' => ('Before' == $PaymentDays) ? TRUE : FALSE, 'id' => 'Before')); ?>
-									  </td>
-									  </td>
-									<td>
-									  <?php echo form_label('After', 'After') . form_radio(array('name' => 'After', 'value' => 'After', 'checked' => ('After' == $PaymentDays) ? TRUE : FALSE, 'id' => 'After')); ?>
-
-                                    </td>
-                            </tr>
-			</div>
+            
 			 
 	</div>
           </div>	   
@@ -693,7 +678,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>Add Capital Purchase Order Item </h4></center>
@@ -701,7 +686,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                             <div align="left">
                                                 <div class="col-md-12">											 
                                                                                                     <div class="col-md-12">
-                                                                                                            <div class="col-md-5">
+                                                                                                            <div class="col-md-5" style="padding:0px;">
                                                                                                                     <div class="col-md-6">
                                                                                                                             <label>Req No</label>
                                                                                                                             <div>
@@ -786,6 +771,11 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
+													 <div class="col-md-6">
+							<label>Service Description </label>	<?php
+							$data = array('name' => 'txtservicedescription','value' => set_value('txtservicedescription'),'id'=>'txtservicedescription',  'class' => 'form-control');
+							echo form_input($data); ?>
+						</div>
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -795,7 +785,17 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+													 <div class="col-md-3">
+						  <label>Frequency</label>
+									<div>
+										<?php
+										 $data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency',  'class' => 'form-control' ,'readonly' => 'true');
+										echo form_input($data);
+										?> 
+                                             <input type="hidden" name="FrequencyNo" id="FrequencyNo" value="FrequencyNo" />
+									</div>
+					   </div>
+                                                    <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
                                                             <?php
@@ -804,8 +804,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
-                                                        <label id="RateIn">Rate(in INR /Ton)</label>
+                                                    <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();' );
@@ -813,7 +813,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="col-md-3">
                                                         <label id="TotalAmount">Basic value in INR</label>
                                                         <div class="form-group">
                                                             <?php
@@ -824,58 +824,107 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                     </div>
                                                                                                     </div>
                                                 </div>
-                                                <div class="col-md-12">											
-                                                                                                    <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Service Tax ( ST ) @ 14% :
-                                                                                                                             <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'AfterServiceTax','value' => set_value('AfterServiceTax'),'id'=>'AfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>	
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Education cess @2% on ST : 
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'AfterEduCess','value' => set_value('AfterEduCess'),'id'=>'AfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Sec. & Higher Edu. cess @1 % on ST  :			  
-                                                                                                                            <div class="form-group">
-                                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'AfterSecHighTax','value' => set_value('AfterSecHighTax'),'id'=>'AfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Krishi Kalyan tax  @.5 % on Basic Account(BA):			  
-                                                                                                                                    <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'AfterKrishiTax','value' => set_value('AfterKrishiTax'),'id'=>'AfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2">
-                                                                                                             Swachh Bharat tax @.5 % on BA:			  
-                                                                                                                    <div class="form-group">
-                                                                                                                                            <?php
-                                                                                                                             $data = array('name' => 'AfterSwachhTax','value' => set_value('AfterSwachhTax'),'id'=>'AfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                                                                                            echo form_input($data);
-                                                                                                                            ?>   
-                                                                                                                    </div>	
-                                                                                                            </div>
-                                                                                                    </div>
+                                                <div class="col-md-12">		
+													    <div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				CGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'Cgst','value' => set_value('Cgst',0),'id'=>'Cgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'AfterCgst','value' => set_value('AfterCgst'),'id'=>'AfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				SGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'Sgst','value' => set_value('Sgst',0),'id'=>'Sgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'AfterSgst','value' => set_value('AfterSgst'),'id'=>'AfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				IGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'Igst','value' => set_value('Igst',0),'id'=>'Igst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'Ratechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'AfterIgst','value' => set_value('AfterIgst'),'id'=>'AfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+				<div class="col-md-12">
+				<div class="col-md-5 col-md-offset-4" align="right">
+							<label>Other Allowances In INR</label>			 
+					</div>	
+		<div class="col-md-3">
+							 <div class="form-group">
+													<?php
+											 $data = array('name' => 'OtherAllowances','value' => set_value('OtherAllowances'),'id'=>'OtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+				</div>
+											 											
+                                                                                                    
                                                                                                     <div class="col-md-12" style="padding:1%;" ></div>
                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
                                                         <br/>
@@ -1236,12 +1285,12 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                 <center><h4>Edit Capital Purchase Order Item </h4></center>
                                             </div>
                                             <div align="left">
-                                                <div class="col-md-12">											 
-                                                                                                    <div class="col-md-12">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Req No</label>
-                                                                                                                            <div>
+							<div class="col-md-12">											 
+																				<div class="col-md-12">
+																						<div class="col-md-5" style="padding:0px;">
+																								<div class="col-md-6">
+																										<label>Req No</label>
+																										<div>
 
                                                                                         <?php
                                                                                             $RL = array("0"=>'Select Req No');     
@@ -1306,7 +1355,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">
-                                                                                            <div class="col-md-12">
+                                                                                                             <div class="col-md-12">
                                                     <div class="col-md-2">
                                                         <label>Item Code</label>                                                     
                                                             <div>                                                        
@@ -1325,6 +1374,11 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
+														 <div class="col-md-6">
+															<label>Service Description </label>	<?php
+																	 $data = array('name' => 'Edittxtservicedescription','value' => set_value('Edittxtservicedescription'),'id'=>'Edittxtservicedescription',  'class' => 'form-control');
+																	echo form_input($data); ?>
+														</div>
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -1334,7 +1388,17 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+													 <div class="col-md-3">
+						  <label>Frequency</label>
+							   <div>
+								<?php
+								$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency',  'class' => 'form-control','readonly' => 'true' );
+									echo form_input($data);
+							   ?> 
+							<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo" value="EditFrequencyNo" />  					 
+							  </div>
+					   </div>
+                                                    <div class="col-md-3">
                                                         <label>Quantity</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1343,8 +1407,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
-                                                        <label id="EditRateIn">Rate(in INR /Ton)</label>
+                                                    <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();' );
@@ -1352,7 +1416,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+                                                    <div class="col-md-3">
                                                         <label id="EditTotalAmount">Basic value in INR</label>
                                                         <div class="form-group">
                                                             <?php
@@ -1365,55 +1429,104 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                 </div>
                                                 <div class="col-md-12">											
                                                                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Service Tax ( ST ) @ 14% :
-                                                                                                                             <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'EditAfterServiceTax','value' => set_value('EditAfterServiceTax'),'id'=>'EditAfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>	
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Education cess @2% on ST : 
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'EditAfterEduCess','value' => set_value('EditAfterEduCess'),'id'=>'EditAfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Sec. & Higher Edu. cess @1 % on ST  :			  
-                                                                                                                            <div class="form-group">
-                                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'EditAfterSecHighTax','value' => set_value('EditAfterSecHighTax'),'id'=>'EditAfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Krishi Kalyan tax  @.5 % on Basic Account(BA):			  
-                                                                                                                                    <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'EditAfterKrishiTax','value' => set_value('EditAfterKrishiTax'),'id'=>'EditAfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2">
-                                                                                                             Swachh Bharat tax @.5 % on BA:			  
-                                                                                                                    <div class="form-group">
-                                                                                                                                            <?php
-                                                                                                                             $data = array('name' => 'EditAfterSwachhTax','value' => set_value('EditAfterSwachhTax'),'id'=>'EditAfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                                                                                            echo form_input($data);
-                                                                                                                            ?>   
-                                                                                                                    </div>	
-                                                                                                            </div>
+                                                                                                         <div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				CGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditCgst','value' => set_value('EditCgst'),'id'=>'EditCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditAfterCgst','value' => set_value('EditAfterCgst'),'id'=>'EditAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				SGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditSgst','value' => set_value('EditSgst'),'id'=>'EditSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditAfterSgst','value' => set_value('EditAfterSgst'),'id'=>'EditAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				IGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditIgst','value' => set_value('EditIgst'),'id'=>'EditIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'EditAfterIgst','value' => set_value('EditAfterIgst'),'id'=>'EditAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+				<div class="col-md-12">
+				 <div class="col-md-5 col-md-offset-4" align="right">
+							<label>Other Allowances In INR</label>			 
+					</div>	
+		<div class="col-md-3">
+							 <div class="form-group">
+													<?php
+											 $data = array('name' => 'EditOtherAllowances','value' => set_value('EditOtherAllowances'),'id'=>'EditOtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+							 </div> 
                                                                                                     </div>
                                                                                                     <div class="col-md-12" style="padding:1%;" ></div>
                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
@@ -1770,84 +1883,83 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                        <div class="modal fade" id="VIEWCAPITAL" role="dialog">
                                 <div class="modal-dialog">
                                     <!-- Modal content-->
-                                    <form>
+                                   <form>
                                         <div class="modal-content" style="width:900px;">
                                             <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>
                                             </div>
                                             <div align="left">
-                                                <div class="col-md-12">											 
-                                                                                                    <div class="col-md-12">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Req No</label>
-                                                                                                                            <div>
+							<div class="col-md-12">											 
+																				  <div class="col-md-12">
+																		<div class="col-md-5" style="padding:0px;">
+																				<div class="col-md-6">
+																						<label>Req No</label>
+																						<div>
 
-                                                                                  					 <?php													
-													
-													 $data = array('name' => 'ViewReqnumber','value' => set_value('ViewReqnumber'),'id'=>'ViewReqnumber',  'class' => 'form-control' ,'readonly' => 'true');
-												echo form_input($data);
+																 <?php													
+				
+				 $data = array('name' => 'ViewReqnumber','value' => set_value('ViewReqnumber'),'id'=>'ViewReqnumber',  'class' => 'form-control' ,'readonly' => 'true');
+			echo form_input($data);
 
-												?>      
+			?>      
 
 
 
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Department Name</label>
-                                                                                                                                    <div>
-                                                                                                                                            <?php
-                                                                                                                                            $data = array('name' => 'ViewCapitalDepartmentName','value' => set_value('ViewCapitalDepartmentName'),'id'=>'ViewCapitalDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            <label>Cost Center Name</label>
-                                                                                                                                    <div>
-                                                                                                                                            <?php
+																						</div>
+																				</div>
+																				<div class="col-md-6">
+																						<label>Department Name</label>
+																								<div>
+																										<?php
+																										$data = array('name' => 'ViewCapitalDepartmentName','value' => set_value('ViewCapitalDepartmentName'),'id'=>'ViewCapitalDepartmentName',  'class' => 'form-control' ,'readonly' => 'true');
+																										echo form_input($data);
+																										?>
+																								</div>
+																				</div>
+																		</div>
+																		<div class="col-md-5">
+																				<div class="col-md-6">
+																						<label>Cost Center Name</label>
+																								<div>
+																										<?php
 
-                                                                                                                                             $data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                            echo form_input($data);
+																										 $data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter',  'class' => 'form-control' ,'readonly' => 'true');
+																										echo form_input($data);
 
-                                                                                                                                            ?>
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                                   <!-- <div class="col-md-6">
-                                                                                                                            <label>Avail Bud Amount</label>
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                    $data = array('name' => 'ViewCapitalbudAmt','value' => set_value('ViewCapitalbudAmt'),'id'=>'ViewCapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>
-                                                                                                                            </div>
-                                                                                                                    </div>-->
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;">
-                                                                                                                    <label> Exchange Rate</label> 
-                                                        <div class="form-group">
-                                                            <?php
-                                                            $data = array('name' => 'ViewExchangeRtModal','value' => set_value('ViewExchangeRtModal'),'id'=>'ViewExchangeRtModal',  'class' => 'form-control' ,'readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>
-                                                        </div>
-                                                                                                            </div>
+																										?>
+																								</div>
+																				</div>
+																			     <div class="col-md-6">
+																						<label>Avail Bud Amount</label>
+																						<div class="form-group">
+																								<?php
+																								$data = array('name' => 'ViewCapitalbudAmt','value' => set_value('ViewCapitalbudAmt'),'id'=>'ViewCapitalbudAmt',  'class' => 'form-control' ,'readonly' => 'true');
+																								echo form_input($data);
+																								?>
+																						</div>
+																				</div> 
+																		</div>
+																		<div class="col-md-2" id="ExchangeRateModalViewDiv" style="display:none;">
+																				<label> Exchange Rate</label> 
+					<div class="form-group">
+						<?php
+						$data = array('name' => 'ViewExchangeRtModal','value' => set_value('ViewExchangeRtModal'),'id'=>'ViewExchangeRtModal',  'class' => 'form-control' ,'readonly' => 'true');
+						echo form_input($data);
+						?>
+					</div>
+																		</div>
                                                                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">
-                                                                                            <div class="col-md-12">
+                                                                                                               <div class="col-md-12">
                                                     <div class="col-md-2">
                                                         <label>Item Code</label>                                                     
                                                             <div>                                                        
-                                                                                                                    
-                                                            <?php
-												 $data = array('name' => 'ViewMaterialCode','value' => set_value('ViewMaterialCode'),'id'=>'ViewMaterialCode',  'class' => 'form-control num' ,'readonly' => 'true');
-												echo form_input($data);
-												?> 
+                                                                                                                    <?php
+                                                            $options = array("0"=>'Item Code');
+                                                            echo form_dropdown('MaterialCode', $options,set_value('ViewMaterialCode'),'id="ViewMaterialCode"' ,'class="form-control select2"');
+                                                            ?>
                                                                                                                     </div> 
                                                     </div>
                                                     <div class="col-md-2">
@@ -1859,6 +1971,11 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
+														 <div class="col-md-6">
+															<label>Service Description </label>	<?php
+																	 $data = array('name' => 'Viewtxtservicedescription','value' => set_value('Viewtxtservicedescription'),'id'=>'Viewtxtservicedescription',  'class' => 'form-control');
+																	echo form_input($data); ?>
+														</div>
                                                     <div class="col-md-2">
                                                         <label>UOM</label>
                                                         <div class="form-group">
@@ -1868,26 +1985,36 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                             ?>
                                                         </div>
                                                     </div>
-                                                    <div class="col-md-2">
+													 <div class="col-md-3">
+						  <label>Frequency</label>
+							   <div>
+								<?php
+								$data = array('name' => 'ViewFrequency','value' => set_value('ViewFrequency'),'id'=>'ViewFrequency',  'class' => 'form-control','readonly' => 'true' );
+									echo form_input($data);
+							   ?> 
+							<input type="hidden" name="ViewFrequencyNo" id="ViewFrequencyNo" value="ViewFrequencyNo" />  					 
+							  </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();','readonly' => 'true');
+                                                            $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="ViewRateIn">Rate(in INR /Ton)</label>
+                                                    <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();','readonly' => 'true' );
+                                                            $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="ViewTotalAmount">Basic value in INR</label>
+                                                    <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');
@@ -1898,56 +2025,104 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
                                                                                                     </div>
                                                 </div>
                                                 <div class="col-md-12">											
-                                                                                                    <div class="col-md-12"  style="border:1px solid #000;padding:0px;">
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Service Tax ( ST ) @ 14% :
-                                                                                                                             <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'ViewAfterServiceTax','value' => set_value('ViewAfterServiceTax'),'id'=>'ViewAfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>	
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Education cess @2% on ST : 
-                                                                                                                            <div class="form-group">
-                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'ViewAfterEduCess','value' => set_value('ViewAfterEduCess'),'id'=>'ViewAfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-5">
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Sec. & Higher Edu. cess @1 % on ST  :			  
-                                                                                                                            <div class="form-group">
-                                                                                                                                                    <?php
-                                                                                                                                     $data = array('name' => 'ViewAfterSecHighTax','value' => set_value('ViewAfterSecHighTax'),'id'=>'ViewAfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                                                                                                    echo form_input($data);
-                                                                                                                                    ?>   
-                                                                                                                            </div>
-                                                                                                                    </div>
-                                                                                                                    <div class="col-md-6">
-                                                                                                                            Krishi Kalyan tax  @.5 % on Basic Account(BA):			  
-                                                                                                                                    <div class="form-group">
-                                                                                                                                                            <?php
-                                                                                                                                             $data = array('name' => 'ViewAfterKrishiTax','value' => set_value('ViewAfterKrishiTax'),'id'=>'ViewAfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                                                                                            echo form_input($data);
-                                                                                                                                            ?>   
-                                                                                                                                    </div>
-                                                                                                                    </div>
-                                                                                                            </div>
-                                                                                                            <div class="col-md-2">
-                                                                                                             Swachh Bharat tax @.5 % on BA:			  
-                                                                                                                    <div class="form-group">
-                                                                                                                                            <?php
-                                                                                                                             $data = array('name' => 'ViewAfterSwachhTax','value' => set_value('ViewAfterSwachhTax'),'id'=>'ViewAfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                                                                                            echo form_input($data);
-                                                                                                                            ?>   
-                                                                                                                    </div>	
-                                                                                                            </div>
+                                                                                                    <div class="col-md-12">
+                                                                                                          <div class="col-md-6" align="right">
+							 
+				CGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'ViewCgst','value' => set_value('ViewCgst'),'id'=>'ViewCgst',  'class' => 'form-control num' ,'placeholder' => 'CGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'ViewAfterCgst','value' => set_value('ViewAfterCgst'),'id'=>'ViewAfterCgst',  'class' => 'form-control num' ,'placeholder' => 'After CGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				SGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'ViewSgst','value' => set_value('ViewSgst'),'id'=>'ViewSgst',  'class' => 'form-control num' ,'placeholder' => 'SGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'ViewAfterSgst','value' => set_value('ViewAfterSgst'),'id'=>'ViewAfterSgst',  'class' => 'form-control num' ,'placeholder' => 'After SGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+		 
+				<div class="col-md-12">
+					<div class="col-md-6" align="right">
+							 
+				IGST In %
+					</div>	
+					
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'ViewIgst','value' => set_value('ViewIgst'),'id'=>'ViewIgst',  'class' => 'form-control num' ,'placeholder' => 'IGST TAX PERCENTAGE','onchange'=>'EditRatechange()');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>	
+					<div class="col-md-3">
+							 <div class="form-group">
+							 
+												<?php
+										 $data = array('name' => 'ViewAfterIgst','value' => set_value('ViewAfterIgst'),'id'=>'ViewAfterIgst',  'class' => 'form-control num' ,'placeholder' => 'After IGST','readonly' => 'true');
+										echo form_input($data);
+										?>   
+									</div>
+			 
+					</div>						
+		 
+				</div>
+				<div class="col-md-12">
+				 <div class="col-md-5 col-md-offset-4" align="right">
+							<label>Other Allowances In INR</label>			 
+					</div>	
+		<div class="col-md-3">
+							 <div class="form-group">
+													<?php
+											 $data = array('name' => 'ViewOtherAllowances','value' => set_value('ViewOtherAllowances'),'id'=>'ViewOtherAllowances',  'class' => 'form-control num' ,'placeholder' => 'Other Allowances');
+											echo form_input($data);
+											?>   
+										</div>
+							 </div>
+							 
                                                                                                     </div>
                                                                                                     <div class="col-md-12" style="padding:1%;" ></div>
                                                     <div class="col-md-12"  style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide" style="display:none;">
@@ -2283,69 +2458,54 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
 
                                                 </div>
 
+
+
+
+
+                                            <div class="modal-footer">
+                                                 
+
+                                            </div>
                                         </div>
                                     </form>
-
                                 </div>
                             </div> 
 			</div>
 			<br/>
 		</table>
         <div class="col-md-12"  style="border: 1px solid;">			
-                                            <div class="col-md-4">
-                                                     Service Tax @14% :					  
-                                                     <div class="form-group">
-                                                                                            <?php
-                                                                             $data = array('name' => 'TotalAfterServiceTax','value' => set_value('TotalAfterServiceTax',$TotalServiceTax),'id'=>'TotalAfterServiceTax',  'class' => 'form-control' ,'placeholder' => 'After Service Tax','readonly' => 'true');
-                                                                            echo form_input($data);
-                                                                            ?>   
-                                                                    </div>			  
-                                            </div>			  
-                                            <div class="col-md-4">
-                                                    Education cess @2% on service Tax : 
-                                                    <div class="form-group">
-                                                            <?php
-                                                             $data = array('name' => 'TotalAfterEduCess','value' => set_value('TotalAfterEduCess',$TotalEducessTax),'id'=>'TotalAfterEduCess',  'class' => 'form-control' ,'placeholder' => 'After Edu. cess','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                    Sec. & Higher Edu. cess @1 % on service Tax  :			  
-                                                    <div class="form-group">
-                                                                            <?php
-                                                             $data = array('name' => 'TotalAfterSecHighTax','value' => set_value('TotalAfterSecHighTax',$TotalSecHigherEducessTax),'id'=>'TotalAfterSecHighTax',  'class' => 'form-control' ,'placeholder' => 'After High Edu. cess','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                            Krishi Kalyan tax  @.5 % on Basic Amount:			  
-                                                            <div class="form-group">
-                                                                                    <?php
-                                                                     $data = array('name' => 'TotalAfterKrishiTax','value' => set_value('TotalAfterKrishiTax',$TotalKrishiKalyantax),'id'=>'TotalAfterKrishiTax',  'class' => 'form-control' ,'placeholder' => 'After Krishi Kalyan tax.','readonly' => 'true');
-                                                                    echo form_input($data);
-                                                                    ?>   
-                                                            </div>
-                                            </div>
-                                            <div class="col-md-4">
-                                                    Swachh Bharat tax @.5 % on Basic Amount:			  
-                                                    <div class="form-group">
-                                                                            <?php
-                                                             $data = array('name' => 'TotalAfterSwachhTax','value' => set_value('TotalAfterSwachhTax',$TotalSwachhBharattax),'id'=>'TotalAfterSwachhTax',  'class' => 'form-control' ,'placeholder' => 'After Swatchh Bhart Tax.','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>			 
-                                            </div>
-   <div class="col-md-4">
-                                                    Total Tax Amount:			  
-                                                    <div class="form-group">
-                                                                            <?php
-                             $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$TotalSummary),'id'=>'txtToatlOrder',  'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
-                                                            echo form_input($data);
-                                                            ?>   
-                                                    </div>			 
-                                            </div>
+                                            <div class="col-md-3">
+									 <label>CGST In INR</label> 
+									 <?php
+											 $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst' ),'id'=>'txtTotCgst',  'class' => 'form-control num'  ,'readonly' => 'true');
+											echo form_input($data);				
+											?>   
+								</div>
+							 
+							  
+								<div class="col-md-3">
+									 <label>SGST In INR</label> 
+									 <?php
+											 $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst' ),'id'=>'txtTotSgst',  'class' => 'form-control num'  ,'readonly' => 'true');
+											echo form_input($data);				
+											?>   
+								</div>
+								<div class="col-md-3">
+									<label>IGST In INR</label> 
+									<?php
+											 $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst' ),'id'=>'txtTotIgst',  'class' => 'form-control num'   ,'readonly' => 'true');
+											echo form_input($data);
+											?>   
+								</div>
+							 
+					<div class="col-md-3">
+							<label >Other Allowances  In INR </label>							
+								<?php
+								 $data = array('name' => 'ToatalOtherAllowances','value' => set_value('ToatalOtherAllowances'),'id'=>'ToatalOtherAllowances',  'class' => 'form-control num'  ,'readonly' => 'true');
+								echo form_input($data);
+								?>   
+									
+							</div>
                                     </div>
     </div>