diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index 02e2fa43..a0bd8e2d 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -5409,445 +5409,448 @@ if (!empty($INRSYMBOL)) {
                 </div>
             </div>
             <!-- Edit Revenue Modal -->
-            <div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-                style="overflow-y:scroll !important">
-                <div class="modal-dialog">
-                    <!-- Modal content-->
-                    <form>
-                        <div class="modal-content" style="width:1200px;">
-                            <div class="modal-header">
-                                <center>
-                                    <h4>Edit Revenue Purchase Order Line Item </h4>
-                                </center>
-                            </div>
-                            <div class="modal-body p-4">
-                                <!-- first row -->
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <label>Req No<span class="badge mandatory">*</span></label>
-                                        <div>
-                                            <?php
-
-                                            $data = array('name' => 'EditRevenueReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditRevenueReqNo', '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' => 'EditRevenuedeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditRevenuedeptName', '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' => 'EditRevenueCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditRevenueCostCenter', 'class' => 'form-control', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-
-                                    <div class="col-md-3">
-                                        <!-- empty div for spacing needed -->
-                                    </div>
-
-                                    <div class="col-md-3" style="display:none;">
-                                        <label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'EditRevenueAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditRevenueAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_hidden($data);
-
-                                            ?>
-                                        </div>
-                                    </div>
+             <div align="center">
+                <div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
+                    style="overflow-y:scroll !important">
+                    <div class="modal-dialog">
+                        <!-- Modal content-->
+                        <form>
+                            <div class="modal-content" style="width:1060px;">
+                                <div class="modal-header">
+                                    <center>
+                                        <h4>Edit Revenue Purchase Order Line Item </h4>
+                                    </center>
                                 </div>
+                                <div class="modal-body p-4" align="left">
+                                    <!-- first row -->
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                            <label>Req No<span class="badge mandatory">*</span></label>
+                                            <div>
+                                                <?php
 
-                                <!-- second-row -->
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <label>Item Code<span class="badge mandatory">*</span></label>
-                                        <div>
-                                            <?php
-                                            $options = array("0" => 'Item Code');
+                                                $data = array('name' => 'EditRevenueReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditRevenueReqNo', 'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
 
-
-                                            echo form_dropdown('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"');
-
-                                            ?>
+                                                ?>
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="col-md-3">
-                                        <label>Item Name</label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'EditRevenueItemName', 'value' => set_value('EditItemName'), 'id' => 'EditRevenueItemName', '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' => 'EditRevenueUOM', 'value' => set_value('EditUOM'), 'id' => 'EditRevenueUOM', 'class' => 'form-control', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                    <div class="col-md-3" style="padding-right:0px;">
-                                        <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;');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-
-                          
-                                </div>
-
-                                <!-- third row -->
-                                <div class="row">
-
-                                    <div class="col-md-3">
-
-                                    </div>
-                                            
-                                    <div class="col-md-3" style="padding-right: 0px;">
-                                            <label><?php echo "Rate  ($INRSYM)"; ?><span
-                                                    class="badge mandatory">*</span></label>
+                                        <div class="col-md-3">
+                                            <label>Department Name</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;');
+                                                $data = array('name' => 'EditRevenuedeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditRevenuedeptName', 'class' => 'form-control', 'readonly' => 'true');
                                                 echo form_input($data);
                                                 ?>
                                             </div>
-                                    </div>    
-                                                                    
-                                    <div class="col-md-3">
-                                        <label>Per</label> <?php
-                                        $data = array('name' => 'editrevenueEmergPer', 'value' => set_value('editrevenueEmergPer'), 'id' => 'editrevenueEmergPer', 'class' => 'form-control');
-                                        echo form_input($data); ?>
-                                    </div>
+                                        </div>
+                                        <div class="col-md-3">
+                                            <label>Cost Center Code</label>
+                                            <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'EditRevenueCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditRevenueCostCenter', 'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
 
-                                    <div class="col-md-3" style="padding: 0px;">
-                                        <label><?php echo "Basic Amt  ($INRSYM)"; ?></label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'txtEditRevenueBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditRevenueBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                            echo form_input($data);
-                                            ?>
+                                        <div class="col-md-3">
+                                            <!-- empty div for spacing needed -->
+                                        </div>
+
+                                        <div class="col-md-3" style="display:none;">
+                                            <label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
+                                            <div class="form-group">
+                                                <?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>      
 
-                               
-                                <!-- fourth row -->
+                                    <!-- second-row -->
+                                    <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('EditRevenueMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditRevenueMaterialCode"', 'class="form-control"');
+
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-3">
+                                            <label>Item Name</label>
+                                            <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'EditRevenueItemName', 'value' => set_value('EditItemName'), 'id' => 'EditRevenueItemName', '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' => 'EditRevenueUOM', 'value' => set_value('EditUOM'), 'id' => 'EditRevenueUOM', 'class' => 'form-control', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-3" style="padding-right:0px;">
+                                            <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;');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
+
                             
-                                <div class="row">
-                                    <div class="col-md-3"></div>
-                                    <div class="col-md-3">
-                                        <label>Discount Type </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('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
-
-                                            ?>
-                                        </div>
                                     </div>
-                                    <div class="col-md-3">
-                                        <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' => 'Editchange();calculateDiscount(1);', 'style' => 'text-align:right;');
-                                            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' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
 
-                                <!-- discount row -->
-                              
-                                <div class="row" style="text-align:left;">
+                                    <!-- third row -->
+                                    <div class="row">
+
+                                        <div class="col-md-3">
+
+                                        </div>
+                                                
+                                        <div class="col-md-3" style="padding-right: 0px;">
+                                                <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;');
+                                                    echo form_input($data);
+                                                    ?>
+                                                </div>
+                                        </div>    
+                                                                        
+                                        <div class="col-md-3">
+                                            <label>Per</label> <?php
+                                            $data = array('name' => 'editrevenueEmergPer', 'value' => set_value('editrevenueEmergPer'), 'id' => 'editrevenueEmergPer', 'class' => 'form-control');
+                                            echo form_input($data); ?>
+                                        </div>
+
+                                        <div class="col-md-3" style="padding: 0px;">
+                                            <label><?php echo "Basic Amt  ($INRSYM)"; ?></label>
+                                            <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'txtEditRevenueBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditRevenueBasicValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
+                                    
+                                    </div>      
+
                                 
-                                    <div class="col-md-3"></div>
-                                    <div class="col-md-3">
-                                        <label>Packaging Type </label>
-                                        <div>
-                                            <?php
-                                            $options = array("0" => 'Select Packaging Type');
-                                            //print_r(  $options);
-                                            
-                                            if (!empty($TaxType)) {
-                                                foreach ($TaxType as $SID):
+                                    <!-- fourth row -->
+                                
+                                    <div class="row">
+                                        <div class="col-md-3"></div>
+                                        <div class="col-md-3">
+                                            <label>Discount Type </label>
+                                            <div>
+                                                <?php
+                                                $options = array("0" => 'Select Discount Type');
+                                                //print_r(  $options);
+                                                
+                                                if (!empty($TaxType)) {
+                                                    foreach ($TaxType as $SID):
 
 
-                                                    $options[$SID->ConfigValue] = $SID->ConfigValue;
+                                                        $options[$SID->ConfigValue] = $SID->ConfigValue;
 
-                                                endforeach;
-                                            }
+                                                    endforeach;
+                                                }
 
-                                            echo form_dropdown('EditPackagingType', $options, set_value('EditPackagingType'), 'id="EditPackagingType"  data-id="editRevenue" ', 'class="form-control "');
+                                                echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType"', 'class="form-control"');
 
-                                            ?>
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-3">
+                                            <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' => 'Editchange();calculateDiscount(1);', 'style' => 'text-align:right;');
+                                                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' => 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="col-md-3">
-                                        <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' => 'Editchange();', 'style' => 'text-align:right;');
-                                            echo form_input($data);
-                                            ?>
+
+                                    <!-- discount row -->
+                                
+                                    <div class="row" style="text-align:left;">
+                                    
+                                        <div class="col-md-3"></div>
+                                        <div class="col-md-3">
+                                            <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"  data-id="editRevenue" ', 'class="form-control "');
+
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-3">
+                                            <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' => 'Editchange();', 'style' => 'text-align:right;');
+                                                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' => '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-3">
-                                        <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);
-                                            ?>
+
+                                    <!-- package -->
+                                    <div class="row">
+                                        <div class="col-md-3"></div>
+
+                                        <div class="col-md-3">
+                                            <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-3" 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(1);');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
+                                        <div class="col-md-3">
+                                            <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' => 'Editchange();', 'style' => 'text-align:right;');
+                                                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' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
+
+                                    </div>
+
+                                    <!-- freight -->
+                                    <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' => 'RevenueEditCgst', 'value' => set_value('RevenueEditCgst', 0), 'id' => 'RevenueEditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();');
+                                                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' => 'RevenueEditAfterCgst', 'value' => set_value('RevenueEditAfterCgst', 0), 'id' => 'RevenueEditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
 
-                                <!-- package -->
-                                <div class="row">
-                                    <div class="col-md-3"></div>
-
-                                    <div class="col-md-3">
-                                        <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 "');
-
-                                            ?>
+                                    <!-- CGST -->
+                                    <div class="row" id="SGSTEditModel">
+                                        <div class="col-md-6">
+                                        </div>
+                                        <div class="col-md-3">
+                                            <label>SGST in %</label>
+                                            <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'RevenueEditSgst', 'value' => set_value('RevenueEditSgst', 0), 'id' => 'RevenueEditSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();');
+                                                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' => 'RevenueEditAfterSgst', 'value' => set_value('RevenueEditAfterSgst', 0), 'id' => 'RevenueEditAfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="col-md-3" 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(1);');
-                                            echo form_input($data);
-                                            ?>
+
+                                    <!-- IGST -->
+                                    <div class="row" id="IGSTEditModel">
+                                        <div class="col-md-6">
+                                        </div>
+                                        <div class="col-md-3">
+                                            <label>IGST in %</label>
+                                            <div class="form-group">
+                                                <?php
+                                                $data = array('name' => 'RevenueEditIgst', 'value' => set_value('RevenueEditIgst', 0), 'id' => 'RevenueEditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()');
+                                                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' => 'RevenueEditAfterIgst', 'value' => set_value('RevenueEditAfterIgst', 0), 'id' => 'RevenueEditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="col-md-3">
-                                        <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' => 'Editchange();', 'style' => 'text-align:right;');
-                                            echo form_input($data);
-                                            ?>
+
+                                    <!-- insurance amount -->
+                                    <div class="row">
+                                        <div class="col-md-9">
+                                        </div>
+                                        <div class="col-md-3">
+                                            <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-3">
-                                        <label>Freight Amt <?php echo "($INRSYM)" ?></label>
-                                        <div class="form-group">
+
+                                    <!-- total order amount -->
+                                    <div class="row">
+                                        <div class="col-md-9">
+                                        </div>
+                                        <div class="col-md-3">
+                                            <div class="form-group">
+                                                <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
+                                                <?php
+                                                $data = array('name' => 'txtEditRevenueTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditRevenueTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
+                                                echo form_input($data);
+                                                ?>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <!-- revenue description -->
+                                    <div class="row">
+                                        <div class="col-12">
+                                            <label><?php echo "Revenue Description"; ?></label>
                                             <?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);
+                                            $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>
+                                <input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
 
-                                <!-- freight -->
-                                <div class="row">
-                                    <div class="col-md-6">
+                                <!-- footer for revenue po -->
+                                <div class="modal-footer">
+                                    <div class="col-md-12 text-right">
+                                        <a class="btn btn-secondary waves-effect" 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-3">
-                                        <label>CGST in %</label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'RevenueEditCgst', 'value' => set_value('RevenueEditCgst', 0), 'id' => 'RevenueEditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();');
-                                            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' => 'RevenueEditAfterCgst', 'value' => set_value('RevenueEditAfterCgst', 0), 'id' => 'RevenueEditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
                                     </div>
                                 </div>
-
-                                <!-- CGST -->
-                                <div class="row" id="SGSTEditModel">
-                                    <div class="col-md-6">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <label>SGST in %</label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'RevenueEditSgst', 'value' => set_value('RevenueEditSgst', 0), 'id' => 'RevenueEditSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();');
-                                            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' => 'RevenueEditAfterSgst', 'value' => set_value('RevenueEditAfterSgst', 0), 'id' => 'RevenueEditAfterSgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <!-- IGST -->
-                                <div class="row" id="IGSTEditModel">
-                                    <div class="col-md-6">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <label>IGST in %</label>
-                                        <div class="form-group">
-                                            <?php
-                                            $data = array('name' => 'RevenueEditIgst', 'value' => set_value('RevenueEditIgst', 0), 'id' => 'RevenueEditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()');
-                                            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' => 'RevenueEditAfterIgst', 'value' => set_value('RevenueEditAfterIgst', 0), 'id' => 'RevenueEditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <!-- insurance amount -->
-                                <div class="row">
-                                    <div class="col-md-9">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <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>
-
-                                <!-- total order amount -->
-                                <div class="row">
-                                    <div class="col-md-9">
-                                    </div>
-                                    <div class="col-md-3">
-                                        <div class="form-group">
-                                            <label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-                                            <?php
-                                            $data = array('name' => 'txtEditRevenueTotalOrderValue', 'value' => set_value('txtEditTotalOrderValue'), 'id' => 'txtEditRevenueTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
-                                            echo form_input($data);
-                                            ?>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <!-- revenue description -->
-                                <div class="row">
-                                    <div class="col-12">
-                                        <label><?php echo "Revenue Description"; ?></label>
-                                        <?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>
-                            <input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
 
-                            <!-- footer for revenue po -->
-                            <div class="modal-footer">
-                                <div class="col-md-12 text-right">
-                                    <a class="btn btn-secondary waves-effect" 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>
-
-                             </div>
-                            </div>
-                        </div>
 
 
 
-                    </form>
-                </div>
-                         
-                    </form>
-                </div>
-                        </div>
-
-                       
-                            
-                    
+                        </form>
                     </div>
+                            
+                        </form>
+                    </div>
+                            </div>
+
+                        
+                                
+                        
+                        </div>
 
 
-                    </form>
+                        </form>
+                    </div>
                 </div>
-            </div>
+             </div>
+         
 
         </div>