req and capital align : ps

This commit is contained in:
VE10-Sanjeev 2025-03-13 11:13:06 +00:00
parent 9ffc4495f2
commit 65f5ea8c5b
4 changed files with 987 additions and 1004 deletions

View File

@ -130,19 +130,21 @@ class Requisitionform extends BaseController
// echo 'ReqType'.$ReqPOType;
$data['ReqPOType'] = $ReqPOType == '' ? $ReqType : $ReqPOType;
$data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo);
// print_r($data['LineItem']);die;
$data['description'] = '';
foreach ($data['LineItem'] as $line) {
foreach ($data['LineItem'] as $key => $line) {
$description = isset($line->MaterialDescription) ? $line->MaterialDescription : null;
//echo $description;
$data['LineItem'][$key]->CategoryName = $line->MaterialCode
? $this->requistion_model->getCategoryName($line->MaterialCode)
: "";
}
$data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);
$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
// $data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType); // Old Based on Type..
$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo);
$data['ServiceOption'] = $this->requistion_model->getConfigValue('C022');
$this->loadViews("editrequisitionform", $this->global, $data, NULL);
}

View File

@ -153,18 +153,18 @@ class Requistion_model extends Model
return $query->getResultArray();
}
function EditMaterialCode($ReqNo,$ReqType)
{
$subQuery ='SELECT Mat.MaterialCode,Mat.MaterialName,Mat.UOM
from t_materialmaster Mat where Mat.MaterialCode not in (select Req.MaterialCode from t_requestion_details Req
join t_requestion_master mast on Req.ReqNo = mast.ReqNo where mast.ReqNo=? and mast.ReqType=?
) and Mat.MaterialType=?';
$query = $this->db->query($subQuery, [$ReqNo,$ReqType,$ReqType]);
// This function also called in store req. also $reqType not removed.....
function EditMaterialCode($ReqNo, $ReqType = NULL){
$subQuery = 'SELECT Mat.MaterialCode, Mat.MaterialName, Mat.UOM FROM t_materialmaster Mat
WHERE Mat.MaterialCode NOT IN (
SELECT Req.MaterialCode FROM t_requestion_details Req
JOIN t_requestion_master mast ON Req.ReqNo = mast.ReqNo
WHERE mast.ReqNo = ?' . ($ReqType ? ' AND mast.ReqType = ?' : '') .')'
. ($ReqType ? ' AND Mat.MaterialType = ?' : '');
$params = $ReqType ? [$ReqNo, $ReqType, $ReqType] : [$ReqNo];
$query = $this->db->query($subQuery, $params);
return $query->getResult();
}
@ -583,6 +583,17 @@ class Requistion_model extends Model
return $query->getResult();
}
function getCategoryName($materialCode){
$subQuery ='SELECT MM.MaterialCode,MM.MaterialName,MM.MaterialType,MM.Category,MM.IsActive,CD.ConfigValue
from t_materialmaster as MM
left join t_configdetails as CD on CD.Key = MM.Category
where MM.MaterialCode = '.$materialCode;
$categoryName = $this->db->query($subQuery)->getRow()->ConfigValue;
return $categoryName;
}
}

View File

