SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amendment issues

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-24 16:17:01 +05:30
parent 3756ad4ec1
commit 489e212b84
4 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/amendmentpurchaseorder.php
View File

@ -1309,17 +1309,17 @@ function CreateAmendPOPrint()
//s $this->load->view('includes/pdffooter'); //s $this->load->view('includes/pdffooter');
// Get output html // Get output html
///$php = $this->output->get_output(); $php = $this->output->get_output();
// Load library // Load library
///$this->load->library('dompdf_gen'); $this->load->library('dompdf_gen');
// Convert to PDF // Convert to PDF
//$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape'); //$this->dompdf->set_paper(array(0, 0, 841.89, 1190.55), 'landscape');
///$this->dompdf->load_html($php); $this->dompdf->load_html($php);
///$this->dompdf->render(); $this->dompdf->render();
///$data['Attachment'] = FALSE; $data['Attachment'] = FALSE;
///$this->dompdf->stream("ImportPOReport.pdf",$data,$php); $this->dompdf->stream("ImportPOReport.pdf",$data,$php);
} }

8
application/views/Amendedimportpopdf.php
View File

@ -51,12 +51,12 @@
//$ReqBy=$PO->Requestedby; //$ReqBy=$PO->Requestedby;
$TotalOrderValue1=$PO->TotalOrderValue; $TotalOrderValue1=$PO->TotalOrderValue;
$PaymentTerms = $PO->PaymentTerms; $PaymentTerms = $PO->PaymentTerms;
$PaymentDays=$PO->PaymentDays; $PaymentDays=$PO->PaymentDays;
$PayableAT=$PO->PayableAT; $PayableAT=$PO->PayableAT;
} }
} }
//echo $SuplierName;
if(!empty($Requestername)) if(!empty($Requestername))

52
application/views/editImportAmendPO.php
View File

