revenue po changes

This commit is contained in:
venbatechnologies@gmail.com 2017-06-29 16:41:49 +05:30
parent 3974533a8d
commit 71ca4fd272
6 changed files with 7851 additions and 7599 deletions

View File

@ -300,7 +300,7 @@ class purchaseorder extends BaseController
{
$PAYTERM=$TER->PaymentTerms;
}
//print_r($PAYTERM);
//print_r($exRate);
//$data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate();
$data['MaxPODate'] = $this->purchaseorder_model->getLastReleasedPODate();
@ -317,6 +317,7 @@ class purchaseorder extends BaseController
{
$data['POItem'] = $this->purchaseorder_model->GetRevenuePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
$this->global['pageTitle'] = 'Siddharth : Edit Revenue Purchase order form';
$this->loadViews("editRevenuepurchaseorder", $this->global, $data, NULL);
}
@ -575,6 +576,19 @@ $DeliveryOption = $this->input->post('DateRange');
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$PaymentDate=$this->input->post('Payment');
if($PaymentDate==1)
{
$PaymentDays='After';
}
else
{
$PaymentDays='Before';
}
$POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange');
@ -590,8 +604,11 @@ $DeliveryOption = $this->input->post('DateRange');
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms');
$Payableat=$this->input->post('PayableAT');
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt );
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays);
$POMaster = $this->purchaseorder_model->addPOMaster($POList);
@ -701,6 +718,20 @@ $DeliveryOption = $this->input->post('DateRange');
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$PaymentDate=$this->input->post('Payment');
if($PaymentDate==1)
{
$PaymentDays='After';
}
else
{
$PaymentDays='Before';
}
$POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange');
@ -715,9 +746,12 @@ $DeliveryOption = $this->input->post('DateRange');
$comma_separated = explode(':', $DeletedRow);
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updateddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms');
$Payableat=$this->input->post('PayableAT');
// PO Master
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt );
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);

View File

