revenue and service po changes done

This commit is contained in:
venbatechnologies@gmail.com 2017-08-01 18:46:20 +05:30
parent d926b897b4
commit 4ed9550af1
9 changed files with 635 additions and 291 deletions

View File

@ -736,9 +736,10 @@ class purchaseorder extends BaseController
$createddt = $dt->format('Y-m-d H:i:s'); $createddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');
$OtherPayment=$this->input->post('Otherpayment');
$Local_Interstate=$this->input->post('Range'); $Local_Interstate=$this->input->post('Range');
// PO Master // 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,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate); $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,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment);
$POMaster = $this->purchaseorder_model->addPOMaster($POList); $POMaster = $this->purchaseorder_model->addPOMaster($POList);
@ -771,6 +772,7 @@ class purchaseorder extends BaseController
$FreightType = $this->input->post('FreightType'.$i); $FreightType = $this->input->post('FreightType'.$i);
$FreightValue = $this->input->post('FreightVal'.$i); $FreightValue = $this->input->post('FreightVal'.$i);
$AfterFreightValue = $this->input->post('AfterFreightVal'.$i); $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
$NOOfTrip = $this->input->post('NoOfTrip'.$i);
$InsuranceValue = $this->input->post('Insval'.$i); $InsuranceValue = $this->input->post('Insval'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$CostCenter = $this->input->post('costCode'.$i); $CostCenter = $this->input->post('costCode'.$i);
@ -811,7 +813,7 @@ class purchaseorder extends BaseController
if(trim($POType) == REVENUE ) if(trim($POType) == REVENUE )
{ {
// echo 'Success'; // echo 'Success';
$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst); $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip);
$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
//echo 'Revenue tax Success'; //echo 'Revenue tax Success';
@ -863,18 +865,17 @@ class purchaseorder extends BaseController
$updateddt = $dt->format('Y-m-d H:i:s'); $updateddt = $dt->format('Y-m-d H:i:s');
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');
$OtherPayment=$this->input->post('Otherpayment');
$Local_Interstate=$this->input->post('Range'); $Local_Interstate=$this->input->post('Range');
// PO Master // PO Master
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
//echo $RowCount;
for ($i = 1; $i <= $RowCount; $i++) for ($i = 1; $i <= $RowCount; $i++)
{ {
@ -899,6 +900,7 @@ class purchaseorder extends BaseController
$FreightType = $this->input->post('FreightType'.$i); $FreightType = $this->input->post('FreightType'.$i);
$FreightValue = $this->input->post('FreightVal'.$i); $FreightValue = $this->input->post('FreightVal'.$i);
$AfterFreightValue = $this->input->post('AfterFreightVal'.$i); $AfterFreightValue = $this->input->post('AfterFreightVal'.$i);
$NOOfTrip = $this->input->post('NoOfTrip'.$i);
$InsuranceValue = $this->input->post('Insval'.$i); $InsuranceValue = $this->input->post('Insval'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$POLineItemNo = $this->input->post('LineItemNo'.$i); $POLineItemNo = $this->input->post('LineItemNo'.$i);
@ -921,8 +923,10 @@ class purchaseorder extends BaseController
} }
} }
if($SkipInsert == "False") if($SkipInsert == "False")
{ {
if(strlen($POLineItemNo) == 0) if(strlen($POLineItemNo) == 0)
{ {
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter);
@ -935,6 +939,7 @@ class purchaseorder extends BaseController
} }
else else
{ {
$LineItemNo = $POLineItemNo; $LineItemNo = $POLineItemNo;
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter);
@ -944,14 +949,15 @@ class purchaseorder extends BaseController
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
if(count($isExists) == 0) if(count($isExists) == 0)
{ {
$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst); $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip);
$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
} }
else else
{ {
$RevenueTaxList = array('DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'CreatedBy'=>$updatedBy);
$RevenueTaxList = array('DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt,'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'CreatedBy'=>$updatedBy,'NoOfTrip'=>$NOOfTrip);
$this->purchaseorder_model->updateRevenueTax($LineItemNo,$RevenueTaxList); $this->purchaseorder_model->updateRevenueTax($LineItemNo,$RevenueTaxList);

View File

@ -177,7 +177,7 @@ class servicepurchaseorder extends BaseController
} }
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');
$OtherPayment=$this->input->post('Otherpayment');
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
@ -196,7 +196,7 @@ class servicepurchaseorder extends BaseController
$WorkStatus=$this->input->post('workstatus'); $WorkStatus=$this->input->post('workstatus');
// 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,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus,'POType'=>$POType ); $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,'ServiceWorkStatus'=>$WorkStatus,'POType'=>$POType,'PaymentOtherDescription'=>$OtherPayment);
$POMaster = $this->purchaseorder_model->addPOMaster($POList); $POMaster = $this->purchaseorder_model->addPOMaster($POList);
@ -274,6 +274,7 @@ class servicepurchaseorder extends BaseController
echo 'Service Purchase Order Created Successfully!The PO NO Is: '.$PONO; echo 'Service Purchase Order Created Successfully!The PO NO Is: '.$PONO;
} }
//update service po
function UpdateServicePurchaseOrder() function UpdateServicePurchaseOrder()
{ {
$PONO =$this->input->post('txtPONO'); $PONO =$this->input->post('txtPONO');
@ -298,7 +299,7 @@ class servicepurchaseorder extends BaseController
$PaymentTerms=$this->input->post('PaymentTerms'); $PaymentTerms=$this->input->post('PaymentTerms');
$Payableat=$this->input->post('PayableAT'); $OtherPayment=$this->input->post('Otherpayment');
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
@ -317,7 +318,7 @@ class servicepurchaseorder extends BaseController
// 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,'PaymentTerms'=>$PaymentTerms,'ServiceWorkStatus'=>$WorkStatus ); $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,'ServiceWorkStatus'=>$WorkStatus,'PaymentOtherDescription'=>$OtherPayment);
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);

View File

@ -354,7 +354,7 @@ function purchaseorderListing($forwhat='')
*/ */
function getRequistionNoFromPO($PONO='') function getRequistionNoFromPO($PONO='')
{ {
$this->db->distinct();
$this->db->select('ReqNo,'); $this->db->select('ReqNo,');
$this->db->from('T_PurchaseOrder_LineItem'); $this->db->from('T_PurchaseOrder_LineItem');
if($PONO != '') if($PONO != '')

View File

@ -17,6 +17,7 @@ $DeliverOption='';
$TotalBasicAmount = 0.0; $TotalBasicAmount = 0.0;
$ServiceDescription = ''; $ServiceDescription = '';
$OtherAmt = 0.0; $OtherAmt = 0.0;
$Deliverydt=''; $Deliverydt='';
$DeliverSchedule=''; $DeliverSchedule='';
$MaxPoDate = ''; $MaxPoDate = '';
@ -67,6 +68,7 @@ if(!empty($POMaster))
$WrkStatus=$Req->ServiceWorkStatus; $WrkStatus=$Req->ServiceWorkStatus;
$StatusName=$Req->StatusName; $StatusName=$Req->StatusName;
$otherPayment = $Req->PaymentOtherDescription;
} }
} }
@ -143,6 +145,16 @@ $('#Deliverydt').val('');
$('#Scheduleby').val(SchName); $('#Scheduleby').val(SchName);
} }
var PaymentOther = '<?php echo $otherPayment; ?>';
var PayTerms = '<?php echo $Terms; ?>';
if(PayTerms=='PT08'){
$('#otheroptiondiv').show();
$('#Otherpayment').val(PaymentOther);
}
else{
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
}); });
</script> </script>
<script> <script>
@ -165,11 +177,11 @@ $("#PODate").datepicker({
minDate : 'now', minDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10' dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
}); });
$("#Requeston").datepicker({ /* $("#Requeston").datepicker({
//minDate : d, //minDate : d,
maxDate : 'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); }); */
$('#drpSupplier').change(function() { $('#drpSupplier').change(function() {
var id = $('#drpSupplier').val(); var id = $('#drpSupplier').val();
@ -665,6 +677,8 @@ function clearEditTaxField()
} }
$(document).ready(function () { $(document).ready(function () {
$("#PaymentTerms").select2();
$('#Date').click(function () { $('#Date').click(function () {
//for Date range selection //for Date range selection
$('#Schedulediv').hide(); $('#Schedulediv').hide();
@ -838,7 +852,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/> <div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
<label >Schedule :</label> <label >Schedule By</label>
<?php <?php
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
echo Form_textarea($data); echo Form_textarea($data);
@ -886,6 +900,15 @@ $(document).ready(function () {
</div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
</div> </div>
</div> </div>
@ -936,7 +959,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1199,7 +1222,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1464,7 +1487,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'ViewCostCenter','value' => set_value('ViewCostCenter'),'id'=>'ViewCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1473,7 +1496,7 @@ $(document).ready(function () {
?> ?>
</div> </div>
</div> </div>
<!-- <div class="col-md-3"> <div class="col-md-3">
<label>Avail Budget Amount In INR</label> <label>Avail Budget Amount In INR</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1481,7 +1504,7 @@ $(document).ready(function () {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>--> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-3">
@ -1705,10 +1728,10 @@ $(document).ready(function () {
<th>Item Description</th> <th>Item Description</th>
<th>Quantity</th> <th>Quantity</th>
<th>UOM</th> <th>UOM</th>
<th>Rate</th> <th>Rate In INR</th>
<th>Basic Amount</th> <th>Basic Amount In INR</th>
<th>Tax Amount</th> <th>Tax Amount In INR</th>
<th>Total Order Amount</th> <th>Total Order Amount In INR</th>
<th>Actual Quantity</th> <th>Actual Quantity</th>
<th>Received Quantity</th> <th>Received Quantity</th>
<th>Pending Quantity</th> <th>Pending Quantity</th>
@ -1783,7 +1806,7 @@ $(document).ready(function () {
<?php <?php
if($PONOStatus == PO_DRAFT) if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED)
{?> {?>
<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a> <td> <a data-target='#EDITSERVICE' data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
<?php <?php
@ -1812,7 +1835,7 @@ $(document).ready(function () {
</table> </table>
</div> </div>
</div>
<div class="row" style="border: 1px solid"> <div class="row" style="border: 1px solid">
<div class="col-md-12"> <div class="col-md-12">
@ -1874,64 +1897,64 @@ $(document).ready(function () {
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>
<!-- <div class="col-md-12">
<label>Special Instructions :</label> <?php
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction" value="<?php echo $ServiceDescription;?>">
</div>-->
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="row"><br/>
<div align="right" style="padding-right:10px"> <div align="right"><br/>
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>"/> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>"/>
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) { <?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) {
if($PONOStatus == PO_DRAFT){?> if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <input type="reset" class="btn btn-primary" value="Reset">
<?php }else {?> <?php }else {?>
<a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?> <a class="btn btn-primary" ID="OK" href="<?php echo base_url().'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <?php } ?>
</div><br/>
</div> </div>
</div>
<br/>
</div><br/>
<div class="col-md-12" style="padding:5px;">
<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',$RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<span>Status</span>
<?php
// $options = array("0"=>'Select Status');
// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"' ,'required="true"' ,'class="form-control select2')
// $options = array("0"=>$PONOStatus);
// echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"' ,'required="true"' ,'class="form-control select2')
</div>
<div class="col-md-12" style="padding:2%;">
<div class="col-md-8">
<div class="row">
<div class="col-md-2"><label>Request On</label></div>
<div class="col-md-4">
<?php
$data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
echo form_input($data);
?>
</div>
</div><br/>
<div class="row">
<div class="col-md-2"><label>Request By</label></div>
<div class="col-md-4">
<?php
$data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
echo form_input($data);
?>
</div>
</div><br/>
<div class="row"><div class="col-md-2"><label>Status</label></div>
<div class="col-md-4">
<?php
$data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div><br/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</section> </section>
</div> </div>
@ -1982,6 +2005,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditReqNo').val($('#Reqnumber'+userid).val()); $('#EditReqNo').val($('#Reqnumber'+userid).val());
$('#EditdeptName').val($('#departmentName'+userid).val()); $('#EditdeptName').val($('#departmentName'+userid).val());
$("#EditCostCenter").val($('#costCode'+userid).val()); $("#EditCostCenter").val($('#costCode'+userid).val());
$('#EditAvlBudAmt').val($('#AvilBudget'+userid).val()); $('#EditAvlBudAmt').val($('#AvilBudget'+userid).val());
$('#EditItemName').val($('#materialName'+userid).val()); $('#EditItemName').val($('#materialName'+userid).val());
@ -2071,7 +2095,7 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
$('#ViewReqNo').val($('#Reqnumber'+userid).val()); $('#ViewReqNo').val($('#Reqnumber'+userid).val());
$('#ViewdeptName').val($('#departmentName'+userid).val()); $('#ViewdeptName').val($('#departmentName'+userid).val());
$("#ViewCostCenter").val($('#costCode'+userid).val()); $("#ViewCostCenter").val($('#costCode'+userid).val());
//$('#ViewAvlBudAmt').val($('#AvilBudget'+userid).val()); $('#ViewAvlBudAmt').val($('#AvilBudget'+userid).val());
$('#ViewItemName').val($('#materialName'+userid).val()); $('#ViewItemName').val($('#materialName'+userid).val());
$('#ViewUOM').val($('#uom'+userid).val()); $('#ViewUOM').val($('#uom'+userid).val());
@ -2713,6 +2737,11 @@ $('#txtDeliveryAddress').val(deladd);
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
alert('Please Enter Other Payment Details');
$('#Otherpayment').focus();
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -2807,5 +2836,30 @@ function calculateIgstTax(varBasicValue,Igst)
return TAXval;// $('#AfterServiceTax').val(TAXval); return TAXval;// $('#AfterServiceTax').val(TAXval);
} }
//If others is the payment terms to display mandatory field
$("#PaymentTerms").change(function() {
var otherPayment = '<?php echo $otherPayment; ?>';
if ($('#PaymentTerms').val().trim()=='PT08')
{
$('#otheroptiondiv').show();
$('#Otherpayment').val(otherPayment);
}
else {
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
});
<!-- script for table , It works under the datatable plugin-->
$(function () {
$('#ServiceTable').DataTable({
"paging": false,
"lengthChange": false,
"searching": false,
//"ordering": true,
// "info": true,
"autoWidth": false
});
});
</script> </script>

View File

@ -333,8 +333,31 @@ var SelectedMaterialList = {
} }
}); });
$('#drpFreight').change(function() { $('#drpEditFreight').change(function() {
var FreightType =$("#drpEditFreight").val();
alert(FreightType);
if (FreightType == "PER TRIP")
{
$('#EditTripsValue').show();
}
else {
$('#EditTripsValue').hide();
}
});
$('#drpFreight').change(function() {
var FreightType =$("#drpFreight").val();
alert(FreightType);
if (FreightType == "PER TRIP")
{
$('#TripsValue').show();
}
else {
$('#TripsValue').hide();
}
selValue = $("#drpFreight").val() ; selValue = $("#drpFreight").val() ;
@ -1755,6 +1778,8 @@ function SetExciseCalculationCancel()
} }
$(document).ready(function(){ $(document).ready(function(){
$("#PaymentMethod").select2();
//Initialize Select2 Elements //Initialize Select2 Elements
$("#purpose").select2(); $("#purpose").select2();
$("#DepartmentName").select2(); $("#DepartmentName").select2();
@ -1874,6 +1899,7 @@ function populateValueMainFormForDeleteItem(rowid)
echo form_open($this->config->base_url().'/purchaseorder/addalterPO/',$attributes); ?> echo form_open($this->config->base_url().'/purchaseorder/addalterPO/',$attributes); ?>
<section class="content"> <section class="content">
<div style="border:2px solid #333">
<div id="content"></div> <div id="content"></div>
<div> <div>
<center><b><h2>Siddharth Industries - Emergency Purchase Order</h2></b></center></div> <center><b><h2>Siddharth Industries - Emergency Purchase Order</h2></b></center></div>
@ -2010,7 +2036,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-3" id="Deliveryby" style="display:none;"> <div class="col-md-3" id="Deliveryby" style="display:none;">
<div class="col-md-12" id="Schedulediv" style="display:none;"> <div class="col-md-12" id="Schedulediv" style="display:none;">
<label >Schedule :</label> <label >Schedule By</label>
<?php <?php
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
@ -2079,7 +2105,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Available Budget</label><img id="AlertImg" src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px" style="display:none;"/> <label>Available Budget In INR</label><img id="AlertImg" src="<?php echo base_url(); ?>assets/dist/img/red.png" alt="your image" width="25px" style="display:none;"/>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'AvalBuget','value' => set_value('AvalBuget'),'id'=>'AvalBuget', 'class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true'); $data = array('name' => 'AvalBuget','value' => set_value('AvalBuget'),'id'=>'AvalBuget', 'class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true');
@ -2193,7 +2219,7 @@ function populateValueMainFormForDeleteItem(rowid)
<legend>Payment Details</legend> <legend>Payment Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-4"> <div class="col-md-4">
<span for="payablefrom">Payable Terms</span> <label for="payablefrom">Payable Terms</label>
<?php <?php
$options1 = array("0"=>'Select Payment method'); $options1 = array("0"=>'Select Payment method');
//print_r( $options); //print_r( $options);
@ -2209,7 +2235,16 @@ function populateValueMainFormForDeleteItem(rowid)
echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"'); echo form_dropdown('PaymentMethod', $options1,set_value('PaymentMethod'),'id="PaymentMethod"' ,'class="form-control"');
?> ?>
</div> </div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div> </div>
</div></div>
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -2225,7 +2260,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Packing Calculation On</h4> <h4 class="modal-title">Packing Calculation On</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -2256,7 +2291,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Excise Duty Calculation On</h4> <h4 class="modal-title">Excise Duty Calculation On</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -2293,7 +2328,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Vat Calculation On</h4> <h4 class="modal-title">Vat Calculation On</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -2322,7 +2357,7 @@ function populateValueMainFormForDeleteItem(rowid)
<!-- Modal for CST Calculation--> <!-- Modal for CST Calculation-->
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">CST Calculation On</h4> <h4 class="modal-title">CST Calculation On</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -2351,7 +2386,7 @@ function populateValueMainFormForDeleteItem(rowid)
<form> <form>
<div class="modal-content" style="width:1000px;"> <div class="modal-content" style="width:1000px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Edit Service Purchase Order Item </h4></center> <center><h4>Edit Service Purchase Order Item </h4></center>
</div> </div>
<div align="left"> <div align="left">
@ -2379,7 +2414,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control','readonly'=>'true'); $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control','readonly'=>'true');
@ -2399,7 +2434,38 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4"> <div class="col-md-3">
<label>Item Code</label>
<div>
<?php
$options = array("0"=>'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
?>
</div>
</div>
<div class="col-md-3">
<label>Item Name</label>
<div class="form-group">
<?php
$data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>UOM</label>
<div class="form-group">
<?php
$data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Frequency</label> <label>Frequency</label>
<div class="form-group"> <div class="form-group">
@ -2410,11 +2476,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-8">
<label>Service Description</label> <?php
$data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' );
echo form_input($data); ?>
</div>
</div> </div>
<!-- <div class="col-md-12"> <!-- <div class="col-md-12">
@ -2472,36 +2534,10 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> --> </div> -->
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-2"> <div class="col-md-6">
<label>Item Code</label> <label>Service Description</label> <?php
<div> $data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' );
<?php echo form_input($data); ?>
$options = array("0"=>'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options,set_value('EditMaterialCode'),'id="EditMaterialCode"' ,'class="form-control"');
?>
</div>
</div>
<div class="col-md-2">
<label>Item Name</label>
<div class="form-group">
<?php
$data = array('name' => 'EditItemName','value' => set_value('EditItemName'),'id'=>'EditItemName', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-2">
<label>UOM</label>
<div class="form-group">
<?php
$data = array('name' => 'EditUOM','value' => set_value('EditUOM'),'id'=>'EditUOM', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label>Quantity</label> <label>Quantity</label>
@ -2692,7 +2728,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditRevenueCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditRevenueCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'EditRevenueCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditRevenueCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -2701,7 +2737,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Avl Bud Amt</label> <label>Avl Bud Amt In INR</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditRevenueAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditRevenueAvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'EditRevenueAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditRevenueAvlBudAmt', 'class' => 'form-control num' ,'readonly' => 'true');
@ -2916,7 +2952,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4"> <div class="col-md-2">
<label>Freight Type </label> <label>Freight Type </label>
<div> <div>
<?php <?php
@ -2938,6 +2974,15 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-2" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips', 'class' => 'form-control num' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-2"> <div class="col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<div class="form-group"> <div class="form-group">
@ -3079,7 +3124,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12" style="padding:0px;">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4"> <div class="col-md-4">
@ -3124,7 +3169,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div class="col-md-2" > <div class="col-md-2" >
<label>CGST in %</label> <label>CGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'RevenueCgst','value' => set_value('RevenueCgst',0),'id'=>'RevenueCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()'); $data = array('name' => 'RevenueCgst','value' => set_value('RevenueCgst',0),'id'=>'RevenueCgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
@ -3187,7 +3232,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div id="SGSTAddModel"> <div id="SGSTAddModel">
<div class="col-md-2"> <div class="col-md-2">
<label>SGST in %</label> <label>SGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'RevenueSgst','value' => set_value('RevenueSgst',0),'id'=>'RevenueSgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()'); $data = array('name' => 'RevenueSgst','value' => set_value('RevenueSgst',0),'id'=>'RevenueSgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
@ -3207,7 +3252,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div id="IGSTAddModel" style="display:none;"> <div id="IGSTAddModel" style="display:none;">
<div class="col-md-2"> <div class="col-md-2">
<label>IGST in %</label> <label>IGST In %</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'RevenueIgst','value' => set_value('RevenueIgst',0),'id'=>'RevenueIgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()'); $data = array('name' => 'RevenueIgst','value' => set_value('RevenueIgst',0),'id'=>'RevenueIgst', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>'change()');
@ -3228,7 +3273,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div class="col-md-12" > <div class="col-md-12" >
<div class="col-md-4"> <div class="col-md-2">
<label>Freight Type </label> <label>Freight Type </label>
<div> <div>
<?php <?php
@ -3247,6 +3292,15 @@ function populateValueMainFormForDeleteItem(rowid)
echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "'); echo form_dropdown('drpFreight', $options,set_value('drpFreight'),'id="drpFreight"' ,'class="form-control "');
?>
</div>
</div>
<div class="col-md-2" id="TripsValue" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips', 'class' => 'form-control num' );
echo form_input($data);
?> ?>
</div> </div>
</div> </div>
@ -3318,14 +3372,14 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:1000px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<center><h4>Add Service Purchase Order Item </h4></center> <center><h4>Add Service Purchase Order Item </h4></center>
</div> </div>
<div align="left"> <div align="left">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4"> <div class="col-md-3">
<label>Item Code</label> <label>Item Code</label>
<div> <div>
<?php <?php
@ -3348,7 +3402,7 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3357,7 +3411,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3366,12 +3420,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3">
</div>
<div class="col-md-12">
<div class="col-md-4">
<label>Frequency</label> <label>Frequency</label>
<div class="form-group"> <div class="form-group">
@ -3381,13 +3430,10 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div>
<div class="col-md-8">
<label>Service Description</label> <?php
$data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' );
echo form_input($data); ?>
</div> </div>
</div> </div>
<!-- <div class="col-md-12"> <!-- <div class="col-md-12">
<div class="col-md-4" id="DisplayScheduleDiv" style="display:none;"> <div class="col-md-4" id="DisplayScheduleDiv" style="display:none;">
<label>Select Service Schedule Type</label> <label>Select Service Schedule Type</label>
@ -3444,7 +3490,12 @@ function populateValueMainFormForDeleteItem(rowid)
</div> --> </div> -->
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4"> <div class="col-md-6">
<label>Service Description</label> <?php
$data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' );
echo form_input($data); ?>
</div>
<div class="col-md-2">
<label>Quantity</label> <label>Quantity</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3453,7 +3504,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-2">
<label><?php echo "Rate In ($INRSYM)";?></label> <label><?php echo "Rate In ($INRSYM)";?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3462,7 +3513,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-2">
<label><?php echo "Basic Amount In ($INRSYM)";?></label> <label><?php echo "Basic Amount In ($INRSYM)";?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3617,7 +3668,7 @@ function populateValueMainFormForDeleteItem(rowid)
<form> <form>
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:900px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Add Import Purchase Order Item </h4></center> <center><h4>Add Import Purchase Order Item </h4></center>
</div> </div>
<div align="left"> <div align="left">
@ -4118,7 +4169,7 @@ function populateValueMainFormForDeleteItem(rowid)
<form> <form>
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:900px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Add Capital Purchase Order Item </h4></center> <center><h4>Add Capital Purchase Order Item </h4></center>
</div> </div>
<div align="left"> <div align="left">
@ -4602,12 +4653,11 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
</table> </table>
<div class="container-fluid">
<div class="row"> <div class="row">
<!-- Revenue po taxes --> <!-- Revenue po taxes -->
<div class="col-md-12" style='border : 1px solid; display:none;' id="revenuepotaxes"> <div class="col-md-12" style='border : 1px solid; display:none;' id="revenuepotaxes">
@ -4632,7 +4682,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-3"> <div class="col-md-3">
<label >Total CGST In INR </label> <label >CGST In INR </label>
<?php <?php
$data = array('name' => 'txtTotalCGST','value' => set_value('txtTotalCGST'),'id'=>'txtTotalCGST', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotalCGST','value' => set_value('txtTotalCGST'),'id'=>'txtTotalCGST', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -4640,14 +4690,14 @@ function populateValueMainFormForDeleteItem(rowid)
</div> </div>
<div class="col-md-3" id="displaySGST"> <div class="col-md-3" id="displaySGST">
<label >Total SGST In INR </label> <label >SGST In INR </label>
<?php <?php
$data = array('name' => 'txtTotalSGST','value' => set_value('txtTotalSGST'),'id'=>'txtTotalSGST', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotalSGST','value' => set_value('txtTotalSGST'),'id'=>'txtTotalSGST', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-3" id="displayIGST" style="display:none;"> <div class="col-md-3" id="displayIGST" style="display:none;">
<label >Total IGST In INR </label> <label > IGST In INR </label>
<?php <?php
$data = array('name' => 'txtTotalIGST','value' => set_value('txtTotalIGST'),'id'=>'txtTotalIGST', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotalIGST','value' => set_value('txtTotalIGST'),'id'=>'txtTotalIGST', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -4698,7 +4748,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions </label> <label>Special Instructions </label>
<?php <?php
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '4', 'cols' => '40' ); $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control');
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>
@ -4735,7 +4785,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label>Total CGST In INR</label> <label>CGST In INR</label>
<?php <?php
$data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -4744,21 +4794,21 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-2"> <div class="col-md-2">
<label>Total SGST In INR</label> <label>SGST In INR</label>
<?php <?php
$data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label>Total IGST In INR </label> <label>IGST In INR </label>
<?php <?php
$data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label>Total Other Allowances In INR</label> <label>Other Allowances In INR</label>
<?php <?php
$data = array('name' => 'txtTotOtherAllo','value' => set_value('txtTotOtherAllo'),'id'=>'txtTotOtherAllo', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotOtherAllo','value' => set_value('txtTotOtherAllo'),'id'=>'txtTotOtherAllo', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -4781,7 +4831,7 @@ function populateValueMainFormForDeleteItem(rowid)
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Scope Of Work</label> <?php <label>Scope Of Work</label> <?php
$data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control num' ,'rows' => '4', 'cols' => '40' ); $data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control num');
echo form_textarea($data); ?> echo form_textarea($data); ?>
</div> </div>
</div> </div>
@ -4803,9 +4853,13 @@ function populateValueMainFormForDeleteItem(rowid)
<br/> <br/>
</div> </div>
</div> </div>
</div> </div> </div>
</div> </div>
</div>
</div></section> </div>
<script type="text/html" id="RevenueList"> <script type="text/html" id="RevenueList">
<tr id="<%=index%>"> <tr id="<%=index%>">
<td align="left"><%=index%></td> <td align="left"><%=index%></td>
@ -6934,4 +6988,18 @@ function calculateRevenueEditTaxValue()
return tot; return tot;
} }
//If others is the payment terms to display mandatory field
$("#PaymentMethod").change(function() {
if ($('#PaymentMethod').val().trim()=='PT08')
{
$('#otheroptiondiv').show();
}
else {
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
});
</script> </script>

View File

@ -26,7 +26,7 @@ if(!empty($CompanyDetails))
if(!empty($AvlBudAmt)) if(!empty($AvlBudAmt))
{ {
$AvlAmount = $AvlBudAmt; $AvlAmount = number_format($AvlBudAmt, 2, '.', '');
} }
@ -65,6 +65,7 @@ foreach ($PaymentTerms as $TER)
$ServiceDescription = ''; $ServiceDescription = '';
$CapitalRange = ''; $CapitalRange = '';
$otherPayment='';
if(!empty($POMaster)) if(!empty($POMaster))
{ {
foreach ($POMaster as $Req) foreach ($POMaster as $Req)
@ -87,6 +88,7 @@ if(!empty($POMaster))
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$CapitalRange = $Req->CapitalRange; $CapitalRange = $Req->CapitalRange;
$StatusName=$Req->StatusName; $StatusName=$Req->StatusName;
$otherPayment = $Req->PaymentOtherDescription;
} }
} }
@ -174,6 +176,16 @@ $('#Deliverydt').val('');
$('#Scheduleby').val(SchName); $('#Scheduleby').val(SchName);
} }
var PaymentOther = '<?php echo $otherPayment; ?>';
var PayTerms = '<?php echo $Terms; ?>';
if(PayTerms=='PT08'){
$('#otheroptiondiv').show();
$('#Otherpayment').val(PaymentOther);
}
else{
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
}); });
</script> </script>
<script> <script>
@ -264,6 +276,8 @@ $("#AvlBudAmt").val('');
var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>; var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>; var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
// For Binding DepartmentName // For Binding DepartmentName
$.each(y, function(idx, obj) { $.each(y, function(idx, obj) {
@ -416,6 +430,8 @@ $("#txtEditBasicValue").val('');
$('#txtAfterDiscount').val(''); $('#txtAfterDiscount').val('');
} }
calculateDiscount(0);
}); });
@ -439,6 +455,8 @@ $('#EditDiscountType').change(function() {
$('#txtEditAfterDiscount').val(''); $('#txtEditAfterDiscount').val('');
} }
calculateDiscount(1);
}); });
$('#PackagingType').change(function() { $('#PackagingType').change(function() {
@ -464,6 +482,8 @@ $('#PackagingType').change(function() {
$('#txtPackaging').removeAttr( 'readonly','true' ); $('#txtPackaging').removeAttr( 'readonly','true' );
} }
} }
calculatePackaging(0);
}); });
$('#EditPackagingType').change(function() { $('#EditPackagingType').change(function() {
@ -489,6 +509,8 @@ $('#EditPackagingType').change(function() {
$('#txtEditPackaging').removeAttr( 'readonly','true' ); $('#txtEditPackaging').removeAttr( 'readonly','true' );
} }
} }
calculatePackaging(1);
}); });
@ -532,7 +554,7 @@ $('#txtEditCST').change(function() {
}); });
$('#drpFreight').change(function() { $('#drpFreight').change(function() {
var FreightType =$("#drpFreight").val(); var FreightType =$("#drpFreight").val();
alert(FreightType);
if (FreightType == "PER TRIP") if (FreightType == "PER TRIP")
{ {
@ -561,6 +583,7 @@ $('#drpFreight').change(function() {
} }
calculateFreight(0);
}); });
/* $('#drpViewFreight').change(function() { /* $('#drpViewFreight').change(function() {
@ -578,7 +601,7 @@ $('#drpFreight').change(function() {
}); */ }); */
$('#drpEditFreight').change(function() { $('#drpEditFreight').change(function() {
var FreightType =$("#drpEditFreight").val(); var FreightType =$("#drpEditFreight").val();
alert(FreightType);
if (FreightType == "PER TRIP") if (FreightType == "PER TRIP")
{ {
@ -605,6 +628,7 @@ $('#drpEditFreight').change(function() {
$('#txtEditFreight').removeAttr( 'readonly','true' ); $('#txtEditFreight').removeAttr( 'readonly','true' );
$('#txtEditFreight').val(''); $('#txtEditFreight').val('');
} }
calculateFreight(1);
}); });
}); });
@ -1513,7 +1537,22 @@ function calculatePackaging(isEdit)
} }
else if(FreightType == '<?php echo PERTRIP;?>') else if(FreightType == '<?php echo PERTRIP;?>')
{ {
if($('#NOOfTrips').val()==''){
alert('Please Enter No of Trip');
$("#NOOfTrips").focus();
$('#txtFreight').val(0)
AfterFreight=0;
$('#txtAfterFreight').val("0.00");
return false;
}
else{
var noOftrip = $("#NOOfTrips").val();
AfterFreight = <?php echo FREIGHT_PERTRIP;?>; AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
}
} }
else { else {
AfterFreight = $("#txtFreight").val(); AfterFreight = $("#txtFreight").val();
@ -1579,7 +1618,20 @@ function calculatePackaging(isEdit)
} }
else if(FreightType == '<?php echo PERTRIP;?>') else if(FreightType == '<?php echo PERTRIP;?>')
{ {
if($('#EditNOOfTrips').val()==''){
alert('Please Enter No of Trip');
$("#EditNOOfTrips").focus();
$('#txtEditFreight').val(0)
AfterFreight=0;
$('#txtEditAfterFreight').val("0.00");
return false;
}
else{
var noOftrip = $("#EditNOOfTrips").val();
AfterFreight = <?php echo FREIGHT_PERTRIP;?>; AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
}
} }
else { else {
AfterFreight = $("#txtEditFreight").val(); AfterFreight = $("#txtEditFreight").val();
@ -2474,7 +2526,7 @@ function calculateEditTaxValue()
<label>NO Of Trips</label> <label>NO Of Trips</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips', 'class' => 'form-control num' ); $data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips', 'class' => 'form-control num','onchange'=>'calculateFreight(0);' );
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -2830,7 +2882,7 @@ function calculateEditTaxValue()
<label>NO Of Trips</label> <label>NO Of Trips</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips', 'class' => 'form-control num' ); $data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips', 'class' => 'form-control num' ,'onchange'=>'calculateFreight(1);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3146,15 +3198,15 @@ function calculateEditTaxValue()
?> ?>
</div> </div>
</div> </div>
<!-- <div class="col-md-2" id="ViewTripsValue" style="display:none;"> <div class="col-md-2" id="ViewTripsValue" style="display:none;">
<label>NO Of Trips</label> <label>NO Of Trips</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewNOOfTrips','value' => set_value('ViewNOOfTrips'),'id'=>'ViewNOOfTrips', 'class' => 'form-control num' ); $data = array('name' => 'ViewNOOfTrips','value' => set_value('ViewNOOfTrips'),'id'=>'ViewNOOfTrips', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>--> </div>
<div class="col-md-2"> <div class="col-md-2">
<label>Freight Rate </label> <label>Freight Rate </label>
<div class="form-group"> <div class="form-group">
@ -3264,7 +3316,7 @@ function calculateEditTaxValue()
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" /> <input type="hidden" name="<?php echo 'Reqnumber'.$index ?>" id="<?php echo 'Reqnumber'.$index ?>" value="<?php echo $record->ReqNo ; ?>" />
<input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->DepartmentName ; ?>" /> <input type="hidden" name="<?php echo 'departmentName'.$index ?>" id="<?php echo 'departmentName'.$index ?>" value="<?php echo $record->DepartmentName ; ?>" />
<input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" /> <input type="hidden" name="<?php echo 'AvilBudget'.$index ?>" id="<?php echo 'AvilBudget'.$index ?>" value="<?php echo $AvlAmount ; ?>" />
<input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" /> <input type="hidden" name="<?php echo 'LineItemNo'.$index ?>" id="<?php echo 'LineItemNo'.$index ?>" value="<?php echo $record->LineItemNo ; ?>" />
<input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" /> <input type="hidden" name="<?php echo 'costCode'.$index ?>" id="<?php echo 'costCode'.$index ?>" value="<?php echo $record->CostCenterCode ; ?>" />
<input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" /> <input type="hidden" name="<?php echo 'materialCode'.$index ?>" id="<?php echo 'materialCode'.$index ?>" value="<?php echo $record->MaterialCode ; ?>" />
@ -3288,6 +3340,7 @@ function calculateEditTaxValue()
<input align="right" type="hidden" name="<?php echo 'RevenueIgst'.$index ?>" id="<?php echo 'RevenueIgst'.$index ?>" value="<?php echo $record->IGST ; ?>" /> <input align="right" type="hidden" name="<?php echo 'RevenueIgst'.$index ?>" id="<?php echo 'RevenueIgst'.$index ?>" value="<?php echo $record->IGST ; ?>" />
<input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst'.$index ?>" id="<?php echo 'RevenueAfterIgst'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" /> <input align="right" type="hidden" name="<?php echo 'RevenueAfterIgst'.$index ?>" id="<?php echo 'RevenueAfterIgst'.$index ?>" value="<?php echo $record->AfterIGST ; ?>" />
<input align="right" type="hidden" name="<?php echo 'FreightType'.$index ?>" id="<?php echo 'FreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" /> <input align="right" type="hidden" name="<?php echo 'FreightType'.$index ?>" id="<?php echo 'FreightType'.$index ?>" value="<?php echo $record->FreightType ; ?>" />
<input align="right" type="hidden" name="<?php echo 'NoOfTrip'.$index ?>" id="<?php echo 'NoOfTrip'.$index ?>" value="<?php echo $record->NoOfTrip ; ?>" />
<input align="right" type="hidden" name="<?php echo 'FreightVal'.$index ?>" id="<?php echo 'FreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" /> <input align="right" type="hidden" name="<?php echo 'FreightVal'.$index ?>" id="<?php echo 'FreightVal'.$index ?>" value="<?php echo $record->FreightValue ; ?>" />
<input align="right" type="hidden" name="<?php echo 'AfterFreightVal'.$index ?>" id="<?php echo 'AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" /> <input align="right" type="hidden" name="<?php echo 'AfterFreightVal'.$index ?>" id="<?php echo 'AfterFreightVal'.$index ?>" value="<?php echo $record->AfterFreightValue ; ?>" />
<input align="right"type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->BasicValue ; ?>"/> <input align="right"type="hidden" name="<?php echo 'basicval'.$index ?>" id="<?php echo 'basicval'.$index ?>" value="<?php echo $record->BasicValue ; ?>"/>
@ -3295,7 +3348,7 @@ function calculateEditTaxValue()
<input align="right" type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" /> <input align="right" type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<?php <?php
if($PONOStatus == PO_DRAFT) if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED)
{?> {?>
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a> <td> <a data-target='#EDITREVENUE' data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo ; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick = "DeleteRow(<?php echo $index ; ?>)" class="link" data-id="<?php echo $index ; ?>" data-userid="<?php echo $index ; ?>" id="Del" ><span class="glyphicon glyphicon-trash"></span></a>
<?php <?php
@ -3321,7 +3374,7 @@ function calculateEditTaxValue()
$totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue; $totOrderSummaryAmt = $totOrderSummaryAmt +$record->TotalValue;
} }
?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>"> ?>
<?php <?php
} }
@ -3436,11 +3489,11 @@ function calculateEditTaxValue()
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>"/> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>"/>
<?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) { <?php if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED ) {
if($PONOStatus == PO_DRAFT){?> if($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED){?>
<a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?> <a class="btn btn-primary Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> <?php }?>
<a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-primary Save" ID="Submit" onclick="Save(1)" >&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="reset" class="btn btn-primary" value="Reset"> <input type="reset" class="btn btn-primary" value="Reset">
@ -3549,6 +3602,14 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('#txtEditFreight').val($('#FreightVal'+userid).val()); $('#txtEditFreight').val($('#FreightVal'+userid).val());
$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val()); $('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
var FreightType =$('#FreightType'+userid).val();
$('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
if (FreightType == "PER TRIP"){
$('#EditTripsValue').show();
}
else{
$('#EditTripsValue').hide();
}
$('#txtEditInsurance').val($('#Insval'+userid).val()); $('#txtEditInsurance').val($('#Insval'+userid).val());
$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val()); $('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
@ -3648,7 +3709,14 @@ $("#VIEWREVENUE").on("shown.bs.modal", function(e) {
$('#txtViewFreight').val($('#FreightVal'+userid).val()); $('#txtViewFreight').val($('#FreightVal'+userid).val());
$('#txtViewAfterFreight').val($('#AfterFreightVal'+userid).val()); $('#txtViewAfterFreight').val($('#AfterFreightVal'+userid).val());
$('#txtViewInsurance').val($('#Insval'+userid).val()); $('#txtViewInsurance').val($('#Insval'+userid).val());
var FreightType =$('#FreightType'+userid).val();
$('#ViewNOOfTrips').val($('#NoOfTrip'+userid).val());
if (FreightType == "PER TRIP"){
$('#ViewTripsValue').show();
}
else{
$('#ViewTripsValue').hide();
}
$('#txtViewTotalOrderValue').val($('#TotalOrderValue'+userid).val()); $('#txtViewTotalOrderValue').val($('#TotalOrderValue'+userid).val());
$('#ViewAfterCGST').val($('#RevenueAfterCgst'+userid).val()); $('#ViewAfterCGST').val($('#RevenueAfterCgst'+userid).val());
$('#ViewAfterSGST').val($('#RevenueAfterSgst'+userid).val()); $('#ViewAfterSGST').val($('#RevenueAfterSgst'+userid).val());
@ -3711,7 +3779,7 @@ $('.AddRevenue').click(function(){
var FreightType = $("#drpFreight").val(); var FreightType = $("#drpFreight").val();
var FreightVal = $("#txtFreight").val(); var FreightVal = $("#txtFreight").val();
var AfterFreightVal = $("#txtAfterFreight").val(); var AfterFreightVal = $("#txtAfterFreight").val();
var NoOfTrip = $("#NOOfTrips").val();
var basicval = $("#txtBasicValue").val(); var basicval = $("#txtBasicValue").val();
var Insval = $("#txtInsurance").val(); var Insval = $("#txtInsurance").val();
var TotalOrderValue = $("#txtTotalOrderValue").val(); var TotalOrderValue = $("#txtTotalOrderValue").val();
@ -3758,6 +3826,7 @@ $('.AddRevenue').click(function(){
addHidden(theForm,"FreightType"+temp,FreightType); addHidden(theForm,"FreightType"+temp,FreightType);
addHidden(theForm,"FreightVal"+temp,FreightVal); addHidden(theForm,"FreightVal"+temp,FreightVal);
addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal); addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
addHidden(theForm,"NoOfTrip"+temp,NoOfTrip);
addHidden(theForm,"basicval"+temp,basicval); addHidden(theForm,"basicval"+temp,basicval);
addHidden(theForm,"Insval"+temp,Insval); addHidden(theForm,"Insval"+temp,Insval);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue); addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
@ -3810,7 +3879,7 @@ clearRevenueModalFields();
var FreightType = $("#drpEditFreight").val(); var FreightType = $("#drpEditFreight").val();
var FreightVal = $("#txtEditFreight").val(); var FreightVal = $("#txtEditFreight").val();
var AfterFreightVal = $("#txtEditAfterFreight").val(); var AfterFreightVal = $("#txtEditAfterFreight").val();
var NoOfTrip = $("#EditNOOfTrips").val();
var basicval = $("#txtEditBasicValue").val(); var basicval = $("#txtEditBasicValue").val();
var Insval = $("#txtEditInsurance").val(); var Insval = $("#txtEditInsurance").val();
var TotalOrderValue = $("#txtEditTotalOrderValue").val(); var TotalOrderValue = $("#txtEditTotalOrderValue").val();
@ -3854,6 +3923,7 @@ clearRevenueModalFields();
$('#FreightType'+userid).val(FreightType); $('#FreightType'+userid).val(FreightType);
$('#FreightVal'+userid).val(FreightVal); $('#FreightVal'+userid).val(FreightVal);
$('#AfterFreightVal'+userid).val(AfterFreightVal); $('#AfterFreightVal'+userid).val(AfterFreightVal);
$('#NoOfTrip'+userid).val(NoOfTrip);
$('#basicval'+userid).val(basicval); $('#basicval'+userid).val(basicval);
$('#Insval'+userid).val(Insval); $('#Insval'+userid).val(Insval);
$('#AvilBudget'+userid).val(AvilBudget); $('#AvilBudget'+userid).val(AvilBudget);
@ -4012,7 +4082,7 @@ function clearRevenueModalFields()
$("#drpFreight").val('0'); $("#drpFreight").val('0');
$("#txtFreight").val(''); $("#txtFreight").val('');
$("#txtAfterFreight").val(''); $("#txtAfterFreight").val('');
$("#NOOfTrips").val('');
$("#txtBasicValue").val(''); $("#txtBasicValue").val('');
$("#txtInsurance").val(''); $("#txtInsurance").val('');
$("#txtTotalOrderValue").val(''); $("#txtTotalOrderValue").val('');
@ -4316,6 +4386,11 @@ $('#txtDeliveryAddress').val(deladd);
{ {
return false; return false;
} }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
alert('Please Enter Payable Terms Description');
$('#Otherpayment').focus();
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -4462,6 +4537,7 @@ $("#PaymentTerms").change(function() {
} }
else { else {
$('#otheroptiondiv').hide(); $('#otheroptiondiv').hide();
$('#Otherpayment').val('');
} }
}); });
</script> </script>

View File

@ -60,10 +60,10 @@ if(!empty($POMaster))
$PODate = $pdt->format('Y-m-d'); $PODate = $pdt->format('Y-m-d');
$DeliverOption = $Req->DeliveryOption; $DeliverOption = $Req->DeliveryOption;
$DeliverSchedule = $Req->DeliverySchedule; $DeliverSchedule = $Req->DeliverySchedule;
echo "*" . $Req->DeliveryDate . "*"; // echo "*" . $Req->DeliveryDate . "*";
$Ddt = new DateTime($Req->DeliveryDate); $Ddt = new DateTime($Req->DeliveryDate);
$Deliverydt = $Ddt->format('Y-m-d'); $Deliverydt = $Ddt->format('Y-m-d');
echo "-" . $Deliverydt . "-"; // echo "-" . $Deliverydt . "-";
$DeliveryAddress =$Req->DeliveryAddress; $DeliveryAddress =$Req->DeliveryAddress;
$PONOStatus = $Req->StatusCode; $PONOStatus = $Req->StatusCode;
$PONO = $Req->PONO; $PONO = $Req->PONO;
@ -123,10 +123,10 @@ foreach ($PaymentTerms as $TER)
tinymce.init({ tinymce.init({
selector: "textarea#txtSpcialInstruction", selector: "textarea#ScopeofWork",
menubar: false, menubar: false,
statusbar: false, statusbar: false,
toolbar: false toolbar: false,
// plugins: "link image" // plugins: "link image"
}); });
var DelOpt = '<?php echo $DeliverOption; ?>'; var DelOpt = '<?php echo $DeliverOption; ?>';
@ -148,17 +148,7 @@ $('#Scheduleby').val(SchName);
} }
}); });
</script> </script>
<script src="<?php echo base_url() ?>assets/tinymce/js/tinymce/tinymce.min.js"></script>
<script>
tinymce.init({
selector: "textarea#ScopeofWork",
selector: "textarea#txtSpcialInstruction",
menubar: false,
statusbar: false,
toolbar: false,
plugins: "link image"
});
</script>
@ -576,6 +566,9 @@ function clearEditTaxField()
} }
$(document).ready(function () { $(document).ready(function () {
$("#PaymentTerms").select2();
$('#Date').click(function () { $('#Date').click(function () {
//for Date range selection //for Date range selection
$('#Schedulediv').hide(); $('#Schedulediv').hide();
@ -741,7 +734,10 @@ $(document).ready(function () {
</div> </div>
<div class="col-md-12" id="Deliverydtdiv"><br/> <div class="col-md-12" id="Deliverydtdiv"><br/>
<label>Delivery Date</label> <label>Delivery Date</label>
<input type="text" name="beforeDeliverydt" value="<?php echo $Deliverydt?>"> <?php if($DeliverOption==1){
$Deliverydt=null;
}?>
<input type="hidden" name="beforeDeliverydt" value="<?php echo $Deliverydt?>">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;'); $data = array('name' => 'Deliverydt','value' => set_value('Deliverydt',$Deliverydt),'id'=>'Deliverydt', 'class' => 'form-control num' ,'required' => 'true', 'onkeypress'=>'return false;');
@ -803,6 +799,15 @@ $(document).ready(function () {
</div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
</div> </div>
</div> </div>
@ -848,7 +853,7 @@ $(document).ready(function () {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1209,6 +1214,37 @@ $(document).ready(function () {
</div> </div>
<!--<div class="col-md-12" style="padding:5px;">
<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',$RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<span>Status</span>
<?php
// $options = array("0"=>'Select Status');
// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"' ,'required="true"' ,'class="form-control select2')
// $options = array("0"=>$PONOStatus);
// echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"' ,'required="true"' ,'class="form-control select2')
$data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data);
?>
</div>
</div> -->
</div>
</div>
<div class="row" style="border: 1px solid"> <div class="row" style="border: 1px solid">
<div class="col-md-12"> <div class="col-md-12">
@ -1253,6 +1289,7 @@ $(document).ready(function () {
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label >Total Order Value In INR </label> <label >Total Order Value In INR </label>
<input type="text" name="preTotalordervalue" value="<?php echo $TotalSummary;?>">
<?php <?php
$data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true'); $data = array('name' => 'txtTotalOrderValueSummary','value' => set_value('txtTotalOrderValueSummary',number_format($TotalSummary, 2, '.', '')),'id'=>'txtTotalOrderValueSummary', 'class' => 'form-control num' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1268,7 +1305,7 @@ $(document).ready(function () {
<label>Scope Of Work</label> <?php <label>Scope Of Work</label> <?php
$data = array('name' => 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' ); $data = array('name' => 'ScopeofWork','value' => set_value('ScopeofWork',$ServiceDescription),'id'=>'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
?> <input type="hidden" name="beforeScopeofWork" id="beforeScopeofWork" value="<?php echo $ServiceDescription;?>"> ?>
</div> </div>
</div> </div>
@ -1284,43 +1321,47 @@ $(document).ready(function () {
<input type="reset" class="btn btn-primary" value="Reset"> <input type="reset" class="btn btn-primary" value="Reset">
</div><br/>
</div> </div>
</div> </div>
<br/> </div>
</div><br/> <div class="col-md-12" style="padding:2%;">
<div class="col-md-12" style="padding:5px;"> <div class="col-md-8">
<div class="row">
<div class="col-md-2"><label>Request On</label></div>
<div class="col-md-4"> <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',$RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
<div class="col-md-4">
<span>Status</span>
<?php
// $options = array("0"=>'Select Status');
// echo form_dropdown('Status', $options,set_value('Status'),'id="Status"' ,'required="true"' ,'class="form-control select2')
// $options = array("0"=>$PONOStatus);
// echo form_dropdown('Status', $options,set_value('Status',$StatusName),'id="Status"' ,'required="true"' ,'class="form-control select2')
<?php
$data = array('name' => 'Requeston','value' => set_value('Requeston',$Reqon),'id'=>'Requeston', 'class' => 'form-control num' ,'required' => 'true','readonly' => 'true');
echo form_input($data);
?>
</div>
</div><br/>
<div class="row">
<div class="col-md-2"><label>Request By</label></div>
<div class="col-md-4">
<?php
$data = array('name' => 'RequestBy','value' => set_value('RequestBy', $RequesterName),'id'=>'RequestBy', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true');
echo form_input($data);
?>
</div>
</div><br/>
<div class="row"><div class="col-md-2"><label>Status</label></div>
<div class="col-md-4">
<?php
$data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'Status','value' => set_value('Status',$StatusName),'id'=>'Status', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div><br/>
</div> </div>
</div> </div>
</div> </div>
<br/>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
@ -1865,11 +1906,12 @@ function validateServiceTax()
} }
// //
</script> </script>
// <script> <script>
// $('#PaymentTerms').change(function() { // $('#PaymentTerms').change(function() {
// var data=$('#PaymentTerms option:selected').text(); // var data=$('#PaymentTerms option:selected').text();
// $('#beforePaymentTermsText').val(data); // $('#beforePaymentTermsText').val(data);
// alert( data ); // alert( data );
// }); // });
// </script> // </script>
<script> <script>
@ -1982,5 +2024,14 @@ function calculateIgstTax(varBasicValue,Igst)
return TAXval;// $('#AfterServiceTax').val(TAXval); return TAXval;// $('#AfterServiceTax').val(TAXval);
} }
//If others is the payment terms to display mandatory field
$("#PaymentTerms").change(function() {
if ($('#PaymentTerms').val().trim()=='PT08')
{
$('#otheroptiondiv').show();
}
else {
$('#otheroptiondiv').hide();
}
});
</script> </script>

View File

@ -395,6 +395,7 @@ $("#txtEditBasicValue").val('');
$('#PackagingType').val("0"); $('#PackagingType').val("0");
$('#Rate').focus(); $('#Rate').focus();
} }
calculateDiscount(0);
}); });
@ -427,6 +428,7 @@ $('#EditDiscountType').change(function() {
$('#EditDiscountType').val("0"); $('#EditDiscountType').val("0");
$('#EditRate').focus(); $('#EditRate').focus();
} }
calculateDiscount(1);
}); });
$('#PackagingType').change(function() { $('#PackagingType').change(function() {
@ -462,6 +464,7 @@ $('#PackagingType').change(function() {
$('#PackagingType').val("0"); $('#PackagingType').val("0");
$('#Rate').focus(); $('#Rate').focus();
} }
calculatePackaging(0);
}); });
@ -488,6 +491,7 @@ $('#EditPackagingType').change(function() {
$('#txtEditPackaging').removeAttr( 'readonly','true' ); $('#txtEditPackaging').removeAttr( 'readonly','true' );
} }
} }
calculatePackaging(1);
}); });
@ -576,6 +580,7 @@ $('#drpFreight').change(function() {
$('#drpFreight').val("0"); $('#drpFreight').val("0");
$('#Rate').focus(); $('#Rate').focus();
} }
calculateFreight(0);
}); });
$('#drpEditFreight').change(function() { $('#drpEditFreight').change(function() {
@ -616,6 +621,7 @@ $('#drpEditFreight').change(function() {
$('#drpEditFreight').val("0"); $('#drpEditFreight').val("0");
$('#EditRate').focus(); $('#EditRate').focus();
} }
calculateFreight(1);
}); });
}); });
@ -1560,7 +1566,22 @@ var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val());
} }
else if(FreightType == '<?php echo PERTRIP;?>') else if(FreightType == '<?php echo PERTRIP;?>')
{ {
if($('#NOOfTrips').val()==''){
alert('Please Enter No of Trip');
$("#NOOfTrips").focus();
$('#txtFreight').val(0)
AfterFreight=0;
$('#txtAfterFreight').val("0.00");
return false;
}
else{
var noOftrip = $("#NOOfTrips").val();
AfterFreight = <?php echo FREIGHT_PERTRIP;?>; AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
}
} }
else { else {
AfterFreight = $("#txtFreight").val(); AfterFreight = $("#txtFreight").val();
@ -1628,7 +1649,20 @@ var ExciseDuty = parseFloat($('#txtAfterExciseDuty').val());
} }
else if(FreightType == '<?php echo PERTRIP;?>') else if(FreightType == '<?php echo PERTRIP;?>')
{ {
if($('#EditNOOfTrips').val()==''){
alert('Please Enter No of Trip');
$("#EditNOOfTrips").focus();
$('#txtEditFreight').val(0)
AfterFreight=0;
$('#txtEditAfterFreight').val("0.00");
return false;
}
else{
var noOftrip = $("#EditNOOfTrips").val();
AfterFreight = <?php echo FREIGHT_PERTRIP;?>; AfterFreight = <?php echo FREIGHT_PERTRIP;?>;
AfterFreight = parseFloat(AfterFreight * noOftrip).toFixed(2);
}
} }
else { else {
AfterFreight = $("#txtEditFreight").val(); AfterFreight = $("#txtEditFreight").val();
@ -2503,7 +2537,7 @@ function calculateEditTaxValue()
<label>NO Of Trips</label> <label>NO Of Trips</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips', 'class' => 'form-control num' ); $data = array('name' => 'NOOfTrips','value' => set_value('NOOfTrips'),'id'=>'NOOfTrips', 'class' => 'form-control num' ,'onchange'=>'calculateFreight(0);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -2856,7 +2890,7 @@ function calculateEditTaxValue()
<label>NO Of Trips</label> <label>NO Of Trips</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips', 'class' => 'form-control num' ); $data = array('name' => 'EditNOOfTrips','value' => set_value('EditNOOfTrips'),'id'=>'EditNOOfTrips', 'class' => 'form-control num' ,'onchange'=>'calculateFreight(1);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3131,8 +3165,17 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('#txtEditFreight').val($('#FreightVal'+userid).val()); $('#txtEditFreight').val($('#FreightVal'+userid).val());
$('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val()); $('#txtEditAfterFreight').val($('#AfterFreightVal'+userid).val());
$('#EditNOOfTrips').val($('#NoOfTrip'+userid).val());
$('#txtEditInsurance').val($('#Insval'+userid).val()); $('#txtEditInsurance').val($('#Insval'+userid).val());
var FreightType =$('#FreightType'+userid).val();
if (FreightType == "PER TRIP"){
$('#EditTripsValue').show();
}
else{
$('#EditTripsValue').hide();
}
$('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val()); $('#txtEditTotalOrderValue').val($('#TotalOrderValue'+userid).val());
$('#EditAfterCgst').val($('#RevenueAfterCgst'+userid).val()); $('#EditAfterCgst').val($('#RevenueAfterCgst'+userid).val());
$('#EditAfterSgst').val($('#RevenueAfterSgst'+userid).val()); $('#EditAfterSgst').val($('#RevenueAfterSgst'+userid).val());
@ -3228,7 +3271,7 @@ $('.AddRevenue').click(function(){
var FreightType = $("#drpFreight").val(); var FreightType = $("#drpFreight").val();
var FreightVal = $("#txtFreight").val(); var FreightVal = $("#txtFreight").val();
var AfterFreightVal = $("#txtAfterFreight").val(); var AfterFreightVal = $("#txtAfterFreight").val();
var NoOfTrip = $("#NOOfTrips").val();
var basicval = $("#txtBasicValue").val(); var basicval = $("#txtBasicValue").val();
var Insval = parseFloat($('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val()).toFixed(2); var Insval = parseFloat($('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val()).toFixed(2);
@ -3295,6 +3338,8 @@ $('.AddRevenue').click(function(){
addHidden(theForm,"FreightType"+temp,FreightType); addHidden(theForm,"FreightType"+temp,FreightType);
addHidden(theForm,"FreightVal"+temp,FreightVal); addHidden(theForm,"FreightVal"+temp,FreightVal);
addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal); addHidden(theForm,"AfterFreightVal"+temp,AfterFreightVal);
addHidden(theForm,"NoOfTrip"+temp,NoOfTrip);
addHidden(theForm,"basicval"+temp,basicval); addHidden(theForm,"basicval"+temp,basicval);
addHidden(theForm,"Insval"+temp,Insval); addHidden(theForm,"Insval"+temp,Insval);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue); addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
@ -3337,7 +3382,7 @@ $('.AddRevenue').click(function(){
var FreightType = $("#drpEditFreight").val(); var FreightType = $("#drpEditFreight").val();
var FreightVal = $("#txtEditFreight").val(); var FreightVal = $("#txtEditFreight").val();
var AfterFreightVal = $("#txtEditAfterFreight").val(); var AfterFreightVal = $("#txtEditAfterFreight").val();
var NoOfTrip = $("#EditNOOfTrips").val();
var basicval = $("#txtEditBasicValue").val(); var basicval = $("#txtEditBasicValue").val();
var Insval = $("#txtEditInsurance").val(); var Insval = $("#txtEditInsurance").val();
var TotalOrderValue = $("#txtEditTotalOrderValue").val(); var TotalOrderValue = $("#txtEditTotalOrderValue").val();
@ -3377,6 +3422,8 @@ $('.AddRevenue').click(function(){
$('#RevenueAfterIgst'+userid).val(AfterIgst); $('#RevenueAfterIgst'+userid).val(AfterIgst);
$('#FreightType'+userid).val(FreightType); $('#FreightType'+userid).val(FreightType);
$('#FreightVal'+userid).val(FreightVal); $('#FreightVal'+userid).val(FreightVal);
$('#NoOfTrip'+userid).val(NoOfTrip);
$('#AfterFreightVal'+userid).val(AfterFreightVal); $('#AfterFreightVal'+userid).val(AfterFreightVal);
$('#basicval'+userid).val(basicval); $('#basicval'+userid).val(basicval);
$('#Insval'+userid).val(Insval); $('#Insval'+userid).val(Insval);
@ -3540,7 +3587,7 @@ function clearRevenueModalFields()
$("#drpFreight").val('0'); $("#drpFreight").val('0');
$("#txtFreight").val(''); $("#txtFreight").val('');
$("#txtAfterFreight").val(''); $("#txtAfterFreight").val('');
$("#NOOfTrips").val('');
$("#txtBasicValue").val(''); $("#txtBasicValue").val('');
$("#txtInsurance").val(''); $("#txtInsurance").val('');
$("#txtTotalOrderValue").val(''); $("#txtTotalOrderValue").val('');
@ -3692,6 +3739,11 @@ $('#SpcialInstruction').val(splinstr);
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
alert('Please Enter Payable Terms Description');
$('#Otherpayment').focus();
return false;
}
else else
{ {
@ -3886,6 +3938,7 @@ $("#PaymentTerms").change(function() {
} }
else { else {
$('#otheroptiondiv').hide(); $('#otheroptiondiv').hide();
$('#Otherpayment').val('');
} }
}); });

View File

@ -487,6 +487,9 @@ function clearEditTaxField()
} }
$(document).ready(function () { $(document).ready(function () {
$("#PaymentTerms").select2();
$('#Date').click(function () { $('#Date').click(function () {
//for Date range selection //for Date range selection
$('#Schedulediv').hide(); $('#Schedulediv').hide();
@ -497,7 +500,9 @@ function clearEditTaxField()
$('#Deliverydtdiv').hide(); $('#Deliverydtdiv').hide();
$('#Schedulediv').show(); $('#Schedulediv').show();
}); });
clearTotalItemValues();
}); });
</script> </script>
<style> <style>
.modal .modal
@ -704,7 +709,15 @@ function clearEditTaxField()
</div> </div>
<div class="col-md-4" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'Otherpayment','Otherpayment' => set_value('Otherpayment'),'id'=>'Otherpayment', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
</div>
</div> </div>
@ -718,7 +731,6 @@ function clearEditTaxField()
<a data-toggle="modal" ><button type="submit" onclick="openModal();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a> <a data-toggle="modal" ><button type="submit" onclick="openModal();" class="btn btn-primary" id="abcd" >Select Line Item</button> </a>
<!-- Model for Add servicepo --> <!-- Model for Add servicepo -->
<div class="modal fade" id="SERVICE" role="dialog"> <div class="modal fade" id="SERVICE" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
@ -759,7 +771,7 @@ function clearEditTaxField()
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'CostCenter','value' => set_value('CostCenter'),'id'=>'CostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -958,7 +970,7 @@ function clearEditTaxField()
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-5 col-md-offset-4" align="right"> <div class="col-md-5 col-md-offset-4" align="right">
<label><?php echo "Total Order value ($INRSYM)";?></label> <label><?php echo "Total Order Value ($INRSYM)";?></label>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
@ -994,7 +1006,7 @@ function clearEditTaxField()
<form> <form>
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:900px;">
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;"> <div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button> <!-- <button type="button" class="close" data-dismiss="modal">&times;</button> -->
<center><h4>Edit Service Purchase Order Item </h4></center> <center><h4>Edit Service Purchase Order Item </h4></center>
</div> </div>
<div align="left"> <div align="left">
@ -1022,7 +1034,7 @@ function clearEditTaxField()
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Cost Center Name</label> <label>Cost Center Code</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true'); $data = array('name' => 'EditCostCenter','value' => set_value('EditCostCenter'),'id'=>'EditCostCenter', 'class' => 'form-control' ,'readonly' => 'true');
@ -1220,7 +1232,7 @@ function clearEditTaxField()
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-5 col-md-offset-4" align="right"> <div class="col-md-5 col-md-offset-4" align="right">
<label><?php echo "Total Order value ($INRSYM)";?></label> <label><?php echo "Total Order Value ($INRSYM)";?></label>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
@ -1250,8 +1262,6 @@ function clearEditTaxField()
<!-- End of Model for EDIT servicepo --> <!-- End of Model for EDIT servicepo -->
</div> </div>
<br/>
<div class="box-body"> <div class="box-body">
<table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;"> <table id="serviceTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
@ -1262,10 +1272,10 @@ function clearEditTaxField()
<th>Item Description</th> <th>Item Description</th>
<th>Quantity</th> <th>Quantity</th>
<th>UOM</th> <th>UOM</th>
<th>Rate</th> <th>Rate In INR</th>
<th>Basic Amount</th> <th>Basic Amount In INR</th>
<th>Tax Amount</th> <th>Tax Amount In INR</th>
<th>Total Order Amount</th> <th>Total Order Amount In INR</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@ -1356,7 +1366,7 @@ function clearEditTaxField()
</div> </div>
</div> </div>
<br/> <br/>
</div><br/> </div>
</div> </div>
</div> </div>
@ -1978,6 +1988,11 @@ $('#txtStatus').val(stat);
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if($('#Otherpayment').val()=='' && $('#PaymentTerms').val()=='PT08'){
alert('Please Enter Other Payment Details');
$('#Otherpayment').focus();
return false;
}
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
@ -2011,17 +2026,17 @@ $('#txtStatus').val(stat);
} }
} }
<!-- script for table , It works under the datatable plugin--> <!-- script for table , It works under the datatable plugin-->
/* $(function () { $(function () {
$('#serviceTax').DataTable({ $('#serviceTax').DataTable({
"paging": true, "paging": false,
"lengthChange": true, "lengthChange": false,
"searching": false, "searching": false,
//"ordering": true, //"ordering": true,
// "info": true, // "info": true,
"autoWidth": true "autoWidth": false
}); });
}); */ });
var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>; var Detail = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
@ -2133,6 +2148,26 @@ function calculateIgstTax(varBasicValue,Igst)
} }
function clearTotalItemValues()
{
$('#txtTotBasicAmount').val('');
$('#txtTotCgst').val('');
$('#txtTotSgst').val('');
$('#txtTotIgst').val('');
$('#TotalOtherAllowances').val('');
$('#txtTotalOrderValueSummary').val('');
}
//If others is the payment terms to display mandatory field
$("#PaymentTerms").change(function() {
if ($('#PaymentTerms').val().trim()=='PT08')
{
$('#otheroptiondiv').show();
}
else {
$('#otheroptiondiv').hide();
$('#Otherpayment').val('');
}
});
</script> </script>