From f8585c26576c21e0a5924db8983971c54c0f45dd Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Sat, 5 Oct 2024 13:24:21 +0530
Subject: [PATCH 1/4] changes in emergency po

---
 app/Views/EditservicePurchaseorder.php |   4 +-
 app/Views/alterpurchaseorder.php       | 673 +++++++++++++------------
 app/Views/editimportpo.php             |  23 +-
 app/Views/editrequisitionform.php      |   4 +-
 4 files changed, 367 insertions(+), 337 deletions(-)

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');
+
 		}
 
 	});

From 738db02a8afca9b1afe3d8b89b2522fb868be268 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Sat, 5 Oct 2024 13:32:16 +0530
Subject: [PATCH 2/4] minor change -vadivel J

---
 app/Views/alterpurchaseorder.php | 767 ++++++++++++++++---------------
 1 file changed, 385 insertions(+), 382 deletions(-)

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>
 

From 5ee2aa170a4a729c5b773b7e25fa63002f735036 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Sat, 5 Oct 2024 14:25:45 +0530
Subject: [PATCH 3/4] minor changes in revenue po - vadivel J

---
 app/Views/alterpurchaseorder.php       |   3 +
 app/Views/editRevenuepurchaseorder.php | 236 ++++++++++++++-----------
 2 files changed, 132 insertions(+), 107 deletions(-)

diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php
index a0bd8e2d..e1174010 100755
--- a/app/Views/alterpurchaseorder.php
+++ b/app/Views/alterpurchaseorder.php
@@ -5420,6 +5420,9 @@ if (!empty($INRSYMBOL)) {
                                     <center>
                                         <h4>Edit 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="modal-body p-4" align="left">
                                     <!-- first row -->
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php
index 143b60a6..0bf198c2 100755
--- a/app/Views/editRevenuepurchaseorder.php
+++ b/app/Views/editRevenuepurchaseorder.php
@@ -647,10 +647,10 @@ if (!empty($getlogpodtl)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#TripsValue').show();
-				$(this).parent().removeClass('col-md-4').addClass('col-md-2');
+				
 			} else {
 				$('#TripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-4');
+				
 			}
 
 			selValue = $("#drpFreight").val();
@@ -701,10 +701,10 @@ if (!empty($getlogpodtl)) {
 
 			if (FreightType == "PER TRIP") {
 				$('#EditTripsValue').show();
-				$(this).parent().removeClass('col-md-4').addClass('col-md-2');
+				
 			} else {
 				$('#EditTripsValue').hide();
-				$(this).parent().removeClass('col-md-2').addClass('col-md-4');
+		
 			}
 
 			selValue = $("#drpEditFreight").val();
@@ -2730,7 +2730,7 @@ if (!empty($getlogpodtl)) {
 <!-- Add Model for revenue po -->
 <div id="REVENUE" 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">Select Revenue Purchase Order Line Item</h4>
@@ -2785,7 +2785,7 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
@@ -2796,7 +2796,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Name</label>
 							<div class="form-group">
 								<?php
@@ -2805,7 +2805,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -2814,7 +2814,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Quantity<span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -2823,7 +2823,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						
+					</div>
+
+					<div class="form-row">
+						<div class="col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -2832,12 +2837,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>Per</label> <?php
 												$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer',  'class' => 'form-control');
 												echo form_input($data); ?>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
 							<div class="form-group">
 								<?php
@@ -2847,9 +2852,10 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Discount Type </label>
 							<div>
 								<?php
@@ -2864,7 +2870,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discount Rate </label>
 							<div class="form-group">
 								<?php
@@ -2873,7 +2879,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2884,8 +2890,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" style="text-align:left;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Packaging Type </label>
 							<div>
 								<?php
@@ -2900,7 +2906,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Rate </label>
 							<div class="form-group">
 								<?php
@@ -2909,7 +2915,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2920,8 +2926,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Freight Type </label>
 							<?php
 							$options = array("0" => 'Select Freight Type');
@@ -2933,17 +2939,8 @@ if (!empty($getlogpodtl)) {
 							}
 							echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
 							?>
-						</div>
-						<div class="form-group col-md-2" id="TripsValue" style="display:none;">
-							<label>NO Of Trips</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="form-group col-md-2">
+						</div>				
+						<div class="form-group col-md-3">
 							<label>Freight Rate </label>
 							<div class="form-group">
 								<?php
@@ -2952,7 +2949,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2962,9 +2959,23 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-9"></div>
+					    <div class="form-group col-md-3" id="TripsValue" style="display:none;">
+							<label>NO Of Trips</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>
+
+					<div class="form-row">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>CGST In %</label>
 							<div class="form-group">
 								<?php
@@ -2973,7 +2984,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -2984,8 +2995,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" id="SGSTAddModel">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>SGST In %</label>
 							<div class="form-group">
 								<?php
@@ -2994,7 +3005,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3004,10 +3015,10 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
-					<div class="form-row" style="text-align:left;">
-						<div id="IGSTAddModel" style="display:none;">
-							<div class="form-group col-md-8"></div>
-							<div class="form-group col-md-2">
+					<div class="form-row" id="IGSTAddModel" style="display:none;" >
+						
+							<div class="form-group col-md-6"></div>
+							<div class="form-group col-md-3">
 								<label>IGST In %</label>
 								<div class="form-group">
 									<?php
@@ -3016,7 +3027,7 @@ if (!empty($getlogpodtl)) {
 									?>
 								</div>
 							</div>
-							<div class="form-group col-md-2">
+							<div class="form-group col-md-3">
 								<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 								<div class="form-group">
 									<?php
@@ -3025,11 +3036,11 @@ if (!empty($getlogpodtl)) {
 									?>
 								</div>
 							</div>
-						</div>
+						
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
 							<div class="form-group">
 								<?php
@@ -3040,8 +3051,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 							<?php
 							$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue'), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
@@ -3073,7 +3084,7 @@ if (!empty($getlogpodtl)) {
 <!-- Edit Model for revenue po -->
 <div id="EDITREVENUE" 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;">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item</h4>
@@ -3125,7 +3136,7 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Code<span class="text-danger">*</span></label>
 							<div>
 								<?php
@@ -3137,7 +3148,7 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Item Name</label>
 							<div class="form-group">
 								<?php
@@ -3146,7 +3157,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -3155,7 +3166,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Quantity<span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -3164,7 +3175,11 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+					</div>
+
+					<div class="form-row">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
 							<div class="form-group">
 								<?php
@@ -3173,12 +3188,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>Per</label> <?php
 												$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer',  'class' => 'form-control');
 												echo form_input($data); ?>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
 							<div class="form-group">
 								<?php
@@ -3187,13 +3202,12 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-
 					</div>
 
 
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Discount Type </label>
 							<div>
 								<?php
@@ -3212,7 +3226,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discount Rate </label>
 							<div class="form-group">
 								<?php
@@ -3221,7 +3235,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Discounted Amt <?php echo "($INRSYM)" ?> </label>
 							<div class="form-group">
 								<?php
@@ -3232,8 +3246,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" style="text-align:left;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Packaging Type </label>
 							<div>
 								<?php
@@ -3252,7 +3266,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Rate </label>
 							<div class="form-group">
 								<?php
@@ -3261,7 +3275,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Packaging Amt <?php echo "($INRSYM)" ?> </label>
 							<div class="form-group">
 								<?php
@@ -3272,8 +3286,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-3"></div>
+						<div class="form-group col-md-3">
 							<label>Freight Type </label>
 							<?php $options = array("0" => 'Select Freight Type');
 							if (!empty($FreightType)) {
@@ -3283,16 +3297,8 @@ if (!empty($getlogpodtl)) {
 							}
 							echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"'); ?>
 						</div>
-						<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
-							<label>NO Of Trips</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
+						
+						<div class="form-group col-md-3">
 							<label>Freight Rate </label>
 							<div class="form-group">
 								<?php
@@ -3301,7 +3307,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3311,30 +3317,46 @@ if (!empty($getlogpodtl)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>CGST In %</label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
-								echo form_input($data);
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-							<div class="form-group">
-								<?php
-								$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-								echo form_input($data);
-								?>
+					    <div class="form-group col-md-9"></div>
+						<div class="form-group 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>
+
+					
+					<div class="form-row">
+					<div class="form-group col-md-6"></div>
+					<div class="form-group col-md-3">
+						<label>CGST In %</label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
+							echo form_input($data);
+							?>
 						</div>
 					</div>
+					<div class="form-group col-md-3">
+						<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+						<div class="form-group">
+							<?php
+							$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+							echo form_input($data);
+							?>
+						</div>
+					</div>
+					</div>
+
 					<div class="form-row" id="SGSTEditModel">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>SGST In %</label>
 							<div class="form-group">
 								<?php
@@ -3343,7 +3365,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3354,8 +3376,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row" id="IGSTEditModel" style="display:none;">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-6"></div>
+						<div class="form-group col-md-3">
 							<label>IGST In %</label>
 							<div class="form-group">
 								<?php
@@ -3364,7 +3386,7 @@ if (!empty($getlogpodtl)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>IGST Amt <?php echo "($INRSYM)" ?></label>
 							<div class="form-group">
 								<?php
@@ -3375,8 +3397,8 @@ if (!empty($getlogpodtl)) {
 						</div>
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label> Insurance Amt <?php echo "($INRSYM)" ?> (if Any)</label>
 							<div class="form-group">
 								<?php
@@ -3389,8 +3411,8 @@ if (!empty($getlogpodtl)) {
 
 					</div>
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
+						<div class="form-group col-md-9"></div>
+						<div class="form-group col-md-3">
 							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 							<div class="form-group">
 								<?php

From 1425a218eb28da20e0a15c8dabb1cda0cc508108 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Sat, 5 Oct 2024 15:09:21 +0530
Subject: [PATCH 4/4] modal alignment fix in purchase module -vadivel J

---
 app/Views/EditservicePurchaseorder.php |  22 ++--
 app/Views/editCapitalPo.php            | 137 +++++++++++++++----------
 app/Views/editRevenuepurchaseorder.php |   1 +
 3 files changed, 93 insertions(+), 67 deletions(-)

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