@ -29,6 +29,11 @@ if(!empty($AvlBudAmt))
}
foreach ($PaymentTerms as $TER)
{
$Terms=$TER->PaymentTerms;
}
$SupId = '';
$SupName = '';
$Address = '';
@ -71,8 +76,31 @@ if(!empty($POMaster))
$POStatus = $Req->StatusCode;
$PONO = $Req->PONO;
$ServiceDescription = $Req->ServiceDescription;
$PayableAT=$Req->PayableAT;
$PaymentDays=$Req->PaymentDays;
}
}
if(!empty($RequistionDetails))
{
foreach ($RequistionDetails as $ReqDet)
{
$Reqon=$ReqDet->ReqDate;
$Requestedby=$ReqDet->Requestedby;
//$Status=$ReqDet->Status;
}
}
foreach ($POSTATUS as $PST )
{
$POStatus=$PST->StatusName;
}
?>
<style>
@ -149,6 +177,27 @@ $(function() {
minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
});
$("#Requeston").datepicker({
//minDate : d,
maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
});
var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>;
if (paymentday=="After")
{
//alert();
document.getElementById("After").checked = true;
}
else
{
document.getElementById("Before").checked = true;
}
$('#drpSupplier').change(function() {
@ -164,6 +213,17 @@ $('#drpSupplier').change(function() {
if(obj.SupplierID === id)
{
$("#SupAddress").val(obj.Address);
$("#PayableAT").val(obj.PayableAT);
var a=obj.PaymentDays;
console.log(a);
if (a=="After")
{
//alert();
document.getElementById("After").checked = true;
}
else
document.getElementById("Before").checked = true;
}
@ -1844,6 +1904,49 @@ body {
</div>
</div>
<div class="col-md-12">
<legend>Payment Details</legend>
<!-- Text input-->
<div class="col-md-3">
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="" ><?php echo $Terms;?></option>
<?php
if(!empty($payment))
{
foreach ($payment as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
<?php
}
}
?>
</select>
</div>
<div class="col-md-3">
<span>Payable AT</span>
<?php
$data = array('name' => 'PayableAT','value' => set_value('PayableAT',$PayableAT),'id'=>'PayableAT', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-6">
Payment Date <br/>
<tr>
<td>
<?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>
<?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
</td>
</tr>
</div>
</div>
</div>
</div>
<!-- Modal for Packing Calculation -->
@ -2578,7 +2681,7 @@ body {
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12" style="text-align:left;">
<div class="col-md-4">
@ -3022,6 +3125,29 @@ body {
</div><br/>
</div>
<div class="col-md-12">
<div class="col-md-4">
<span>Request On</span>
<?php
$data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<span>Request By</span>
<?php
$data = array('name' => 'RequestBy','value' => set_value('RequestBy',$Requestedby),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<span>Status</span>
<?php
$options = array("0"=>$POStatus);
echo form_dropdown('Status', $options,set_value('Status'),'id="Status"' ,'required="true"' ,'class="form-control select2')
?>
</div><br/>
</div>
</div>
</div>
</div>
@ -3879,4 +4005,17 @@ $('#Scheduleby').change(function(){
});
});
var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
//console.log(Detail);
$.each(Detail, function (index, value)
{
$("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
} );
</script>

View File

@ -441,7 +441,7 @@ foreach ($POSTATUS as $PST )
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="Date of invoice" ><?php echo $Terms;?></option>
<option value="" ><?php echo $Terms;?></option>
<!-- <option value=<?php echo $Deatail?> > Payment method</option> -->
<?php

View File

@ -345,7 +345,7 @@ function vaildateBeforeOpenModal()
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="Date of invoice" > Payment method</option>
<option value="" > Payment method</option>
<!-- <option value=<?php echo $Deatail?> > Payment method</option> -->
<?php

View File

@ -12,7 +12,6 @@
$DeliveryDate ='';
$ServiceDescription = '';
$index=0;
if(!empty($CompanyDetails))
{
foreach ($CompanyDetails as $CO)

View File

@ -4,6 +4,7 @@ $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('Y-m-d');
$MaxPoDate = '';
$AvlAmount = 0;
$Value="&#8377;";
if(!empty($MaxPODate))
{
foreach ($MaxPODate as $date)
@ -97,7 +98,21 @@ $('#drpSupplier').change(function() {
{
$("#SupAddress").val(obj.Address);
$("#PayableAT").val(obj.PayableAT);
$("#PaymentTerms").val(obj.PaymentTerms);
// $("#PaymentTerms").val(obj.PaymentTerms);
var a=obj.PaymentDays;
var b=obj.PaymentTerms;
$("#PaymentTerms").val(b);
console.log(a);
console.log($("#PaymentTerms").val());
if (a=="After")
{
//alert();
document.getElementById("After").checked = true;
}
else
document.getElementById("Before").checked = true;
}
@ -1880,7 +1895,49 @@ body {
</div>
</div>
<div class="col-md-12">
<legend>Payment Details</legend>
<!-- Text input-->
<div class="col-md-3">
<span for="payablefrom">Payable Terms</span>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="" >Select Payment method</option>
<?php
if(!empty($payment))
{
foreach ($payment as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>"><?php echo $rl->ConfigValue ?></option>
<?php
}
}
?>
</select>
</div>
<div class="col-md-3">
<span>Payable AT</span>
<?php
$data = array('name' => 'PayableAT','value' => set_value('PayableAT'),'id'=>'PayableAT', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-6">
Payment Date <br/>
<tr>
<td>
<?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"0", 'checked'=>set_radio('Payment', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td>
<?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"1", 'checked'=>set_radio('Payment', '1', FALSE))); ?>
</td>
</tr>
</div>
</div>
</div>
</div>
<!-- Modal for Packing Calculation -->
@ -2117,7 +2174,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Rate</label>
<label><?php echo "Rate In ($Value)";?></label>
<!-- <label>Rate</label> -->
<div class="form-group">
<?php
$data = array('name' => 'Rate','value' => set_value('Rate'),'id'=>'Rate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()' );
@ -2126,7 +2184,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Basic Amount</label>
<label><?php echo "Basic Amount ($Value)";?></label>
<!-- <label>Basic Amount</label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtBasicValue','value' => set_value('txtBasicValue'),'id'=>'txtBasicValue', 'class' => 'form-control' ,'readonly' => 'true');
@ -2162,6 +2221,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Discount Rate </label>
<div class="form-group">
<?php
@ -2171,8 +2231,9 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Discounted Amount </label>
<div class="form-group">
<label><?php echo "Discounted Amount In ($Value)";?></label>
<!-- <label>Discounted Amount </label>
--> <div class="form-group">
<?php
$data = array('name' => 'txtAfterDiscount','value' => set_value('txtAfterDiscount'),'id'=>'txtAfterDiscount', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
@ -2190,7 +2251,8 @@ body {
</div>
</div>
<div class="col-md-2" >
<label>Vat Amount </label>
<p id=labelvat> <label><?php echo "VAT Amount ($Value)";?></label></p>
<!-- <label>Vat Amount </label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtAfterVat','value' => set_value('txtAfterVat'),'id'=>'txtAfterVat', 'class' => 'form-control' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);');
@ -2246,6 +2308,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Packaging Rate </label>
<div class="form-group">
<?php
@ -2255,7 +2318,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Packaging Amount </label>
<label><?php echo "Packaging Amount ($Value)";?> </label>
<div class="form-group">
<?php
$data = array('name' => 'txtAfterPackaging','value' => set_value('txtAfterPackaging'),'id'=>'txtAfterPackaging', 'class' => 'form-control' ,'readonly' => 'true');
@ -2273,7 +2336,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label>GST Amount</label>
<label><?php echo "GST Amount ($Value)";?></label>
<!-- <label>GST Amount</label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtAfterGST','value' => set_value('txtAfterGST'),'id'=>'txtAfterGST', 'class' => 'form-control' ,'readonly' => 'true');
@ -2296,7 +2360,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label> Excise Duty Amount</label>
<label><?php echo "Excise Duty Amount ($Value)";?></label>
<!-- <label> Excise Duty Amount</label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtAfterExciseDuty','value' => set_value('txtAfterExciseDuty'),'id'=>'txtAfterExciseDuty', 'class' => 'form-control' ,'readonly' => 'true');
@ -2314,7 +2379,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Other Taxes Amount</label>
<label><?php echo "Other Taxes Amount ($Value)";?></label>
<!-- <label>Other Taxes Amount</label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtAfterOtherTax','value' => set_value('txtAfterOtherTax'),'id'=>'txtAfterOtherTax', 'class' => 'form-control' ,'readonly' => 'true');
@ -2360,7 +2426,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Freight Amount</label>
<label><?php echo "Freight Amount ($Value)";?></label>
<!-- <label>Freight Amount</label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtAfterFreight','value' => set_value('txtAfterFreight'),'id'=>'txtAfterFreight', 'class' => 'form-control' ,'readonly' => 'true');
@ -2384,7 +2451,7 @@ body {
<div class="row">
<div class="col-md-12" >
<div class="col-md-4" align="right"> <label>Total Order Amount :</label></div>
<div class="col-md-4" align="right"> <label><?php echo "Total Order Amount ($Value)";?></label></div>
<div class="col-md-4 ">
<div class="form-group">
<?php
@ -2507,7 +2574,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Rate</label>
<label><?php echo "Rate ($Value);";?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditRate','value' => set_value('EditRate'),'id'=>'EditRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Editchange()','style'=>'text-align:right;' );
@ -2516,7 +2583,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Basic Amount</label>
<label><?php echo "Basic Amount ($Value)"?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditBasicValue','value' => set_value('txtEditBasicValue'),'id'=>'txtEditBasicValue', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2561,7 +2628,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Discounted Amount </label>
<label><?php echo "Discounted Amount ($Value)";?> </label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterDiscount','value' => set_value('txtEditAfterDiscount'),'id'=>'txtEditAfterDiscount', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2581,7 +2648,7 @@ body {
</div>
<div class="col-md-2" >
<label>Vat Amount </label>
<label><?php echo "Vat Amount ($Value)";?> </label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterVat','value' => set_value('txtEditAfterVat'),'id'=>'txtEditAfterVat', 'class' => 'form-control' ,'readonly' => 'true','onkeypress'=>'return isNumberKey(event);','style'=>'text-align:right;');
@ -2649,7 +2716,8 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Packaging Amount </label>
<label><?php echo "Packaging Amount ($Value)";?></label>
<!-- <label>Packaging Amount </label> -->
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterPackaging','value' => set_value('txtEditAfterPackaging'),'id'=>'txtEditAfterPackaging', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2667,7 +2735,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>GST Amount</label>
<label><?php echo "GST Amount ($Value)";?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterGST','value' => set_value('txtEditAfterGST'),'id'=>'txtEditAfterGST', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2690,7 +2758,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label> Excise Duty Amount</label>
<label> <?php echo "Excise Duty Amount ($Value)";?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterExciseDuty','value' => set_value('txtEditAfterExciseDuty'),'id'=>'txtEditAfterExciseDuty', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2708,7 +2776,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Other Taxes Amount</label>
<label><?php echo "Other Taxes Amount ($Value)";?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterOtherTax','value' => set_value('txtEditAfterOtherTax'),'id'=>'txtEditAfterOtherTax', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2754,7 +2822,7 @@ body {
</div>
</div>
<div class="col-md-2">
<label>Freight Amount </label>
<label><?php echo "Freight Amount ($Value)";?> </label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterFreight','value' => set_value('txtEditAfterFreight'),'id'=>'txtEditAfterFreight', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
@ -2778,7 +2846,7 @@ body {
<div class="row">
<div class="col-md-12" >
<div class="col-md-4" align="right"> <label>Total Order Amount :</label></div>
<div class="col-md-4" align="right"> <label><?php echo "Total Order Amount : ($Value)";?></label></div>
<div class="col-md-4">
<div class="form-group">
<?php
@ -3709,4 +3777,16 @@ $('#Scheduleby').change(function(){
$('#Scheduleby').val('');
});
var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
//console.log(Detail);
$.each(Detail, function (index, value)
{
$("#PaymentTerms").append( $('<option></option>').val(value.PaymentTerms).html(value.PaymentTerms) );
} );
</script>