edit correction

This commit is contained in:
venbatechnologies@gmail.com 2017-07-06 19:51:53 +05:30
parent 45b1fc6470
commit 59ffdee16e
5 changed files with 138 additions and 14 deletions

View File

@ -153,6 +153,21 @@ if(!empty($RequistionDetails))
.dataTables_wrapper {
padding-bottom: 0px;
}
.content {
Padding:0% ! important;
}
body {
background-color: #ecf0f5;
}
.pagination {
margin :0px ! important;
}
.box-body {
padding:0px ! important;
}
</style>
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript">
@ -204,13 +219,16 @@ if(!empty($RequistionDetails))
</script>
<div class="content-wrapper">
<section class="content">
<div id="content"></div>
<?php
$attributes = array('class' => 'form-label-left ImportPO ','name' => 'ImportPO','id' => 'ImportPO');
echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
<section class="content">
<!-- <section class="content"> -->
<div style="border:2px solid #333">
<div class="col-md-12">
@ -1173,7 +1191,7 @@ if(!empty($RequistionDetails))
<label>Quantity</label>
<div class="form-group">
<?php
$data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange(),ExceedEditQuantityCheck()');
$data = array('name' => 'EditQuantity','value' => set_value('EditQuantity'),'id'=>'EditQuantity', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange(),ExceedEditQuantityCheck()');
echo form_input($data);
?>
@ -1185,7 +1203,7 @@ if(!empty($RequistionDetails))
<P id=labelEditRate> <label><?php echo "Rate in $Currencycode ($Value)";?>
<div class="form-group">
<?php
$data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'Ratechange()' );
$data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);' ,'onchange'=>'EditRatechange()' );
echo form_input($data);
?>
</div>
@ -1888,9 +1906,9 @@ if(!empty($RequistionDetails))
<div class="col-md-4">
<label>Total Order Value :</label> <?php
<!-- <label>Total Order Value :</label> --> <?php
$data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
echo form_input($data);
// echo form_input($data);
?>
</div>
</div>
@ -2257,6 +2275,21 @@ function USRate()
//}
}
function EditRatechange()
{
var txteditQuantity=parseFloat($('#EditQuantity').val());
var txteditUnitPrice=parseFloat($('#EditRate').val());
var editTot=txteditQuantity*txteditUnitPrice
$('#EdittxtBasicValue').val(editTot);
$(EditimBasicPrice).val(editTot);
var exchangerate=parseFloat($('#EditExchangeRt').val());
var txtINR=editTot*exchangerate;
$('#EditINRBasicvalue').val(txtINR);
$('#EditBasicPriceTax').val(txtINR);
$('#EditAfterBasicPriceTax').val(txtINR);
EditCalculateloadingcharge();
}
function Ratechange(){
@ -3076,6 +3109,10 @@ function EditCalculateCtable()
var total=0;
var basicamt=0;
basicamt=parseFloat($('#EdittxtBasicValue').val());
$('#EditTotalExp').val(basicamt);
var a=parseFloat($('#EditTotalExp').val());
//console.log(a);
//alert(basicamt);
txtCtablequantity=parseFloat($('#EditPurQuantity').val());
txtbasicinrprice=parseFloat($('#EditAfterBasicPriceTax').val());
//txtpurchaserate=txtbasicinrprice/txtCtablequantity;
@ -3092,6 +3129,8 @@ function EditCalculateCtable()
$('#EditRMCIncludingCustomers').val(txtrmc);
total=<?php echo CALCULATE_TOTAL;?>;
$('#EditTotalExp').val(basicamt);
//var a=parseFloat($('#EditTotalExp').val());
//console.log(basicamt);
}
@ -3442,7 +3481,7 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
$('#EditTotalExp').val($("#TotalValue"+userid).val());
$('#EditINRBasicvalue').val($("#BasicINRValue"+userid).val());
$('#EditTotalOrderValue').val(cellval[8].innerHTML);
$('#EditTotalOrderValue').val(cellval[6].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append( $('<option></option>').val($('#materialCode'+userid).val()).html($('#materialCode'+userid).val() + "-" + $('#materialName'+userid).val() ) );
@ -3527,7 +3566,7 @@ $('.EditImport').click(function(){
var CustomDutyExpense=$("#EditCustomDutyExpenses").val();
var RMC=$("#EditRMCIncludingCustomers").val();
var TotalExp=$('#EditTotalExp').val();
//alert(itemRate);
var tr= document.getElementById(userid);
var cellval = tr.cells;
@ -3542,7 +3581,7 @@ $('.EditImport').click(function(){
$('#materialName'+userid).val(edititemname);
$('#uom'+userid).val(editUOM);
$('#Quantity'+userid).val(EditQuantity);
$('#itemRate'+userid).val(EditRate);
$('#itemRate'+userid).val(itemRate);
$('#BasicAmt'+userid).val(BasicValue);
$('#BasicPriceTax'+userid).val(BasicPrice);
$('#AfterBasicPriceTax'+userid).val(AfterBasicPrice);

View File

@ -141,15 +141,32 @@ function vaildateBeforeOpenModal()
}
</script>
<style>
.content {
Padding:0% ! important;
}
body {
background-color: #ecf0f5;
}
.pagination {
margin :0px ! important;
}
.box-body {
padding:0px ! important;
}
</style>
<div class="content-wrapper">
<section class="content">
<div id="content"></div>
<?php
$attributes = array('class' => 'form-label-left ImportPO ','name' => 'ImportPO','id' => 'ImportPO');
echo form_open($this->config->base_url().'/purchaseorder/addPO/',$attributes); ?>
<section class="content">
<div style="border:2px solid #333">
@ -1681,6 +1698,8 @@ function vaildateBeforeOpenModal()
</script>
<script type="text/javascript">
// for delivey date and scheduled
//alert();
@ -1697,6 +1716,7 @@ $(document).ready(function () {
});
});
var SelectedMaterialCode = [];
var RequistQuantity = '';
var AvilBudAmt = '';

View File

@ -38,6 +38,13 @@ if(!empty($INRSYMBOL))
}
}
//echo "$INRSYM";
?>
<style>
@ -66,6 +73,59 @@ if(!empty($INRSYMBOL))
</style>
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
<script>
function openModal()
{
if(vaildateBeforeOpenModal())
{
$('#REVENUE').modal('show');
}
}
function vaildateBeforeOpenModal()
{
if($('#PODate').val() == '')
{
alert('Please Enter the Purchase Order date');
$('#PODate').focus();
return false;
}
else if($('#drpSupplier').val() == "0")
{
alert('Please Select the Supplier details');
$('#drpSupplier').focus();
return false;
}
else if($('#DeliveryAddr').val() == '')
{
alert('Please Enter the Delivery Address');
$('#DeliveryAddr').focus();
return false;
}
else if($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '')
{
alert('Please Enter the Delivery Date');
$('#Deliverydt').focus();
return false;
}
else if($('#PayableAT').val()=='')
{
alert('Please Enter Payable AT Value');
$('#PayableAT').focus();
return false;
}
else
{
return true;
}
}
var NilType = '<?php echo NILTYPE;?>';
var PercentageType = '<?php echo PERCENTAGE;?>';
var POMaxDate = '<?php echo $MaxPoDate;?>';
@ -2084,7 +2144,7 @@ body {
<table>
<div align="right">
<div align="right">
<a data-toggle="modal" ><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd" >Add Line Item</button> </a>
<a data-toggle="modal" ><button type="submit" onclick="openModal();" class="btn btn-primary" id="abcd" >Add Line Item</button> </a>
</div>
<!-- Model for revenue po -->

View File

@ -41,6 +41,7 @@ if(!empty($INRSYMBOL))
?>
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
<script>
var RequistQuantity = '';
var AvilBudAmt = '';
var POMaxDate = '<?php echo $MaxPoDate;?>';
@ -67,6 +68,8 @@ var AvilBudAmt = '';
$('#drpSupplier').change(function() {

View File

@ -37,9 +37,9 @@
foreach ($POItem as $PO)
{
$PONO = $PO->PONO;
$postatus= $PO->Status;
$SuplierName = $PO->SupplierName;
$PONO = $PO->PONO;
$postatus= $PO->Status;
$SuplierName = $PO->SupplierName;
$SuplierAddress = $PO->Address;
$DeliveryAddress = $PO->DeliveryAddress;
$dt = new DateTime($PO->PODate, new DateTimeZone('Asia/Kolkata'));
@ -53,6 +53,8 @@
}
echo $PaymentTerms;
if(!empty($Requestername))