SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

advance screen issue fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-10-04 12:24:37 +05:30
parent 1d8ffc6004
commit 806925a5da
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/purchaseorder_model.php
View File

@ -1548,7 +1548,7 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
function getadvancePONO($Status='') function getadvancePONO($Status='')
{ {
$this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks,Mast.CapitalRange'); $this->db->select ('Mast.PONO,POType,Mast.CreatedDate,Mast.ReleasedOn,Mast.TotalOrderValue,Mast.SupplierID,DeliveryDate,DeliverySchedule,DeliveryOption,Mast.PaymentTerms as Paycode,Payterm.PaymentTerms,LineItem.ReqNo,Requestedby,Departmentcode,DepartmentName,LineItem.CostCenterCode,SupDet.SupplierName,Import_DispatchDetails,CurrencyType,AdvancePercentage,AdvanceAmount,POAdv.Remarks,Mast.CapitalRange,Mast.PaymentOtherDescription');
$this->db->from('T_PurchaseOrder_Master Mast'); $this->db->from('T_PurchaseOrder_Master Mast');
$this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO'); $this->db->join('T_PurchaseOrder_LineItem LineItem','Mast.PONO=LineItem.PONO');
$this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo'); $this->db->join('T_Requestion_Master ReqMa','LineItem.ReqNo=ReqMa.ReqNo');

30
application/views/advancerequest.php
View File

@ -142,7 +142,8 @@ $(function() {
<legend>Payment Details</legend> <legend>Payment Details</legend>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3">
<div class="col-md-2">
<label for="payablefrom">Payment Terms</label> <label for="payablefrom">Payment Terms</label>
<?php <?php
$data = array('name' => 'PaymenyTerms','value' => set_value('PaymentTerms'),'id'=>'PaymenyTerms' , 'class' => 'form-control' ,'readonly' => 'true' ); $data = array('name' => 'PaymenyTerms','value' => set_value('PaymentTerms'),'id'=>'PaymenyTerms' , 'class' => 'form-control' ,'readonly' => 'true' );
@ -152,8 +153,18 @@ $(function() {
<div class="col-md-2" id="otheroptiondiv" style="display:none;">
<label for="payablefrom">Payment Terms Description</label>
<?php
$data = array('name' => 'PaymenyTermsDes','value' => set_value('PaymentTermsDes'),'id'=>'PaymenyTermsDes' , 'class' => 'form-control' ,'readonly' => 'true' );
echo form_input($data);
?>
</div>
<div class="col-md-3">
<div class="col-md-2">
<label for="payablefrom">Advance In %</label> <label for="payablefrom">Advance In %</label>
<?php <?php
$data = array('name' => 'AdvanceIn','value' => set_value('Advance In'),'id'=>'AdvanceIn' ,'class' => 'form-control','onchange'=>'advanceamountCalculation()','required' => 'true','style'=>'text-align:right;' ); $data = array('name' => 'AdvanceIn','value' => set_value('Advance In'),'id'=>'AdvanceIn' ,'class' => 'form-control','onchange'=>'advanceamountCalculation()','required' => 'true','style'=>'text-align:right;' );
@ -162,7 +173,7 @@ $(function() {
</div> </div>
<div class="col-md-3"> <div class="col-md-2">
<label for="selectmonth" id=labeladv>Advance Amount In INR</label> <label for="selectmonth" id=labeladv>Advance Amount In INR</label>
<?php <?php
$data = array('name' => 'AdvanceAmount','value' => set_value('AdvanceAmount'),'id'=>'AdvanceAmount', 'class' => 'form-control num' ,'required' => 'true','readonly'=>'true'); $data = array('name' => 'AdvanceAmount','value' => set_value('AdvanceAmount'),'id'=>'AdvanceAmount', 'class' => 'form-control num' ,'required' => 'true','readonly'=>'true');
@ -232,6 +243,19 @@ var PONUM=$('#PurchaseOrderNumber').val();
$('#ReleasedOn').val(convertReldt); $('#ReleasedOn').val(convertReldt);
$('#TotalOrderValue').val(obj.TotalOrderValue); $('#TotalOrderValue').val(obj.TotalOrderValue);
$('#PaymenyTerms').val(obj.PaymentTerms); $('#PaymenyTerms').val(obj.PaymentTerms);
if (obj.PaymentTerms=='Others')
{
$('#otheroptiondiv').show();
$('#PaymenyTermsDes').val(obj.PaymentOtherDescription);
//console.log(obj.PaymentOtherDescription);
}
else
{
$('#otheroptiondiv').hide();
$('#PaymenyTermsDes').val('');
}
$('#Department').val(obj.DepartmentName); $('#Department').val(obj.DepartmentName);
$('#CostCenterCode').val(obj.CostCenterCode); $('#CostCenterCode').val(obj.CostCenterCode);
$('#SupplierName').val(obj.SupplierName); $('#SupplierName').val(obj.SupplierName);