amendment Po
This commit is contained in:
parent
78678320ff
commit
e77d5b11c2
@ -132,6 +132,7 @@ class amendmentpurchaseorder extends BaseController
|
||||
// $data[$Rate->ExchangeRate]=$Rate->ExchangeRate;
|
||||
$data['CurrencyDetail']=$this->purchaseorder_model->GetCurrencyDetail($Currency);
|
||||
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
|
||||
$data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
|
||||
//print_r($data['PaymentTerms']);
|
||||
$unicode ='';
|
||||
foreach ($data['CurrencyDetail'] as $Detail)
|
||||
@ -655,21 +656,40 @@ function UpdateAmendServicePurchaseOrder()
|
||||
$Deliverydt = $this->getDateformat($dt);
|
||||
$POType = $this->input->post('POType');
|
||||
$PoRange = $this->input->post('txtPoRange');
|
||||
$DeliveryOption = $this->input->post('DateRange');
|
||||
//$DeliveryOption = $this->input->post('DateRange');
|
||||
$updatedBy = $this->session->userdata ( 'userId' );
|
||||
|
||||
|
||||
$Exchangerate=$this->input->post('ExchangeRate');
|
||||
$ExchangeRateCalculatedon=$this->input->post('Exchangerateon');
|
||||
$CurrencyType=$this->input->post('currencytype');
|
||||
|
||||
$DeliveryOption = $this->input->post('DateRange');
|
||||
|
||||
if($DeliveryOption==1){
|
||||
$Deliverydt = '';
|
||||
$DeliverySchedule = $this->input->post('Scheduleby');
|
||||
}
|
||||
else{
|
||||
$Deliverydt = $this->getDateformat($dt);
|
||||
$DeliverySchedule = '';
|
||||
}
|
||||
|
||||
$DeliverySchedule='';
|
||||
$Dispatch='';
|
||||
if($DeliveryOption==1)
|
||||
{
|
||||
$Dispatch='';
|
||||
$DeliverySchedule = $this->input->post('Scheduleby');
|
||||
}
|
||||
|
||||
|
||||
else
|
||||
{
|
||||
$Dispatch = $this->input->post('Dispatch');
|
||||
$DeliverySchedule = '';
|
||||
}
|
||||
|
||||
|
||||
// if($DeliveryOption==1){
|
||||
// $Deliverydt = '';
|
||||
// $DeliverySchedule = $this->input->post('Scheduleby');
|
||||
// }
|
||||
// else{
|
||||
// $Deliverydt = $this->getDateformat($dt);
|
||||
// $DeliverySchedule = '';
|
||||
// }
|
||||
|
||||
|
||||
$SpcialInstruction = $this->input->post('txtSpcialInstruction');
|
||||
@ -688,10 +708,15 @@ function UpdateAmendServicePurchaseOrder()
|
||||
|
||||
$PaymentTerms=$this->input->post('PaymentTerms');
|
||||
$Payableat=$this->input->post('PayableAT');
|
||||
echo $RowCount;
|
||||
$Palaceoforigin=$this->input->post('PlaceOforigin');
|
||||
//echo $RowCount;
|
||||
// PO Master
|
||||
// PO Master
|
||||
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt);
|
||||
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID, 'POType'=>$POType,'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'Import_PlaceofOrgin'=>$Palaceoforigin);
|
||||
|
||||
|
||||
// $POList = array('SupplierID'=>$Supp,lierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
|
||||
|
||||
|
||||
//print_r($POMaster);
|
||||
|
||||
|
||||
@ -7,6 +7,12 @@ $Rowcount = 0;
|
||||
$Value=$unicode;
|
||||
|
||||
|
||||
$Import_DispatchDetails='';
|
||||
$Import_PlaceofOrgin='';
|
||||
|
||||
$DeliverySchedule='';
|
||||
|
||||
|
||||
$Currencycode=$currencycode;
|
||||
$Cur = '';
|
||||
$CurCode= '';
|
||||
@ -37,6 +43,18 @@ if(!empty($MaxPODate))
|
||||
}
|
||||
|
||||
|
||||
$INR='';
|
||||
if(!empty($INRSYMBOL))
|
||||
{
|
||||
foreach ($INRSYMBOL as $INR)
|
||||
{
|
||||
$INR=$INR->Currency_Code;
|
||||
// $INR=$INR->FontCode2000;
|
||||
}
|
||||
}
|
||||
//echo $INR;
|
||||
|
||||
|
||||
|
||||
$CompanyAddress = '';
|
||||
if(!empty($CompanyDetails))
|
||||
@ -103,6 +121,10 @@ if(!empty($POMaster))
|
||||
$PaymentDays=$Req->PaymentDays;
|
||||
$StatusName=$Req->StatusName;
|
||||
|
||||
$Import_DispatchDetails=$Req->Import_DispatchDetails;
|
||||
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
|
||||
$DeliverySchedule=$Req->DeliverySchedule;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -183,10 +205,10 @@ body {
|
||||
});
|
||||
|
||||
|
||||
$("#Deliverydt").datepicker({
|
||||
minDate : 'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||
});
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate : 'now',
|
||||
// dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||
// });
|
||||
|
||||
$("#Requeston").datepicker({
|
||||
//minDate : d,
|
||||
@ -337,7 +359,7 @@ body {
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-12">
|
||||
<!-- <div class="col-md-12">
|
||||
<label>Purchase Order Type</label>
|
||||
<div class="form-group">
|
||||
|
||||
@ -346,6 +368,28 @@ body {
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="col-md-12" style="padding: 0px;">
|
||||
<div class="col-md-6">
|
||||
<label>PO Type</label>
|
||||
<div class="form-group">
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'POType','value' => set_value('POType',IMPORT),'id'=>'POType', 'class' => 'form-control' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label>PO Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<label>Delivery Address</label>
|
||||
@ -374,7 +418,10 @@ body {
|
||||
<b><u>Select Delivery By</u></b><br/>
|
||||
<tr>
|
||||
<td>
|
||||
<?php echo form_label('Date', 'Date') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?> </td>
|
||||
<!-- <?php echo form_label('Date', 'Date') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?> </td> -->
|
||||
|
||||
|
||||
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?> </td>
|
||||
<td>
|
||||
<?php echo form_label('Schedule', 'Schedule') ." ". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?>
|
||||
|
||||
@ -383,20 +430,35 @@ body {
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
|
||||
<label >Schedule </label>
|
||||
<!-- <label >Schedule </label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
|
||||
echo Form_textarea($data);
|
||||
?> -->
|
||||
|
||||
<label >Schedule </label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverySchedule),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
|
||||
echo Form_textarea($data);
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12" id="Deliverydtdiv"><br/>
|
||||
<label>Delivery Date</label>
|
||||
<!-- <label>Delivery Date</label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$CurrentDate),'id'=>'Deliverydt', 'class' => 'form-control' ,'required' => 'true');
|
||||
echo form_input($data);
|
||||
?> -->
|
||||
|
||||
|
||||
<label>Dispatch Instruction</label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Dispatch','value' => set_value('Dispatch',$Import_DispatchDetails),'id'=>'Dispatch', 'class' => 'form-control' ,'required' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
|
||||
</div>
|
||||
@ -431,11 +493,15 @@ body {
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Purchase Order Date</label>
|
||||
<label>Place of Origin</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
echo form_input($data);
|
||||
// $data = array('name' => 'PODate','value' => set_value('PODate',$CurrentDate),'id'=>'PODate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
// echo form_input($data);
|
||||
|
||||
$data = array('name' => 'PlaceOforigin','value' => set_value('PlaceOforigin',$Import_PlaceofOrgin),'id'=>'PlaceOforigin', 'class' => 'form-control' ,'required' => 'true');
|
||||
echo form_input($data);
|
||||
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
@ -619,7 +685,7 @@ body {
|
||||
|
||||
<!-- Basic Price in US $ per Ton : -->
|
||||
|
||||
<p id="labelEditBasicPriceUs"><b><?php echo "Basic Price in $Currencycode ($Value)"?></p>
|
||||
<p id="labelEditBasicPriceUs"><b><?php echo "Basic Value in $Currencycode ($Value)"?></p>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
@ -666,10 +732,11 @@ body {
|
||||
<div class="col-md-6" style="padding:0px;">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4" >
|
||||
Basic Price:
|
||||
<!-- Basic Price: -->
|
||||
<label><?php echo "Basic Price In ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<div class="form-group" style="display:none;">
|
||||
<?php
|
||||
$data = array('name' => 'EditBasicPriceTax','value' => set_value('EditBasicPriceTax'),'id'=>'EditBasicPriceTax', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);');
|
||||
echo form_input($data);
|
||||
@ -687,7 +754,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Landing charge
|
||||
<!-- Landing charge -->
|
||||
<label><?php echo "Landing charge In ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -711,7 +779,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
High seas sales charge
|
||||
<!-- High seas sales charge -->
|
||||
<label><?php echo "High seas sales charge In ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -732,7 +801,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Custom duty : (a)
|
||||
<!-- Custom duty : (a) -->
|
||||
<label><?php echo "Custom duty : (a) ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -753,7 +823,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Excise duty : (b)
|
||||
<!-- Excise duty : (b) -->
|
||||
<label><?php echo "Excise duty : (b) ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -774,7 +845,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Excise duty ED_cess : (C)
|
||||
<!-- Excise duty ED_cess : (C) -->
|
||||
<label><?php echo "Excise duty ED_cess : (C) ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -795,7 +867,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Excise duty S & H cess :(d)
|
||||
<!-- Excise duty S & H cess :(d) -->
|
||||
<label><?php echo "Excise duty S & H cess :(d) ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -816,7 +889,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Custom ED_cess : (e)
|
||||
<!-- Custom ED_cess : (e) -->
|
||||
<label><?php echo "Custom ED_cess : (e)($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -837,7 +911,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Custom S & H cess : (f)
|
||||
<!-- Custom S & H cess : (f) -->
|
||||
<label><?php echo "Custom S & H cess : (f) ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -860,7 +935,8 @@ body {
|
||||
<div class="col-md-6" style="padding:0px;">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
Additional Excise duty : (g)
|
||||
<!-- Additional Excise duty : (g) -->
|
||||
<label><?php echo "Additional Excise duty : (g) ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -881,7 +957,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-8">
|
||||
Gross duty payable
|
||||
<!-- Gross duty payable -->
|
||||
<label><?php echo "Gross duty payable ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -894,7 +971,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-8">
|
||||
Available Modvat set-off on import :
|
||||
<!-- Available Modvat set-off on import : -->
|
||||
<label><?php echo "Available Modvat set-off on import : ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -909,7 +987,8 @@ body {
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-8">
|
||||
Gross expenses due to custom duty:
|
||||
<!-- Gross expenses due to custom duty: -->
|
||||
<label><?php echo "Gross expenses due to custom duty: ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -927,7 +1006,7 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
purchase rate [Basic]
|
||||
purchase rate [Basic]/UOM
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -951,7 +1030,8 @@ body {
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="col-md-4">
|
||||
Custom Duty Expenses
|
||||
<!-- Custom Duty Expenses -->
|
||||
<label><?php echo "Custom Duty Expenses ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -965,7 +1045,8 @@ body {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4">
|
||||
RMC Including Customers
|
||||
<!-- RMC Including Customers -->
|
||||
<label><?php echo "RMC Including Customers ($INR)";?></label>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
@ -975,11 +1056,11 @@ body {
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
Total Amount:
|
||||
<div class="col-md-4" style="display:none;">
|
||||
<!-- Total Amount: -->
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="form-group">
|
||||
<div class="form-group" style="display:none;" >
|
||||
<?php
|
||||
$data = array('name' => 'EditTotalExp','value' => set_value('EditTotalExp'),'id'=>'EditTotalExp', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','readonly'=>'true');
|
||||
echo form_input($data);
|
||||
@ -1373,6 +1454,21 @@ body {
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
|
||||
$(document).ready(function () {
|
||||
$('#Date').click(function () {
|
||||
//for Date range selection
|
||||
$('#Schedulediv').hide();
|
||||
$('#Deliverydtdiv').show();
|
||||
});
|
||||
$('#Schedule').click(function () {
|
||||
//for schedule range selection
|
||||
$('#Deliverydtdiv').hide();
|
||||
$('#Schedulediv').show();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
var SelectedMaterialCode = [];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user