@ -23,6 +23,15 @@ foreach ($CurrencyDetail as $Detail)
$CurCode = $Detail->Currency_Code; $CurCode = $Detail->Currency_Code;
} }
if(!empty($AvlBudAmt))
{
$AvlAmount = $AvlBudAmt;
}
//echo $AvlBudAmt;
foreach ($PaymentTerms as $TER) foreach ($PaymentTerms as $TER)
@ -124,6 +133,7 @@ if(!empty($POMaster))
$Import_DispatchDetails=$Req->Import_DispatchDetails; $Import_DispatchDetails=$Req->Import_DispatchDetails;
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
$DeliverySchedule=$Req->DeliverySchedule; $DeliverySchedule=$Req->DeliverySchedule;
$ServiceDescription=$Req->ServiceDescription;
} }
} }
@ -624,7 +634,10 @@ body {
<label>Available Budget Amount</label> <label>Available Budget Amount</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt'),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true'); // $data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt',),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
// echo form_input($data);
$data = array('name' => 'EditAvlBudAmt','value' => set_value('EditAvlBudAmt','dsfd'),'id'=>'EditAvlBudAmt', 'class' => 'form-control' ,'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1162,7 +1175,7 @@ body {
<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 'AvlBudAmt'.$index ?>" id="<?php echo 'AvlBudAmt'.$index ?>" value="<?php echo $AvlBudAmt;?>" /> <!-- <input type="hidden" name="<?php echo 'AvlBudAmt'.$index ?>" id="<?php echo 'AvlBudAmt'.$index ?>" value="<?php echo $AvlBudAmt;?>" /> -->
<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 ; ?>" />
@ -1423,15 +1436,15 @@ body {
$TotalLanding = $TotalLanding + $record->AfterLandingCharge; $TotalLanding = $TotalLanding + $record->AfterLandingCharge;
$tothighseas = $tothighseas + $record->AfterHighSeasSalesCharge; $tothighseas = $tothighseas + $record->AfterHighSeasSalesCharge;
$totcustom = $totcustom + $record->AfterCustomDuty; $totcustom = $totcustom + $record->AfterCustomDuty;
$totexciseduty = $totexciseduty + $record->ExciseDuty; $totexciseduty = $totexciseduty + $record->AfterExciseDuty;
$totexcisedutyED = $totexcisedutyED + $record->ExciseDutyEdCess; $totexcisedutyED = $totexcisedutyED + $record->AfterExciseDutyEdCess;
$totexciseSH = $totexciseSH + $record->AfterExciseDutySHCess; $totexciseSH = $totexciseSH + $record->AfterExciseDutySHCess;
$totcustomED = $totcustomED +$record->AfterCustomEdCess; $totcustomED = $totcustomED +$record->AfterCustomEdCess;
$totcustomSH = $totcustomSH + $record->CustomSHCess; $totcustomSH = $totcustomSH + $record->AfterCustomSHCess;
$totaddtnlexcise= $totaddtnlexcise + $record->AddlExciseDuty; $totaddtnlexcise= $totaddtnlexcise + $record->AfterAddlExciseDuty;
$totgrossduty = $totgrossduty + $record->Grossdutypayable; //$totgrossduty = $totgrossduty + $record->Grossdutypayable;
$totavlmodvat = $totavlmodvat +$record->AvailableModvat; //$totavlmodvat = $totavlmodvat +$record->AvailableModvat;
$totgrossduty=$totgrossduty+$record->Grossdutypayable; $totgrossduty=$totgrossduty+$record->Grossdutypayable;
$totavlmodvat=$totavlmodvat+$record->AvailableModvat; $totavlmodvat=$totavlmodvat+$record->AvailableModvat;
$totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty; $totgrossexpense=$totgrossexpense+$record->Grossexpensesduetocustomduty;
@ -1599,7 +1612,7 @@ body {
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">
<label>Special Instructions :</label> <?php <label>Special Instructions :</label> <?php
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' ); $data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>
@ -1700,10 +1713,12 @@ var NilType = '<?php echo NILTYPE;?>';
}; };
var AvlBudAmt = '<?php echo $AvlAmount ?>';
//alert(AvlBudAmt);
$('#EditAvlBudAmt').val(AvlBudAmt);
//$('#EditAvlBudAmt').val(<?php echo $AvlAmount; ?>);
$('#EditAvlBudAmt').val(<?php echo $AvlAmount; ?>);
@ -1806,10 +1821,9 @@ $("#txtBasicValue").val('');
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>; var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// console.log(Material); // console.log(Material);
var AvlBudAmt = '<?php echo $AvlAmount ?>'; //var AvlBudAmt = '<?php echo $AvlAmount ?>';
//alert(JSON.stringify(Material)); //alert(JSON.stringify(Material));
// For Binding DepartmentName // For Binding DepartmentName
$.each(y, function(idx, obj) { $.each(y, function(idx, obj) {
if(obj.ReqNo === id) if(obj.ReqNo === id)
@ -1819,7 +1833,7 @@ $("#txtBasicValue").val('');
} }
}); });
$("#AvlBudAmt").val(AvlBudAmt); //$("#EditAvlBudAmt").val(AvlBudAmt);
// For Binding Material list center for the selected Requistion Number // For Binding Material list center for the selected Requistion Number
$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") ); $("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
@ -3011,7 +3025,9 @@ $('.EditImport').click(function(){
var editQuantity = $('#EditQuantity').val(); var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val(); var itemRate = $("#EditRate").val();
var BasicValue=$("#EdittxtBasicValue").val(); var BasicValue=$("#EdittxtBasicValue").val();
//console.log(BasicValue);
var BasicUSPrice=$("#EditimBasicPrice").val(); var BasicUSPrice=$("#EditimBasicPrice").val();
var basicinr=$('#EditINRBasicvalue').val();
//var BasicValue=$("#EdittxtBasicValue").val(); //var BasicValue=$("#EdittxtBasicValue").val();
var BasicPrice=$("#EditBasicPriceTax").val(); var BasicPrice=$("#EditBasicPriceTax").val();
var AfterBasicPrice=$("#EditAfterBasicPriceTax").val(); var AfterBasicPrice=$("#EditAfterBasicPriceTax").val();
@ -3059,7 +3075,9 @@ $('.EditImport').click(function(){
$('#uom'+userid).val(editUOM); $('#uom'+userid).val(editUOM);
$('#quantity'+userid).val(editQuantity); $('#quantity'+userid).val(editQuantity);
$('#itemRate'+userid).val(itemRate); $('#itemRate'+userid).val(itemRate);
$('#ProductPrice'+userid).val(BasicValue);
$('#BasicAmt'+userid).val(BasicValue); $('#BasicAmt'+userid).val(BasicValue);
$('#BasicINRValue'+userid).val(basicinr);
$('#BasicPriceInMTon'+userid).val(BasicUSPrice); $('#BasicPriceInMTon'+userid).val(BasicUSPrice);
$('#BasicPriceTax'+userid).val(BasicPrice); $('#BasicPriceTax'+userid).val(BasicPrice);
$('#AfterBasicPriceTax'+userid).val(AfterBasicPrice); $('#AfterBasicPriceTax'+userid).val(AfterBasicPrice);
@ -3089,8 +3107,8 @@ $('.EditImport').click(function(){
$('#RMCIncludingCustomersPerKG'+userid).val(RMC); $('#RMCIncludingCustomersPerKG'+userid).val(RMC);
$('#TotalValue'+userid).val(TotalExp); $('#TotalValue'+userid).val(TotalExp);
$('#AvailableModvat'+userid).val(AvailaleModvat); $('#AvailableModvat'+userid).val(AvailaleModvat);
//var a=parseFloat($('#HighSeasSalesCharge'+userid).val()); var a=parseFloat($('#ProductPrice'+userid).val());
//console.log(a); console.log(a);
populateValueMainFormForEditImportTax(); populateValueMainFormForEditImportTax();

12
application/views/editimportpo.php
View File

@ -141,6 +141,7 @@ if(!empty($POMaster))
$Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin;
$PaymentTerms=$Req->PaymentTerms; $PaymentTerms=$Req->PaymentTerms;
$DeliveryOption=$Req->DeliveryOption; $DeliveryOption=$Req->DeliveryOption;
$ServiceDescription=$Req->ServiceDescription;
} }
} }
//echo $DeliveryOption; //echo $DeliveryOption;
@ -2632,7 +2633,7 @@ if($PONOStatus == PO_RELEASED)
<div class="col-md-4"> <div class="col-md-4">
<label>Total Order Value:<?php echo "($INR)"?></label> <?php <label>Total Order Value:<?php echo "($Value)"?></label> <?php
$data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtToatlOrder','value' => set_value('txtToatlOrder',$totorder),'id'=>'txtToatlOrder', 'class' => 'form-control' ,'required' => 'true','readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -4562,6 +4563,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
var itemRate = $("#EditRate").val(); var itemRate = $("#EditRate").val();
var BasicValue=$("#EdittxtBasicValue").val(); var BasicValue=$("#EdittxtBasicValue").val();
var BasicUSPrice=$("#EditimBasicPrice").val(); var BasicUSPrice=$("#EditimBasicPrice").val();
var basicinr=$('#EditINRBasicvalue').val();
//console.log(basicinr);
//var BasicValue=$("#EdittxtBasicValue").val(); //var BasicValue=$("#EdittxtBasicValue").val();
var BasicPrice=$("#EditBasicPriceTax").val(); var BasicPrice=$("#EditBasicPriceTax").val();
var AfterBasicPrice=$("#EditAfterBasicPriceTax").val(); var AfterBasicPrice=$("#EditAfterBasicPriceTax").val();
@ -4609,8 +4612,11 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
$('#uom'+userid).val(editUOM); $('#uom'+userid).val(editUOM);
$('#quantity'+userid).val(editQuantity); $('#quantity'+userid).val(editQuantity);
$('#itemRate'+userid).val(itemRate); $('#itemRate'+userid).val(itemRate);
$('#ProductPrice'+userid).val(BasicValue);
$('#BasicAmt'+userid).val(BasicValue); $('#BasicAmt'+userid).val(BasicValue);
$('#BasicPriceInMTon'+userid).val(BasicUSPrice); $('#BasicPriceInMTon'+userid).val(BasicUSPrice);
$('#BasicINRValue'+userid).val(basicinr);
$('#BasicPriceTax'+userid).val(BasicPrice); $('#BasicPriceTax'+userid).val(BasicPrice);
$('#AfterBasicPriceTax'+userid).val(AfterBasicPrice); $('#AfterBasicPriceTax'+userid).val(AfterBasicPrice);
$('#LandingCharge'+userid).val(Landingcharge); $('#LandingCharge'+userid).val(Landingcharge);
@ -4639,8 +4645,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck())
$('#RMCIncludingCustomersPerKG'+userid).val(RMC); $('#RMCIncludingCustomersPerKG'+userid).val(RMC);
$('#TotalValue'+userid).val(TotalExp); $('#TotalValue'+userid).val(TotalExp);
$('#AvailableModvat'+userid).val(AvailaleModvat); $('#AvailableModvat'+userid).val(AvailaleModvat);
//var a=parseFloat($('#AfterAddlExciseDuty'+userid).val()); // var a=parseFloat($('#ProductPrice'+userid).val());
//console.log(a); // console.log(a);
populateValueMainFormForEditImportTax(); populateValueMainFormForEditImportTax();
} }