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

import,edit import,amendment

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-11 10:53:25 +05:30
parent 9d7bfd375e
commit 7e3f05df2e
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/views/editImportAmendPO.php
View File

@ -186,9 +186,7 @@ if(!empty($RequistionDetails))
.box-body { .box-body {
padding:0px ! important; padding:0px ! important;
} }
.select2{
width:100% ! important;
}
</style> </style>
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"> <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript">
@ -213,7 +211,6 @@ if(!empty($RequistionDetails))
$("#PaymentTerms").select2(); $("#PaymentTerms").select2();
$("#currencytype").select2(); $("#currencytype").select2();
$("#EditMaterialCode").select2();
var POMaxDate = '<?php echo $MaxPoDate;?>'; var POMaxDate = '<?php echo $MaxPoDate;?>';
var d = new Date(POMaxDate); var d = new Date(POMaxDate);
@ -698,7 +695,7 @@ if(!empty($RequistionDetails))
echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control select2"'); echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
?> ?>
</div> </div>
@ -1156,7 +1153,7 @@ if(!empty($RequistionDetails))
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-info font EditImport" ID="EditImport" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> <a class="btn btn-info font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>--> <!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a>
@ -2955,7 +2952,7 @@ $('#txttotalgrossduty').val((parseFloat(TotalGrossDuty) + parseFloat(Grossdutypa
$('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) ); $('#txttotalavlmodvat').val((parseFloat(TotalAvlmodvat) + parseFloat(AvailableModvat)).toFixed(2) );
$('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) ); $('#txttotalgrossexpense').val((parseFloat(TotalGrossExpense) + parseFloat(Grossexpenses)).toFixed(2) );
$('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) ); $('#txtToatlOrder').val((parseFloat(TotalOrder) + parseFloat(totalexp)).toFixed(2) );
$('#txttot').val((parseFloat(TotalOrder)+parseFloat(totalexp)).toFixed(2));

8
application/views/editimportpo.php Normal file → Executable file
View File

@ -4069,7 +4069,7 @@ $('.AddImport').click(function()
var receivedqty=''; var receivedqty='';
var rejectedqty=''; var rejectedqty='';
var pendingqty=''; var pendingqty='';
//console.log(totalexp); //console.log(CustomED);
$('#MaterialCode option[value='+materialCode+']').remove(); $('#MaterialCode option[value='+materialCode+']').remove();
@ -4145,9 +4145,8 @@ $('.AddImport').click(function()
addHidden(theForm,"ProductPrice"+temp,BasicAmt); addHidden(theForm,"ProductPrice"+temp,BasicAmt);
addHidden(theForm,"BasicPriceInMTon"+temp,Basicpriceinus); addHidden(theForm,"BasicPriceInMTon"+temp,Basicpriceinus);
addHidden(theForm,"BasicINRValue"+temp,AfterBasicPrice); addHidden(theForm,"BasicINRValue"+temp,AfterBasicPrice);
addHidden(theForm,"TotalExp"+temp,totalexp);
//var a=parseFloat($('#AfterLandingCharge'+temp).val()); //var a=parseFloat($('#AfterCustomEDcess').val());
//console.log(a); //console.log(a);
@ -4468,7 +4467,6 @@ $('#txttot').val(parseFloat(TotalOrdervalue).toFixed(2));
} }
function clearTaxField() function clearTaxField()
{ {
//$('#AfterBasicPriceTax').val(''); //$('#AfterBasicPriceTax').val('');
@ -4765,7 +4763,7 @@ var AfterExcisedutyTax=$('#AfterExciseDuty'+rowid).val()==''?'0.00':$('#AfterExc
var AfterExcisedutyEDcess=$('#AfterExciseDutyEdCess'+rowid).val()==''?'0.00':$('#AfterExciseDutyEdCess'+rowid).val(); var AfterExcisedutyEDcess=$('#AfterExciseDutyEdCess'+rowid).val()==''?'0.00':$('#AfterExciseDutyEdCess'+rowid).val();
var AfterExciseDutySH=$('#AfterExciseDutySHCess'+rowid).val()==''?'0.00':$('#AfterExciseDutySHCess'+rowid).val(); var AfterExciseDutySH=$('#AfterExciseDutySHCess'+rowid).val()==''?'0.00':$('#AfterExciseDutySHCess'+rowid).val();
var AfterAdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val(); var AfterAdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val();
var AfterCustomEDcess=$('#AfterCustomEdCess'+rowid).val()==''?'0.00':$('#AfterCustomEdCess'+rowid).val(); var AfterCustomEDcess=$('#AfterCustomEDcess'+rowid).val()==''?'0.00':$('#AfterCustomEDcess'+rowid).val();
var AfterCustomSHcess=$('#AfterCustomSHCess'+rowid).val()==''?'0.00':$('#AfterCustomSHCess'+rowid).val(); var AfterCustomSHcess=$('#AfterCustomSHCess'+rowid).val()==''?'0.00':$('#AfterCustomSHCess'+rowid).val();
//var AdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val(); //var AdditionalExciseduty=$('#AfterAddlExciseDuty'+rowid).val()==''?'0.00':$('#AfterAddlExciseDuty'+rowid).val();
var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossdutypayable'+rowid).val(); var Grossdutypayable=$('#Grossdutypayable'+rowid).val()==''?'0.00':$('#Grossdutypayable'+rowid).val();

20
application/views/importpo.php
View File

@ -73,9 +73,6 @@ if(!empty($AvlimportBudAmt))
.dataTables_wrapper { .dataTables_wrapper {
padding-bottom: 0px; padding-bottom: 0px;
} }
.select2{
width:100% ! important;
}
</style> </style>
<script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script> <script src="<?php echo base_url()?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script> <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
@ -83,9 +80,6 @@ if(!empty($AvlimportBudAmt))
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$("#PaymentTerms").select2(); $("#PaymentTerms").select2();
$("#ReqNo").select2();
$("#MaterialCode").select2();
$("#EditMaterialCode").select2();
tinymce.init({ tinymce.init({
selector: "textarea#txtSpcialInstruction", selector: "textarea#txtSpcialInstruction",
@ -358,7 +352,7 @@ function vaildateBeforeOpenModal()
</tr> </tr>
</div> </div>
<div class="col-md-12" id="Schedulediv" style="display:none;"> <div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
<label >Schedule By </label> <label >Schedule By </label>
<?php <?php
@ -367,7 +361,7 @@ function vaildateBeforeOpenModal()
?> ?>
</div> </div>
<div class="col-md-12" id="Deliverydtdiv"> <div class="col-md-12" id="Deliverydtdiv"><br/>
<label>Dispatch Instruction</label> <label>Dispatch Instruction</label>
<?php <?php
@ -517,7 +511,7 @@ function vaildateBeforeOpenModal()
endforeach; endforeach;
} }
echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control select2"'); echo form_dropdown('ReqNo', $RL,set_value('ReqNo'),'id="ReqNo"' ,'class="form-control"');
?> ?>
</div> </div>
@ -568,7 +562,7 @@ function vaildateBeforeOpenModal()
$options = array("0"=>'Item Code'); $options = array("0"=>'Item Code');
//print_r( $options); //print_r( $options);
echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control select2"'); echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control"');
?> ?>
</div> </div>
@ -1025,7 +1019,7 @@ function vaildateBeforeOpenModal()
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-info font AddImport" ID="AddImport" ></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a> <a class="btn btn-info font AddImport" ID="AddImport" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Import</span></a>
<!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>--> <!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a>
@ -1124,7 +1118,7 @@ function vaildateBeforeOpenModal()
echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control select2"'); echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
?> ?>
</div> </div>
@ -1584,7 +1578,7 @@ function vaildateBeforeOpenModal()
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-info font EditImport" ID="EditImport" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> <a class="btn btn-info font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a>
<!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>--> <!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-info" data-dismiss="modal" value="Cancel">Cancel</a>