From e87e407c9cc3f93215bc800fdcc11e37918e7952 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Thu, 8 Aug 2024 05:22:24 +0000
Subject: [PATCH] FIX_master page alignment

---
 app/Views/EditservicePurchaseorder.php |  21 +-
 app/Views/addRawMaterial.php           |  16 +-
 app/Views/addSupplier.php              |  16 +-
 app/Views/addUser.php                  |   9 +-
 app/Views/addasset.php                 |  16 +-
 app/Views/addconfig.php                |  16 +-
 app/Views/adddepartment.php            |  13 +-
 app/Views/alterpurchaseorder.php       | 751 ++++++++++++-------------
 app/Views/capitalpurchaseorder.php     |  12 +-
 app/Views/editCapitalAmendPO.php       |  16 +-
 app/Views/editOld.php                  |  20 +-
 app/Views/editRawmaterial.php          |  16 +-
 app/Views/editRevenueAmendPO.php       | 538 +++++++++---------
 app/Views/editRevenuepurchaseorder.php | 348 ++++++------
 app/Views/editServiceAmendPO.php       |  20 +-
 app/Views/editasset.php                |  15 +-
 app/Views/editconfig.php               |  14 +-
 app/Views/editdepartment.php           |  18 +-
 app/Views/editimportpo.php             |  12 +-
 app/Views/importpo.php                 |  12 +-
 app/Views/purchaseorder.php            | 258 +++++----
 app/Views/servicePurchaseorder.php     | 604 ++++++++++----------
 22 files changed, 1400 insertions(+), 1361 deletions(-)

diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index f3bc7735..26d5cc45 100644
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -801,7 +801,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Supplier<span class="badge mandatory">*</span></label>
+							<label>Select Supplier<span class="badge mandatory">*</span></label>
 							<?php
 							$options = array("0" => 'Select Supplier');
 							//print_r(  $options);
