CHANGE_EMERGE_PO_CONFLIT_MERGE
This commit is contained in:
aadhavan valli
commit
1e218bfcf3
@ -507,7 +507,7 @@ class Emergencypurchaseorder extends BaseController
|
||||
}else{
|
||||
|
||||
}
|
||||
print_r($POList);die;
|
||||
// print_r($POList);die;
|
||||
$POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
|
||||
$PONO = $POMaster ? $newPONO : "";
|
||||
// $PONO = '';
|
||||
|
||||
@ -564,7 +564,7 @@ $mpdf->use_kwt = true;
|
||||
|
||||
$ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
|
||||
$data['RequistionDetails'] = $ReqDetails;
|
||||
|
||||
$Status = "";
|
||||
foreach ($data['RequistionDetails'] as $ReqDet) {
|
||||
|
||||
$Status = $ReqDet->Status;
|
||||
|
||||
@ -1589,9 +1589,9 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
|
||||
->join('t_requestion_master rmast', 'rmast.ReqNo=req.ReqNo')
|
||||
//->join('t_costcenter_budget bud','bud.CostCenterCode = req.CostCenterCode and bud.BudgetType = rmast.ReqType')
|
||||
->join('t_costcenter_master ccm', 'ccm.CostCenterCode = req.CostCenterCode', 'left')
|
||||
->join('tbl_users tbl', 'rmast.createdby=tbl.userid')
|
||||
->join('t_employee_details as emp', 'emp.empid=tbl.empid')
|
||||
->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode');
|
||||
->join('tbl_users tbl', 'rmast.createdby=tbl.userid', 'left')
|
||||
->join('t_employee_details as emp', 'emp.empid=tbl.empid', 'left')
|
||||
->join('t_departmentdetails as Dep', 'Dep.DEPCode=emp.Departmentcode', 'left');
|
||||
|
||||
// old Status Don't Deleted it.
|
||||
// if ($type == 'APPROVAL') {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5720,6 +5720,7 @@ if (!empty($INRSYMBOL)) {
|
||||
</tr>
|
||||
`;
|
||||
$('#RevenueAppend').empty();
|
||||
$('#ServiceAppend').empty();
|
||||
|
||||
$('#RevenueAppend').append(html);
|
||||
// $('#serviceTax').row.add($(html)).draw();
|
||||
@ -6405,6 +6406,8 @@ if (!empty($INRSYMBOL)) {
|
||||
</tr>
|
||||
`;
|
||||
$('#ServiceAppend').empty();
|
||||
$('#RevenueAppend').empty();
|
||||
|
||||
$('#ServiceAppend').append(html);
|
||||
|
||||
|
||||
@ -7052,11 +7055,11 @@ $('#content').loader('hide');
|
||||
// alert(data);
|
||||
console.log(data);
|
||||
|
||||
// $('#txtRowCount1').val('');
|
||||
// $('#txtDeletedRow1').val('');
|
||||
// $('#SpcialInstruction').val('');
|
||||
// $('#txtDeliveryAddress').val('');
|
||||
// window.location = "purchaseorderListing";
|
||||
$('#txtRowCount1').val('');
|
||||
$('#txtDeletedRow1').val('');
|
||||
$('#SpcialInstruction').val('');
|
||||
$('#txtDeliveryAddress').val('');
|
||||
window.location = "purchaseorderListing";
|
||||
},
|
||||
error: function(xhr, status, error) {
|
||||
// Handle errors
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -233,11 +233,6 @@ if (!empty($RequistionDetails)) {
|
||||
margin: 0 5px;
|
||||
}
|
||||
|
||||
.mandatory {
|
||||
color: red;
|
||||
text-align: right;
|
||||
background-color: white;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript">
|
||||
@ -319,7 +314,8 @@ if (!empty($RequistionDetails)) {
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<h4><?= "Purchase Order - $PONO "; ?></h4>
|
||||
<h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
|
||||
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -329,33 +325,17 @@ if (!empty($RequistionDetails)) {
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
|
||||
<div class="content-wrapper">
|
||||
|
||||
<section class="content">
|
||||
<div id="content"></div>
|
||||
<?php
|
||||
$attributes = array('class' => 'form-label-left ImportPO ', 'name' => 'ImportPO', 'id' => 'ImportPO', 'enctype' => 'multipart/form-data');
|
||||
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
<?php
|
||||
$attributes = array('class' => 'form-label-left ImportPO ', 'name' => 'ImportPO', 'id' => 'ImportPO', 'enctype' => 'multipart/form-data');
|
||||
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
|
||||
|
||||
|
||||
<!-- <section class="content"> -->
|
||||
|
||||
<div style="border:2px solid #333;">
|
||||
<div class="col-md-12">
|
||||
<div class="header-container">
|
||||
<h2> Amended Import Purchase Order-<?php echo "$PONO" ?></h2>
|
||||
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-cancel" id="back" value="Back">Back</a>
|
||||
</div>
|
||||
<!--<div class="col-md-1"><br/>
|
||||
<a class="btn btn-info" href="<?php echo base_url(); ?>purchaseorder/CreateimportPOPrint" target="_blank">Print</a>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Requistion No</label>
|
||||
<?php
|
||||
$options = array("0" => 'Selected Requisition Numbers');
|
||||
@ -367,7 +347,7 @@ if (!empty($RequistionDetails)) {
|
||||
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"', 'height="400px"');
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Purchase Order Type</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -377,8 +357,8 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Supplier<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Supplier<span class="text-danger">*</span></label>
|
||||
|
||||
<?php
|
||||
$options = array("0" => 'Select Supplier');
|
||||
@ -395,7 +375,7 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Address</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -406,9 +386,9 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Currency Type<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Currency Type<span class="text-danger">*</span></label>
|
||||
|
||||
<?php
|
||||
$options = array($CurCode => $Cur);
|
||||
@ -422,8 +402,8 @@ if (!empty($RequistionDetails)) {
|
||||
echo form_dropdown('currencytype', $options, set_value('currencytype'), 'id="currencytype"', 'required="true"', 'class="form-control select2'); ?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<b><u>Select Delivery By<span class="badge mandatory">*</span></u></b><br />
|
||||
<div class="form-group col-md-3">
|
||||
<b><u>Select Delivery By<span class="text-danger">*</span></u></b><br />
|
||||
|
||||
<!-- <?php echo form_label('Date', 'Date') . " " . form_radio(array("name" => "DateRange", "id" => "Date", "value" => "0", 'checked' => 'checked')); ?> </td> -->
|
||||
|
||||
@ -433,7 +413,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3" id="Schedulediv" style="display:none;"> <br />
|
||||
<div class="form-group col-md-3" id="Schedulediv" style="display:none;"> <br />
|
||||
<!-- <label >Schedule </label>
|
||||
|
||||
<?php
|
||||
@ -441,7 +421,7 @@ if (!empty($RequistionDetails)) {
|
||||
echo Form_textarea($data);
|
||||
?> -->
|
||||
|
||||
<label>Schedule By<span class="badge mandatory">*</span></label>
|
||||
<label>Schedule By<span class="text-danger">*</span></label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby', 'value' => set_value('Scheduleby', $DeliverySchedule), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110');
|
||||
@ -449,7 +429,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3" id="Deliverydtdiv">
|
||||
<div class="form-group col-md-3" id="Deliverydtdiv">
|
||||
<!-- <label>Delivery Date</label>
|
||||
|
||||
<?php
|
||||
@ -458,7 +438,7 @@ if (!empty($RequistionDetails)) {
|
||||
?> -->
|
||||
|
||||
|
||||
<label>Dispatch Instruction<span class="badge mandatory">*</span></label>
|
||||
<label>Dispatch Instruction<span class="text-danger">*</span></label>
|
||||
|
||||
<?php
|
||||
// $data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch', 'class' => 'form-control' ,'required' => 'true');
|
||||
@ -469,7 +449,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Delivery Address</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -481,11 +461,11 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Exchange Rate On</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -494,10 +474,10 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<!-- <label>Exchange Rate </label> -->
|
||||
|
||||
<label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="badge mandatory">*</span></label>
|
||||
<label id=label1><b><?php echo "Exchange Rate in $Currencycode ($Value)" ?><span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'ExchangeRate', 'value' => set_value('ExchangeRate', $ExchangeRate), 'id' => 'ExchangeRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'USRate()');
|
||||
@ -505,8 +485,8 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Place of Origin<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3">
|
||||
<label>Place of Origin<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
// $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
@ -539,8 +519,8 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Purchase Order Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -549,7 +529,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Mode Of Shipment</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -559,7 +539,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Contact Reference</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -569,7 +549,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Supplier's Offer No</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -582,8 +562,8 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Our Reference(S)</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -593,8 +573,8 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="payablefrom">Import Type Options<span class="text-danger">*</span></label>
|
||||
|
||||
<?php
|
||||
//$options1 = array("0"=>'Select Import Option');
|
||||
@ -619,8 +599,8 @@ if (!empty($RequistionDetails)) {
|
||||
echo form_dropdown('Importoption', $options2, set_value('Importoption'), 'id="Importoption"', 'class="form-control"'); ?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="payablefrom">Payable Terms<span class="text-danger">*</span></label>
|
||||
<input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
|
||||
|
||||
|
||||
@ -654,8 +634,8 @@ if (!empty($RequistionDetails)) {
|
||||
echo form_dropdown('PaymentTerms', $optionsPay, set_value('PaymentTerms'), 'id="PaymentTerms"', 'required="true"', 'class="form-control select2'); ?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3" id="otheroptiondiv" style="display:none;">
|
||||
<label>Description of Payable Terms<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
|
||||
<label>Description of Payable Terms<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
|
||||
@ -667,9 +647,9 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label for="payablefrom">Insurance<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="payablefrom">Insurance<span class="text-danger">*</span></label>
|
||||
|
||||
|
||||
|
||||
@ -702,8 +682,8 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3" id="insurancenum" style="display:none;">
|
||||
<label>Insurance No / Insurance Details<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3" id="insurancenum" style="display:none;">
|
||||
<label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
|
||||
@ -712,8 +692,8 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-3">
|
||||
<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
|
||||
<select id='BudgetType' name='BudgetType'>
|
||||
<?php if ($BudgetType == 'CAPITAL') {
|
||||
$opt1 = 'CAPITAL';
|
||||
@ -728,7 +708,7 @@ if (!empty($RequistionDetails)) {
|
||||
<option value=<?php echo $opt2; ?>><?php echo $opt2; ?></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -759,9 +739,9 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
<div align="left">
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Req No<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Req No<span class="text-danger">*</span></label>
|
||||
<div>
|
||||
<?php
|
||||
|
||||
@ -770,7 +750,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Department Name</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -779,7 +759,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Cost Center Code</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -793,7 +773,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" style="padding-right: 0px;">
|
||||
<div class="form-group col-md-3" style="padding-right: 0px;">
|
||||
<label>Available Budget Amount (<?php echo $INR ?>)</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -808,9 +788,9 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-2">
|
||||
<label>Item Code<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-2">
|
||||
<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-->
|
||||
<div>
|
||||
@ -828,7 +808,7 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-2">
|
||||
<div class="form-group col-md-2">
|
||||
<label>Item Name</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -837,7 +817,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<div class="form-group col-md-2">
|
||||
<label>UOM</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -846,9 +826,9 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6" style="padding: 0px;">
|
||||
<div class="col-md-3">
|
||||
<label>Quantity<span class="badge mandatory">*</span></label>
|
||||
<div class="form-group col-md-6" style="padding: 0px;">
|
||||
<div class="form-group col-md-3">
|
||||
<label>Quantity<span class="text-danger">*</span></label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
|
||||
@ -857,11 +837,11 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" style="padding-left: 0px;">
|
||||
<div class="form-group col-md-3" style="padding-left: 0px;">
|
||||
<!-- <label>Rate </label> -->
|
||||
|
||||
|
||||
<label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="badge mandatory">*</span> </label>
|
||||
<label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger">*</span> </label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
|
||||
@ -869,12 +849,12 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<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="col-md-3" 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 class="form-group">
|
||||
@ -888,9 +868,9 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
|
||||
<!-- Basic Price in US $ per Ton : -->
|
||||
|
||||
@ -905,7 +885,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
|
||||
<?php echo "Exchange Rate ($Currencycode ($Value))" ?>
|
||||
|
||||
@ -918,7 +898,7 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
|
||||
<!-- Basic value in INR : -->
|
||||
|
||||
@ -931,19 +911,19 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="col-md-3">
|
||||
<!--<div class="form-group col-md-3">
|
||||
<a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
|
||||
</div>-->
|
||||
|
||||
<div class="col-md-12" style="border:1px solid #000;padding:0px;">
|
||||
<div class="form-group col-md-12" style="border:1px solid #000;padding:0px;">
|
||||
<br />
|
||||
<div class="col-md-6" style="padding:0px;">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-6" style="padding:0px;">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Basic Price: -->
|
||||
<label><?php echo "Basic Price ($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group" style="display:none;">
|
||||
<?php
|
||||
$data = array('name' => 'EditBasicPriceTax', 'value' => set_value('EditBasicPriceTax'), 'id' => 'EditBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
|
||||
@ -951,7 +931,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -960,12 +940,12 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Landing charge -->
|
||||
<label><?php echo "Landing charge ($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
|
||||
@ -976,7 +956,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -985,12 +965,12 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- High seas sales charge -->
|
||||
<label><?php echo "Assessable Value (A) ($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group" style="display: none">
|
||||
<?php
|
||||
$data = array('name' => 'EditHighseas ', 'value' => set_value('EditHighseas'), 'id' => 'EditHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateHighseassalescharge()');
|
||||
@ -998,7 +978,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1007,12 +987,12 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Custom duty : (a) -->
|
||||
<label><?php echo "Custom duty (B)($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomduty()');
|
||||
@ -1020,7 +1000,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1032,12 +1012,12 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Custom ED_cess : (e) -->
|
||||
<label><?php echo "Custom ED_cess (C) ($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
|
||||
@ -1045,7 +1025,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1054,12 +1034,12 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<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="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomSHcess()');
|
||||
@ -1067,7 +1047,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1077,13 +1057,13 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6" style="padding:0px;">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-6" style="padding:0px;">
|
||||
<div class="form-group col-md-12">
|
||||
<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="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group" 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()');
|
||||
@ -1091,7 +1071,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1105,12 +1085,12 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Additional Excise duty : (g) -->
|
||||
<label><?php echo "IGST on (E): (F) ($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditIgst ', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()');
|
||||
@ -1118,7 +1098,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
|
||||
@ -1135,12 +1115,12 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="col-md-8">
|
||||
<!-- Gross duty payable -->
|
||||
<label><?php echo "Total Duty (G)($INR) (B+C+D+E)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
|
||||
@ -1152,8 +1132,8 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
<!--Start of Adding of Frieght model-->
|
||||
<div class="col-md-12" style="padding:0px;">
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-12" style="padding:0px;">
|
||||
<div class="form-group col-md-3">
|
||||
<span>Freight Type </span>
|
||||
<div>
|
||||
<?php
|
||||
@ -1174,7 +1154,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" id="AmendTripsValue" style="display:block;">
|
||||
<div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
|
||||
<span>NO Of Trips</span>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -1183,7 +1163,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group col-md-3">
|
||||
<span>Freight Rate </span>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -1193,7 +1173,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3" style="padding-left: 0px;">
|
||||
<div class="form-group col-md-3" style="padding-left: 0px;">
|
||||
<span>Freight Amt In <?php echo $INR; ?></span>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -1206,15 +1186,15 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
<!--End of Adding of freight in edit model -->
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
<center> <label>Cost of the product Per UOM</label></center>
|
||||
<hr />
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
Duty Impact
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditDutyImpact', 'value' => set_value('EditDutyImpact'), 'id' => 'EditDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1222,7 +1202,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4" style="margin-top: -4.8%">
|
||||
<div class="form-group col-md-4" style="margin-top: -4.8%">
|
||||
<span>Quantity</span>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -1233,13 +1213,13 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- Custom Duty Expenses -->
|
||||
<label><?php echo "Custom Duty($INR) /UOM"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditCustomDutyExpenses ', 'value' => set_value('EditCustomDutyExpenses'), 'id' => 'EditCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1249,12 +1229,12 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- RMC Including Customers -->
|
||||
<label><?php echo "Clearing Charges ($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditClearingCharges', 'value' => set_value('EditClearingCharges'), 'id' => 'EditClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);');
|
||||
@ -1265,11 +1245,11 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<!-- RMC Including Customers -->
|
||||
<label><?php echo "Nett per UOM($INR)"; ?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1283,10 +1263,10 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4" style="display:none;">
|
||||
<div class="form-group col-md-4" style="display:none;">
|
||||
<!-- Total Amount: -->
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group" style="display:none;">
|
||||
<?php
|
||||
$data = array('name' => 'EditTotalExp', 'value' => set_value('EditTotalExp'), 'id' => 'EditTotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
|
||||
@ -1301,8 +1281,8 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
<label>Import Description :</label>
|
||||
<?php
|
||||
$data = array('name' => 'edittxtInstruction', 'value' => set_value('edittxtInstruction'), 'id' => 'edittxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
||||
@ -1606,7 +1586,7 @@ if (!empty($RequistionDetails)) {
|
||||
// if($PONOStatus == PO_DRAFT)
|
||||
// {
|
||||
?>
|
||||
<td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo; ?> Requisition details"></i> </a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
|
||||
<td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="fas fa-pencil-alt" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo; ?> Requisition details"></i> </a> <!-- <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>-->
|
||||
<?php
|
||||
// } else {
|
||||
?>
|
||||
@ -1674,10 +1654,10 @@ if (!empty($RequistionDetails)) {
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" style="border: 1px solid;">
|
||||
<div class="form-group col-md-12" style="border: 1px solid;">
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Landing Charge <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1686,7 +1666,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Assessable Value <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1695,7 +1675,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Custom Duty Charge <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1705,7 +1685,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Subtotal Charge <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1715,7 +1695,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total IGST <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1725,7 +1705,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Custom ED_cess Charge <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1734,7 +1714,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Custom S & H cess Charge <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1743,7 +1723,7 @@ if (!empty($RequistionDetails)) {
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
|
||||
|
||||
<?php
|
||||
@ -1755,7 +1735,7 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Freight Value </label> <?php
|
||||
$data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', $totfreight), 'id' => 'txtTotalFreight', 'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1765,7 +1745,7 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
<input type="hidden" name="txttotamend" id="txttotamed" value=<?php echo $totorder; ?>>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group col-md-4">
|
||||
<label>Total Order Value <?php echo "($Value)" ?></label> <?php
|
||||
$data = array('name' => 'txtToatlOrder', 'value' => set_value('txtToatlOrder', $totorder), 'id' => 'txtToatlOrder', 'class' => 'form-control', 'required' => 'true', 'readonly' => 'true', 'style' => 'text-align:right;');
|
||||
echo form_input($data);
|
||||
@ -1777,8 +1757,8 @@ if (!empty($RequistionDetails)) {
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
<div class="form-group col-md-12">
|
||||
<label>Special Instructions </label> <?php
|
||||
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction', strip_tags($ServiceDescription)), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
|
||||
echo form_textarea($data);
|
||||
@ -1850,9 +1830,7 @@ if (!empty($RequistionDetails)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div> <!-- end card body-->
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -25,8 +25,8 @@
|
||||
<!-- END wrapper -->
|
||||
|
||||
|
||||
<!-- Right bar overlay-->
|
||||
<div class="rightbar-overlay"></div>
|
||||
|
||||
|
||||
|
||||
<!-- Vendor js -->
|
||||
<script src="<?php echo base_url(); ?>public/new_assets/js/vendor.min.js"></script>
|
||||
|
||||
@ -63,6 +63,19 @@
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
|
||||
|
||||
<style>
|
||||
::-webkit-scrollbar {
|
||||
width: 5px;
|
||||
height: 5px;
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
background-color: #797a7c;
|
||||
border-radius: 15px;
|
||||
height: 5px;
|
||||
}
|
||||
::-webkit-scrollbar-track {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
/* Select2 Input Hight Set */
|
||||
.select2-selection.select2-selection--single{
|
||||
@ -75,7 +88,7 @@
|
||||
top: 7px;
|
||||
}
|
||||
/* Select2 Height End */
|
||||
/* .navbar-custom{
|
||||
.navbar-custom{
|
||||
height: 55px;
|
||||
}
|
||||
.logo-box .logo {
|
||||
@ -93,13 +106,13 @@
|
||||
}
|
||||
.topnav .navbar-nav .nav-link{
|
||||
line-height: 15px;
|
||||
} */
|
||||
}
|
||||
.navbar-custom {
|
||||
background-color: #4f7c97 !important;
|
||||
}
|
||||
th{
|
||||
/* th{
|
||||
background-color: #ddd !important;
|
||||
}
|
||||
} */
|
||||
.btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{
|
||||
border: 1px solid grey;
|
||||
border-radius: 4px !important;
|
||||
@ -108,9 +121,7 @@
|
||||
border-bottom: 2px solid #FFF !important;
|
||||
margin-left: -2%;
|
||||
}
|
||||
.form-group {
|
||||
/* padding-bottom: 4%; */
|
||||
}
|
||||
|
||||
.badge {
|
||||
color: red;
|
||||
background-color: #fff;
|
||||
@ -337,10 +348,10 @@
|
||||
|
||||
<a href="index.html" class="logo logo-light text-center">
|
||||
<span class="logo-sm">
|
||||
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="24">
|
||||
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
|
||||
</span>
|
||||
<span class="logo-lg">
|
||||
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="20">
|
||||
<img src="<?php echo base_url(); ?>public/new_assets/images/RESICO (2).png" alt="" height="30">
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user