From 0d0a4a37dfb9f95e3ffa152f26f3cd277d7bc658 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Thu, 26 Sep 2024 15:19:04 +0530
Subject: [PATCH] revenue purchase order bugs fixed

---
 app/Views/editimportpo.php  |   4 +-
 app/Views/purchaseorder.php | 828 +++++++++++++++++++-----------------
 2 files changed, 445 insertions(+), 387 deletions(-)

diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php
index b110c051..82d9c252 100755
--- a/app/Views/editimportpo.php
+++ b/app/Views/editimportpo.php
@@ -1168,8 +1168,8 @@ if (!empty($getlogpodtl)) {
 
                                     <div class="form-group col-md-3" align="left">
                                                
-                                                   <label>Select File</label>
-                                                    <input type="file" class="form-control" name="POFile" id="POFile">
+                                                   <label>Select Purchase Order File</label>
+                                                    <input type="file" class="" name="POFile" id="POFile">
                                                     <?php if ($PrePOFile) { ?>
                                                         <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
                                                     <?php } ?>
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 4098e38c..8f873b57 100755
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -657,10 +657,10 @@ if (!empty($INRSYMBOL)) {
 
 			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');
+				
 			}
 			if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
 				selValue = $("#drpFreight").val();
@@ -704,10 +704,10 @@ if (!empty($INRSYMBOL)) {
 
 			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');
+				
 			}
 			if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
 				selValue = $("#drpEditFreight").val();
@@ -2224,10 +2224,23 @@ if (!empty($INRSYMBOL)) {
 									<input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="">
 								</div>
 							</div>
+
+
+							<label>Select Purchase Order File</label>
+							<div class="form-row">
+								
+								<div class="form-group col-md-12">
+								
+								<input type="file" name="POFile" id="POFile"><br>
+								</div>
+						    
+
+							</div>
+
 							<div class="form-row">
 								<div class="form-group col-md-12">
 									<div align="right" style="padding-right:10px">
-										<input type="file" name="POFile" id="POFile"><br>
+										
 										<input type="hidden" name="txtPoRange" id="txtPoRange" />
 										<input type="hidden" name="isEdit" id="isEdit" value="0" />
 										<input type="hidden" name="txtStatus" id="txtStatus" />
@@ -2403,349 +2416,376 @@ if (!empty($INRSYMBOL)) {
 	</div>
 </div><!-- /.modal -->
 <!-- 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-content">
-			<div class="modal-header">
-				<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
-				<button type="button" class="close" data-dismiss="modal"
-					aria-hidden="true">×</button>
+ <div align="center">
+		<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-content" align="left" style="width:1060px;">
+					<div class="modal-header">
+						<h4 class="modal-title">Select Revenue Purchase Order Line Item</h4>
+						<button type="button" class="close" data-dismiss="modal"
+							aria-hidden="true">×</button>
+					</div>
+
+					<form>
+						<div class="modal-body p-4">
+
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Req No<span class="text-danger">*</span></label>
+									<div>
+										<?php
+										$RL = array("0" => 'Select Req No');
+										if (!empty($RequistionDetails)) {
+											foreach ($RequistionDetails as $SID) :
+												$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
+											endforeach;
+										}
+
+										echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
+
+										?>
+									</div>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Department Name</label>
+
+									<?php
+									$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Cost Center Code</label>
+
+									<?php
+
+									$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<div class="form-group col-md-3">
+									<label>Item Code<span class="text-danger">*</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="form-group col-md-3">
+									<label>Item Name</label>
+
+									<?php
+									$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>UOM</label>
+
+									<?php
+									$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+
+								</div>
+								<div class="form-group col-md-3">
+									<label>Qty<span class="text-danger">*</span></label>
+									<?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 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>
+									<!-- <label>Rate</label> -->
+									<?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 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-3">
+									<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
+									<!-- <label>Basic Amount</label> -->
+									<?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="form-row" style="padding:0px;">
+								<div class="form-group col-md-3"></div>
+
+								<div class="form-group 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('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"');
+
+										?>
+									</div>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Discount Rate </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="form-group col-md-3">
+									<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+
+							</div>
+
+							<div class="form-row" style="text-align:left;">
+								<div class="form-group col-md-3"></div>
+								<div class="form-group 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('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" class="form-control "');
+
+										?>
+									</div>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Packaging Rate </label>
+									<?php
+									$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<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)) {
+										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 class="form-group col-md-3">
+									<label>Freight Rate </label>
+									<?php
+									$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+
+								<div class="form-group col-md-3">
+									<label>Freight Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>				
+
+							</div>
+
+							<div class="form-row">
+
+							<div class="from-group col-md-9"></div>
+
+							<div class="form-group col-md-3" id="TripsValue" style="display:none;">
+									<label>NO Of Trips</label>
+									<?php
+									$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+
+							<!-- cgst -->
+							<div class="form-row">
+								<div class="form-group col-md-6"></div>
+								<div class="form-group col-md-3">
+									<label>CGST In %</label>
+									<?php
+									$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>CGST Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<!-- sgst -->
+							<div class="form-row" id="SGSTAddModel">
+								<div class="form-group col-md-6"></div>
+								<div class="form-group col-md-3">
+									<label>SGST In %</label>
+									<?php
+									$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>SGST Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<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>
+									<?php
+									$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
+									echo form_input($data);
+									?>
+								</div>
+								<div class="form-group col-md-3">
+									<label>IGST Amt <?php echo "($INRSYM)" ?></label>
+									<?php
+									$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<div class="form-group col-md-9"></div>
+								<div class="form-group col-md-3">
+									<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
+									<?php
+									$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+
+							<div class="form-row">
+								<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', 0.00), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
+									echo form_input($data);
+									?>
+								</div>
+							</div>
+							<div class="form-row">
+								<div class="form-group col-md-12">
+									<label><?php echo "Revenue Description"; ?></label>
+									<?php
+									$data = array('name' => 'Service_Description', 'value' => set_value('Service_Description'), 'id' => 'Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
+									echo form_textarea($data);;
+									?>
+								</div>
+							</div>
+
+
+						</div>
+						<div class="modal-footer">
+
+							<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
+							<a class="btn btn-info waves-effect waves-light font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
+
+						</div>
+					</form>
+
+				</div>
 			</div>
+		</div><!-- /.modal -->
+ </div>
 
-			<form>
-				<div class="modal-body p-4">
-
-
-					<div class="form-row">
-						<div class="form-group col-md-3">
-							<label>Req No<span class="text-danger">*</span></label>
-							<div>
-								<?php
-								$RL = array("0" => 'Select Req No');
-								if (!empty($RequistionDetails)) {
-									foreach ($RequistionDetails as $SID) :
-										$RL[$SID->ReqNo] =  $SID->ReqNo . ' ' . ' - ' . ' ' . $SID->DepartmentName;
-									endforeach;
-								}
-
-								echo form_dropdown('ReqNo', $RL, set_value('ReqNo'), 'id="ReqNo" class="form-control"');
-
-								?>
-							</div>
-						</div>
-
-						<div class="form-group col-md-3">
-							<label>Department Name</label>
-
-							<?php
-							$data = array('name' => 'deptName', 'value' => set_value('deptName'), 'id' => 'deptName',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-3">
-							<label>Cost Center Code</label>
-
-							<?php
-
-							$data = array('name' => 'CostCenter', 'value' => set_value('CostCenter'), 'id' => 'CostCenter',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-3">
-							<label>Avl Bud Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AvlBudAmt', 'value' => set_value('AvlBudAmt'), 'id' => 'AvlBudAmt',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-					<div class="form-row">
-						<div class="form-group col-md-2">
-							<label>Item Code<span class="text-danger">*</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="form-group col-md-2">
-							<label>Item Name</label>
-
-							<?php
-							$data = array('name' => 'ItemName', 'value' => set_value('ItemName'), 'id' => 'ItemName',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-1">
-							<label>UOM</label>
-
-							<?php
-							$data = array('name' => 'UOM', 'value' => set_value('UOM'), 'id' => 'UOM',  'class' => 'form-control', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-
-						</div>
-						<div class="form-group col-md-2">
-							<label>Qty<span class="text-danger">*</span></label>
-							<?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 class="form-group col-md-1">
-							<label><?php echo "Rate  ($INRSYM)"; ?><span class="text-danger">*</span></label>
-							<!-- <label>Rate</label> -->
-							<?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 class="form-group col-md-2">
-							<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">
-							<label><?php echo "Basic Amt ($INRSYM)"; ?></label>
-							<!-- <label>Basic Amount</label> -->
-							<?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="form-row" style="padding:0px;">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
-							<label>Discount Type </label>
-							<div>
-								<?php
-								$options = array("0" => 'Select Discount Type');
-								//print_r(  $options);
-
-								if (!empty($TaxType)) {
-									foreach ($TaxType as $SID) :
-
-
-										$options[$SID->ConfigValue] =  $SID->ConfigValue;
-
-									endforeach;
-								}
-
-								echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType" class="form-control"');
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Discount Rate </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="form-group col-md-2">
-							<label>Discounted Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtAfterDiscount', 'value' => set_value('txtAfterDiscount', 0.00), 'id' => 'txtAfterDiscount',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</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">
-							<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('PackagingType', $options, set_value('PackagingType'), 'id="PackagingType" class="form-control "');
-
-								?>
-							</div>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Packaging Rate </label>
-							<?php
-							$data = array('name' => 'txtPackaging', 'value' => set_value('txtPackaging'), 'id' => 'txtPackaging',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Packaging Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtAfterPackaging', 'value' => set_value('txtAfterPackaging', 0.00), 'id' => 'txtAfterPackaging',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row">
-						<div class="form-group col-md-4"></div>
-						<div class="form-group col-md-4">
-							<label>Freight Type </label>
-							<?php
-							$options = array("0" => 'Select Freight Type');
-							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 class="form-group col-md-2" id="TripsValue" style="display:none;">
-							<label>NO Of Trips</label>
-							<?php
-							$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips',  'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Freight Rate </label>
-							<?php
-							$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>Freight Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight', 0.00), 'id' => 'txtAfterFreight',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-
-					</div>
-
-
-					<!-- cgst -->
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>CGST In %</label>
-							<?php
-							$data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>CGST Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0.00), 'id' => 'AfterCgst',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<!-- sgst -->
-					<div class="form-row" id="SGSTAddModel">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>SGST In %</label>
-							<?php
-							$data = array('name' => 'Sgst', 'value' => set_value('Sgst', 0), 'id' => 'Sgst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>SGST Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst', 0.00), 'id' => 'AfterSgst',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-					<div class="form-row" id="IGSTAddModel" style="display:none;">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
-							<label>IGST In %</label>
-							<?php
-							$data = array('name' => 'Igst', 'value' => set_value('Igst', 0), 'id' => 'Igst',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
-							echo form_input($data);
-							?>
-						</div>
-						<div class="form-group col-md-2">
-							<label>IGST Amt <?php echo "($INRSYM)" ?></label>
-							<?php
-							$data = array('name' => 'AfterIgst', 'value' => set_value('AfterIgst', 0.00), 'id' => 'AfterIgst',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4">
-							<label> Insurance <?php echo "($INRSYM)" ?> (if Any)</label>
-							<?php
-							$data = array('name' => 'txtInsurance', 'value' => set_value('txtInsurance', 0.00), 'id' => 'txtInsurance',  'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateTotalValue(0);');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-
-					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-4 ">
-							<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
-							<?php
-							$data = array('name' => 'txtTotalOrderValue', 'value' => set_value('txtTotalOrderValue', 0.00), 'id' => 'txtTotalOrderValue',  'class' => 'form-control num', 'readonly' => 'true');
-							echo form_input($data);
-							?>
-						</div>
-					</div>
-					<div class="form-row">
-						<div class="form-group col-md-12">
-							<label><?php echo "Revenue Description"; ?></label>
-							<?php
-							$data = array('name' => 'Service_Description', 'value' => set_value('Service_Description'), 'id' => 'Service_Description',  'class' => 'form-control', 'rows' => '2', 'cols' => '100');
-							echo form_textarea($data);;
-							?>
-						</div>
-					</div>
-
-
-				</div>
-				<div class="modal-footer">
-
-					<a class="btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
-					<a class="btn btn-info waves-effect waves-light font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
-
-				</div>
-			</form>
-
-		</div>
-	</div>
-</div><!-- /.modal -->
 <!-- Edit Model for revenue po -->
-<div id="EDITREVENUE" class="modal fade" tabindex="-1" role="dialog"
+ <div align="center">
+ <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-content">
+		<div class="modal-content" align="left" style="width:1060px;">
 			<div class="modal-header">
 				<h4 class="modal-title">Edit Revenue Purchase Order Line Item </h4>
 				<button type="button" class="close" data-dismiss="modal"
@@ -2795,7 +2835,7 @@ if (!empty($INRSYMBOL)) {
 						</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
@@ -2807,7 +2847,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2816,7 +2856,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-						<div class="form-group col-md-1">
+						<div class="form-group col-md-3">
 							<label>UOM</label>
 							<div class="form-group">
 								<?php
@@ -2825,7 +2865,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2834,7 +2874,13 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2843,12 +2889,12 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2857,12 +2903,11 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</div>
 						</div>
-
 					</div>
 
 					<div class="form-row">
-						<div class="col-md-4"></div>
-						<div class="col-md-4">
+						<div class="col-md-3"></div>
+						<div class="col-md-3">
 							<label>Discount Type </label>
 							<div>
 								<?php
@@ -2883,7 +2928,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2892,7 +2937,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2902,9 +2947,10 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row" style="text-align:left;">
-						<div class="col-md-4"></div>
-						<div class="col-md-4">
+						<div class="col-md-3"></div>
+						<div class="col-md-3">
 							<label>Packaging Type </label>
 							<div>
 								<?php
@@ -2925,7 +2971,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2934,7 +2980,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -2944,9 +2990,10 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
-						<div class="col-md-4"></div>
-						<div class="col-md-4">
+						<div class="col-md-3"></div>
+						<div class="col-md-3">
 							<label>Freight Type </label>
 							<?php
 							$options = array("0" => 'Select Freight Type');
@@ -2957,32 +3004,38 @@ if (!empty($INRSYMBOL)) {
 							}
 							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>
-							<?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-2">
+						</div>					
+						<div class="form-group col-md-3">
 							<label>Freight Rate </label>
 							<?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 class="form-group col-md-2">
+						<div class="form-group col-md-3">
 							<label>Freight Amt <?php echo "($INRSYM)" ?></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);
 							?>
 						</div>
+					
 					</div>
+
 					<div class="form-row">
-						<div class="form-group col-md-8"></div>
-						<div class="form-group col-md-2">
+						<div class="col-md-9"></div>
+						<div class="form-group col-md-3" id="EditTripsValue" style="display:none;">
+							<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>
+
+					<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
@@ -2991,7 +3044,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -3005,8 +3058,8 @@ if (!empty($INRSYMBOL)) {
 
 					<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
@@ -3015,7 +3068,7 @@ if (!empty($INRSYMBOL)) {
 								?>
 							</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
@@ -3026,10 +3079,11 @@ if (!empty($INRSYMBOL)) {
 						</div>
 
 					</div>
+
 					<div class="form-row" style="text-align:left;">
 						<div id="IGSTEditModel" style="display:none;">
-							<div class="col-md-8"></div>
-							<div class="form-group col-md-2">
+							<div class="col-md-6"></div>
+							<div class="form-group col-md-3">
 								<label>IGST In %</label>
 								<div class="form-group">
 									<?php
@@ -3038,7 +3092,7 @@ if (!empty($INRSYMBOL)) {
 									?>
 								</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
@@ -3051,8 +3105,8 @@ if (!empty($INRSYMBOL)) {
 					</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
@@ -3064,9 +3118,10 @@ if (!empty($INRSYMBOL)) {
 
 
 					</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">
 							<div class="form-group">
 								<label><?php echo "Total Order Amt  ($INRSYM)"; ?></label>
 								<?php
@@ -3076,6 +3131,7 @@ if (!empty($INRSYMBOL)) {
 							</div>
 						</div>
 					</div>
+
 					<div class="form-row">
 						<div class="form-group col-md-12">
 							<label><?php echo "Reveneue Description"; ?></label>
@@ -3087,7 +3143,7 @@ if (!empty($INRSYMBOL)) {
 						</div>
 					</div>
 				</div>
-				<div class="modal-footer" style="border:none;>
+				<div class="modal-footer" style="border:none;">
 					<a class=" btn btn-secondary waves-effect" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;&nbsp;&nbsp;
 					<a class="btn btn-info waves-effect waves-light EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
 				</div>
@@ -3095,6 +3151,8 @@ if (!empty($INRSYMBOL)) {
 		</div>
 	</div>
 </div><!-- /.modal -->
+ </div>
+