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

Emergency po checkin

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-06 11:31:15 +05:30
parent b49828eac6
commit 660530d841
12 changed files with 241 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
application/controllers/MRIRcontroller.php Normal file → Executable file
View File

24
application/controllers/emergencypurchaseorder.php
View File

@ -64,6 +64,8 @@ class emergencypurchaseorder extends BaseController
$data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate(); $data['MaxPODate'] = $this->purchaseorder_model->getLastCreatedPODate();
$data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006'); $data['TaxType'] = $this->purchaseorder_model->getConfigValue('C006');
$data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018'); $data['FreightType'] = $this->purchaseorder_model->getConfigValue('C018');
$data['Payment']=$this->purchaseorder_model->getSupplierPayment('C009');
$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
$this->loadViews("alterpurchaseorder", $this->global, $data, Null); $this->loadViews("alterpurchaseorder", $this->global, $data, Null);
@ -130,6 +132,14 @@ class emergencypurchaseorder extends BaseController
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentMethod');
$PayableAT=$this->input->post('PayableAT');
$PaymentDays=$this->input->post('paymentDateOptions');
$ServiceWorkStatus=$this->input->post('workStatus');
//create T_Requestion_Master //create T_Requestion_Master
$Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$SpcialInstruction,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy); $Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$SpcialInstruction,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
@ -143,7 +153,7 @@ class emergencypurchaseorder extends BaseController
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt ); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'ServiceWorkStatus'=>$ServiceWorkStatus,'POType'=>$POType);
$POMaster = $this->purchaseorder_model->addPOMaster($POList); $POMaster = $this->purchaseorder_model->addPOMaster($POList);
$PONO = ''; $PONO = '';
@ -172,6 +182,7 @@ class emergencypurchaseorder extends BaseController
$CostCenter = $this->input->post('costCode'.$i); $CostCenter = $this->input->post('costCode'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$ServiceFrequency=$this->input->post('Frequency'.$i);
$SkipInsert = "False"; $SkipInsert = "False";
if( count($comma_separated) > 0) if( count($comma_separated) > 0)
{ {
@ -198,7 +209,7 @@ class emergencypurchaseorder extends BaseController
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
$LineItemNo = ''; $LineItemNo = '';
if(count($POLineItem)>0) if(count($POLineItem)>0)
@ -243,6 +254,7 @@ class emergencypurchaseorder extends BaseController
function addNewRevenuePurchaseOrder() function addNewRevenuePurchaseOrder()
{ {
$POdt =$this->input->post('PODate'); $POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier'); $SupplierID = $this->input->post('drpSupplier');
@ -276,7 +288,10 @@ class emergencypurchaseorder extends BaseController
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentMethod');
$PayableAT=$this->input->post('PayableAT');
$PaymentDays=$this->input->post('paymentDateOptions');
//add requistion //add requistion
$Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$SpcialInstruction,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy); $Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$SpcialInstruction,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
@ -288,7 +303,7 @@ class emergencypurchaseorder extends BaseController
$RegNo = $Req[0]['ReqNo']; $RegNo = $Req[0]['ReqNo'];
} }
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt ); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'POType'=>$POType );
$POMaster = $this->purchaseorder_model->addPOMaster($POList); $POMaster = $this->purchaseorder_model->addPOMaster($POList);
@ -1091,3 +1106,4 @@ class emergencypurchaseorder extends BaseController
} }
?> ?>

2
application/controllers/purchaseorder.php
View File

@ -270,7 +270,7 @@ class purchaseorder extends BaseController
endforeach; endforeach;
$data['MaterialList'] = $result;//$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray); $data['MaterialList'] = $result;//$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
$data['Suplist'] = $this->purchaseorder_model->getSupplierName(); $data['Suplist'] = $this->purchaseorder_model->getSupplierName();
$data['Payment']=$this->purchaseorder_model->getSupplierPayment(); $data['Payment']=$this->purchaseorder_model->getSupplierPayment('C009');
$data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR'); $data['INRSYMBOL']=$this->purchaseorder_model->GetINRCurrencytype('INR');
/* Cost code from Requisition - Client Review Fix /* Cost code from Requisition - Client Review Fix
Start here */ Start here */

6
application/logs/log-2017-07-06.php Normal file
View File

