Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

This commit is contained in:
vadivel J 2024-09-26 11:39:42 +05:30
commit e7bb513f03
4 changed files with 360 additions and 387 deletions

View File

@ -341,6 +341,7 @@ class Servicepurchaseorder extends BaseController
//update service po
function UpdateServicePurchaseOrder()
{
// print_r($this->request->getPost());die;
$PONO = $this->request->getPost('txtPONO');
$newsup = $this->request->getPost('newsup');
// $newSupId = split("[ - ]+", $newsup);
@ -408,23 +409,30 @@ class Servicepurchaseorder extends BaseController
$POList['ReleasedOn'] = get_current_date_time();
$POList['ReleasedBy'] = $this->session->get('userId');
}
$file = $this->request->getFile('POFile');
$requestfilename = $file->getName();
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/';
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database' . $requestfilename);
} else {
$file->move($path, $requestfilename);
$POList['POFile'] = $requestfilename;
if ($file !== null) {
$requestfilename = $file->getName();
if (!empty($requestfilename)) {
if ($file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/';
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database: ' . $requestfilename);
} else {
$file->move($path, $requestfilename);
$POList['POFile'] = $requestfilename;
}
}
}
} else {
log_message('error', 'No file was uploaded');
}
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList);

View File

@ -2995,16 +2995,16 @@ if (!empty($getlogpodtl)) {
var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
if (validate()) {
if (document.getElementById('ServiceTable').rows.length < 2) {
if (document.getElementById('ServiceTable').rows.length < 2)
{
alert('Please Select Line item to Create PO');
$('#Deliverydt').focus();
return false;
}
// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) {
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// return false;
// }
// }
else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
alert('Please Enter Payable Terms');
$('#Otherpayment').focus();
@ -3025,7 +3025,16 @@ if (!empty($getlogpodtl)) {
processData: false,
contentType: false,
success: function(data) {
// console.log(data);
// var newWindow = window.open("", "_blank", "toolbar=yes,scrollbars=yes,resizable=yes,width=1024,height=768");
// newWindow.document.write("<html><head><title>Response</title></head><body>");
// newWindow.document.write("<pre>" + data + "</pre>"); // Using <pre> to preserve formatting
// newWindow.document.write("</body></html>");
// newWindow.document.close();
// newWindow.moveTo(0, 0);
// newWindow.resizeTo(screen.width, screen.height);
if (data) {
$('#loader').hide();
alert(data);

View File

@ -723,7 +723,7 @@ if (!empty($RequistionDetails)) {
</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>
<!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
@ -741,7 +741,7 @@ if (!empty($RequistionDetails)) {
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Item Name</label>
<div>
<?php
@ -750,7 +750,7 @@ if (!empty($RequistionDetails)) {
?>
</div>
</div>
<div class="form-group col-md-1">
<div class="form-group col-md-3">
<label>UOM</label>
<div>
<?php
@ -759,7 +759,7 @@ if (!empty($RequistionDetails)) {
?>
</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>
<?php
@ -769,7 +769,12 @@ if (!empty($RequistionDetails)) {
?>
</div>
</div>
<div class="form-group col-md-2" style="padding-left: 0px;">
</div>
<div class="form-row">
<div class="form-group col-md-3" style="padding-left: 0px;">
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<!-- <label>Rate </label> -->
@ -781,12 +786,12 @@ if (!empty($RequistionDetails)) {
?>
</div>
</div>
<div class="form-group col-md-1">
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-2" style="padding: 0px;">
<div class="form-group col-md-3" style="padding: 0px;">
<!-- <label><?php echo "Basic Value In"; ?></label>-->
<label id="label3"><?php echo "Basic Value In $Currencycode ($Value)"; ?></label>
<div>
@ -800,6 +805,8 @@ if (!empty($RequistionDetails)) {
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<!-- Basic Price in US $ per Ton : -->
@ -813,9 +820,7 @@ if (!empty($RequistionDetails)) {
</div>
<div class="form-group col-md-3">
<?php echo "Exchange Rate ($Currencycode ($Value))" ?>
<p><b><?php echo "Exchange Rate ($Currencycode ($Value))" ?></b></p>
<div>
<?php
$data = array('name' => 'EditExchangeRt', 'value' => set_value('EditExchangeRt'), 'id' => 'EditExchangeRt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -828,7 +833,7 @@ if (!empty($RequistionDetails)) {
<!-- Basic value in INR : -->
<label id="labelEditBasicINR"><?php echo "Basic value in ($INR) :"; ?></label>
<p id="labelEditBasicINR"><b><?php echo "Basic value in ($INR) :"; ?></b></p>
<div>
<?php
@ -842,335 +847,325 @@ if (!empty($RequistionDetails)) {
</div>-->
</div>
<br />
<div style="padding:0px;">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Basic Price: -->
<label><?php echo "Basic Price ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div style="display:none;">
<?php
$data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
<div class="form-row" style="border:1px solid black;">
<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">
<!-- Basic Price: -->
<label><?php echo "Basic Price ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div style="display:none;">
<?php
$data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Landing charge -->
<label><?php echo "Landing charge ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- High seas sales charge -->
<label><?php echo "Assessable Value (A) ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div style="display: none">
<?php
$data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom duty : (a) -->
<label><?php echo "Custom duty (B)($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom ED_cess : (e) -->
<label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom S & H cess : (f) -->
<label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Landing charge -->
<label><?php echo "Landing charge ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
echo form_input($data);
?>
<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) -->
<label><?php echo "Subtotal (E)($INR) (A+B+C+D)"; ?></label>
</div>
<div class="form-group col-md-4">
<div style="display: none">
<?php
$data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
<label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- High seas sales charge -->
<label><?php echo "Assessable Value (A) ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div style="display: none">
<?php
$data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
echo form_input($data);
?>
<div class="form-row">
<div class="form-group col-md-8">
<!-- Gross duty payable -->
<label><?php echo "Total Duty (G)($INR) (B+C+D+E)"; ?></label>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom duty : (a) -->
<label><?php echo "Custom duty (B)($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom ED_cess : (e) -->
<label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom S & H cess : (f) -->
<label><?php echo "Custom S & H cess (D)($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
<label><?php echo "Subtotal (E)($INR) (A+B+C+D)"; ?></label>
</div>
<div class="form-group col-md-4">
<div style="display: none">
<?php
$data = array('name' => 'EditAdditionalExciseduty ', 'value' => set_value('EditAdditionalExciseduty'), 'id' => 'EditAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
<label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-8">
<!-- Gross duty payable -->
<label><?php echo "Total Duty (G)($INR) (B+C+D+E)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<span>Freight Type </span>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
<span>NO Of Trips</span>
<?php
$data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<span>Freight Rate </span>
<?php
$data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt In <?php echo $INR; ?></span>
<?php
$data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<!--End of Adding of freight in edit model -->
<center> <label>Cost of the product Per UOM</label></center>
<hr />
<div class="form-row">
<div class="form-group col-md-4">
Duty Impact
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-4">
<span>Quantity</span>
<div>
<?php
$data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom Duty Expenses -->
<label><?php echo "Custom Duty($INR) /UOM"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-group col-md-4" style="display:none;">
<!-- Total Amount: -->
</div>
<div class="form-group col-md-4">
<div style="display:none;">
<!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<span>Freight Type </span>
<?php
$data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
<span>NO Of Trips</span>
<?php
$data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<span>Freight Rate </span>
<?php
$data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt In <?php echo $INR; ?></span>
<?php
$data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<!--End of Adding of freight in edit model -->
<center> <label>Cost of the product Per UOM</label></center>
<hr />
<div class="form-row">
<div class="form-group col-md-6">
<label> Duty Impact</label>
<div>
<?php
$data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-6">
<label>Quantity</label>
<div>
<?php
$data = array('name' => 'EditPurQuantity', 'value' => set_value('EditPurQuantity'), 'id' => 'EditPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<!-- Custom Duty Expenses -->
<label><?php echo "Custom Duty($INR) /UOM"; ?></label>
<div>
<?php
$data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges ($INR)"; ?></label>
<div>
<?php
$data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Nett 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');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4" style="display:none;">
<!-- Total Amount: -->
</div>
<div class="form-group col-md-4">
<div style="display:none;">
<?php
$data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Import Description :</label>
<label style="margin-top:10px;">Import Description :</label>
<?php
$data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data);
@ -1180,7 +1175,7 @@ if (!empty($RequistionDetails)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:15px">Cancel</a>
<a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
</div>
@ -1236,7 +1231,7 @@ if (!empty($RequistionDetails)) {
<!-- <input type="hidden" name="<?php //echo 'AvlBudAmt'.$index
?>" id="<?php //echo 'AvlBudAmt'.$index
?>" value="<?php //echo $AvlBudAmt;
?>" /> -->
?>" /> -->
<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
<input type="hidden" name="<?php echo 'costCode' . $index ?>" id="<?php echo 'costCode' . $index ?>" value="<?php echo $record->CostCenterCode; ?>" />

View File

@ -1758,10 +1758,8 @@ if (!empty($getlogpodtl)) {
<hr>
<div class="form-row mt-3">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<label>Duty Impact</label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1769,7 +1767,7 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.0%">
<div class="form-group col-md-6">
<label>Quantity</label>
<div>
<?php
@ -1778,15 +1776,11 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- Custom Duty Expenses -->
<label><?php echo "Custom Duty Expenses($INR)/UOM"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1797,11 +1791,9 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
@ -1809,12 +1801,7 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.0%">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label>
<?php echo "Nett per UOM($INR)"; ?>
@ -2090,7 +2077,7 @@ if (!empty($getlogpodtl)) {
<div class="form-row" style="border:1px solid black;">
<br />
<div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<div class="form-group col-md-12">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Basic Price: -->
<label><?php echo "Basic Price ($INR)"; ?></label>
@ -2349,10 +2336,8 @@ if (!empty($getlogpodtl)) {
<hr />
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<label>Duty Impact</label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2360,7 +2345,7 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.8%">
<div class="form-group col-md-6">
<span>Quantity</span>
<div>
<?php
@ -2369,15 +2354,11 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- Custom Duty Expenses -->
<label><?php echo "Custom Duty Expenses($INR) /UOM"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2388,11 +2369,9 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges ($INR)" ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
@ -2400,16 +2379,9 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2418,17 +2390,9 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-group col-md-4" style="display:none;">
<div class="form-group col-md-6" style="display:none;">
<!-- Total Amount: -->
<label id=labelEditTotalAmount>Total Amount</label>
</div>
<div class="form-group col-md-4">
<div style="display:none;">
<?php
$data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2436,17 +2400,14 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Import Description :</label>
<label style="margin-top:10px;">Import Description :</label>
<?php
$data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data);