@@ -820,7 +820,7 @@ if (!empty($getlogpodtl)) {
 
 						</div>
 						<div class="col-md-3">
-							<label>Address</label>
+							<label>Supplier Address</label>
 							<div class="form-group">
 								<?php
 								$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -865,12 +865,11 @@ if (!empty($getlogpodtl)) {
 							<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
 							<div class="centered">
 								<?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?>
-
 								<?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
 							</div>
 
 						</div>
-						<div class="col-md-3" id="Deliverydtdiv"><br />
+						<div class="col-md-3" id="Deliverydtdiv">
 							<label>Delivery Date<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 								<?php
@@ -879,7 +878,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="col-md-3" id="Schedulediv" style="display:none;"><br />
+						<div class="col-md-3" id="Schedulediv" style="display:none;">
 							<label>Schedule By<span class="badge mandatory">*</span></label>
 							<?php
 							$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
@@ -963,7 +962,7 @@ if (!empty($getlogpodtl)) {
 						<div class="col-md-3">
 
 
-							<label>Service Type Options</label>
+							<label>Service Type Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 
 								<?php
@@ -996,7 +995,7 @@ if (!empty($getlogpodtl)) {
 
 						</div>
 						<div class="col-md-3">
-							<label>Payment Terms</label>
+							<label>Payment Terms<span class="badge mandatory">*</span></label>
 							<?php
 							if (!empty($Payment)) {
 								foreach ($Payment as $pay2) :
@@ -1027,7 +1026,7 @@ if (!empty($getlogpodtl)) {
 				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
-							<label>Insurance Options</label>
+							<label>Insurance Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 
 								<?php
@@ -1071,8 +1070,8 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label for="BudgetType">Budget Type</label>
-							<select id='BudgetType' name='BudgetType'>
+							<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
+							<select id='BudgetType' name='BudgetType' required='true'>
 								<?php if ($BudgetType == 'CAPITAL') {
 									$opt1 = 'CAPITAL';
 									$opt2 = 'REVENUE';
@@ -2119,7 +2118,7 @@ if (!empty($getlogpodtl)) {
 		</div>
 
 </div>
-<div class="row" style="border: 1px solid">
+<div class="row">
 	<div class="col-md-12" style="padding: 0px;">
 
 		<div class="col-md-2">
diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php
index 0a57f7f3..5a499b11 100644
--- a/app/Views/addRawMaterial.php
+++ b/app/Views/addRawMaterial.php
@@ -22,16 +22,16 @@
 <div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-        <h1>
-            <center> Add New Material </center>
-        </h1>
-    </section>
+		<h1>
+			<center>  Add Material Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>rawmaterialListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section>  <br />
 
     <section class="content" id="content">
-        <div style="text-align:right;">
-            <a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-cancel" value="Back" />Back</a>
-        </div>
-        <br />
+      
         <div class="row">
             <!-- left column -->
             <div class="col-md-12">
diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php
index afb0f450..cd69d4bb 100644
--- a/app/Views/addSupplier.php
+++ b/app/Views/addSupplier.php
@@ -199,14 +199,14 @@
 </style>
 <div class="content-wrapper">
   <!-- Content Header (Page header) -->
-<section class="content-header">
-<center><h2> Add Supplier</h2>
-<!-- <small>Preview</small> -->
-</center>
-<ol class="breadcrumb">
-  <a class="btn btn-cancel" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
-</ol>
-</section>
+  <section class="content-header">
+    <h1>
+      <center>  Add Supplier Details</center>
+    </h1>
+    <ol class="breadcrumb">
+      <a class="btn btn-cancel" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
+    </ol>
+  </section>
   
 <section class="content" id="content">
     <br />
diff --git a/app/Views/addUser.php b/app/Views/addUser.php
index fd3d7a25..c7472818 100644
--- a/app/Views/addUser.php
+++ b/app/Views/addUser.php
@@ -1,8 +1,13 @@
 <div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-      <h1><center> Add User</center></h1>	  
-    </section>
+		<h1>
+			<center>  Add User Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>userListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section>
     
     <section class="content">
     <div style="text-align:right;">
diff --git a/app/Views/addasset.php b/app/Views/addasset.php
index ad96e391..d488d91a 100644
--- a/app/Views/addasset.php
+++ b/app/Views/addasset.php
@@ -49,15 +49,17 @@ $(function() {
 
 <div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
-    <section class="content-header">
-	<center><b><h3> Add Asset </h3></b></center>
-    </section>
+	<section class="content-header">
+		<h1>
+			<center>  Add Asset Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>assetListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section><br>
     
     <section class="content">
-    <div style="text-align:right;">
-    <a href="<?php base_url() ?>assetListing" class="btn btn-cancel" value="Back"/>Back</a>
-	</div>
-	<br>
+  
         <div class="row">
             <!-- left column -->
             <div class="col-md-12">
diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php
index a5d2612c..d2fd07de 100644
--- a/app/Views/addconfig.php
+++ b/app/Views/addconfig.php
@@ -1,16 +1,14 @@
 <div class="content-wrapper" style="min-height: 537px;">
 	<!-- Content Header (Page header) -->
 	<section class="content-header">
-		<center><b>
-				<h3> Add Config</h3>
-			</b></center>
-	</section>
+		<h1>
+			<center>  Add Config Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>configlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section>
 	<section class="content">
-
-
-		<div style="text-align:right;">
-			<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel" value="Back">Back</a>
-		</div>
 		<br>
 		<div class="row">
 		<div class="col-md-12">
diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php
index 158ab09d..b9b9d690 100644
--- a/app/Views/adddepartment.php
+++ b/app/Views/adddepartment.php
@@ -62,13 +62,16 @@
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-    <center><b><h3 class="box-title">Add Department Details</h3></b></center>
-    </section>
+		<h1>
+			<center> Add Department Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>departmentListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section>
+   
     
     <section class="content">
-    <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>departmentListing" class="btn btn-cancel" value="Back"/>Back</a>
-	</div>
 	<br/>
         <div class="row">
             <!-- left column -->
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index c90314cc..a5cdd7ca 100644
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -1468,7 +1468,7 @@ if (!empty($INRSYMBOL)) {
     /* Set the Packaging calculation option for calculating Packaging */
     function submitoption() {
         submitoptionvalue = $("input:radio[name='optsubmit']:checked").val();
-    
+
         var PO = $('#POType').val();
         if (PO == 'REVENUE') {
 
@@ -1833,7 +1833,7 @@ if (!empty($INRSYMBOL)) {
                 $('#txtSpecialservice').val(0);
                 Save(1)
             }
-        }else{
+        } else {
             $('#submitmodel').modal('show');
         }
     }
@@ -1851,8 +1851,7 @@ if (!empty($INRSYMBOL)) {
 
         if (input == -1) {
             alert("Select Request Type");
-        }
-        else if ($('#drpSupplier').val() == "0") {
+        } else if ($('#drpSupplier').val() == "0") {
             alert('Please Select the Supplier details');
             $('#drpSupplier').focus();
             return false;
@@ -1875,8 +1874,7 @@ if (!empty($INRSYMBOL)) {
             $('#Scheduleby').focus();
             return false;
 
-        } 
-        else {
+        } else {
             $("#" + input).modal('show');
             $('#isEdit').val(0);
             if (StateTaxCheck == "0") {
@@ -2022,6 +2020,36 @@ if (!empty($INRSYMBOL)) {
     .num {
         text-align: right;
     }
+    .header-container {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 25px;
+        }
+
+        .header-container h2 {
+            flex: 1;
+            text-align: center;
+            margin: 0;
+        }
+
+        .centered {
+            display: flex;
+            /* justify-content: center; */
+            align-items: center;
+            height: 10vh;
+        }
+
+        .centered label,
+        .centered input {
+            margin: 0 5px;
+        }
+
+        .mandatory {
+            color: red;
+            text-align: right;
+            background-color: white;
+        }
 </style>
 
 <div class="content-wrapper">
@@ -2031,20 +2059,16 @@ if (!empty($INRSYMBOL)) {
     echo form_open(base_url() . '/purchaseorder/addalterPO/', $attributes); ?>
 
     <section class="content">
-        <div style="border:2px solid #333">
+        <div class="box">
             <div id="content"></div>
-            <div>
-                <center><b>
+            <div class="header-container">
                         <h2>Emergency Purchase Order</h2>
-                    </b></center>
             </div>
             <div class="container-fluid">
-
-                <div class="row">
+            <div class="row">
                     <div class="col-md-12">
-                        <div class="row">
-                            <div class="col-md-3">
-                                <label>Request Type <span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                    <div class="col-md-3">
+                                <label>Request Type <span class="badge mandatory">*</span></label>
                                 <?php
                                 $options = array("-1" => 'Select Request Type');
 
@@ -2062,20 +2086,7 @@ if (!empty($INRSYMBOL)) {
                                 ?>
 
                             </div>
-                            <div class="col-md-2">
-                                <label>Purchase Order Date</label>
-
-                                <div class="form-group">
-
-                                        <?php
-                                        $data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress'=>'return false;');
-                                        echo form_input($data);
-                                        ?>
-                                </div>
-
-
-                            </div>
-                            <div class="col-md-2">
+                            <div class="col-md-3">
                                 <label>Purchase Order Type</label>
                                 <div class="form-group">
 
@@ -2085,8 +2096,46 @@ if (!empty($INRSYMBOL)) {
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-2" style='display:none;' id='workstatus'>
-                                <label>Work Status<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                            <div class="col-md-3">
+                                <label>Select Supplier<span class="badge mandatory" >*</span></label>
+                                <div>
+                                    <?php
+                                    $options = array("0" => 'Select Supplier');
+                                    //print_r(  $options);
+
+                                    if (!empty($Suplist)) {
+                                        foreach ($Suplist as $SID) :
+                                            $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName;
+                                        endforeach;
+                                    }
+
+                                    echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"');
+
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="col-md-3">
+                                <label>Supplier Address</label>
+                                <div class="form-group">
+                                    <?php
+                                    $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
+                                    echo Form_textarea($data);
+                                    ?>
+                                </div>
+                            </div>
+                    </div>
+            </div>
+            <div class="row">
+                    <div class="col-md-12">
+                            <div class="col-md-3" style='display:none;' id='txtPoRange'>
+                                <b><u>Select Tax Range<span class="badge mandatory">*</span></u></b><br />
+                                <div class="centered">
+                                        <?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Local", "value" => "0", 'checked' => set_radio('Range', '0', TRUE))); ?>
+                                        <?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Inter_state", "value" => "1", 'checked' => set_radio('Range', '1', FALSE))); ?>
+                                </div>
+                            </div>
+                            <div class="col-md-3" style='display:none;' id='workstatus'>
+                                <label>Work Status<span class="badge mandatory">*</span></label>
                                 <?php
                                 if (!empty($WorkStatus)) {
                                     //$options4 = array("0"=>'Selected Work Status'); 
@@ -2097,47 +2146,30 @@ if (!empty($INRSYMBOL)) {
                                 echo form_dropdown('workstatus', $options4, set_value('workstatus'), 'id="workstatusValue"', 'required="true"', 'class="form-control select2');
                                 ?>
                             </div>
-                            <!-- <div class="col-md-3" id="selectdeliveryby" style="display:none;"> -->
-                            <div class="col-md-3">
-                                <b><u>Select Delivery By<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></u></b><br />
-                                <tr>
-                                <td>
-                                    <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => set_radio('DateRange', '0', true))); ?>&nbsp;&nbsp;&nbsp;&nbsp;
-                                </td>
-                                <td>
-                                    <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1", 'checked' => set_radio('DateRange', '1', false))); ?>
-                                </td>
-                                </tr>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-3">
-                                <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-                                <div>
-                                    <?php
-                                    $options = array("0" => 'Select Supplier');
-                                    //print_r(  $options);
-
-                                    if (!empty($Suplist)) {
-                                        foreach ($Suplist as $SID) :
-                                            $options[$SID->SupplierID] = $SID->SupplierID . ' - ' . $SID->SupplierName ;
-                                        endforeach;
-                                    }
-
-                                    echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier"', 'required="true"', 'class="form-control select2"');
-
-                                    ?>
+                            <div class="col-md-3" id="Deliveryby">
+                                <b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
+                                <div class="centered">
+                                        <?php echo form_label('Date', 'Date') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => set_radio('DateRange', '0', true))); ?>
+                                        <?php echo form_label('Schedule', 'Schedule') . "&nbsp;&nbsp;" . form_radio(array("name" => "DateRange", "id" => "Schedule", "value" => "1", 'checked' => set_radio('DateRange', '1', false))); ?>
                                 </div>
                             </div>
-                            <div class="col-md-3">
-                                <label>Address</label>
-                                <div class="form-group">
+                            <div class="col-md-3" id="Schedulediv">
+                                    <label>Schedule By<span class="badge mandatory">*</span></label>
+
                                     <?php
-                                    $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
-                                    echo Form_textarea($data);
+                                    $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
+                                    echo form_textarea($data);
                                     ?>
+
+                                </div>
+                                <div class="col-md-3" id="Deliverydtdiv" style="display:none;">
+                                    <label>Delivery Date<span class="badge mandatory">*</span></label>
+                                    <?php
+                                    $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    echo form_input($data);
+                                    ?>
+
                                 </div>
-                            </div>
                             <div class="col-md-3">
                                 <label>Delivery Address</label>
                                 <div class="form-group">
@@ -2148,31 +2180,39 @@ if (!empty($INRSYMBOL)) {
 
                                 </div>
                             </div>
-                            <div class="col-md-3" id="Deliveryby" style="padding: 0px;">
-
-                                <div class="col-md-12" id="Schedulediv">
-                                    <label>Schedule By<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                    </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                <div id="currencyexchange" style='display:none;'>
+                                <div class="col-md-3">
+                                    <label>Currency Type<span class="badge mandatory">*</span></label>
 
                                     <?php
-                                    $data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby',  'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
-                                    echo form_textarea($data);
-                                    ?>
-
-                                </div>
-                                <div class="col-md-12" id="Deliverydtdiv" style="display:none;">
-                                    <label>Delivery Date<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-                                    <?php
-                                    $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt',  'class' => 'form-control', 'required' => 'true', 'onkeypress'=>'return false;');
+                                    $data = array('name' => 'txtcurrencytype', 'value' => set_value('txtcurrencytype'), 'id' => 'txtcurrencytype',  'class' => 'form-control', 'required' => 'true');
                                     echo form_input($data);
                                     ?>
 
                                 </div>
+                                <div class="col-md-3">
+                                    <label>Exchange Rate</label>
 
+                                    <?php
+                                    $data = array('name' => 'txtexachangerate', 'value' => set_value('txtexachangerate'), 'id' => 'txtexachangerate',  'class' => 'form-control', 'required' => 'true');
+                                    echo form_input($data);
+                                    ?>
+
+                                </div>
+                                <div class="col-md-3">
+                                    <a href="http://www.xe.com/" target="_blank"><u>To check Today's Foreign Exchange value</u></a>
+                                </div>
                             </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-3">
-                                <label>Department Name<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                </div>
+            </div>
+            <div class="row">
+                    <div class="col-md-12">
+                    <div class="col-md-3">
+                                <label>Department Name<span class="badge mandatory">*</span></label>
                                 <div>
                                     <?php
                                     $options1 = array("0" => 'Select Department Name');
@@ -2193,7 +2233,7 @@ if (!empty($INRSYMBOL)) {
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label>Cost Center Name<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                <label>Cost Center Name<span class="badge mandatory">*</span></label>
                                 <div>
                                     <?php
                                     $options2 = array("0" => 'Cost Center Name');
@@ -2222,49 +2262,11 @@ if (!empty($INRSYMBOL)) {
                                     echo form_hidden($data);
                                     // echo form_input($data);
 
-                                    
+
                                     ?>
                                 </div>
                             </div>
-                            <div class="col-md-3" style='display:none;' id='txtPoRange'>
-                                <b><u>Select Tax Range<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></u></b><br />
-                                <tr>
-                                    <td>
-                                        <?php echo form_label('Local', 'Local') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Local", "value" => "0", 'checked' => set_radio('Range', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-                                    <td>
-                                        <?php echo form_label('Inter state', 'Inter state') . "&nbsp;&nbsp;" . form_radio(array("name" => "Range", "id" => "Inter_state", "value" => "1", 'checked' => set_radio('Range', '1', FALSE))); ?>
-                                    </td>
-                                </tr>
-
-
-                            </div>
-                            <div class="col-md-3" id="currencyexchange" style='display:none;'>
-                                <div class="col-md-6">
-                                    <label>Currency Type<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
-
-                                    <?php
-                                    $data = array('name' => 'txtcurrencytype', 'value' => set_value('txtcurrencytype'), 'id' => 'txtcurrencytype',  'class' => 'form-control', 'required' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="col-md-6">
-                                    <label>Exchange Rate</label>
-
-                                    <?php
-                                    $data = array('name' => 'txtexachangerate', 'value' => set_value('txtexachangerate'), 'id' => 'txtexachangerate',  'class' => 'form-control', 'required' => 'true');
-                                    echo form_input($data);
-                                    ?>
-
-                                </div>
-                                <div class="col-md-12">
-                                    <a href="http://www.xe.com/" target="_blank"><u>To check Today's Foreign Exchange value</u></a>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12" style="padding: 0px;">
-                                <div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
+                            <div class="col-md-3" id="DisplayScheduleDiv" style="display:none;">
                                     <label>Select Service Schedule Type</label>
                                     <div class="form-group">
                                         <?php
@@ -2307,62 +2309,53 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
-
-                        <!--start new fields 1 sep-->
-                        <div class="row">
-                            <div class="col-md-12" style="padding: 0px;">
-                                <div class="col-md-3">
-                                    <div class="col-md-12" style="padding: 0px;">
-
-
-                                        <label>Mode Of Shipment</label>
-                                        <div class="form-group">
-
-                                            <?php
-                                            $data = array('name' => 'emergmodeofshipment', 'value' => set_value('emergmodeofshipment'), 'id' => 'emergmodeofshipment',  'class' => 'form-control');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-
-
-
-                                    </div>
+                    </div>
+            </div>
+            <div class="row">
+                    <div class="col-md-12">
+                            <div class="col-md-3">
+                                <label>Purchase Order Date</label>
+                                <div class="form-group">
+                                    <?php
+                                    $data = array('name' => 'PODate', 'value' => set_value('PODate', $CurrentDate), 'id' => 'PODate',  'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
+                                    echo form_input($data);
+                                    ?>
                                 </div>
-                                <div class="col-md-9" style="padding:0px;">
-                                    <div class="col-md-4" style="padding:0px;">
-                                        <div class="col-md-12">
-                                            <label>Contact Reference</label>
-                                            <div class="form-group">
+                            </div>
+                            <div class="col-md-3">
+                                <label>Mode Of Shipment</label>
+                                <div class="form-group">
+                                    <?php
+                                    $data = array('name' => 'emergmodeofshipment', 'value' => set_value('emergmodeofshipment'), 'id' => 'emergmodeofshipment',  'class' => 'form-control');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="col-md-3">
+                                <label>Contact Reference</label>
+                                <div class="form-group">
 
-                                                <?php
-                                                $data = array('name' => 'emergsupplierreference', 'value' => set_value('emergsupplierreference'), 'id' => 'emergsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-
-
-
-
-                                        </div>
-                                    </div>
-                                    <div class="col-md-4" style="padding:0px;">
-                                        <div class="col-md-12">
-                                            <label>Supplier's Offer No</label>
-                                            <div class="form-group">
-
-                                                <?php
-                                                $data = array('name' => 'emergsupplierofferno', 'value' => set_value('emergsupplierofferno'), 'id' => 'emergsupplierofferno',  'class' => 'form-control');
-                                                echo form_input($data);
-                                                ?>
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                    <div class="col-md-4" style="padding:0px;">
-                                        <div class="col-md-12" style="padding-right:0px;">
+                                    <?php
+                                    $data = array('name' => 'emergsupplierreference', 'value' => set_value('emergsupplierreference'), 'id' => 'emergsupplierreference',  'class' => 'form-control', 'maxlength' => '40');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
+                            </div>
+                            <div class="col-md-3">
+                                <label>Supplier's Offer No</label>
+                                <div class="form-group">
+                                    <?php
+                                    $data = array('name' => 'emergsupplierofferno', 'value' => set_value('emergsupplierofferno'), 'id' => 'emergsupplierofferno',  'class' => 'form-control');
+                                    echo form_input($data);
+                                    ?>
+                                </div>
 
+                            </div>
+                    </div>
+            </div>
+            <div class="row">
+                    <div class="col-md-12">
+                                    <div class="col-md-3">
                                             <label>Our Reference(S)</label>
                                             <div class="form-group">
 
@@ -2371,19 +2364,9 @@ if (!empty($INRSYMBOL)) {
                                                 echo form_input($data);
                                                 ?>
                                             </div>
-                                        </div>
                                     </div>
-                                </div>
-                            </div>
-                        </div><!--End new fields 1 sep-->
-
-                    </div>
-                    <!--start new fields 1 sep-->
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="col-md-3">
-                                <div class="col-md-6" style="padding: 0px;">
-                                    <label id="typeOptions">Service Type Options</label>
+                                    <div class="col-md-3">
+                                    <label id="typeOptions">Service Type Options<span class="badge mandatory">*</span></label>
                                     <div class="form-group">
                                         <?php
 
@@ -2407,8 +2390,38 @@ if (!empty($INRSYMBOL)) {
 
 
                                 </div>
-                                <div class="col-md-6" style="padding-right: 0px;">
-                                    <label>Insurance Options</label>
+                                <div class="col-md-3">
+                                    <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
+                                    <?php
+                                    $options1 = array("0" => 'Select Payment method');
+                                    //print_r(  $options);
+                                    if (!empty($Payment)) {
+                                        foreach ($Payment as $payment) :
+
+
+                                            $options1[$payment->PaymentID] =  $payment->PaymentTerms;
+
+                                        endforeach;
+                                    }
+                                    echo form_dropdown('PaymentMethod', $options1, set_value('PaymentMethod'), 'id="PaymentMethod"', 'class="form-control"');
+                                    ?>
+                                </div>
+
+                                <div class="col-md-3" id="otheroptiondiv" style="display:none;">
+                                    <label>Description of Payable Terms<span class="badge mandatory">*</span></label>
+                                    <div class="form-group">
+                                        <?php
+                                        $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
+                                        echo form_input($data);
+                                        ?>
+                                    </div>
+                                </div>
+                    </div>
+            </div>
+            <div class="row">
+                    <div class="col-md-12">
+                    <div class="col-md-3">
+                                    <label>Insurance Options<span class="badge mandatory">*</span></label>
                                     <div class="form-group">
 
                                         <?php
@@ -2433,11 +2446,8 @@ if (!empty($INRSYMBOL)) {
 
 
                                 </div>
-                            </div>
-                            <div class="col-md-9" style="padding:0px;">
-
-                                <div class="col-md-4" id="insuranceTxtDiv" style="display:block;">
-                                    <label>Insurance No / Insurance Details<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                <div class="col-md-3" id="insuranceTxtDiv" style="display:block;">
+                                    <label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
                                     <div class="form-group">
                                         <?php
                                         $data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber'), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
@@ -2445,54 +2455,22 @@ if (!empty($INRSYMBOL)) {
                                         ?>
                                     </div>
                                 </div>
-                                <div class="col-md-4">
-                                    <label for="payablefrom">Payable Terms</label>
-                                    <?php
-                                    $options1 = array("0" => 'Select Payment method');
-                                    //print_r(  $options);
-                                    if (!empty($Payment)) {
-                                        foreach ($Payment as $payment) :
-
-
-                                            $options1[$payment->PaymentID] =  $payment->PaymentTerms;
-
-                                        endforeach;
-                                    }
-                                    echo form_dropdown('PaymentMethod', $options1, set_value('PaymentMethod'), 'id="PaymentMethod"', 'class="form-control"');
-                                    ?>
-                                </div>
-
-                                <div class="col-md-4" id="otheroptiondiv" style="display:none;">
-                                    <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
-                                    <div class="form-group">
-                                        <?php
-                                        $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment',  'class' => 'form-control', 'required' => 'true');
-                                        echo form_input($data);
-                                        ?>
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-                        <div class="col-md-12">
-                            <div class="col-md-2" style="padding-right: 0px;">
-                                <label for="BudgetType">Budget Type</label>
+                            <div class="col-md-3">
+                                <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
                                 <?php
                                 $optionsnew = array('0' => 'Select', '1' => 'REVENUE', '2' => 'CAPITAL');
                                 echo form_dropdown('BudgetType', $optionsnew, set_value('BudgetType'), 'id="BudgetType"', 'required="true"', 'class="form-control select2');
                                 ?>
                             </div>
-                        </div>
-                    </div><!--End new fields 1 sep-->
+                            <div class="col-md-3">
+                                
+                            </div>
+                    </div>
+            </div>
 
-                    <div class="col-md-12" style="padding:0px;"></div>
-
-                </div>
-                
-                
                 <div class="col-md-12">
                     <div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
-                        <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT
+                        <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT
                     </div>
                     <div class="col-md-1" align="right">
                         <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a>
@@ -2905,7 +2883,7 @@ if (!empty($INRSYMBOL)) {
                                 </form>
                             </div>
                             <div class="modal-footer">
-                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a> 
+                                <a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
                                 <a class="btn btn-success" ID="CSTOption" onclick="SetCSTCalculation();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
                             </div>
                         </div>
@@ -2928,7 +2906,7 @@ if (!empty($INRSYMBOL)) {
 
                                     <div class="col-md-12">
                                         <div class="col-md-3">
-                                            <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                            <label>Req No<span class="badge mandatory">*</span></label>
                                             <div>
                                                 <?php
 
@@ -2970,7 +2948,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                     <div class="col-md-12">
                                         <div class="col-md-3">
-                                            <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                            <label>Item Code<span class="badge mandatory">*</span></label>
                                             <div>
                                                 <?php
                                                 $options = array("0" => 'Item Code');
@@ -3068,7 +3046,7 @@ if (!empty($INRSYMBOL)) {
 
 
                                         <div class="col-md-3">
-                                            <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                            <label>Quantity<span class="badge mandatory">*</span></label>
                                             <div class="form-group">
                                                 <?php
                                                 $data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
@@ -3077,7 +3055,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
                                         </div>
                                         <div class="col-md-3">
-                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge" style="color:red;text-align:right;background-color: #fff;">*</span></label>
+                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
                                             <div class="form-group">
                                                 <?php
                                                 $data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
@@ -3213,7 +3191,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
                                         </div>
                                         <div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-                                            <label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label> <?php
+                                            <label>Service Description<span class="badge mandatory">*</span></label> <?php
                                                                                                                                                                         $data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
                                                                                                                                                                         echo form_textarea($data); ?>
                                         </div>
@@ -3247,7 +3225,7 @@ if (!empty($INRSYMBOL)) {
                             <div align="left">
                                 <div class="col-md-12">
                                     <div class="col-md-3">
-                                        <label>Req No<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                        <label>Req No<span class="badge mandatory">*</span></label>
                                         <div>
                                             <?php
 
@@ -3282,14 +3260,14 @@ if (!empty($INRSYMBOL)) {
                                             <?php
                                             $data = array('name' => 'EditRevenueAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditRevenueAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
                                             echo form_hidden($data);
-                                            
+
                                             ?>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="col-md-12">
                                     <div class="col-md-2">
-                                        <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                        <label>Item Code<span class="badge mandatory">*</span></label>
                                         <div>
                                             <?php
                                             $options = array("0" => 'Item Code');
@@ -3321,7 +3299,7 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                     <div class="col-md-6" style="padding: 0px;">
                                         <div class="col-md-2" style="padding-right:0px;">
-                                            <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                            <label>Quantity<span class="badge mandatory">*</span></label>
                                             <div class="form-group">
                                                 <?php
                                                 $data = array('name' => 'EditRevenueQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditRevenueQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -3330,7 +3308,7 @@ if (!empty($INRSYMBOL)) {
                                             </div>
                                         </div>
                                         <div class="col-md-2" style="padding-right: 0px;">
-                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                            <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
                                             <div class="form-group">
                                                 <?php
                                                 $data = array('name' => 'EditRevenueRate', 'value' => set_value('EditRate'), 'id' => 'EditRevenueRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()', 'style' => 'text-align:right;');
@@ -3619,7 +3597,7 @@ if (!empty($INRSYMBOL)) {
                                         <div align="left">
                                             <div class="col-md-12">
                                                 <div class="col-md-2">
-                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                                    <label>Item Code<span class="badge mandatory">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0" => 'Item Code');
@@ -3651,7 +3629,7 @@ if (!empty($INRSYMBOL)) {
                                                 </div>
                                                 <div class="col-md-6" style="padding:0px;">
                                                     <div class="col-md-3">
-                                                        <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                                        <label>Quantity<span class="badge mandatory">*</span></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Quantity', 'value' => set_value('Quantity'), 'id' => 'Quantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@@ -3660,7 +3638,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-3">
-                                                        <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
@@ -3689,7 +3667,7 @@ if (!empty($INRSYMBOL)) {
 
                                                 <div class="col-md-12">
                                                     <div class="col-md-4">
-                                                        <label>Discount Type <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label>Discount Type <span class="badge mandatory"></span></label>
                                                         <div>
                                                             <?php
                                                             $options = array("0" => 'Select Discount Type');
@@ -3710,7 +3688,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label>Discount Rate<span class="badge" style="color:red;text-align:right;background-color: #fff ;"> </label>
+                                                        <label>Discount Rate<span class="badge mandatory"></span> </label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtDiscount', 'value' => set_value('txtDiscount'), 'id' => 'txtDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();calculateDiscount(0);');
@@ -3751,7 +3729,7 @@ if (!empty($INRSYMBOL)) {
 
                                                 <div class="col-md-12" style="text-align:left;">
                                                     <div class="col-md-4">
-                                                        <label>Packaging Type <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label>Packaging Type <span class="badge mandatory"></span></label>
                                                         <div>
                                                             <?php
                                                             $options = array("0" => 'Select Packaging Type');
@@ -3772,7 +3750,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label>Packaging Rate <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label>Packaging Rate <span class="badge mandatory"></span></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging(0);change();');
@@ -3833,7 +3811,7 @@ if (!empty($INRSYMBOL)) {
 
                                                 <div class="col-md-12">
                                                     <div class="col-md-2">
-                                                        <label>Freight Type <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label>Freight Type <span class="badge mandatory"></label>
                                                         <div>
                                                             <?php
                                                             $options = array("0" => 'Select Freight Type');
@@ -3854,7 +3832,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2" id="TripsValue" style="display:none;">
-                                                        <label>NO Of Trips<span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label>NO Of Trips<span class="badge mandatory"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
@@ -3863,7 +3841,7 @@ if (!empty($INRSYMBOL)) {
                                                         </div>
                                                     </div>
                                                     <div class="col-md-2">
-                                                        <label>Freight Rate <span class="badge" style="color:red;text-align:right;background-color: #fff ;"></label>
+                                                        <label>Freight Rate <span class="badge mandatory"></label>
                                                         <div class="form-group">
                                                             <?php
                                                             $data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);change();');
@@ -3951,7 +3929,7 @@ if (!empty($INRSYMBOL)) {
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
-                                                    <label>Item Code<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                                    <label>Item Code<span class="badge mandatory">*</span></label>
                                                     <div>
                                                         <?php
                                                         $options = array("0" => 'Item Code');
@@ -4059,7 +4037,7 @@ if (!empty($INRSYMBOL)) {
 
 
                                                 <div class="col-md-3">
-                                                    <label>Quantity<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                                    <label>Quantity<span class="badge mandatory">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceQuantity', 'value' => set_value('ServiceQuantity'), 'id' => 'ServiceQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
@@ -4068,7 +4046,7 @@ if (!empty($INRSYMBOL)) {
                                                     </div>
                                                 </div>
                                                 <div class="col-md-3">
-                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label>
+                                                    <label><?php echo "Rate  ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
                                                     <div class="form-group">
                                                         <?php
                                                         $data = array('name' => 'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()');
@@ -4212,7 +4190,7 @@ if (!empty($INRSYMBOL)) {
 
                                                 </div>
                                                 <div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-                                                    <label>Service Description<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</span></label> <?php
+                                                    <label>Service Description<span class="badge mandatory">*</span></label> <?php
                                                                                                                                                                                 $data = array('name' => 'txtSpcialInstructionSingle', 'value' => set_value('txtSpcialInstructionSingle'), 'id' => 'txtSpcialInstructionSingle',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
                                                                                                                                                                                 echo form_textarea($data); ?>
                                                 </div>
@@ -5201,7 +5179,7 @@ if (!empty($INRSYMBOL)) {
 
                     <div class="box-body">
                         <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px">
-                        <thead style="background-color: #ddd;">
+                            <thead style="background-color: #ddd;">
                                 <tr>
                                     <th>SNo</th>
                                     <th>Requisition No</th>
@@ -5402,7 +5380,7 @@ if (!empty($INRSYMBOL)) {
                         </div>
                         <!--start new fields 1 sep-->
                         <div class="col-md-12" id="emergdescofpoDiv" style="display:none;">
-                            <label>Description Of Service<span class="badge" style="color:red;text-align:right;background-color: #fff ;">*</label>
+                            <label>Description Of Service<span class="badge mandatory">*</label>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
@@ -5581,7 +5559,7 @@ if (!empty($INRSYMBOL)) {
 
             addHidden(theForm, "Reqnumber" + temp, Reqnumber);
             addHidden(theForm, "departmentName" + temp, departmentName);
-            addHidden(theForm, "AvilBudget" + temp, (AvilBudget?AvilBudget:0));
+            addHidden(theForm, "AvilBudget" + temp, (AvilBudget ? AvilBudget : 0));
             addHidden(theForm, "costCode" + temp, costCode);
             addHidden(theForm, "materialCode" + temp, materialCode);
             addHidden(theForm, "materialName" + temp, materialName);
@@ -5674,10 +5652,10 @@ if (!empty($INRSYMBOL)) {
 
     function clearRevenueModalFields() {
         // To reset the Modal controls
-        var isChecked = $('#IsOpenOrder').is(':checked');        
-        isChecked ? $('#Quantity').val(0).prop('readonly', true).prop('required', false) 
-                  : $('#Quantity').val('').prop('readonly', false).prop('required', true);
-        
+        var isChecked = $('#IsOpenOrder').is(':checked');
+        isChecked ? $('#Quantity').val(0).prop('readonly', true).prop('required', false) :
+            $('#Quantity').val('').prop('readonly', false).prop('required', true);
+
         $('#ReqNo').val('0');
         $('#deptName').val('');
         $('#CostCenter').val("0");
@@ -5732,8 +5710,8 @@ if (!empty($INRSYMBOL)) {
             $.ajax({
                 // data: $('.CreatePO').serialize(),
                 data: formData,
-					processData: false,
-					contentType: false,
+                processData: false,
+                contentType: false,
                 type: "POST",
                 url: "<?php echo base_url() ?>purchaseorder/addNewPurchaseOrder",
                 success: function(data) {
@@ -6105,7 +6083,7 @@ if (!empty($INRSYMBOL)) {
                 success: function(data) {
                     if (data) {
                         $('#content').loader('hide');
-                        $("#AvalBuget").val(data?parseFloat(data).toFixed(2):0);
+                        $("#AvalBuget").val(data ? parseFloat(data).toFixed(2) : 0);
                     } else {
                         $('#content').loader('hide');
                         // alert("Error");
@@ -6144,13 +6122,16 @@ if (!empty($INRSYMBOL)) {
         });
         var d = $('#drpSupplier').val();
         $.ajax({
-					url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
-                    type: 'POST',
-                    data: {supplierid : d, materialcode: selectedMaterialCode },
-                    success: function(response) {
-						if(response) alert(response);
-                    }
-                });
+            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
+            type: 'POST',
+            data: {
+                supplierid: d,
+                materialcode: selectedMaterialCode
+            },
+            success: function(response) {
+                if (response) alert(response);
+            }
+        });
 
     });
     /**
@@ -6169,13 +6150,16 @@ if (!empty($INRSYMBOL)) {
         });
         var d = $('#drpSupplier').val();
         $.ajax({
-					url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
-                    type: 'POST',
-                    data: {supplierid : d, materialcode: selectedRevenueMaterialCode },
-                    success: function(response) {
-						if(response) alert(response);
-                    }
-                });
+            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
+            type: 'POST',
+            data: {
+                supplierid: d,
+                materialcode: selectedRevenueMaterialCode
+            },
+            success: function(response) {
+                if (response) alert(response);
+            }
+        });
 
     });
 
@@ -6453,7 +6437,7 @@ if (!empty($INRSYMBOL)) {
 
             addHidden(theForm, "Reqnumber" + temp, Reqnumber);
             addHidden(theForm, "departmentName" + temp, departmentName);
-            addHidden(theForm, "AvilBudget" + temp, (AvilBudget?AvilBudget:0));
+            addHidden(theForm, "AvilBudget" + temp, (AvilBudget ? AvilBudget : 0));
             addHidden(theForm, "costCode" + temp, costCode);
             addHidden(theForm, "materialCode" + temp, materialCode);
             addHidden(theForm, "materialName" + temp, materialName);
@@ -6485,7 +6469,7 @@ if (!empty($INRSYMBOL)) {
      */
     function validateServiceTax() {
         var isChecked = $('#IsOpenOrder').is(':checked');
-        
+
         if ($('#ServiceMaterialCode').val() == "0") {
             alert('Please select the Material Code');
             $('#ServiceMaterialCode').focus();
@@ -6566,8 +6550,8 @@ if (!empty($INRSYMBOL)) {
     function clearServiceModalFields() {
 
         // To reset the Modal controls
-        
-        var isChecked = $('#IsOpenOrder').is(':checked');        
+
+        var isChecked = $('#IsOpenOrder').is(':checked');
         isChecked ? $('#ServiceQuantity').val(0).prop('readonly', true).prop('required', false) : $('#ServiceQuantity').val('').prop('readonly', false).prop('required', true);
 
         $('#ServiceMaterialCode').val("0");
@@ -6831,7 +6815,7 @@ $('#content').loader('hide');
      */
     function validateEditServiceTax() {
         var isChecked = $('#IsOpenOrder').is(':checked');
-        
+
         if ($('#EditQuantity').val() == '') {
             alert('Please Enter the Quantity value');
             $('#EditQuantity').focus();
@@ -7089,8 +7073,7 @@ $('#content').loader('hide');
                 alert('Please Select Line item to Create PO');
                 $('#Deliverydt').focus();
                 return false;
-            }
-            else if ($('#insuranceStatus').val() == 'YES' && $('#InsuranceNumber').val() == '') {
+            } else if ($('#insuranceStatus').val() == 'YES' && $('#InsuranceNumber').val() == '') {
                 alert('Please Enter Insurance Number..!');
 
                 return false;
@@ -7276,13 +7259,16 @@ $('#content').loader('hide');
         });
         var d = $('#drpSupplier').val();
         $.ajax({
-					url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
-                    type: 'POST',
-                    data: {supplierid : d, materialcode: editselectedMaterialCode },
-                    success: function(response) {
-						if(response) alert(response);
-                    }
-                });
+            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
+            type: 'POST',
+            data: {
+                supplierid: d,
+                materialcode: editselectedMaterialCode
+            },
+            success: function(response) {
+                if (response) alert(response);
+            }
+        });
     });
     $("#EDITREVENUE").on("shown.bs.modal", function(e) {
 
@@ -7397,13 +7383,16 @@ $('#content').loader('hide');
         });
         var d = $('#drpSupplier').val();
         $.ajax({
-					url:"<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
-                    type: 'POST',
-                    data: {supplierid : d, materialcode: editselectedMaterialCode },
-                    success: function(response) {
-						if(response) alert(response);
-                    }
-                });
+            url: "<?php echo base_url() ?>VerifyWithSupplierForPendingPO",
+            type: 'POST',
+            data: {
+                supplierid: d,
+                materialcode: editselectedMaterialCode
+            },
+            success: function(response) {
+                if (response) alert(response);
+            }
+        });
 
     });
     $('.EditRevenue').click(function() {
@@ -7499,59 +7488,44 @@ $('#content').loader('hide');
 
     });
 
-    function validateAddRevenueTax()
- {  
-    var isChecked = $('#IsOpenOrder').is(':checked');
-	if($('#ReqNo').val() == "0")
-	{
-		alert('Please select the Requisition Number');
-		$('#ReqNo').focus();
-		return false;
-	}
-	else if($('#CostCenter').val() == "0")
-	{
-		alert('Please select the Cost center');
-		$('#CostCenter').focus();
-		return false;
-	}
-	else if($('#MaterialCode').val() == "0")
-	{
-		alert('Please select the Material Code');
-		$('#MaterialCode').focus();
-		return false;
-	}		
-	else if($('#Quantity').val() == '')
-	{
-		alert('Please Enter the Quantity value');
-		$('#Quantity').focus();
-		return false;
-	}
-        else if(isChecked == false && $('#Quantity').val() == "0")
-	{
-		alert('Please Enter the Valid Quantity value');
-		$('#Quantity').focus();
-		return false;
-	}
-	else if($('#Rate').val() == '')
-	{
-		alert('Please Enter the Rate of the Item');
-		$('#Rate').focus();
-		return false;
-	}
-        else if(isChecked == false && $('#Rate').val() == "0")
-	{
-		alert('Please Enter the Valid Rate of the Item');
-		$('#Rate').focus();
-		return false;
-	}
-	else
-	{
-		return true;
-	}	
- }
+    function validateAddRevenueTax() {
+        var isChecked = $('#IsOpenOrder').is(':checked');
+        if ($('#ReqNo').val() == "0") {
+            alert('Please select the Requisition Number');
+            $('#ReqNo').focus();
+            return false;
+        } else if ($('#CostCenter').val() == "0") {
+            alert('Please select the Cost center');
+            $('#CostCenter').focus();
+            return false;
+        } else if ($('#MaterialCode').val() == "0") {
+            alert('Please select the Material Code');
+            $('#MaterialCode').focus();
+            return false;
+        } else if ($('#Quantity').val() == '') {
+            alert('Please Enter the Quantity value');
+            $('#Quantity').focus();
+            return false;
+        } else if (isChecked == false && $('#Quantity').val() == "0") {
+            alert('Please Enter the Valid Quantity value');
+            $('#Quantity').focus();
+            return false;
+        } else if ($('#Rate').val() == '') {
+            alert('Please Enter the Rate of the Item');
+            $('#Rate').focus();
+            return false;
+        } else if (isChecked == false && $('#Rate').val() == "0") {
+            alert('Please Enter the Valid Rate of the Item');
+            $('#Rate').focus();
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     function validateEditRevenueTax() {
         var isChecked = $('#IsOpenOrder').is(':checked');
-        
+
         if ($('#EditRevenueCostCenter').val() == "0") {
             alert('Please select the Cost center');
             $('#EditRevenueCostCenter').focus();
@@ -7564,7 +7538,7 @@ $('#content').loader('hide');
             alert('Please Enter the Quantity value');
             $('#EditRevenueQuantity').focus();
             return false;
-        } else if (isChecked == false &&  $('#EditRevenueQuantity').val() == 0) {
+        } else if (isChecked == false && $('#EditRevenueQuantity').val() == 0) {
             alert('Please Enter the Quantity value');
             $('#EditRevenueQuantity').focus();
             return false;
@@ -7572,7 +7546,7 @@ $('#content').loader('hide');
             alert('Please Enter the Rate of the Item');
             $('#EditRevenueRate').focus();
             return false;
-        } 
+        }
         //        else if($('#EditRevenueRate').val() == 0)
         // {
         //  alert('Please Enter the Valid Rate of the Item');
@@ -7584,7 +7558,7 @@ $('#content').loader('hide');
         }
     }
 
-    
+
 
     function populateValueMainFormForEditRevenueTax() {
 
@@ -7668,7 +7642,7 @@ $('#content').loader('hide');
         });
 
     });
-    
+
     $('#Deliverydt').change(function() {
 
         $('#Scheduleby').val('');
@@ -8549,32 +8523,31 @@ $('#content').loader('hide');
 </script>
 <script>
     $('#IsOpenOrder').change(function() {
-    var input = document.getElementById('purpose').value;
-    // alert("IsOpenOrder");
-    if (this.checked) {
-        
-        if (input == 'REVENUE') {
-            $('#Quantity').val(0);
-            $('#Quantity').removeAttr('required');
-            $('#Quantity').attr('readonly', true);
+        var input = document.getElementById('purpose').value;
+        // alert("IsOpenOrder");
+        if (this.checked) {
+
+            if (input == 'REVENUE') {
+                $('#Quantity').val(0);
+                $('#Quantity').removeAttr('required');
+                $('#Quantity').attr('readonly', true);
+            }
+            if (input == 'SERVICE') {
+                $('#ServiceQuantity').val(0);
+                $('#ServiceQuantity').removeAttr('required');
+                $('#ServiceQuantity').attr('readonly', true);
+            }
+        } else {
+            if (input == 'REVENUE') {
+                $('#Quantity').val('');
+                $('#Quantity').removeAttr('readonly');
+                $('#Quantity').attr('required', true);
+            }
+            if (input == 'SERVICE') {
+                $('#ServiceQuantity').val('');
+                $('#ServiceQuantity').removeAttr('readonly');
+                $('#ServiceQuantity').attr('required', true);
+            }
         }
-        if( input == 'SERVICE')
-        {
-            $('#ServiceQuantity').val(0);
-            $('#ServiceQuantity').removeAttr('required');
-            $('#ServiceQuantity').attr('readonly', true);
-        }
-    } else {
-        if (input == 'REVENUE') {
-            $('#Quantity').val('');
-            $('#Quantity').removeAttr('readonly');
-            $('#Quantity').attr('required', true);
-        }
-        if( input == 'SERVICE'){
-            $('#ServiceQuantity').val('');
-            $('#ServiceQuantity').removeAttr('readonly');
-            $('#ServiceQuantity').attr('required', true);
-        }
-    }
-});
+    });
 </script>
\ No newline at end of file
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php
index 9433e8da..de528ad2 100644
--- a/app/Views/capitalpurchaseorder.php
+++ b/app/Views/capitalpurchaseorder.php
@@ -344,7 +344,7 @@
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label>Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                                <label>Select Supplier<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
                                 <?php
                                 $options = array("0" => 'Select Supplier');
                                 //print_r(  $options);
@@ -359,7 +359,7 @@
                                 ?>
                             </div>
                             <div class="col-md-3">
-                                <label>Address</label>
+                                <label>Supplier Address</label>
                                 <div class="form-group">
                                     <?php
                                     $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -541,7 +541,7 @@
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label>Capital Type Options</label>
+                                <label>Capital Type Options<span class="badge mandatory">*</span></label>
                                 <div class="form-group">
 
                                     <?php
@@ -574,7 +574,7 @@
                                     endforeach;
                                 }
 
-                                echo form_dropdown('PaymentMethod', $options1, set_value('PaymentMethod'), 'id="PaymentMethod"', 'class="form-control"');
+                                echo form_dropdown('PaymentMethod', $options1, set_value('PaymentMethod'), 'id="PaymentMethod"', 'class="form-control"','required="true"');
 
                                 ?>
                             </div>
@@ -594,7 +594,7 @@
                         <div class="col-md-12">
 
                             <div class="col-md-3">
-                                <label>Insurance Options</label>
+                                <label>Insurance Options<span class="badge mandatory">*</span></label>
                                 <div class="form-group">
 
                                     <?php
@@ -618,7 +618,7 @@
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label for="BudgetType">Budget Type</label>
+                                <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
                                 <?php
 
 
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index d5b1feb5..dd0b5526 100644
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -477,7 +477,7 @@
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label>Supplier</label>
+                                <label>Select Supplier</label>
                                 <?php
                                 if (!empty($Suplist)) {
                                     foreach ($Suplist as $SID) :
@@ -488,7 +488,7 @@
                                 ?>
                             </div>
                             <div class="col-md-3">
-                                <label>Address</label>
+                                <label>Supplier Address</label>
                                 <div class="form-group">
                                     <?php
                                     $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -630,7 +630,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             <div class="col-md-3">
-                                <label>PO Date</label>
+                                <label>Purchase Order Date</label>
                                 <div class="form-group">
                                     <?php
                                     $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
@@ -684,7 +684,7 @@
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label>Capital Type Options</label>
+                                <label>Capital Type Options<span class="badge mandatory">*</span></label>
                                 <div class="form-group">
                                     <?php
                                     if (!empty($PoTypeOptions)) {
@@ -737,7 +737,7 @@
                             </div>
 
                             <div class="col-md-3" id="otheroptiondiv" style="display:none;">
-                                <label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                                <label>Description of Payable Terms<span class="badge">*</span></label>
                                 <div class="form-group">
                                     <?php
 
@@ -751,7 +751,7 @@
                     <div class="row">
                         <div class="col-md-12">
                             <div class="col-md-3">
-                                <label>Insurance Options</label>
+                                <label>Insurance Options<span class="badge mandatory">*</span></label>
                                 <div class="form-group">
                                     <?php
                                     if (!empty($insuranceStatus)) {
@@ -776,7 +776,7 @@
 
                             </div>
                             <div class="col-md-3" id="insuranceTxtDiv" style="display:block;">
-                                <label>Insurance No / Insurance Details<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
+                                <label>Insurance No / Insurance Details<span class="badge">*</span></label>
                                 <div class="form-group">
                                     <?php
                                     $data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber',  'class' => 'form-control', 'required' => 'true');
@@ -785,7 +785,7 @@
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label for="BudgetType">Budget Type</label>
+                                <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
                                 <select id='BudgetType' name='BudgetType'>
                                     <?php if ($BudgetType == 'CAPITAL') {
                                         $opt1 = 'CAPITAL';
diff --git a/app/Views/editOld.php b/app/Views/editOld.php
index a0d049fd..10089914 100644
--- a/app/Views/editOld.php
+++ b/app/Views/editOld.php
@@ -41,17 +41,16 @@ if(!empty($EmpList))
 <div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-      <h1>
-        <center>  Edit User  </center>
-        
-      </h1>
-	  	  
-    </section>
+		<h1>
+			<center>Edit User <?= ' - '.$EmpId; ?> Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>userListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section><br>
     
     <section class="content">
-    <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>userListing" class="btn btn-success" value="Back">Back</a>
-	</div>
+   
 	<br/>
         <div class="row">
             <!-- left column -->
@@ -239,9 +238,8 @@ if(!empty($EmpList))
 
                         <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId?>" />
 
-
+                            <input type="reset" class="btn btn-cancel" value="Cancel" />
                             <input type="submit" class="btn btn-success" value="Submit" />
-                            <input type="reset" class="btn btn-success" value="Cancel" />
                         </div>
                     </form>
             </div>
diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php
index 1286a25c..cd94a13e 100644
--- a/app/Views/editRawmaterial.php
+++ b/app/Views/editRawmaterial.php
@@ -104,16 +104,22 @@ if ($total <= $reorder) {
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            <center> Edit Material -<?php echo $MaterialCode;  ?> </center>
+            <center>  </center>
 
         </h1>
     </section>
+    <section class="content-header">
+		<h1>
+			<center>  Edit Material - <?php echo $MaterialCode;  ?> Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>rawmaterialListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section> <br />
 
     <section class="content">
-        <div style="text-align:right;margin-right:17px">
-            <a href="<?php echo base_url() ?>rawmaterialListing" class="btn btn-cancel" value="Back" />Back</a>
-        </div>
-        <br />
+        
+       
         <!-- <div class="row"> -->
         <!-- left column -->
         <div class="col-md-12">
diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php
index 6b4be17f..093c00d3 100644
--- a/app/Views/editRevenueAmendPO.php
+++ b/app/Views/editRevenueAmendPO.php
@@ -900,6 +900,10 @@ if (!empty($INRSYMBOL)) {
 		text-align: right;
 	}
 
+	.btn-container .btn {
+		margin-left: 10px;
+	}
+
 	.header-container {
 		display: flex;
 		justify-content: space-between;
@@ -1114,7 +1118,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Revenue Type Options</label>
+							<label>Revenue Type Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 
 								<?php
@@ -1141,7 +1145,7 @@ if (!empty($INRSYMBOL)) {
 
 						</div>
 						<div class="col-md-3">
-							<label for="payablefrom">Payable Terms</label>
+							<label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
 							<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
 
 
@@ -1193,7 +1197,7 @@ if (!empty($INRSYMBOL)) {
 				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
-							<label for="insurance">Insurance</label>
+							<label for="insurance">Insurance<span class="badge mandatory">*</span></label>
 							<?php
 							$optionsnew = array('1' => 'Yes', '0' => 'No');
 							echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus"', 'required="true"', 'class="form-control select2', 'readonly ="true"');
@@ -1209,7 +1213,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label for="BudgetType">Budget Type</label>
+							<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
 							<select id='BudgetType' name='BudgetType'>
 								<?php if ($BudgetType == 'CAPITAL') {
 									$opt1 = 'CAPITAL';
@@ -1514,263 +1518,260 @@ if (!empty($INRSYMBOL)) {
 											</div>
 										</div><br />
 										<div class="col-md-12">
-											<div class="row">
-												<div class="col-md-12">
-													<div class="col-md-4">
-														<label>Discount Type </label>
-														<div>
-															<?php
-															$options = array("0" => 'Select Discount Type');
-															//print_r(  $options);
+											<div class="col-md-4"></div>
+											<div class="col-md-4">
+												<label>Discount Type </label>
+												<div>
+													<?php
+													$options = array("0" => 'Select Discount Type');
+													//print_r(  $options);
 
-															if (!empty($TaxType)) {
-																foreach ($TaxType as $SID) :
+													if (!empty($TaxType)) {
+														foreach ($TaxType as $SID) :
 
 
-																	$options[$SID->ConfigValue] =  $SID->ConfigValue;
+															$options[$SID->ConfigValue] =  $SID->ConfigValue;
 
-																endforeach;
-															}
+														endforeach;
+													}
 
-															echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
-
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>Discount Rate </label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div id="SGSTModel">
-														<div class="col-md-2">
-															<label>SGST in %</label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-														<div class="col-md-2">
-															<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-													</div>
-													<div id="IGSTModel" style="display:none;">
-														<div class="col-md-2">
-															<label>IGST in %</label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-														<div class="col-md-2">
-															<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-
-														</div>
-
-
-													</div>
-
-												</div>
-
-											</div>
-											<div class="row">
-												<div class="col-md-12" style="text-align:left;">
-													<div class="col-md-4">
-														<label>Packaging Type </label>
-														<div>
-															<?php
-															$options = array("0" => 'Select Packaging Type');
-															//print_r(  $options);
-
-															if (!empty($TaxType)) {
-																foreach ($TaxType as $SID) :
-
-
-																	$options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-																endforeach;
-															}
-
-															echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType"', 'class="form-control "');
-
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>Packaging Rate </label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div id="CGSTArea">
-														<div class="col-md-2">
-															<label>CGST in %</label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-														<div class="col-md-2">
-															<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-															<div class="form-group">
-																<?php
-																$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-																echo form_input($data);
-																?>
-															</div>
-														</div>
-													</div>
+													echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
 
+													?>
 												</div>
 											</div>
-											<div class="row">
-												<div class="col-md-12 ">
-													<div class="col-md-2">
-														<label>Freight Type </label>
-														<div>
-															<?php
-															$options = array("0" => 'Select Freight Type');
-															//print_r(  $options);
-
-															if (!empty($FreightType)) {
-																foreach ($FreightType as $SID) :
-
-
-																	$options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-																endforeach;
-															}
-
-															echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight"', 'class="form-control "');
-
-															?>
-														</div>
-													</div>
-													<div class="col-md-2" id="EditTripsValue" style="display:none;">
-														<label>NO Of Trips</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>Freight Rate </label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>Freight Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-4">
-														<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-
+											<div class="col-md-2">
+												<label>Discount Rate </label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount();', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
 												</div>
 											</div>
-											<div class="row">
-												<div class="col-md-12">
-
-													<div class="col-md-4 col-md-offset-8">
-														<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-
-													<label><?php echo "Revenue Description"; ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-														echo form_textarea($data);;
-														?>
-
-													</div>
-												</div>
-											</div>
-											<hr />
-											<div class="row">
-												<div class="col-md-12">
-													<div class="col-md-3 col-md-offset-9">
-														<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-														<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
-													</div>
+											<div class="col-md-2">
+												<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
 												</div>
 											</div>
 										</div>
-										<br /><br />
-										<!-- footer for revenue po -->
-										<div class="modal-footer">
+										<div class="col-md-12 ">
+											<div class="col-md-4"></div>
+											<div class="col-md-4">
+												<label>Freight Type </label>
+												<div>
+													<?php
+													$options = array("0" => 'Select Freight Type');
+													//print_r(  $options);
 
+													if (!empty($FreightType)) {
+														foreach ($FreightType as $SID) :
+
+
+															$options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+														endforeach;
+													}
+
+													echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight"', 'class="form-control "');
+
+													?>
+												</div>
+											</div>
+											<div class="col-md-2" id="EditTripsValue" style="display:none;">
+												<label>NO Of Trips</label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight();');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>Freight Rate </label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>Freight Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-12" style="text-align:left;">
+											<div class="col-md-4"></div>
+											<div class="col-md-4">
+												<label>Packaging Type </label>
+												<div>
+													<?php
+													$options = array("0" => 'Select Packaging Type');
+													//print_r(  $options);
+
+													if (!empty($TaxType)) {
+														foreach ($TaxType as $SID) :
+
+
+															$options[$SID->ConfigValue] =  $SID->ConfigValue;
+
+														endforeach;
+													}
+
+													echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType"', 'class="form-control "');
+
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>Packaging Rate </label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditPackaging', 'value' => set_value('txtEditPackaging'), 'id' => 'txtEditPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculatePackaging();', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditAfterPackaging', 'value' => set_value('txtEditAfterPackaging'), 'id' => 'txtEditAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-12" id="CGSTArea">
+											<div class="col-md-8"></div>
+											<div class="col-md-2">
+												<label>CGST in %</label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditGST', 'value' => set_value('txtEditGST'), 'id' => 'txtEditGST',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' calculateGST(1);', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditAfterGST', 'value' => set_value('txtEditAfterGST'), 'id' => 'txtEditAfterGST',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-12" id="SGSTModel">
+											<div class="col-md-8"></div>
+											<div class="col-md-2">
+												<label>SGST in %</label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditVat', 'value' => set_value('txtEditVat'), 'id' => 'txtEditVat',  'class' => 'form-control num', 'onchange' => 'calculateVat();', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+
+											</div>
+											<div class="col-md-2">
+												<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditAfterVat', 'value' => set_value('txtEditAfterVat'), 'id' => 'txtEditAfterVat',  'class' => 'form-control num', 'readonly' => 'true', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+
+											</div>
+										</div>
+										<div class="col-md-12" id="IGSTModel" style="display:none;">
+											<div class="col-md-8"></div>
+											<div class="col-md-2">
+												<label>IGST in %</label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditOtherTax', 'value' => set_value('txtEditOtherTax'), 'id' => 'txtEditOtherTax',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateOtherTaxes(1);', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditAfterOtherTax', 'value' => set_value('txtEditAfterOtherTax'), 'id' => 'txtEditAfterOtherTax',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+
+											</div>
+
+
+										</div>
+										<div class="col-md-12">
+											<div class="col-md-8"></div>
+											<div class="col-md-4">
+												<label> Insurance Amt <?php echo "($INRSYM)" ?>(if Any)</label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditInsurance', 'value' => set_value('txtEditInsurance'), 'id' => 'txtEditInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateEditTotalValue(1);', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-12">
+
+											<div class="col-md-4 col-md-offset-8">
+												<label>Total Order Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'txtEditTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+										</div>
+										<div class="col-md-12">
+
+											<label><?php echo "Revenue Description"; ?></label>
+											<div class="form-group">
+												<?php
+												$data = array('name' => 'Edit_Service_Description', 'value' => set_value('Edit_Service_Description'), 'id' => 'Edit_Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+												echo form_textarea($data);;
+												?>
+
+											</div>
 										</div>
 									</div>
+									<hr />
+									<div class="row">
+										<div class="col-md-12">
+											<div class="col-md-3 col-md-offset-9">
+												<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+												<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
+											</div>
+										</div>
+									</div>
+								</div>
+								<br /><br />
+								<!-- footer for revenue po -->
+								<div class="modal-footer">
 
 								</div>
+
 							</form>
 						</div>
 					</div>
@@ -1904,7 +1905,7 @@ if (!empty($INRSYMBOL)) {
 					</div>
 					<!-- /.box-body -->
 					<br>
-					<div class="row" style="border:1px solid;">
+					<div class="row">
 						<div class="col-md-12">
 							<div class="col-md-3">
 								<label>Basic Amount <?php echo "($INRSYM)" ?> </label>
@@ -2012,19 +2013,20 @@ if (!empty($INRSYMBOL)) {
 									<?php } ?>
 									<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
 								</div>
-								<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
-								<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="txtRowCount" value="<?php echo $RowCount; ?>" />
-								<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
-								<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
+								<div class="btn-container" style="text-align: right;">
+									<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
+									<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="txtRowCount" value="<?php echo $RowCount; ?>" />
+									<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+									<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 
-								<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
-								<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-
-								<!-- <input type="reset" class="btn btn-success" value = "OK">  -->
+									<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
+									<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
 
+									<!-- <input type="reset" class="btn btn-success" value = "OK">  -->
+								</div>
 
 
 							</div>
@@ -2038,12 +2040,28 @@ if (!empty($INRSYMBOL)) {
 				</div>
 				<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
 				$Reqon = $Reqon->format('d-m-Y'); ?>
-				<label>Request On :</label><?php echo $Reqon; ?><br />
+				<label>Request On :</label><?php echo $Reqon; ?><br>
 				<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-					<label>Request By : </label><?php echo $RequesterName; ?><br />
+					<label>Request By : </label><?php echo $RequesterName; ?>
 				<?php } ?><br />
-				<label>Status :</label><?php echo $POStatus; ?>
+				<label>Status : </label><?php
+										$statusMappings = [
+											'PO APPROVED' => 'AWAITING APPROVE',
+											'AWAITING RELEASE' => 'AWAITING APPROVE',
+											'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+											'PO RELEASED' => 'PO APPROVED',
+										];
 
+										if (isset($POStatus) && !empty($POStatus)) {
+											if (isset($statusMappings[$POStatus])) {
+												echo $statusMappings[$POStatus];
+											} else {
+												echo $POStatus;
+											}
+										} else {
+											echo "Status not provided";
+										}
+										?>
 			</div>
 		</div>
 	</section>
@@ -2567,8 +2585,8 @@ if (!empty($INRSYMBOL)) {
 
 		$('#Scheduleby').val('');
 
-	}); < !--script
-	for table, It works uned the datatable plugin-- >
+	});
+	//  < !--script for table, It works uned the datatable plugin-- >
 	$(function() {
 
 		$('#revenueTax').DataTable({
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index ab244497..b0e2ef9b 100644
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -2059,7 +2059,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Revenue Type Options</label>
+							<label>Revenue Type Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 
 								<?php
@@ -2090,7 +2090,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Payment Terms</label>
+							<label>Payment Terms<span class="badge mandatory">*</span></label>
 
 							<?php
 
@@ -2125,7 +2125,7 @@ if (!empty($getlogpodtl)) {
 				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
-							<label for="insurance">Insurance Options</label>
+							<label for="insurance">Insurance Options<span class="badge mandatory">*</span></label>
 							<?php
 							$optionsnew = array('1' => 'Yes', '0' => 'No');
 							echo form_dropdown('insurancestatus', $optionsnew, set_value('insurancestatus'), 'id="insurancestatus"', 'required="true"', 'class="form-control select2');
@@ -2141,7 +2141,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label for="BudgetType">Budget Type</label>
+							<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
 							<select id='BudgetType' name='BudgetType'>
 								<?php if ($BudgetType == 'CAPITAL') {
 									$opt1 = 'CAPITAL';
@@ -2407,6 +2407,7 @@ if (!empty($getlogpodtl)) {
 										<div class="col-md-12" style="padding:0px;">
 
 											<div class="col-md-12">
+											    <div class="col-md-4"></div>
 												<div class="col-md-4">
 													<label>Discount Type </label>
 													<div>
@@ -2440,29 +2441,9 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
-
-												<div class="col-md-2">
-													<label>CGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-
 											</div>
-
 											<div class="col-md-12" style="text-align:left;">
+											    <div class="col-md-4"></div>
 												<div class="col-md-4">
 													<label>Packaging Type </label>
 													<div>
@@ -2496,50 +2477,10 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
-												<div id="SGSTAddModel">
-													<div class="col-md-2">
-														<label>SGST In %</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-												<div id="IGSTAddModel" style="display:none;">
-													<div class="col-md-2">
-														<label>IGST In %</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
 											</div>
-
 											<div class="col-md-12">
-												<div class="col-md-2">
+											    <div class="col-md-4"></div>
+												<div class="col-md-4">
 													<label>Freight Type </label>
 													<div>
 														<?php
@@ -2572,7 +2513,6 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
-
 												<div class="col-md-2">
 													<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 													<div class="form-group">
@@ -2582,6 +2522,79 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
+											</div>
+											<div class="col-md-12">
+												<div class="col-md-8"></div>
+												<div class="col-md-2">
+													<label>CGST In %</label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+												<div class="col-md-2">
+													<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+											</div>
+
+											
+											<div class="col-md-12" style="text-align:left;">
+												<div id="SGSTAddModel">
+													<div class="col-md-8"></div>
+													<div class="col-md-2">
+														<label>SGST In %</label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+													<div class="col-md-2">
+														<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+												</div>
+											</div>
+											<div class="col-md-12" style="text-align:left;">
+												<div id="IGSTAddModel" style="display:none;">
+													<div class="col-md-8"></div>
+													<div class="col-md-2">
+														<label>IGST In %</label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+													<div class="col-md-2">
+														<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+												</div>
+											</div>
+
+											<div class="col-md-12">
+												<div class="col-md-8"></div>
 												<div class="col-md-4">
 													<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
 													<div class="form-group">
@@ -2591,10 +2604,10 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
-
 											</div>
 
 											<div class="col-md-12">
+												<div class="col-md-8"></div>
 
 												<div class="col-md-4 ">
 													<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
@@ -2766,6 +2779,7 @@ if (!empty($getlogpodtl)) {
 										</div><br />
 
 										<div class="col-md-12">
+											<div class="col-md-4"></div>
 											<div class="col-md-4">
 												<label>Discount Type </label>
 												<div>
@@ -2803,29 +2817,9 @@ if (!empty($getlogpodtl)) {
 													?>
 												</div>
 											</div>
-
-
-											<div class="col-md-2">
-												<label>CGST In %</label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-											<div class="col-md-2">
-												<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-												<div class="form-group">
-													<?php
-													$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-													echo form_input($data);
-													?>
-												</div>
-											</div>
-
 										</div>
 										<div class="col-md-12" style="text-align:left;">
+											<div class="col-md-4"></div>
 											<div class="col-md-4">
 												<label>Packaging Type </label>
 												<div>
@@ -2863,49 +2857,10 @@ if (!empty($getlogpodtl)) {
 													?>
 												</div>
 											</div>
-											<div id="SGSTEditModel">
-												<div class="col-md-2">
-													<label>SGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
-											<div id="IGSTEditModel" style="display:none;">
-												<div class="col-md-2">
-													<label>IGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-											</div>
 										</div>
 										<div class="col-md-12">
-											<div class="col-md-2">
+											<div class="col-md-4"></div>
+											<div class="col-md-4">
 												<label>Freight Type </label>
 												<div>
 													<?php
@@ -2951,8 +2906,73 @@ if (!empty($getlogpodtl)) {
 													?>
 												</div>
 											</div>
-
-
+										</div>
+										<div class="col-md-12" id="SGSTEditModel">
+											    <div class="col-md-8"></div>
+												<div class="col-md-2">
+													<label>SGST In %</label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+												<div class="col-md-2">
+													<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+											</div>
+											<div class="col-md-12" id="IGSTEditModel" style="display:none;">
+												<div class="col-md-8"></div>
+												<div class="col-md-2">
+													<label>IGST In %</label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+												<div class="col-md-2">
+													<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+											</div>
+										<div class="col-md-12">
+											<div class="col-md-8"></div>
+											<div class="col-md-2">
+												<label>CGST In %</label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+											<div class="col-md-2">
+												<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+												<div class="form-group">
+													<?php
+													$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+													echo form_input($data);
+													?>
+												</div>
+											</div>
+										</div>
+										
+										<div class="col-md-12">
+											<div class="col-md-8"></div>
 											<div class="col-md-4">
 												<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
 												<div class="form-group">
@@ -2968,6 +2988,7 @@ if (!empty($getlogpodtl)) {
 
 
 										<div class="col-md-12">
+											<div class="col-md-8"></div>
 											<div class="col-md-4">
 												<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 												<div class="form-group">
@@ -3269,9 +3290,8 @@ if (!empty($getlogpodtl)) {
 											</div>
 										</div>
 
-										<div class="col-md-12">
-											<div class="col-md-8"></div>
-											<div id="SGSTViewModel">
+										<div class="col-md-12" id="SGSTViewModel">
+											   <div class="col-md-8"></div>
 												<div class="col-md-2">
 													<label>SGST In %</label>
 													<div class="form-group">
@@ -3290,8 +3310,9 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
-											</div>
-											<div id="IGSTViewModel" style="display:none;">
+										</div>
+										<div class="col-md-12" id="IGSTViewModel" style="display:none;">
+												<div class="col-md-8"></div>
 												<div class="col-md-2">
 													<label>IGST In %</label>
 													<div class="form-group">
@@ -3310,7 +3331,6 @@ if (!empty($getlogpodtl)) {
 														?>
 													</div>
 												</div>
-											</div>
 										</div>
 
 										<div class="col-md-12">
@@ -3482,7 +3502,7 @@ if (!empty($getlogpodtl)) {
 				<!-- /.box-body -->
 
 
-				<div class="row" style="border:1px solid;">
+				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
 							<label>Basic Amount <?php echo "($INRSYM)" ?></label>
@@ -3899,6 +3919,7 @@ if (!empty($getlogpodtl)) {
 								<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 								<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
 								<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
+								<div class="btn-container" style="text-align: right;">
 								<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
 									<a class="btn btn-cancel Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
 									<?php if ($PONOStatus == PO_DRAFT) { ?>
@@ -3911,37 +3932,42 @@ if (!empty($getlogpodtl)) {
 								<?php } else { ?>
 									<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
 								<?php } ?>
+								</div>
 
 
 
 							</div><br />
 						</div>
 
-						<label>Request On : </label><?php echo $Reqon; ?><br />
-						<?php if ($RequesterName != '' || $RequesterName != null) { ?>
-							<label>Request By : </label><?php echo $RequesterName; ?><br />
-						<?php
-						} ?>
-						<label>Status : </label><?php echo $StatusName; ?>
+						<div class="row">
+						  <div class="col-md-12">
+							<div class="col-md-6">
 
-						<!-- <label>Status : </label><?php
-														$statusMappings = [
-															'PO APPROVED' => 'AWAITING APPROVE',
-															'AWAITING RELEASE' => 'AWAITING APPROVE',
-															'RELEASER ONHOLD' => 'APPROVER ONHOLD',
-															'PO RELEASED' => 'PO APPROVED',
-														];
+								<label>Request On : </label><?php echo $Reqon; ?><br />
+								<?php if ($RequesterName != '' || $RequesterName != null) { ?>
+									<label>Request By : </label><?php echo $RequesterName; ?><br />
+								<?php } ?>
+								<label>Status : </label><?php
+															$statusMappings = [
+																'PO APPROVED' => 'AWAITING APPROVE',
+																'AWAITING RELEASE' => 'AWAITING APPROVE',
+																'RELEASER ONHOLD' => 'APPROVER ONHOLD',
+																'PO RELEASED' => 'PO APPROVED',
+															];
 
-														if (isset($StatusName) && !empty($StatusName)) {
-															if (isset($statusMappings[$StatusName])) {
-																echo $statusMappings[$StatusName];
+															if (isset($StatusName) && !empty($StatusName)) {
+																if (isset($statusMappings[$StatusName])) {
+																	echo $statusMappings[$StatusName];
+																} else {
+																	echo $StatusName;
+																}
 															} else {
-																echo $StatusName;
+																echo "Status not provided";
 															}
-														} else {
-															echo "Status not provided";
-														}
-														?> -->
+															?>
+							</div>
+						  </div>
+				        </div>
 				</div>
 			</div>
 
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php
index 2498231e..1b00e674 100644
--- a/app/Views/editServiceAmendPO.php
+++ b/app/Views/editServiceAmendPO.php
@@ -723,7 +723,7 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Supplier<span class="badge mandatory">*</span></label>
+							<label>Select Supplier<span class="badge mandatory">*</span></label>
 							<?php
 							$options = array("0" => 'Select Supplier');
 							//print_r(  $options);
@@ -740,7 +740,7 @@ foreach ($PaymentTerms as $TER) {
 
 						</div>
 						<div class="col-md-3">
-							<label>Address</label>
+							<label>Supplier Address</label>
 							<div class="form-group">
 								<?php
 								$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -869,7 +869,7 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Service Type Options</label>
+							<label>Service Type Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 								<?php
 
@@ -895,7 +895,7 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Payment Terms</label>
+							<label>Payment Terms<span class="badge mandatory">*</span></label>
 							<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms ?>">
 							<?php
 							if (!empty($Payment)) {
@@ -936,7 +936,7 @@ foreach ($PaymentTerms as $TER) {
 				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
-							<label>Insurance Options</label>
+							<label>Insurance Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 
 								<?php
@@ -976,8 +976,8 @@ foreach ($PaymentTerms as $TER) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label for="BudgetType">Budget Type</label>
-							<select id='BudgetType' name='BudgetType'>
+							<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
+							<select id='BudgetType' name='BudgetType' required="true">
 								<?php if ($BudgetType == 'CAPITAL') {
 									$opt1 = 'CAPITAL';
 									$opt2 = 'REVENUE';
@@ -1273,8 +1273,8 @@ foreach ($PaymentTerms as $TER) {
 
 												<div class="modal-footer">
 													<div class="col-md-12">
+														<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
 														<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
-														<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
 													</div>
 												</div>
 											</div>
@@ -1445,7 +1445,7 @@ foreach ($PaymentTerms as $TER) {
 					</div>
 
 
-					<div class="row" style="border: 1px solid">
+					<div class="row">
 						<div class="col-md-12" style="padding:0px;">
 
 							<div class="col-md-2">
@@ -1531,10 +1531,10 @@ foreach ($PaymentTerms as $TER) {
 									<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
 									<input type="hidden" name="txtStatus" id="txtStatus" />
 									<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
+									<input type="button" class="btn btn-cancel" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
 
 									<!-- <a class="btn btn-success Save"  ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
 									<a class="btn btn-success Save" ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
-									<input type="button" class="btn btn-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
 
 
 								</div><br />
diff --git a/app/Views/editasset.php b/app/Views/editasset.php
index 7283aa07..bc2facae 100644
--- a/app/Views/editasset.php
+++ b/app/Views/editasset.php
@@ -103,13 +103,14 @@ if(!empty($assetList))
 ?>
 <div class="content-wrapper" style="min-height: 537px;">
     <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        <!-- <center>Resico Industries - Edit Asset Details-<?php echo $AssetCode ; ?></center>  -->
-		<center><b><h3 class="box-title"><?= 'Edit Asset - ' .$AssetCode; ?></h3></b></center>
-      </h1>
-    </section>
-    
+	<section class="content-header">
+		<h1>
+			<center><?= 'Edit Asset - ' .$AssetCode; ?> Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>assetListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section><br>
     <section class="content">
     <div style="text-align:right;">
     <a href="<?php echo base_url()?>assetListing" class="btn btn-cancel"value="Back">Back</a>
diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php
index 19262af6..9f737bab 100644
--- a/app/Views/editconfig.php
+++ b/app/Views/editconfig.php
@@ -22,14 +22,16 @@ if (!empty($master)) {
 <div class="content-wrapper" style="min-height: 537px;">
 	<!-- Content Header (Page header) -->
 	<section class="content-header">
-		<h1><center> Edit Config Details</center></h1>
-	</section>
+		<h1>
+			<center>Edit Config <?= ' - '.$ConfigName; ?> Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>configlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section><br>
 
 	<section class="content">
-		<div style="text-align:right;">
-			<a href="<?php echo base_url() ?>configlisting" class="btn btn-cancel" value="Back">Back</a>
-		</div>
-		<br>
+
 
 		<div class="row">
 			<!-- left column -->
diff --git a/app/Views/editdepartment.php b/app/Views/editdepartment.php
index 24bf9deb..58001612 100644
--- a/app/Views/editdepartment.php
+++ b/app/Views/editdepartment.php
@@ -93,18 +93,16 @@ if(!empty($department))
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-      <h1>
-       <center>  <?php echo  $DepartmentName;  ?> Department  Details</center>
-       
-      </h1>
-        
-    </section>
+		<h1>
+			<center> Edit Department - <?php echo  $DepartmentName;  ?>  Details</center>
+		</h1>
+		<ol class="breadcrumb">
+			<a class="btn btn-cancel" href="<?php echo base_url(); ?>departmentListing">&nbsp;&nbsp;<span class="bold">Back</span></a>
+		</ol>
+  	</section><br/>
     
     <section class="content">
-    <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>departmentListing" class="btn btn-cancel" value="Back"/>Back</a>
-  </div>
-  <br/>
+
         <div class="row">
             <!-- left column -->
             <div class="col-md-12">
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index ae5da4e2..0fce1838 100644
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -431,7 +431,7 @@ if (!empty($getlogpodtl)) {
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label>Supplier<span class="badge mandatory">*</span></label>
+                            <label>Select Supplier<span class="badge mandatory">*</span></label>
 
                             <?php
                             $options = array("0" => 'Select Supplier');
@@ -451,7 +451,7 @@ if (!empty($getlogpodtl)) {
 
                         </div>
                         <div class="col-md-3">
-                            <label>Address</label>
+                            <label>Supplier Address</label>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress', $Address), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -624,7 +624,7 @@ if (!empty($getlogpodtl)) {
                         </div>
                     </div>
                     <div class="col-md-3">
-                        <label for="payablefrom">Import Options</label>
+                        <label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
                         <?php // $options2 = array("0"=>'Select Import Option');       
                         if (!empty($PoTypeOptions)) {
                             foreach ($PoTypeOptions as $payment) :
@@ -646,7 +646,7 @@ if (!empty($getlogpodtl)) {
                         echo form_dropdown('Importoption', $options2, set_value('Importoption'), 'id="Importoption"', 'class="form-control"');                                              ?>
                     </div>
                     <div class="col-md-3">
-                        <label for="payablefrom">Payable Terms</label>
+                        <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
                         <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
                         <?php if (!empty($Payment)) {
                             foreach ($Payment as $pay2)
@@ -681,7 +681,7 @@ if (!empty($getlogpodtl)) {
             <div class="row">
                 <div class="col-md-12">
                     <div class="col-md-3">
-                        <label for="payablefrom">Insurance Option</label>
+                        <label for="payablefrom">Insurance Option<span class="badge mandatory">*</span></label>
                         <select id='Insurance' name='Insurance'>
                             <?php if ($Insurance == 1) {
                                 $opt1 = 'YES';
@@ -707,7 +707,7 @@ if (!empty($getlogpodtl)) {
                         </div>
                     </div>
                     <div class="col-md-3">
-                        <label for="BudgetType">Budget Type</label>
+                        <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
                         <select id='BudgetType' name='BudgetType'>
                             <?php if ($BudgetType == 'CAPITAL') {
                                 $opt1 = 'CAPITAL';
diff --git a/app/Views/importpo.php b/app/Views/importpo.php
index df3ccec3..c89c3eeb 100644
--- a/app/Views/importpo.php
+++ b/app/Views/importpo.php
@@ -309,7 +309,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label>Supplier<span class="badge mandatory">*</span></label>
+                            <label>Select Supplier<span class="badge mandatory">*</span></label>
 
                             <?php
                             $options = array("0" => 'Select Supplier');
@@ -326,7 +326,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
                         </div>
                         <div class="col-md-3">
-                            <label>Address</label>
+                            <label>Supplier Address</label>
                             <div class="form-group">
                                 <?php
                                 $data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -491,7 +491,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label for="payablefrom">Import Type Options</label>
+                                <label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
                                 <?php
 
                                 $options3 = array("0" => 'Select');
@@ -509,7 +509,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
 
                             </div>
                             <div class="col-md-3">
-                                <label for="payablefrom">Payable Terms</label>
+                                <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
                                 <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
 
 
@@ -547,7 +547,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                         <div class="col-md-12">
 
                             <div class="col-md-3">
-                                <label for="payablefrom">Insurance Options</label>
+                                <label for="payablefrom">Insurance Options<span class="badge mandatory">*</span></label>
                                 <?php
                                 $options1 = array("0" => 'NO', "1" => 'YES');
 
@@ -574,7 +574,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
                                 </div>
                             </div>
                             <div class="col-md-3">
-                                <label for="BudgetType">Budget Type</label>
+                                <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
                                 <?php
 
 
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 78707c53..d7b2a4f9 100644
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -86,6 +86,8 @@ if (!empty($INRSYMBOL)) {
 <script>
 	$(document).ready(function() {
 		$("#PaymentTerms").select2();
+		
+		
 		clearTotalItemValues();
 		if ($("#insurance").val() == 1) {
 
@@ -1735,6 +1737,10 @@ if (!empty($INRSYMBOL)) {
 		margin: 0;
 	}
 
+	.btn-container .btn {
+		margin-left: 10px;
+	}
+
 	.centered {
 		display: flex;
 		/* justify-content: center; */
@@ -2015,6 +2021,15 @@ if (!empty($INRSYMBOL)) {
 					</div>
 				</div>
 
+				<div class="btn-container">
+					<div class="row">
+						<div class="col text-right">
+							<!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
+							<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+						</div>
+					</div>
+				</div>
+
 				<!-- Modal for Packing Calculation -->
 				<div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
 					<div class="modal-dialog">
@@ -2045,7 +2060,7 @@ if (!empty($INRSYMBOL)) {
 
 					</div>
 				</div>
-				<!-- freightcalmodel-->
+				<!-- Modal for freight Calculation-->
 				<div id="freightcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
 					<div class="modal-dialog">
 
@@ -2169,19 +2184,8 @@ if (!empty($INRSYMBOL)) {
 					</div>
 				</div>
 
-				<div class="container-fluid">
-
-					<div align="right">
-						<div class="col-md-12">
-							<div class="col-md-3 col-md-offset-7" align="right" style="padding:10px">
-								<!-- <input type="checkbox" id="IsOpenOrder"  name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
-							</div>
-							<div class="col-md-1" align="right" style="padding:10px">
-								<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
-							</div>
-							<br>
-						</div>
 
+						
 						<!-- Model for revenue po -->
 						<div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
 							<div class="modal-dialog">
@@ -2313,14 +2317,6 @@ if (!empty($INRSYMBOL)) {
 												</div>
 											</div>
 											<div class="col-md-12" style="padding:0px;">
-
-
-
-
-
-
-
-
 												<div class="col-md-12">
 													<div class="col-md-4"></div>
 													<div class="col-md-4">
@@ -2587,8 +2583,9 @@ if (!empty($INRSYMBOL)) {
 								</form>
 							</div>
 						</div>
+						</br>
 
-						<br />
+						<!-- Edit Model for revenue po -->
 						<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="overflow-y:scroll !important">
 							<div class="modal-dialog">
 								<!-- Modal content-->
@@ -2711,6 +2708,7 @@ if (!empty($INRSYMBOL)) {
 												</div>
 											</div>
 											<div class="col-md-12">
+											    <div class="col-md-4"></div>
 												<div class="col-md-4">
 													<label>Discount Type </label>
 													<div>
@@ -2750,29 +2748,9 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-
-
-												<div class="col-md-2">
-													<label>CGST In %</label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-												<div class="col-md-2">
-													<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-													<div class="form-group">
-														<?php
-														$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0.00), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-														echo form_input($data);
-														?>
-													</div>
-												</div>
-
 											</div>
 											<div class="col-md-12" style="text-align:left;">
+											    <div class="col-md-4"></div>
 												<div class="col-md-4">
 													<label>Packaging Type </label>
 													<div>
@@ -2812,49 +2790,10 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
-												<div id="SGSTEditModel">
-													<div class="col-md-2">
-														<label>SGST In %</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0.00), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-												<div id="IGSTEditModel" style="display:none;">
-													<div class="col-md-2">
-														<label>IGST In %</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-2">
-														<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0.00), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
 											</div>
 											<div class="col-md-12">
-												<div class="col-md-2">
+												<div class="col-md-4"></div>
+												<div class="col-md-4">
 													<label>Freight Type </label>
 													<div>
 														<?php
@@ -2902,8 +2841,79 @@ if (!empty($INRSYMBOL)) {
 														?>
 													</div>
 												</div>
+											</div>
+											<div class="col-md-12">
+											    <div class="col-md-8"></div>
+												<div class="col-md-2">
+													<label>CGST In %</label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
+												<div class="col-md-2">
+													<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+													<div class="form-group">
+														<?php
+														$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0.00), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+														echo form_input($data);
+														?>
+													</div>
+												</div>
 
-
+											</div>
+											
+											<div class="col-md-12" style="text-align:left;">
+												<div id="SGSTEditModel">
+												   <div class="col-md-8"></div>
+													<div class="col-md-2">
+														<label>SGST In %</label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+													<div class="col-md-2">
+														<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0.00), 'id' => 'EditAfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+												</div>
+											</div>
+											<div class="col-md-12" style="text-align:left;">
+												<div id="IGSTEditModel" style="display:none;">
+												    <div class="col-md-8"></div>   
+													<div class="col-md-2">
+														<label>IGST In %</label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => ' Editchange();');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+													<div class="col-md-2">
+														<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+														<div class="form-group">
+															<?php
+															$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0.00), 'id' => 'EditAfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+															echo form_input($data);
+															?>
+														</div>
+													</div>
+												</div>
+											</div>
+											
+											<div class="col-md-12">
+												<div class="col-md-8"></div>
 												<div class="col-md-4">
 													<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
 													<div class="form-group">
@@ -2917,7 +2927,7 @@ if (!empty($INRSYMBOL)) {
 
 											</div>
 											<div class="col-md-12">
-
+												<div class="col-md-8"></div>
 												<div class="col-md-4">
 													<div class="form-group">
 														<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
@@ -2929,7 +2939,6 @@ if (!empty($INRSYMBOL)) {
 												</div>
 											</div>
 											<div class="col-md-12">
-
 												<label><?php echo "Reveneue Description"; ?></label>
 												<div class="form-group">
 													<?php
@@ -2957,47 +2966,46 @@ if (!empty($INRSYMBOL)) {
 							</div>
 							</form>
 						</div>
-					</div>
-					</br>
-					<div class="box-body">
-						<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-							<thead style="background-color: #ddd;">
-								<tr>
-									<th>SNo</th>
-									<th>Requisition No</th>
-									<th>Item Code</th>
-									<th>Item Description</th>
-									<th>Quantity</th>
-									<th>UOM</th>
-									<th>Rate <?php echo "($INRSYM)" ?></th>
-									<th>Basic Amount <?php echo "($INRSYM)" ?></th>
-									<th>Tax Amount <?php echo "($INRSYM)" ?></th>
-									<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
-									<th>Action</th>
-								</tr>
-							</thead>
+					    </br>
 
-							<tbody id='RevenueAppend'></tbody>
-						</table>
-					</div>
-					<!-- /.box-body -->
+						<!-- Table box-body -->
+						<div class="box-body">
+						 <div class="row">
+							<table id="revenueTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+								<thead style="background-color: #ddd;">
+									<tr>
+										<th>SNo</th>
+										<th>Requisition No</th>
+										<th>Item Code</th>
+										<th>Item Description</th>
+										<th>Quantity</th>
+										<th>UOM</th>
+										<th>Rate <?php echo "($INRSYM)" ?></th>
+										<th>Basic Amount <?php echo "($INRSYM)" ?></th>
+										<th>Tax Amount <?php echo "($INRSYM)" ?></th>
+										<th>Total Order Amount <?php echo "($INRSYM)" ?></th>
+										<th>Action</th>
+									</tr>
+								</thead>
 
+								<tbody id='RevenueAppend'></tbody>
+							</table>
+						 </div>
+						</div>
+						</br>
+						<!-- /.box-body -->
+				
+				
 
-
-
-				</div>
-
-				<div class="row" style="border:1px solid;">
+				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
 							<label>Basic Amount <?php echo "($INRSYM)" ?></label>
-
 							<?php
 							$data = array('name' => 'txtTotBasicAmount', 'value' => set_value('txtTotBasicAmount'), 'id' => 'txtTotBasicAmount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
 							echo form_input($data);
 							?>
 
-
 						</div>
 						<div class="col-md-3">
 							<label>Total Discount Amount <?php echo "($INRSYM)" ?> </label>
@@ -3037,8 +3045,6 @@ if (!empty($INRSYMBOL)) {
 						</div>
 					</div>
 					<div class="col-md-12">
-
-
 						<div class="col-md-3">
 							<label>Total Packaging Amount <?php echo "($INRSYM)" ?></label>
 
@@ -3084,7 +3090,8 @@ if (!empty($INRSYMBOL)) {
 							<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
 						</div>
 					</div>
-					<div class="row" style="padding: 2% 0%">
+				</div>
+				<div class="row" style="padding: 2% 0%">
 						<div class="col-md-4 col-md-offset-8"><br />
 							<input type="file" name="POFile" id="POFile"><br>
 							<input type="hidden" name="txtPoRange" id="txtPoRange" />
@@ -3093,13 +3100,14 @@ if (!empty($INRSYMBOL)) {
 							<input type="hidden" name="txtRowCount" id="txtRowCount" />
 							<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
 							<input type="hidden" name="Budget" id="Budget" />
-							<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-							<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-							<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+							<div class="btn-container" style="text-align: right;">
+								<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+								<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+								<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+							</div>
 						</div><br />
-					</div>
 				</div>
-
+					
 			</div>
 		</div>
 	</section>
diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php
index cb83ef2c..b6df14e9 100644
--- a/app/Views/servicePurchaseorder.php
+++ b/app/Views/servicePurchaseorder.php
@@ -670,7 +670,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Supplier<span class="badge mandatory">*</span></label>
+							<label>Select Supplier<span class="badge mandatory">*</span></label>
 
 							<?php
 							$options = array("0" => 'Select Supplier');
@@ -688,7 +688,7 @@ if (!empty($INRSYMBOL)) {
 
 						</div>
 						<div class="col-md-3">
-							<label>Address</label>
+							<label>Supplier Address</label>
 							<div class="form-group">
 								<?php
 								$data = array('name' => 'SupAddress', 'value' => set_value('SupAddress'), 'id' => 'SupAddress',  'class' => 'form-control', 'readonly' => 'true', 'rows' => '3', 'cols' => '40');
@@ -814,7 +814,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Service Type Options</label>
+							<label>Service Type Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 								<?php
 								//$optionsWork = array("0"=>'Select Work Status');     
@@ -830,7 +830,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label>Payment Terms</label>
+							<label>Payment Terms<span class="badge mandatory">*</span></label>
 							<?php
 							if (!empty($Payment)) {
 								$options6 = array("0" => 'Select Payment Terms ');
@@ -859,7 +859,7 @@ if (!empty($INRSYMBOL)) {
 				<div class="row">
 					<div class="col-md-12">
 						<div class="col-md-3">
-							<label>Insurance Options</label>
+							<label>Insurance Options<span class="badge mandatory">*</span></label>
 							<div class="form-group">
 
 								<?php
@@ -890,7 +890,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 						<div class="col-md-3">
-							<label for="BudgetType">Budget Type</label>
+							<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
 							<?php
 
 
@@ -903,15 +903,15 @@ if (!empty($INRSYMBOL)) {
 						</div>
 					</div>
 				</div>
-
+				<div class="col-md-12">
+						<div class="row">
+							<div class="btn-container" style="text-align: right; ">
+								<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
+							</div>
+						</div>
+				</div>
 				<div class="container-fluid">
 					<table class="table table-bordered" style="border:1px solid #333" id="ServiceTable">
-						<div style="padding-right:10px">
-							<div align="right">
-
-								<a data-toggle="modal"><button type="submit" onclick="openModal();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
-
-
 								<!-- Model for Add servicepo -->
 								<div class="modal fade" id="SERVICE" role="dialog">
 									<div class="modal-dialog">
@@ -1207,296 +1207,295 @@ if (!empty($INRSYMBOL)) {
 
 									</div>
 								</div>
-							</div>
-							<!-- END of model for Add servicepo -->
-							<!-- Edit Service po moddel-->
-							<div class="modal fade" id="EDITSERVICE" role="dialog">
-								<div class="modal-dialog">
-									<!-- Modal content-->
-									<form>
-										<div class="modal-content" style="width:900px;">
-											<div class="modal-header">
-												<!--  <button type="button" class="close" data-dismiss="modal">&times;</button> -->
-												<center>
-													<h4>Edit Service Purchase Order Item </h4>
-												</center>
-											</div>
-											<div align="left">
-
-												<div class="col-md-12">
-													<div class="col-md-3">
-														<label>Req No<span class="badge mandatory">*</span></label>
-														<div>
-															<?php
-
-															$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-
-														</div>
-													</div>
-
-													<div class="col-md-3">
-														<label>Department Name</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Cost Center Code</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
-															echo form_input($data);
-
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
+							    <!-- END of model for Add servicepo -->
+								<!-- Edit Service po moddel-->
+								<div class="modal fade" id="EDITSERVICE" role="dialog">
+									<div class="modal-dialog">
+										<!-- Modal content-->
+										<form>
+											<div class="modal-content" style="width:900px;">
+												<div class="modal-header">
+													<!--  <button type="button" class="close" data-dismiss="modal">&times;</button> -->
+													<center>
+														<h4>Edit Service Purchase Order Item </h4>
+													</center>
 												</div>
-												<div class="col-md-12">
-													<div class="col-md-3">
-														<label>Item Code<span class="badge mandatory" #fff ;">*</span></label>
-														<div>
-															<?php
-															$options = array("0" => 'Item Code');
-															//print_r(  $options);
+												<div align="left">
 
-															echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
-
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Item Name</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-
-
-
-													<div class="col-md-3" id=EditotherDescription>
-														<label>Item Description</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-
-
-													<div class="col-md-3">
-														<label>UOM</label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Service Schedule Type</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>
-												<div class="col-md-12">
-
-													<div class="col-md-3">
-														<label>Quantity<span class="badge mandatory">*</span></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-													<div class="col-md-3">
-														<label>Per</label><!--date should be come-->
-														<?php
-														$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
-														echo form_input($data); ?>
-													</div>
-													<div class="col-md-3">
-														<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</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();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
-															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()', 'onkeypress' => 'return isNumberKey(event);');
-															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()', 'onkeypress' => 'return isNumberKey(event);');
-															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 <?php echo "($INRSYM)" ?></label>
-													</div>
-													<div class="col-md-3">
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-												<div class="col-md-12">
-													<div class="col-md-5 col-md-offset-4" align="right">
-														<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
-													</div>
-													<div class="col-md-3">
-														<div class="form-group">
-															<?php
-															$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
-															echo form_input($data);
-															?>
-														</div>
-													</div>
-												</div>
-
-												<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
-													<label>Service Description </label>
-													<?php
-													$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
-													echo form_textarea($data); ?>
-
-												</div>
-
-
-
-
-												<div class="modal-footer">
 													<div class="col-md-12">
-														<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
-														<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+														<div class="col-md-3">
+															<label>Req No<span class="badge mandatory">*</span></label>
+															<div>
+																<?php
+
+																$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+
+															</div>
+														</div>
+
+														<div class="col-md-3">
+															<label>Department Name</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="col-md-3">
+															<label>Cost Center Code</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+
+																?>
+															</div>
+														</div>
+														<div class="col-md-3">
+															<label>Avail Budget Amount <?php echo "($INRSYM)" ?></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+													<div class="col-md-12">
+														<div class="col-md-3">
+															<label>Item Code<span class="badge mandatory" #fff ;">*</span></label>
+															<div>
+																<?php
+																$options = array("0" => 'Item Code');
+																//print_r(  $options);
+
+																echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
+
+																?>
+															</div>
+														</div>
+														<div class="col-md-3">
+															<label>Item Name</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+
+
+
+														<div class="col-md-3" id=EditotherDescription>
+															<label>Item Description</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditOtheritemDescription', 'value' => set_value('EditOtheritemDescription'), 'id' => 'EditOtheritemDescription',  'class' => 'form-control', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+
+
+														<div class="col-md-3">
+															<label>UOM</label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM',  'class' => 'form-control num', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="col-md-3">
+															<label>Service Schedule Type</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>
+													<div class="col-md-12">
+
+														<div class="col-md-3">
+															<label>Quantity<span class="badge mandatory">*</span></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="col-md-3">
+															<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+														<div class="col-md-3">
+															<label>Per</label><!--date should be come-->
+															<?php
+															$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
+															echo form_input($data); ?>
+														</div>
+														<div class="col-md-3">
+															<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue',  'class' => 'form-control num', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</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();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
+																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()', 'onkeypress' => 'return isNumberKey(event);');
+																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()', 'onkeypress' => 'return isNumberKey(event);');
+																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 <?php echo "($INRSYM)" ?></label>
+														</div>
+														<div class="col-md-3">
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances',  'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+													<div class="col-md-12">
+														<div class="col-md-5 col-md-offset-4" align="right">
+															<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
+														</div>
+														<div class="col-md-3">
+															<div class="form-group">
+																<?php
+																$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue',  'class' => 'form-control num', 'placeholder' => 'Total value', 'readonly' => 'true');
+																echo form_input($data);
+																?>
+															</div>
+														</div>
+													</div>
+
+													<div class="col-md-12" style="padding: 0px 30px 10px 30px;">
+														<label>Service Description </label>
+														<?php
+														$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction',  'class' => 'form-control', 'rows' => '3', 'cols' => '40');
+														echo form_textarea($data); ?>
+
+													</div>
+
+
+
+
+													<div class="modal-footer">
+														<div class="col-md-12">
+															<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+															<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
+														</div>
 													</div>
 												</div>
-											</div>
-									</form>
+										</form>
 
+									</div>
 								</div>
-							</div>
-						</div>
-						<!-- End of Model for EDIT servicepo -->
+								<!-- End of Model for EDIT servicepo -->
+					</table>		
 				</div>
 
 				<div class="box-body">
@@ -1523,8 +1522,8 @@ if (!empty($INRSYMBOL)) {
 					</table>
 				</div>
 
-				</table>
-				<div class="row" style="border: 1px solid">
+				
+				<div class="row">
 					<div class="col-md-12" style="padding: 0px;">
 
 						<div class="col-md-2">
@@ -1604,9 +1603,12 @@ if (!empty($INRSYMBOL)) {
 								<input type="hidden" name="SpcialInstruction" id="SpcialInstruction">
 								<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
 								<input type="hidden" name="Budget" id="Budget" />
-								<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
-								<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
-								<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+								<div class="btn-container" style="text-align: right;">
+
+									<a class="btn btn-reset Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
+									<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
+									<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
+								</div>
 							</div><br />
 						</div>
 					</div>