@ -0,0 +1,6 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
ERROR - 2017-07-06 07:52:20 --> Severity: Notice --> Undefined variable: RequistionDetails /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 138
ERROR - 2017-07-06 07:52:20 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 140
ERROR - 2017-07-06 07:52:20 --> Severity: Notice --> Undefined variable: MaterialList /opt/lampp/htdocs/Git_Server/siddharth_application/application/views/alterpurchaseorder.php 186
ERROR - 2017-07-06 07:58:05 --> Severity: Warning --> mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given /opt/lampp/htdocs/Git_Server/siddharth_application/system/database/drivers/mysqli/mysqli_result.php 38

0
application/models/mrir_model.php Normal file → Executable file
View File

0
application/models/store_model.php Normal file → Executable file
View File

0
application/views/Editmaterialinspectionreport.php Normal file → Executable file
View File

198
application/views/alterpurchaseorder.php
View File

@ -1975,6 +1975,30 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div class="col-md-3" style='display:none;' id='workstatus'>
<label>Work Status</label>
<?php
if(!empty($WorkStatus))
{
$options4 = array("0"=>'Selected Work Status');
foreach ($WorkStatus as $WSID):
$options4[$WSID->ConfigValue] = $WSID->ConfigValue;
endforeach;
}
echo form_dropdown('workstatus', $options4,set_value('workstatus'),'id="workstatusValue"' ,'required="true"' ,'class="form-control select2');
?>
</div>
<div class="col-md-3" id="currencyexchange" style='display:none;'> <div class="col-md-3" id="currencyexchange" style='display:none;'>
<div class="col-md-6"> <div class="col-md-6">
<label>Currency Type</label> <label>Currency Type</label>
@ -2001,7 +2025,61 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> <div class="row">
<div class="col-md-12">
<legend>Payment Details</legend>
<!-- Text input-->
<div class="col-md-3">
<span for="payablefrom">Payable Terms</span>
<?php
$options1 = array("0"=>'Select Payment method');
//print_r( $options);
if(!empty($payment))
{
foreach ($payment as $payment):
$options1[$rl->ConfigValue] = $rl->ConfigValue.' '.' - '.' '.$rl->ConfigValue;
endforeach;
}
echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"');
?>
</div>
<div class="col-md-3">
<span>Payable AT</span>
<!-- <input type="text" class="form-control required" id="PayableAT" name="PayableAT"> -->
<?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-3"><span>Payment Date</span><br/>
<label class="radio-inline"><input type="radio" name="Payment" value="Before">Before</label>
<label class="radio-inline"><input type="radio" name="Payment" value="After">After</label>
</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>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-1 col-md-offset-11" align="right" > <div class="col-md-1 col-md-offset-11" align="right" >
<a data-toggle="modal" onclick="showmodel();" class=" btn btn-primary"> Add Line Item </a> <a data-toggle="modal" onclick="showmodel();" class=" btn btn-primary"> Add Line Item </a>
@ -2735,7 +2813,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div align="left"> <div align="left">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-2"> <div class="col-md-3">
<label>Item Code</label> <label>Item Code</label>
<div> <div>
<?php <?php
@ -2758,7 +2836,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2767,7 +2845,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2776,7 +2854,19 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Frequency</label>
<div class="form-group">
<?php
$data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-3">
<label>Quantity</label> <label>Quantity</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2785,7 +2875,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Rate</label> <label>Rate</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2794,7 +2884,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-3">
<label>Basic Amount</label> <label>Basic Amount</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -4829,10 +4919,12 @@ function populateValueMainFormForDeleteItem(rowid)
$("#revenuepotaxes").show(); $("#revenuepotaxes").show();
$("#currencyexchange").hide(); $("#currencyexchange").hide();
$("#servicepotaxes").hide(); $("#servicepotaxes").hide();
$("#workstatus").hide();
} }
else if ( this.value == 'SERVICE') // Service po else if ( this.value == 'SERVICE') // Service po
{ {
$("#servicepotaxes").show(); $("#servicepotaxes").show();
$("#workstatus").show();
$("#currencyexchange").hide(); $("#currencyexchange").hide();
$("#txtPoRange").hide(); $("#txtPoRange").hide();
$("#revenuepotaxes").hide(); $("#revenuepotaxes").hide();
@ -4843,6 +4935,7 @@ function populateValueMainFormForDeleteItem(rowid)
$("#txtPoRange").hide(); $("#txtPoRange").hide();
$("#revenuepotaxes").hide(); $("#revenuepotaxes").hide();
$("#servicepotaxes").hide(); $("#servicepotaxes").hide();
$("#workstatus").hide();
} }
else if ( this.value == 'CAPITAL') // Capital po else if ( this.value == 'CAPITAL') // Capital po
{ {
@ -4850,6 +4943,7 @@ function populateValueMainFormForDeleteItem(rowid)
$("#txtPoRange").hide(); $("#txtPoRange").hide();
$("#revenuepotaxes").hide(); $("#revenuepotaxes").hide();
$("#servicepotaxes").hide(); $("#servicepotaxes").hide();
$("#workstatus").hide();
} }
else // Default else // Default
{ {
@ -4857,6 +4951,7 @@ function populateValueMainFormForDeleteItem(rowid)
$("#txtPoRange").hide(); $("#txtPoRange").hide();
$("#revenuepotaxes").hide(); $("#revenuepotaxes").hide();
$("#servicepotaxes").hide(); $("#servicepotaxes").hide();
$("#workstatus").hide();
} }
}); });
}); });
@ -4898,10 +4993,61 @@ function populateValueMainFormForDeleteItem(rowid)
if(obj.SupplierID === id) if(obj.SupplierID === id)
{ {
$("#SupAddress").val(obj.Address); $("#SupAddress").val(obj.Address);
supPaymentTerms=obj.PaymentTerms;
supPaymentAT=obj.PayableAT;
subPaymentDate=obj.PaymentDays;
if (subPaymentDate=="After")
{
//alert();
document.getElementById("After").checked = true;
}
else{
document.getElementById("Before").checked = true;
}
} }
}); });
$('#PaymentMethod').empty();
var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
$.each(paymentList, function(idx1, obj1) {
if(obj1.ConfigValue == supPaymentTerms )
{
$("#PaymentMethod").append( $('<option></option>').val(obj1.ConfigValue).html(obj1.ConfigValue));
$("#PayableAT").val(supPaymentAT);
}
});
$.each(paymentList, function(idx, obj) {
if(obj.ConfigValue != supPaymentTerms )
{
$("#PaymentMethod").append( $('<option></option>').val(obj.ConfigValue).html(obj.ConfigValue));
$("#PayableAT").val(supPaymentAT);
}
});
} }
else else
@ -5358,7 +5504,7 @@ function populateValueMainFormForDeleteItem(rowid)
var uom = $("#ServiceUOM").val(); var uom = $("#ServiceUOM").val();
var quantity = $("#ServiceQuantity").val(); var quantity = $("#ServiceQuantity").val();
var itemRate = $("#ServiceRate").val(); var itemRate = $("#ServiceRate").val();
var AfterServiceTax = $("#AfterServiceTax").val(); var AfterServiceTax = $("#AfterServiceTax").val();
@ -5378,10 +5524,10 @@ function populateValueMainFormForDeleteItem(rowid)
var basicval = $("#ServiceBasAmt").val(); var basicval = $("#ServiceBasAmt").val();
var Frequency =$("#Frequency").val();
var TotalTaxValue = calculateTaxValue(); var TotalTaxValue = calculateTaxValue();
$('#ServiceMaterialCode option[value='+materialCode+']').remove(); $('#ServiceMaterialCode option[value='+materialCode+']').remove();
SelectedMaterialCode[CollIndex] = materialCode; SelectedMaterialCode[CollIndex] = materialCode;
@ -5416,6 +5562,7 @@ function populateValueMainFormForDeleteItem(rowid)
addHidden(theForm,"KrishiTax"+temp,AfterKrishiTax); addHidden(theForm,"KrishiTax"+temp,AfterKrishiTax);
addHidden(theForm,"SwachhTax"+temp,AfterSwachhTax); addHidden(theForm,"SwachhTax"+temp,AfterSwachhTax);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue); addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
addHidden(theForm,"Frequency"+temp,Frequency);
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
@ -5560,6 +5707,7 @@ function populateValueMainFormForDeleteItem(rowid)
$('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val()); $('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val());
$('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val()); $('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
$('#EditTotalOrderValue').val(cellval[8].innerHTML); $('#EditTotalOrderValue').val(cellval[8].innerHTML);
@ -5910,7 +6058,17 @@ $('#content').loader('hide');
var TextTotalOrderValueSummaryService = $('#txtTotalOrderValueSummaryService').val(); var TextTotalOrderValueSummaryService = $('#txtTotalOrderValueSummaryService').val();
var TextSpcialInstruction = $('#txtSpcialInstruction').val(); var TextSpcialInstruction = $('#txtSpcialInstruction').val();
var TextStatus = stat; var TextStatus = stat;
var PaymentMethod = $('#PaymentMethod').val();
var PayableAT = $('#PayableAT').val();
var paymentDateOptions ='';
if($("input:radio[name='Payment']:checked").val=='0'){
paymentDateOptions="Before";
}
else{
paymentDateOptions="After";
}
var workStatus=$('#workstatusValue').val();
if(validate()) if(validate())
{ {
@ -5929,7 +6087,7 @@ $('#content').loader('hide');
{ {
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextStatus="+TextStatus, data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&TextTotalOrderValueSummaryService="+TextTotalOrderValueSummaryService+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextStatus="+TextStatus+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&paymentDateOptions="+paymentDateOptions+"&workStatus="+workStatus,
type:"POST", type:"POST",
url:"<?php echo base_url() ?>emergencypurchaseorder/addNewServicePurchaseOrder", url:"<?php echo base_url() ?>emergencypurchaseorder/addNewServicePurchaseOrder",
success:function(data) { success:function(data) {
@ -5984,7 +6142,15 @@ $('#content').loader('hide');
var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val(); var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
var TextSpcialInstruction = $('#txtSpcialInstruction').val(); var TextSpcialInstruction = $('#txtSpcialInstruction').val();
var TextStatus = stat; var TextStatus = stat;
var PaymentMethod = $('#PaymentMethod').val();
var PayableAT = $('#PayableAT').val();
var paymentDateOptions ='';
if($("input:radio[name='Payment']:checked").val=='0'){
paymentDateOptions="Before";
}
else{
paymentDateOptions="After";
}
if(validate()) if(validate())
{ {
if(document.getElementById('serviceTax').rows.length < 2) if(document.getElementById('serviceTax').rows.length < 2)
@ -6002,7 +6168,7 @@ $('#content').loader('hide');
{ {
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&txtTotalOrderValueSummary="+txtTotalOrderValueSummary+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextStatus="+TextStatus, data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&txtTotalOrderValueSummary="+txtTotalOrderValueSummary+"&TextSpcialInstruction="+TextSpcialInstruction+"&TextStatus="+TextStatus+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&paymentDateOptions="+paymentDateOptions,
type:"POST", type:"POST",
url:"<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder", url:"<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",
success:function(data) { success:function(data) {

39
application/views/capitalpurchaseorder.php
View File

@ -82,6 +82,7 @@ $paymentCheckDays1='After';
}); });
}); });
document.getElementById("Date").checked = true;
</script> </script>
<div class="content-wrapper"> <div class="content-wrapper">
<?php <?php
@ -91,7 +92,7 @@ $paymentCheckDays1='After';
<section class="content"> <section class="content">
<div id="content"></div>
<div style="border:2px solid #333"> <div style="border:2px solid #333">
<div class="col-md-12"> <div class="col-md-12">
@ -215,7 +216,7 @@ $paymentCheckDays1='After';
<b><u>Select Delivery By</u></b><br/> <b><u>Select Delivery By</u></b><br/>
<tr> <tr>
<td> <td>
<?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>set_radio('DateRange', '0', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td> <td>
<?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?> <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
@ -326,12 +327,11 @@ $paymentCheckDays1='After';
<div class="col-md-6"> <div class="col-md-6">
Payment Date <br/> Payment Date <br/>
<tr> <tr>
<td>
<?php echo form_label('Before', 'Before') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"Before", "value"=>"Before", 'checked'=>set_radio('Payment', 'Before', TRUE))); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td> <td>
<?php echo form_label('After', 'After') ."&nbsp;&nbsp;". form_radio(array("name"=>"Payment", "id"=>"After", "value"=>"After", 'checked'=>set_radio('Payment', 'After', FALSE))); ?>
<?php echo form_label('Before', 'Before') . "&nbsp;&nbsp;". form_radio(array('name' => 'Payment', 'value' => 'Before', 'checked' => ('Before'==$paymentCheckDays) ? TRUE : FALSE, 'id' => 'Before')); ?>
<td>
<?php echo form_label('After', 'After') . "&nbsp;&nbsp;". form_radio(array('name' => 'Payment', 'value' => 'After', 'checked' => ('After'==$paymentCheckDays1) ? TRUE : FALSE, 'id' => 'After')); ?>
</td> </td>
</tr> </tr>
@ -491,7 +491,7 @@ $paymentCheckDays1='After';
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label id="RateIn">Rate(In INR /Ton)</label> <label id="RateIn">Rate(In INR /UOM)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' ); $data = array('name' => 'CPRate','value' => set_value('CPRate'),'id'=>'CPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'Ratechange();' );
@ -1032,7 +1032,7 @@ $paymentCheckDays1='After';
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label id="EditRateIn">Rate(in INR /Ton)</label> <label id="EditRateIn">Rate(in INR/UOM)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' ); $data = array('name' => 'EditCPRate','value' => set_value('EditCPRate'),'id'=>'EditCPRate', 'class' => 'form-control' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'EditRatechange();' );
@ -1786,6 +1786,17 @@ $paymentCheckDays1='After';
supPaymentTerms=obj.PaymentTerms; supPaymentTerms=obj.PaymentTerms;
supPaymentAT=obj.PayableAT; supPaymentAT=obj.PayableAT;
subPaymentDate=obj.PaymentDays; subPaymentDate=obj.PaymentDays;
if (subPaymentDate=="After")
{
//alert();
document.getElementById("After").checked = true;
}
else{
document.getElementById("Before").checked = true;
}
} }
@ -1799,9 +1810,9 @@ $paymentCheckDays1='After';
$.each(paymentList, function(idx1, obj1) { $.each(paymentList, function(idx1, obj1) {
if(obj1.PaymentTerms == supPaymentTerms ) if(obj1.ConfigValue == supPaymentTerms )
{ {
$("#PaymentMethod").append( $('<option></option>').val(obj1.PaymentTerms).html(obj1.PaymentTerms)); $("#PaymentMethod").append( $('<option></option>').val(obj1.ConfigValue).html(obj1.ConfigValue));
$("#PayableAT").val(supPaymentAT); $("#PayableAT").val(supPaymentAT);
@ -1815,9 +1826,9 @@ $paymentCheckDays1='After';
$.each(paymentList, function(idx, obj) { $.each(paymentList, function(idx, obj) {
if(obj.PaymentTerms != supPaymentTerms ) if(obj.ConfigValue != supPaymentTerms )
{ {
$("#PaymentMethod").append( $('<option></option>').val(obj.PaymentTerms).html(obj.PaymentTerms)); $("#PaymentMethod").append( $('<option></option>').val(obj.ConfigValue).html(obj.ConfigValue));
$("#PayableAT").val(supPaymentAT); $("#PayableAT").val(supPaymentAT);
@ -4136,4 +4147,4 @@ function SetCapitalPo()
</script> </script>

14
application/views/editCapitalPo.php
View File

@ -429,8 +429,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
foreach ($Payment as $rl): foreach ($Payment as $rl):
if($PaymentTerms==$rl->PaymentTerms){ if($PaymentTerms==$rl->ConfigValue){
$options6[$rl->PaymentTerms] = $rl->PaymentTerms; $options6[$rl->ConfigValue] = $rl->ConfigValue;
} }
@ -443,8 +443,8 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
foreach ($Payment as $rl2): foreach ($Payment as $rl2):
if($PaymentTerms!=$rl2->PaymentTerms){ if($PaymentTerms!=$rl2->ConfigValue){
$options6[$rl2->PaymentTerms] = $rl2->PaymentTerms; $options6[$rl2->ConfigValue] = $rl2->ConfigValue;
} }
endforeach; endforeach;
@ -2081,9 +2081,9 @@ var myArray = <?php echo json_encode($res_arr_values); ?>;
$.each(paymentList, function(idx1, obj1) { $.each(paymentList, function(idx1, obj1) {
if(obj1.PaymentTerms == supPaymentTerms ) if(obj1.ConfigValue == supPaymentTerms )
{ {
$("#PaymentMethod").append( $('<option></option>').val(obj1.PaymentTerms).html(obj1.PaymentTerms)); $("#PaymentMethod").append( $('<option></option>').val(obj1.ConfigValue).html(obj1.ConfigValue));
$("#PayableAT").val(supPaymentAT); $("#PayableAT").val(supPaymentAT);
@ -4454,4 +4454,4 @@ PaymentDate=$('#After').val();
}); });
</script> </script>

0
application/views/materialinspectionreport.php Normal file → Executable file
View File

0
application/views/viewmaterialinspectionreport.php Normal file → Executable file
View File