diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index 69a83303..f8677c52 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1551,7 +1551,7 @@ if (!empty($getlogpodtl)) {
 <!-- Model for servicepo -->
 <div id="SERVICE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width" style="width: 1200px; !important">
+	<div class="modal-dialog modal-full-width" style="width: 1060px; !important">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Add Service Purchase Order Item</h4>
@@ -1829,7 +1829,7 @@ if (!empty($getlogpodtl)) {
 <!-- Edit Service Modal content Starts Here-->
 <div id="EDITSERVICE" class="modal fade" tabindex="-1" role="dialog"
 	aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
-	<div class="modal-dialog modal-full-width">
+	<div class="modal-dialog modal-full-width" style="width: 1060px; !important">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Service Purchase Order Item</h4>
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index a25b9c91..02e2fa43 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -1860,16 +1860,40 @@ if (!empty($INRSYMBOL)) {
 
         if (input == -1) {
             alert("Select Request Type");
+            $('#purpose').focus();
+            return false;
         } else if ($('#drpSupplier').val() == "0") {
             alert('Please Select the Supplier details');
             $('#drpSupplier').focus();
             return false;
         } else if ($('#PoTypeOptions').val() == "0") {
-            alert('Please Select POType');
-            $('#PoTypeOptions').focus();
-            return false;
 
-        } else if ($('#BudgetType').val() == "0") {
+            if($('#purpose').val()=="REVENUE"){
+
+                alert('Please Revenue Service Type Options');
+                $('#PoTypeOptions').focus();
+                return false;
+
+                }else{
+
+                alert('Please Select Service Type Options');
+                $('#PoTypeOptions').focus();
+                return false;
+
+                }
+           
+
+        } else if ($('#DepartmentName').val()=="0"){
+            alert('Please Select Department Name ')
+            return false;
+        } 
+         else if ($('#CostCenterName').val()=="0"){
+                alert('Please Select Cost Center Name ')
+            } 
+
+
+        
+        else if ($('#BudgetType').val() == "0") {
             alert('Please Select Budget Type');
             $('#BudgetType').focus();
             return false;
@@ -1973,7 +1997,7 @@ if (!empty($INRSYMBOL)) {
                 // $("#selectdeliveryby").show();
                 $("#txtPoRange").show();
                 $("#emergdescofpoDiv").hide();
-                $('#typeOptions').html('Revenue Type Options');
+                $('#typeOptions').html('Revenue Type Options <span class="badge mandatory">*</span>');
             } else if (this.value == 'SERVICE') // Service po  
             {
                 $("#potaxes").show();
@@ -1988,7 +2012,7 @@ if (!empty($INRSYMBOL)) {
                 $('#EditDisplayScheduleDiv').show();
                 $("#txtPoRange").hide();
                 $("#emergdescofpoDiv").show();
-                $('#typeOptions').html('Service Type Options');
+                $('#typeOptions').html('Service Type Options <span class="badge mandatory">*</span>');
 
             } else if (this.value == 'IMPORT') // Import po  
             {
@@ -1998,7 +2022,7 @@ if (!empty($INRSYMBOL)) {
                 $("#revenuepotaxes").hide();
                 $("#servicepotaxes").hide();
                 $("#workstatus").hide();
-                $('#typeOptions').html('Import Type Options');
+                $('#typeOptions').html('Import Type Options <span class="badge mandatory">*</span>');
             } else if (this.value == 'CAPITAL') // Capital po
             {
                 $("#potaxes").show();
@@ -2007,7 +2031,7 @@ if (!empty($INRSYMBOL)) {
                 $("#revenuepotaxes").hide();
                 $("#servicepotaxes").hide();
                 $("#workstatus").hide();
-                $('#typeOptions').html('Capital Type Options');
+                $('#typeOptions').html('Capital Type Options <span class="badge mandatory">*</span>');
             } else // Default
             {
                 $("#potaxes").show();
@@ -2639,8 +2663,9 @@ if (!empty($INRSYMBOL)) {
                                     </div>
                                 </div>
                                 <div class="col-md-3">
-                                    <label id="typeOptions">Service Type Options<span
-                                            class="badge mandatory">*</span></label>
+                                    <label id="typeOptions">Service Type Options 
+                                        <span class="badge mandatory">*</span>
+                                    </label>
                                     <div class="form-group">
                                         <?php
 
@@ -3047,371 +3072,378 @@ if (!empty($INRSYMBOL)) {
                                     <div  style="padding-right:10px">
 
                                         <!-- Model for revenue PO -->
-                                        <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-                                            aria-hidden="true">
-                                            <div class="modal-dialog">
-                                                <!-- Modal content-->
-                                                <form>
-                                                    <div class="modal-content " style="width:1060px;">
-                                                        <div class="modal-header">
-                                                            <center>
-                                                                <h4>Select Revenue Purchase Order Line Item </h4>
-                                                            </center>
-                                                        </div>
-
-                                                        <div style="padding: 31px;">
-                                                        
-                                                            <div class="row">
-                                                                <div class="col-md-3">
-                                                                    <label>Item Code<span class="badge mandatory">*</span></label>
-                                                                    <div>
-                                                                        <?php
-                                                                        $options = array("0" => 'Item Code');
-                                                                        echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-
-                                                                <div class="col-md-3">
-                                                                    <label>Item Name</label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName', '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' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM', 'class' => 'form-control', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <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()');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
+                                         <div align="center">
+                                            <div id="REVENUE" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+                                                aria-hidden="true">
+                                                <div class="modal-dialog">
+                                                    <!-- Modal content-->
+                                                    <form>
+                                                        <div class="modal-content " style="width:1060px;">
+                                                            <div class="modal-header">
+                                                                <center>
+                                                                    <h4>Select Revenue Purchase Order Line Item </h4>
+                                                                </center>
+                                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                                <span aria-hidden="true">&times;</span>
+                                                                </button>
                                                             </div>
 
-                                                            <div class="row">
-                                                                <div class="col-md-3"></div>
-                                                                
-                                                                <div class="col-md-3">  
-                                                                        <label><?php echo "Rate  ($INRSYM)"; ?><span
-                                                                                class="badge mandatory"></label>
+                                                            <div align="left" style="padding: 31px;">
+                                                            
+                                                                <div class="row">
+                                                                    <div class="col-md-3">
+                                                                        <label>Item Code<span class="badge mandatory">*</span></label>
+                                                                        <div>
+                                                                            <?php
+                                                                            $options = array("0" => 'Item Code');
+                                                                            echo form_dropdown('MaterialCode', $options, set_value('MaterialCode'), 'id="MaterialCode"', 'class="form-control"');
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="col-md-3">
+                                                                        <label>Item Name</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()');
+                                                                            $data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName', 'class' => 'form-control', 'readonly' => 'true');
                                                                             echo form_input($data);
                                                                             ?>
-                                                                </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label>Per</label> <?php
-                                                                    $data = array('name' => 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control');
-                                                                    echo form_input($data); ?>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label><?php echo "Basic Amt  ($INRSYM)"; ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'txtBasicValue',
-                                                                        'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 
-                                                                        'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label>UOM</label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM', 'class' => 'form-control', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <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()');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
-                                                            </div>
-                    
-                                                            <div class="row">
-                                                                <div class="col-md-3"></div>
-                                                                <div class="col-md-3">
-                                                                    <label>Discount Type <span
-                                                                            class="badge mandatory"></span></label>
-                                                                    <div>
-                                                                        <?php
-                                                                        $options = array("0" => 'Select Discount Type');
-                                                                        //print_r(  $options);
-                                                                        
-                                                                        if (!empty($TaxType)) {
-                                                                            foreach ($TaxType as $SID):
 
-
-                                                                                $options[$SID->ConfigValue] = $SID->ConfigValue;
-
-                                                                            endforeach;
-                                                                        }
-
-                                                                        echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
-
-                                                                        ?>
+                                                                <div class="row">
+                                                                    <div class="col-md-3"></div>
+                                                                    
+                                                                    <div class="col-md-3">  
+                                                                            <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()');
+                                                                                echo form_input($data);
+                                                                                ?>
+                                                                    </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Per</label> <?php
+                                                                        $data = array('name' => 'addrevenueEmergPer', 'value' => set_value('addrevenueEmergPer'), 'id' => 'addrevenueEmergPer', 'class' => 'form-control');
+                                                                        echo form_input($data); ?>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label><?php echo "Basic Amt  ($INRSYM)"; ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'txtBasicValue',
+                                                                            'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 
+                                                                            'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3">
-                                                                    <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);');
-                                                                        echo form_input($data);
-                                                                        ?>
+                        
+                                                                <div class="row">
+                                                                    <div class="col-md-3"></div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Discount Type <span
+                                                                                class="badge mandatory"></span></label>
+                                                                        <div>
+                                                                            <?php
+                                                                            $options = array("0" => 'Select Discount Type');
+                                                                            //print_r(  $options);
+                                                                            
+                                                                            if (!empty($TaxType)) {
+                                                                                foreach ($TaxType as $SID):
+
+
+                                                                                    $options[$SID->ConfigValue] = $SID->ConfigValue;
+
+                                                                                endforeach;
+                                                                            }
+
+                                                                            echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
+
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <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);');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount'), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3">
-                                                                    <label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount'), 'id' => 'txtAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
+
+                                                                <!-- cmtl-packaging type -->
+                                                                <div class="row" style="text-align:left;">
+                                                                    <div class="col-md-3"></div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Packaging Type <span
+                                                                                class="badge mandatory"></span></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('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" data-id="addRevenue"', 'class="form-control "');
+
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <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();');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging'), 'id' => 'txtAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
-                                                            </div>
 
-                                                            <!-- cmtl-packaging type -->
-                                                            <div class="row" style="text-align:left;">
-                                                                <div class="col-md-3"></div>
-                                                                <div class="col-md-3">
-                                                                    <label>Packaging Type <span
-                                                                            class="badge mandatory"></span></label>
-                                                                    <div>
-                                                                        <?php
-                                                                        $options = array("0" => 'Select Packaging Type');
-                                                                        //print_r(  $options);
-                                                                        
-                                                                        if (!empty($TaxType)) {
-                                                                            foreach ($TaxType as $SID):
+                                                                <!-- cmtl-freight type -->
+                                                                <div class="row">
+                                                                    <div class="col-md-3"></div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Freight Type <span class="badge mandatory"></label>
+                                                                        <div>
+                                                                            <?php
+                                                                            $options = array("0" => 'Select Freight Type');
+                                                                            //print_r(  $options);
+                                                                            
+                                                                            if (!empty($FreightType)) {
+                                                                                foreach ($FreightType as $SID):
 
 
-                                                                                $options[$SID->ConfigValue] = $SID->ConfigValue;
+                                                                                    $options[$SID->ConfigValue] = $SID->ConfigValue;
 
-                                                                            endforeach;
-                                                                        }
+                                                                                endforeach;
+                                                                            }
 
-                                                                        echo form_dropdown('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" data-id="addRevenue"', 'class="form-control "');
+                                                                            echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
 
-                                                                        ?>
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3" id="TripsValue" style="display:none;">
+                                                                        <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);');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <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();');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label>Freight Amt <?php echo "($INRSYM)" ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-3">
-                                                                    <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();');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging'), 'id' => 'txtAfterPackaging', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
 
-                                                            <!-- cmtl-freight type -->
-                                                            <div class="row">
-                                                                <div class="col-md-3"></div>
-                                                                <div class="col-md-3">
-                                                                    <label>Freight Type <span class="badge mandatory"></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('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight"', 'class="form-control "');
-
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3" id="TripsValue" style="display:none;">
-                                                                    <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);');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <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();');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label>Freight Amt <?php echo "($INRSYM)" ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="row">
-                                                                <div class="col-md-6"></div>
-                                                                <div class="col-md-3">
-                                                                    <label>CGST In %</label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'RevenueCgst', 'value' => set_value('RevenueCgst', 0), 'id' => 'RevenueCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label>CGST Amt <?php echo "($INRSYM)" ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'RevenueAfterCgst', 'value' => set_value('RevenueAfterCgst', 0), 'id' => 'RevenueAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="row" id="SGSTAddModel">
-                                                                <div class="col-md-6"></div>
-                                                                <div class="col-md-3">
-                                                                    <label>SGST In %</label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label>SGST Amt <?php echo "($INRSYM)" ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="row" style="text-align:left;">
-                                                                <div id="IGSTAddModel" style="display:none;">
+                                                                <div class="row">
                                                                     <div class="col-md-6"></div>
                                                                     <div class="col-md-3">
-                                                                        <label>IGST In %</label>
+                                                                        <label>CGST In %</label>
                                                                         <div class="form-group">
                                                                             <?php
-                                                                            $data = array('name' => 'RevenueIgst', 'value' => set_value('RevenueIgst', 0), 'id' => 'RevenueIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                                            $data = array('name' => 'RevenueCgst', 'value' => set_value('RevenueCgst', 0), 'id' => 'RevenueCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
                                                                             echo form_input($data);
                                                                             ?>
                                                                         </div>
                                                                     </div>
                                                                     <div class="col-md-3">
-                                                                        <label>IGST Amt <?php echo "($INRSYM)" ?></label>
+                                                                        <label>CGST Amt <?php echo "($INRSYM)" ?></label>
                                                                         <div class="form-group">
                                                                             <?php
-                                                                            $data = array('name' => 'RevenueAfterIgst', 'value' => set_value('RevenueAfterIgst', 0), 'id' => 'RevenueAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            $data = array('name' => 'RevenueAfterCgst', 'value' => set_value('RevenueAfterCgst', 0), 'id' => 'RevenueAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
                                                                             echo form_input($data);
                                                                             ?>
                                                                         </div>
                                                                     </div>
                                                                 </div>
-                                                            </div>
 
-                                                            <div class="row">
-                                                                <div class="col-md-9">
-                                                                </div>
-                                                                <div class="col-md-3">
-                                                                    <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
-                                                                        echo form_input($data);
-                                                                        ?>
+                                                                <div class="row" id="SGSTAddModel">
+                                                                    <div class="col-md-6"></div>
+                                                                    <div class="col-md-3">
+                                                                        <label>SGST In %</label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
-                                                                </div>
-                                                            </div>
-
-                                                            <div class="row">
-                                                                <div class="col-md-9">
-                                                                </div>
-                                                                <div class="col-md-3 ">
-                                                                    <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-                                                                    <div class="form-group">
-                                                                        <?php
-                                                                        $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
-                                                                        echo form_input($data);
-                                                                        ?>
+                                                                    <div class="col-md-3">
+                                                                        <label>SGST Amt <?php echo "($INRSYM)" ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
                                                                     </div>
                                                                 </div>
 
+                                                                <div class="row" style="text-align:left;">
+                                                                    <div id="IGSTAddModel" style="display:none;">
+                                                                        <div class="col-md-6"></div>
+                                                                        <div class="col-md-3">
+                                                                            <label>IGST In %</label>
+                                                                            <div class="form-group">
+                                                                                <?php
+                                                                                $data = array('name' => 'RevenueIgst', 'value' => set_value('RevenueIgst', 0), 'id' => 'RevenueIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()');
+                                                                                echo form_input($data);
+                                                                                ?>
+                                                                            </div>
+                                                                        </div>
+                                                                        <div class="col-md-3">
+                                                                            <label>IGST Amt <?php echo "($INRSYM)" ?></label>
+                                                                            <div class="form-group">
+                                                                                <?php
+                                                                                $data = array('name' => 'RevenueAfterIgst', 'value' => set_value('RevenueAfterIgst', 0), 'id' => 'RevenueAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                                echo form_input($data);
+                                                                                ?>
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
 
-                                                            </div>
+                                                                <div class="row">
+                                                                    <div class="col-md-9">
+                                                                    </div>
+                                                                    <div class="col-md-3">
+                                                                        <label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance'), 'id' => 'txtInsurance', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+
+                                                                <div class="row">
+                                                                    <div class="col-md-9">
+                                                                    </div>
+                                                                    <div class="col-md-3 ">
+                                                                        <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+                                                                        <div class="form-group">
+                                                                            <?php
+                                                                            $data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
+                                                                            echo form_input($data);
+                                                                            ?>
+                                                                        </div>
+                                                                    </div>
 
-                                                            <div class="row">
-                                                                <div class="col-12">
-                                                                    <label><?php echo "Revenue Description"; ?></label>
-                                                                    <?php
-                                                                    $data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-                                                                    echo form_textarea($data);
-                                                                    ;
-                                                                    ?>
 
                                                                 </div>
+
+                                                                <div class="row">
+                                                                    <div class="col-12">
+                                                                        <label><?php echo "Revenue Description"; ?></label>
+                                                                        <?php
+                                                                        $data = array('name' => 'Add_Service_Description', 'value' => set_value('Add_Service_Description'), 'id' => 'Add_Service_Description', 'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+                                                                        echo form_textarea($data);
+                                                                        ;
+                                                                        ?>
+
+                                                                    </div>
+                                                                </div>
+                                                                <br>
+
+                                                                <div class="col-12 text-right">
+                                                                    <a class="btn btn-secondary waves-effect" data-dismiss="modal"
+                                                                        value="Cancel">Cancel</a> &nbsp;&nbsp;
+                                                                
+                                                                        <a class="btn btn-success font AddRevenue" ID="AddRevenue">
+                                                                        &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+                                                                </div>
+                                                                
+
                                                             </div>
-                                                            <br>
+                                                                
+
 
-                                                            <div class="col-12 text-right">
-                                                                <a class="btn btn-secondary waves-effect" data-dismiss="modal"
-                                                                    value="Cancel">Cancel</a> &nbsp;&nbsp;
-                                                            
-                                                                    <a class="btn btn-success font AddRevenue" ID="AddRevenue">
-                                                                    &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
                                                             </div>
-                                                            
+                                                            <!-- footer for revenue po -->
+                                                            <div class="modal-footer">
 
+                                                            </div>
                                                         </div>
-                                                            
-
-
-                                                        </div>
-                                                        <!-- footer for revenue po -->
-                                                        <div class="modal-footer">
-
-                                                        </div>
-                                                    </div>
-                                                </form>
+                                                    </form>
+                                                </div>
                                             </div>
-                                        </div>
+                                         </div>
+                               
 
                                         <!-- Model for service PO -->
-                                        <div class="modal fade" id="SERVICE" role="dialog">
+                                         <div align="center">
+                                         <div class="modal fade" id="SERVICE" role="dialog">
                                             <div class="modal-dialog">
                                                 <!-- Modal content-->
                                                 <form>
@@ -3420,6 +3452,9 @@ if (!empty($INRSYMBOL)) {
                                                             <center>
                                                                 <h4>Add Service Purchase Order Item </h4>
                                                             </center>
+                                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                                <span aria-hidden="true">&times;</span>
+                                                                </button>
                                                         </div>
 
                                                         <div align="left" style="padding: 31px;">
@@ -3691,6 +3726,8 @@ if (!empty($INRSYMBOL)) {
 
                                             </div>
                                         </div>
+                                         </div>
+                                       
 
 
                                         <!-- model for import PO -->
diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index 56790931..57c18e78 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -1820,7 +1820,7 @@ if (!empty($getlogpodtl)) {
                                     <div class="form-group col-md-6">
                                         <!-- RMC Including Customers -->
                                         <label>
-                                            <?php echo "Nett per UOM($INR)"; ?>
+                                            <?php echo "Net per UOM($INR)"; ?>
                                         </label>
                                         <div>
                                             <?php
@@ -2095,7 +2095,7 @@ if (!empty($getlogpodtl)) {
                         <br>
 
                         <div class="form-row" style="border:1px solid black;">
-                            <br />
+                            <br/>
                             <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
@@ -2237,6 +2237,7 @@ if (!empty($getlogpodtl)) {
                                 </div>
                             </div>
                             <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
+                                
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
                                         <!-- Additional Excise duty : (g) -->
@@ -2262,11 +2263,6 @@ if (!empty($getlogpodtl)) {
                                     </div>
                                 </div>
 
-
-
-
-
-
                                 <div class="form-row">
                                     <div class="form-group col-md-4">
                                         <!-- Additional Excise duty : (g) -->
@@ -2290,10 +2286,6 @@ if (!empty($getlogpodtl)) {
                                     </div>
                                 </div>
 
-
-
-
-
                                 <div class="form-row">
                                     <div class="form-group col-md-8">
                                         <!-- Gross duty payable -->
@@ -2312,11 +2304,10 @@ if (!empty($getlogpodtl)) {
 
                                 <br>
 
-
                                 <!--Start of Adding of Frieght model-->
                                 <div class="form-row" style="padding:0px;">
                                     <div class="form-group col-md-4">
-                                        <span>Freight Type </span>
+                                        <label>Freight Type </label>
                                         <?php
                                         $options = array("0" => 'Select Freight Type');
                                         if (!empty($FreightType)) {
@@ -2328,14 +2319,14 @@ if (!empty($getlogpodtl)) {
                                         ?>
                                     </div>
                                     <div class="form-group col-md-4" id="EditTripsValue" style="display:block;">
-                                        <span>NO Of Trips</span>
+                                        <label>NO Of Trips</label>
                                         <?php
                                         $data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
                                         echo form_input($data);
                                         ?>
                                     </div>
                                     <div class="form-group col-md-4">
-                                        <span>Freight Rate </span>
+                                        <label>Freight Rate </label>
                                         <?php
                                         $data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
                                         echo form_input($data);
@@ -2406,7 +2397,7 @@ if (!empty($getlogpodtl)) {
                                     </div>
                                     <div class="form-group col-md-6">
                                         <!-- RMC Including Customers -->
-                                        <label><?php echo "Nett per UOM($INR)"; ?></label>
+                                        <label><?php echo "Net per UOM($INR)"; ?></label>
                                         <div>
                                             <?php
                                             $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php
index dc19fb80..14523fa9 100755
--- a/app/Views/editrequisitionform.php
+++ b/app/Views/editrequisitionform.php
@@ -788,7 +788,7 @@ td {
 			var rowHtml = `<tr id="${temp}">
 					<td align="center">${temp}</td>
 					<td align="center">${materialCode}</td>
-					<td align="center">${materialName}</td>
+					<td align="left">${materialName}</td>
 					<td align="center">${uom}</td>
 					<td align="center">${quantity}</td>
 					<td align="center">0.00</td>
@@ -852,6 +852,8 @@ td {
 
 			$('#txtRowCount').val(temp);
 
+			$('#add-req-modal').modal('hide');
+
 		}
 
 	});