@ -20,7 +20,8 @@
box-shadow: 0 0 5px rgba(0, 123, 255, 0.5);
}
.save-btn, .cancel-btn {
.save-btn,
.cancel-btn {
border: none;
background: none;
cursor: pointer;
@ -174,12 +175,7 @@ if (!empty($AvlBudAmt)) {
$AvlAmount = number_format($AvlCapitalBudAmt, 2, '.', '');
}
// if(!empty($AvlimportBudAmt))
// {
// $AvlAmount = $AvlimportBudAmt;
// }
// if(!empty($AvlimportBudAmt)){ $AvlAmount = $AvlimportBudAmt; }
@ -398,7 +394,9 @@ if (!empty($INRSYMBOL)) {
alert('Please Select Budget Type');
$('#BudgetType').focus();
return false;
} else { return true; }
} else {
return true;
}
}
if (capitalType == 'Domestic') {
if ($('#drpSupplier').val() == "0") {
@ -437,13 +435,10 @@ if (!empty($INRSYMBOL)) {
alert('Please Select Budget Type');
$('#BudgetType').focus();
return false;
} else { return true; }
} else {
return true;
}
}
}
</script>
<div class="content-page">
@ -456,9 +451,9 @@ if (!empty($INRSYMBOL)) {
<div class="page-title-box page-title-box-alt">
<h4><?= "Capital Purchase Order"; ?></h4>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>
</div><!-- page-title-box -->
</div> <!-- col-12 -->
</div><!-- row -->
<!-- end page title -->
<!-- Form row -->
<div class="row">
@ -469,9 +464,6 @@ if (!empty($INRSYMBOL)) {
$attributes = array('class' => 'form-label-left CapitalPO ', 'name' => 'CapitalPO', 'id' => 'ImportPO', 'enctype' => 'multipart/form-data');
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<div class="form-row">
<div class="form-group col-md-3">
<label>Requistion No</label>
@ -488,7 +480,7 @@ if (!empty($INRSYMBOL)) {
}
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo"', 'required="true"');
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Purchase Order Type</label>
<div>
@ -498,7 +490,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Select Supplier<span class="text-danger">*</span></label>
<?php
@ -513,7 +505,7 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('drpSupplier', $options, set_value('drpSupplier'), 'id="drpSupplier" required="true" class="form-control select2"');
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Supplier Address</label>
<div>
@ -522,9 +514,8 @@ if (!empty($INRSYMBOL)) {
echo Form_textarea($data);
?>
</div>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-3" id="currencyOpt">
@ -544,7 +535,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<b><u>Select Delivery By<span class="text-danger">*</span></u></b> <br />
<div style="display:inline-flex;">
@ -561,7 +552,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="Schedulediv">
<label>Schedule By <span class="text-danger">*</span></label>
@ -570,7 +561,7 @@ if (!empty($INRSYMBOL)) {
echo form_textarea($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="Deliverydtdiv" style="display:none;">
<label>Dispatch Instruction<span class="text-danger">*</span></label>
@ -582,7 +573,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="deliverydateby" style="display:none;">
<label>Delivery Date<span class="text-danger">*</span></label>
<div>
@ -592,7 +583,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Delivery Address</label>
<div>
@ -601,13 +592,13 @@ if (!empty($INRSYMBOL)) {
echo Form_textarea($data);
?>
</div>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-3" id="FromOnlineRate">
Check Today's Foreign Exchange value <a href="http://www.xe.com/" target="_blank"><u>(Click here)</u></a>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="hideExchangeRateOn">
<label>Exchange Rate On</label>
<div>
@ -617,7 +608,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="hideExchangeRate">
<label id="CurrencySymbol">Exchange Rate</label><span class="text-danger">*</span>
<div>
@ -627,7 +618,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="PlaceOforigindiv">
<label>Place of Origin<span class="text-danger">*</span></label>
<div>
@ -638,8 +629,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-3">
@ -651,7 +642,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Mode Of Shipment</label>
<div>
@ -661,7 +652,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Contact Reference</label>
<div>
@ -671,7 +662,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Supplier's Offer No</label>
<div>
@ -681,8 +672,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-3">
@ -694,7 +685,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Capital Type Options<span class="text-danger">*</span></label>
<div>
@ -713,7 +704,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label for="payablefrom">Payable Terms<span class="text-danger">*</span> </label>
<?php
@ -732,7 +723,7 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('PaymentMethod', $options1, set_value('PaymentMethod'), 'id="PaymentMethod" class="form-control" required="true"');
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="text-danger">*</span></label>
<div>
@ -741,12 +732,10 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-3">
<label>Insurance Options<span class="text-danger">*</span></label>
<div>
@ -761,7 +750,7 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"');
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
<label>Insurance No / Insurance Details <span class="text-danger">*</span></label>
<div>
@ -770,7 +759,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
<?php
@ -780,20 +769,20 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('BudgetType', $optionsnew, set_value('BudgetType'), 'id="BudgetType" required="true" class="form-control select2"');
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row -->
<div>
<!-- <a data-toggle="modal" ><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
<div class="form-row">
<div class="form-group col-md-12 text-right">
<!-- <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
<a data-toggle="modal" class="btn btn-success" data-dismiss="modal" onclick="openModal();">Add Line Item </a>
</div>
</div>
</div><!-- form-group col-md-12 -->
</div><!-- form-row add line item -->
<br>
</div>
<div class="form-row">
<div class="table-responsive" style="padding-bottom: 30px;">
<table id="serviceTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
@ -819,7 +808,7 @@ if (!empty($INRSYMBOL)) {
</tbody>
</table>
</div>
</div>
</div><!-- form-row table -->
<div class="form-row" id="DOMdiv">
<div class="form-group col-md-3">
@ -829,7 +818,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'CapitalBasicOrder', 'value' => set_value('CapitalBasicOrder'), 'id' => 'CapitalBasicOrder', 'class' => 'form-control num', 'readonly' => 'true',);
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Total Discount Amount <?php echo "($INR)" ?> </label>
@ -839,28 +828,28 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Total CGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst'), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Total SGST <?php echo "($INR)" ?> </label>
<?php
$data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst'), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Total IGST <?php echo "($INR)" ?> </label>
<?php
$data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst'), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Total Other Allowances <?php echo "($INR)" ?> </label>
<?php
@ -868,7 +857,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-3 -->
<div class="form-group col-md-3">
<label>Total Freight <?php echo "($INR)" ?> </label>
<?php
@ -876,8 +865,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group col-md-3 -->
</div><!-- form-row dom -->
<div class="form-row" id="HideImportTaxTotal">
@ -888,7 +877,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotallanding', 'value' => set_value('txttotallanding'), 'id' => 'txttotallanding', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Assessable Value <?php echo "($INR)" ?></label>
@ -897,7 +886,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalAssessable', 'value' => set_value('txttotalAssessable'), 'id' => 'txttotalAssessable', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Custom Duty Charge <?php echo "($INR)" ?> </label>
@ -906,7 +895,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalcustom', 'value' => set_value('txttotalcustom'), 'id' => 'txttotalcustom', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Subtotal Charge <?php echo "($INR)" ?></label>
@ -915,7 +904,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalSubtotal', 'value' => set_value('txttotalSubtotal'), 'id' => 'txttotalSubtotal', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total IGST <?php echo "($INR)" ?></label>
@ -924,7 +913,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalIgst', 'value' => set_value('txttotalIgst'), 'id' => 'txttotalIgst', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Custom ED_cess Charge <?php echo "($INR)" ?> </label>
@ -933,7 +922,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalcustomED', 'value' => set_value('txttotalcustomED'), 'id' => 'txttotalcustomED', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Custom S & H cess Charge <?php echo "($INR)" ?> </label>
@ -942,7 +931,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalcustomSH', 'value' => set_value('txttotalcustomSH'), 'id' => 'txttotalcustomSH', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Gross duty payable Charge <?php echo "($INR)" ?> </label>
@ -951,7 +940,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txttotalgrossduty', 'value' => set_value('txttotalgrossduty'), 'id' => 'txttotalgrossduty', 'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
<div class="form-group col-md-4">
<label>Total Freight Amount <?php echo "($INR)" ?></label>
@ -961,9 +950,9 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div><!-- form-group col-md-4 -->
</div>
</div><!-- form-row international -->
<div class="form-row">
<div class="form-group col-md-3">
@ -974,7 +963,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-row CapitalToatlOrder -->
<div class="form-row">
<div class="form-group col-md-12">
@ -984,7 +973,7 @@ if (!empty($INRSYMBOL)) {
echo form_textarea($data);
?>
</div>
</div>
</div><!-- form-row Instructions -->
<br>
@ -993,7 +982,7 @@ if (!empty($INRSYMBOL)) {
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"><br>
</div>
</div>
</div><!-- form-row PO file -->
<div align="right" style="padding:1% 0%;">
@ -1012,15 +1001,17 @@ if (!empty($INRSYMBOL)) {
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div><!-- hiden and button -->
<br />
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div>
</div><!-- row -->
</div> <!-- container -->
</div> <!-- content -->
</div>
</div><!-- content-page -->
<!-- modal 1 add packing cal model -->
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg">
@ -1049,6 +1040,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div><!-- /.modal -->
<!-- modal 2 edit packing cal model -->
<div id="editpackagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg">
@ -1077,6 +1070,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div><!-- /.modal -->
<!-- modal 3 add capitial -->
<div align="center">
<div id="CAPITAL" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none; overflow-y:scroll !important">
@ -1688,7 +1682,7 @@ if (!empty($INRSYMBOL)) {
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>&nbsp;&nbsp;
<a class="btn btn-success font AddCapital" ID="AddCapital"></i>&nbsp;&nbsp;<span class="bold">Add Capital</span></a>
</div>
</form>
@ -1697,6 +1691,7 @@ if (!empty($INRSYMBOL)) {
</div><!-- /.modal -->
</div>
<!-- modal 4 Edit capitial -->
<div align="center">
<div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
@ -1706,12 +1701,11 @@ if (!empty($INRSYMBOL)) {
<h4 class="modal-title">Edit Capital Purchase Order Item</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
</div><!-- modal-header -->
<form>
<div class="modal-body p-4" align="left">
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<label>Req No<span class="text-danger">*</span></label>
<div>
@ -1731,7 +1725,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>Department Name</label>
<div>
@ -1740,9 +1734,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>Cost Center Code</label>
<div>
@ -1753,15 +1745,13 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3"> <label>Avail Bud Amount</label>
<div> <?php $data = array('name' => 'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?> </div>
</div>
echo form_input($data); ?>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-1 -->
<div class="form-row">
<div class="form-group col-md-9"></div>
@ -1774,9 +1764,9 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
</div>
</div><!-- form-row-2 -->
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
@ -1787,7 +1777,7 @@ if (!empty($INRSYMBOL)) {
echo form_dropdown('MaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode" class="form-control select2"');
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3" style="padding-right:0px;">
<label>Item Name</label>
<div>
@ -1796,7 +1786,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>UOM</label>
<div>
@ -1805,7 +1795,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label>
<div>
@ -1814,10 +1804,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-3 -->
<div class="form-row">
<div class="form-group col-md-3"></div>
@ -1829,12 +1817,12 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
<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><!-- form-col-3 -->
<div class="form-group col-md-3">
<label id="EditTotalAmount">Basic value <?php echo "($INR)" ?></label>
<div>
@ -1843,17 +1831,14 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-4 -->
<div id="EDITCAPdiv">
<div class="form-row"> <!--<div class="form-group col-md-4">
</div>-->
<div class="form-group col-md-3">
</div>
<div class="form-row">
<!--<div class="form-group col-md-4"></div>-->
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3">
<label>Discount Type </label>
<div>
@ -1874,7 +1859,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>Discount Rate </label>
<div>
@ -1883,7 +1868,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>Discounted Amt <?php echo "($INR)" ?> </label>
<div>
@ -1892,8 +1877,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-5 -->
<div class="form-row">
@ -1910,7 +1895,7 @@ if (!empty($INRSYMBOL)) {
}
echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "');
?>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<label>Freight Rate </label>
@ -1918,7 +1903,7 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();');
echo form_input($data);
?>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3" style="padding-left: -2px;">
<label>Freight Amt <?php echo "($INR)"; ?></label>
@ -1926,9 +1911,9 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- form-col-3 -->
</div>
</div><!-- form-row-6 -->
<div class="form-row" id="TripsValuelocedit" style="display:none;">
<div class="form-group col-md-9"></div>
@ -1938,15 +1923,14 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'NOOfTripslocedit', 'value' => set_value('NOOfTripslocedit'), 'id' => 'NOOfTripslocedit', 'class' => 'form-control num', 'onchange' => 'calculateFreightlocaddper(0);');
echo form_input($data);
?>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-7 -->
<div class="form-row">
<div class="form-group col-md-6" align="right">
<label> CGST In % </label>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<div>
@ -1957,7 +1941,8 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<div>
@ -1967,14 +1952,15 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-8 -->
</div>
<div class="form-row">
<div class="form-group col-md-6" align="right">
<label> SGST In % </label>
</div>
</div><!-- form-col-6 -->
<div class="form-group col-md-3">
<div>
@ -1985,7 +1971,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<div>
@ -1995,14 +1981,15 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-9 -->
</div>
<div class="form-row">
<div class="form-group col-md-6" align="right">
<label> IGST In % </label>
</div>
</div><!-- form-col-6 -->
<div class="form-group col-md-3">
<div>
@ -2013,7 +2000,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3">
<div>
@ -2023,9 +2010,10 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div><!-- form-col-3 -->
</div><!-- form-row-10 -->
</div>
<div class="form-row">
<div class="col-md-9 col-md-offset-4" align="right">
<label>Other Allowances <?php echo "($INR)" ?></label>
@ -2049,9 +2037,9 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row-11 -->
</div>
</div><!-- EDITCAPdiv -->
<div class="form-row" style="padding:1%;"></div>
<div class="form-row p-2" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
@ -2078,7 +2066,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-4">
<label> Landing charge <?php echo "($INR)" ?> </label>
@ -2100,7 +2088,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-4">
<label> Assessable Value (A)<?php echo "($INR)" ?> </label>
@ -2122,7 +2110,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-4">
<label> Custom duty (B)<?php echo "($INR)" ?> </label>
@ -2144,10 +2132,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-4">
<label> Custom ED_cess (C) </label>
@ -2169,7 +2154,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<div class="form-row">
<div class="form-group col-md-4">
<label> Custom S & H cess (D) </label>
@ -2191,14 +2176,14 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div>
</div><!-- form-row -->
</div><!-- form-group first 6-->
<div class="form-group col-md-6" style="padding:10px;">
<div class="form-row" style="text-align:left;">
<div class="form-group col-md-4">
<label> Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?></label>
</div>
</div><!-- form-group -->
<div class="form-group col-md-4">
<div class="form-group" style="display: none;">
<?php
@ -2206,7 +2191,7 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div><!-- form-group -->
<div class="form-group col-md-4">
<div>
<?php
@ -2214,10 +2199,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div>
</div>
</div><!-- form-group -->
</div><!-- form-row -->
<div class="form-row" style="text-align:left;">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -2241,8 +2224,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<div class="form-row" style="text-align:left;">
<div class="form-group col-md-8">
<label> Total Duty (G)<?php echo "($INR) (B+C+D+F)" ?> </label>
@ -2256,8 +2238,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div><!-- form-row -->
<!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;">
@ -2300,7 +2281,6 @@ if (!empty($INRSYMBOL)) {
</div>
<!--End of Adding of freight in edit model -->
<br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
<hr>
@ -2321,15 +2301,8 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div><!-- form-group second 6-->
</div><!-- EditModalImportTaxHide -->
<div class="form-row">
<div class="form-group col-md-6">
@ -2339,8 +2312,8 @@ if (!empty($INRSYMBOL)) {
echo form_input($data);
?>
</div>
</div><!-- form-row 5 -->
</div>
<div class="form-row">
<div class="form-group col-md-6">
@ -2359,15 +2332,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
</div>
</div>
<br>
</div><!-- form-row 6 -->
<div class="form-row">
<div class="form-group col-md-12">
@ -2378,19 +2343,19 @@ if (!empty($INRSYMBOL)) {
$data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
</div>
</div>
</div><!-- form-row 7 -->
</div><!-- modal-body -->
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin: 10px;">Cancel</a>
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin: 10px;">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
</div>
</div><!-- modal-footer -->
</form>
</div>
</div>
</div><!-- /.modal -->
</div>
<!-- modal 5 Domestical international Confirmation -->
<div class="modal fade" id="DomesticNOT" role="dialog">
<div class="modal-dialog">
<!-- Modal content-->

View File

@ -93,6 +93,7 @@ td {
text-align:center !important;
width:10%;
}
.hidden-column { display: none; }
</style>
<script type="text/javascript">
@ -209,6 +210,7 @@ td {
<th class="th th-PoQuantity">PoQuantity</th>
<th class="th th-status">Status</th>
<th class="th">Action</th>
<th class="hidden-column">Mategory Category</th>
</tr>
</thead>
<tbody id="tempAppend">
@ -234,6 +236,7 @@ td {
<td>
<a data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->MaterialCode; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $record->MaterialCode; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
</td>
<td class="hidden-column"><?php echo $record->CategoryName; ?></td>
</tr>
<?php $RowCount = $index;
}
@ -403,14 +406,14 @@ td {
</div>
</div>
</div>
<!-- <div class="row">
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label for="EditCategory" class="control-label">Category</label>
<input type ="text" id="EditCategory" readonly class="form-control">
</div>
</div>
</div> -->
</div>
<div class="row">
<div class="col-md-12" id="EditotherDescription">
<div class="form-group">
@ -831,6 +834,7 @@ td {
<span class="ri-delete-bin-7-fill"></span>
</a>
</td>
<td class="hidden-column">${categoryName}</td>
</tr>
`;
@ -929,6 +933,7 @@ td {
$('#EditDescription').val($cells.eq(2).text());
$('#EditUOM').val($cells.eq(3).text());
$('#EditQuantity').val($cells.eq(4).text());
$('#EditCategory').val($cells.eq(8).text());
$('#Edituserid').val(userid);
});
});