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

done capital ,service screen changes

Browse Source
This commit is contained in:
gandhimathi 2017-09-18 14:25:05 +05:30
parent b0668ec8f3
commit 89a04ed2ba
7 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/purchaseorder_model.php
View File

@ -246,7 +246,7 @@ function purchaseorderListing($forwhat='')
function GetAvailableCapitalBudgetAmount($CostCode,$Year,$BudgetType) function GetAvailableCapitalBudgetAmount($CostCode,$Year,$BudgetType)
{ {
$subQuery ='select BudgetAmount, (select ifnull(sum(IF(POMaster.ExchangeRate>0,Quantity*Rate*POMaster.ExchangeRate,Quantity*Rate)),0) as Totalvalue from $subQuery ='select BudgetAmount, (select ifnull(sum(IF(POMaster.ExchangeRate>0,Quantity*Rate*POMaster.ExchangeRate,POMaster.TotalOrderValue)),0) as Totalvalue from
T_PurchaseOrder_LineItem Item join T_Requestion_Master mast T_PurchaseOrder_LineItem Item join T_Requestion_Master mast
on mast.ReqNo = Item.ReqNo join T_PurchaseOrder_Master POMaster on POMaster.PONO=Item.PONO where Item.CostCenterCode=? and mast.ReqType=? and POMaster.status not in (?))as Totalvalue on mast.ReqNo = Item.ReqNo join T_PurchaseOrder_Master POMaster on POMaster.PONO=Item.PONO where Item.CostCenterCode=? and mast.ReqType=? and POMaster.status not in (?))as Totalvalue
from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and from T_CostCenter_Budget Bud where Bud.CostCenterCode=? and

9
application/views/EditservicePurchaseorder.php
View File

@ -886,7 +886,7 @@ $(document).ready(function () {
<div class="col-md-4" style="padding:0px;"> <div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;"> <div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1962,7 +1962,7 @@ $(document).ready(function () {
<input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" /> <input type="hidden" name="<?php echo 'AfterIgst'.$index ?>" id="<?php echo 'AfterIgst'.$index ?>" value="<?php echo $record->After_IGST ; ?>" />
<input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" /> <input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency; ?>" /> <input type="hidden" name="<?php echo 'Frequency'.$index ?>" id="<?php echo 'Frequency'.$index ?>" value="<?php echo $Frequency.'-'.$FrequencyNo; ?>" />
<input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" /> <input type="hidden" name="<?php echo 'FrequencyNo'.$index ?>" id="<?php echo 'FrequencyNo'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" /> <input type="hidden" name="<?php echo 'FrequencyValue'.$index ?>" id="<?php echo 'FrequencyValue'.$index ?>" value="<?php echo $FrequencyNo ; ?>" />
<input type="hidden" name="<?php echo 'ItemDescription'.$index ?>" id="<?php echo 'ItemDescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" /> <input type="hidden" name="<?php echo 'ItemDescription'.$index ?>" id="<?php echo 'ItemDescription'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
@ -3059,7 +3059,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$("#EditFrequencyNo").val(1); $("#EditFrequencyNo").val(1);
} }
else{ else{
$('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val()); $('#EditFrequency').val($('#Frequency'+userid).val());
$("#EditFrequencyNo").val($('#FrequencyValue'+userid).val()); $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
} }
@ -3150,7 +3150,7 @@ $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
$("#ViewFrequencyNo").val(1); $("#ViewFrequencyNo").val(1);
} }
else{ else{
$('#ViewFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val()); $('#ViewFrequency').val($('#Frequency'+userid).val());
$("#ViewFrequencyNo").val($('#FrequencyValue'+userid).val()); $("#ViewFrequencyNo").val($('#FrequencyValue'+userid).val());
} }
@ -3223,3 +3223,4 @@ $('#insuranceNo').val('');
} }
}); });
</script> </script>

37
application/views/capitalpurchaseorder.php
View File

@ -562,7 +562,7 @@ function vaildateBeforeOpenModal()
<div class="col-md-4" style="padding:0px;"> <div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;"> <div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2825,7 +2825,7 @@ EditRatechange();
$('#AvailableModvat').val(calculateAvailableModvatCharge($('#AfterExcisedutyTax').val(),$('#AfterExcisedutyEDcess').val(),$('#AfterExcisedutySHcess').val(),$('#AfterAdditionalExciseduty').val())); $('#AvailableModvat').val(calculateAvailableModvatCharge($('#AfterExcisedutyTax').val(),$('#AfterExcisedutyEDcess').val(),$('#AfterExcisedutySHcess').val(),$('#AfterAdditionalExciseduty').val()));
$('#Grossexpenses').val(calculateGrossexpensesCharge($('#Grossdutypayable').val(),$('#AvailableModvat').val())); $('#Grossexpenses').val(calculateGrossexpensesCharge($('#Grossdutypayable').val(),$('#AvailableModvat').val()));
if($('#PurQuantity').val()!=''){ if($('#PurQuantity').val()!='' && $('#PurQuantity').val()!='0'){
$('#purchaserate').val(calculatepurchaserate($('#AfterBasicPriceTax').val(),$('#PurQuantity').val())); $('#purchaserate').val(calculatepurchaserate($('#AfterBasicPriceTax').val(),$('#PurQuantity').val()));
$('#CustomDutyExpenses').val(calculateCustomDutyExpenses($('#Grossexpenses').val(),$('#PurQuantity').val())); $('#CustomDutyExpenses').val(calculateCustomDutyExpenses($('#Grossexpenses').val(),$('#PurQuantity').val()));
$('#RMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#purchaserate').val(),$('#CustomDutyExpenses').val())); $('#RMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#purchaserate').val(),$('#CustomDutyExpenses').val()));
@ -2836,6 +2836,20 @@ EditRatechange();
$('#txtTotalOrderValue').val(perKg); $('#txtTotalOrderValue').val(perKg);
}
else {
$('#purchaserate').val('0.00');
$('#CustomDutyExpenses').val('0.00');
$('#RMCIncludingCustomers').val('0.00');
var Rmc = $('#RMCIncludingCustomers').val();
var Quanty =$('#CPQuantity').val();
var BasicAmt = $('#CPTotalAmount').val();
var perKg = parseFloat(BasicAmt).toFixed(2);
$('#txtTotalOrderValue').val(perKg);
} }
} }
@ -3986,7 +4000,7 @@ function DeleteRow(rowid)
$('#Editpurchaserate').val($('#purchaseRate'+userid).val()); $('#Editpurchaserate').val($('#purchaseRate'+userid).val());
$('#EditCustomDutyExpenses').val($('#CustomDutyExpenses'+userid).val()); $('#EditCustomDutyExpenses').val($('#CustomDutyExpenses'+userid).val());
$('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val()); $('#txtEditInsurance').val($('#RMCIncludingCustomers'+userid).val());
$('#EditRMCIncludingCustomers').val($('#ServiceTotalOrderValue'+userid).val()); $('#EditRMCIncludingCustomers').val($('#RMCIncludingCustomers'+userid).val());
$('#EdittxtTotalOrderValue').val($('#PerKgExpense'+userid).val()); $('#EdittxtTotalOrderValue').val($('#PerKgExpense'+userid).val());
$('#EditCgst').val($('#Cgst'+userid).val()); $('#EditCgst').val($('#Cgst'+userid).val());
@ -4343,7 +4357,7 @@ function clearAfterAddLineItemAdd(){
$('#EditAvailableModvat').val(calculateAvailableModvatCharge($('#EditAfterExcisedutyTax').val(),$('#EditAfterExcisedutyEDcess').val(),$('#EditAfterExcisedutySHcess').val(),$('#EditAfterAdditionalExciseduty').val())); $('#EditAvailableModvat').val(calculateAvailableModvatCharge($('#EditAfterExcisedutyTax').val(),$('#EditAfterExcisedutyEDcess').val(),$('#EditAfterExcisedutySHcess').val(),$('#EditAfterAdditionalExciseduty').val()));
$('#EditGrossexpenses').val(calculateGrossexpensesCharge($('#EditGrossdutypayable').val(),$('#EditAvailableModvat').val())); $('#EditGrossexpenses').val(calculateGrossexpensesCharge($('#EditGrossdutypayable').val(),$('#EditAvailableModvat').val()));
if($('#EditPurQuantity').val()!=''){ if($('#EditPurQuantity').val()!='' && $('#EditPurQuantity').val()!='0'){
$('#Editpurchaserate').val(calculatepurchaserate($('#EditAfterBasicPriceTax').val(),$('#EditPurQuantity').val())); $('#Editpurchaserate').val(calculatepurchaserate($('#EditAfterBasicPriceTax').val(),$('#EditPurQuantity').val()));
$('#EditCustomDutyExpenses').val(calculateCustomDutyExpenses($('#EditGrossexpenses').val(),$('#EditPurQuantity').val())); $('#EditCustomDutyExpenses').val(calculateCustomDutyExpenses($('#EditGrossexpenses').val(),$('#EditPurQuantity').val()));
$('#EditRMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#Editpurchaserate').val(),$('#EditCustomDutyExpenses').val())); $('#EditRMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#Editpurchaserate').val(),$('#EditCustomDutyExpenses').val()));
@ -4354,6 +4368,20 @@ function clearAfterAddLineItemAdd(){
$('#EdittxtTotalOrderValue').val(perKg); $('#EdittxtTotalOrderValue').val(perKg);
}
else {
$('#Editpurchaserate').val('0.00');
$('#EditCustomDutyExpenses').val('0.00');
$('#EditRMCIncludingCustomers').val('0.00');
var Rmc = $('#EditRMCIncludingCustomers').val();
var Quanty =$('#EditCPQuantity').val();
var BasicAmt = $('#EditCPQuantity').val();
var perKg = parseFloat(BasicAmt).toFixed(2);
$('#EdittxtTotalOrderValue').val(perKg);
} }
} }
@ -5600,3 +5628,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){

2
application/views/editCapitalAmendPO.php
View File

@ -663,7 +663,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<div class="col-md-4" style="padding:0px;"> <div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;"> <div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
<?php <?php

52
application/views/editCapitalPo.php
View File

@ -407,7 +407,7 @@ $("#PaymentMethod").select2();
foreach ($ReqList as $SID): foreach ($ReqList as $SID):
$options[$SID->ReqNo] = $SID->ReqNo ."-". $SID->ReqNo; $options[$SID->ReqNo] = $SID->ReqNo;
endforeach; endforeach;
} }
@ -666,7 +666,7 @@ $("#PaymentMethod").select2();
<div class="col-md-4" style="padding:0px;"> <div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;"> <div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1199,10 +1199,9 @@ $("#PaymentMethod").select2();
</div> </div>
</div> </div>
<div class="col-md-12" style="padding:2%"> <div class="col-md-12" style="padding:2%">
<div class="col-md-12" id="ADDCAPdiv" > <div class="col-md-12" id="ADDCAPdiv" style="padding:0px;">
<div class="col-md-12" style="border:1px solid #000;padding:0px" > <div class="col-md-12" style="border:1px solid #000;">
<div class="col-md-12"> <div class="col-md-12"> <div class="col-md-4">
<div class="col-md-4">
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Discount Type </label> <label>Discount Type </label>
@ -1342,8 +1341,8 @@ $("#PaymentMethod").select2();
</div> </div>
</div> </div>
</div> </div>
</div> </div> </div>
</div>
<div class="col-md-12" style="padding:1%;" ></div> <div class="col-md-12" style="padding:1%;" ></div>
<div class="col-md-12" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;"> <div class="col-md-12" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
<br/> <br/>
@ -1729,13 +1728,13 @@ $("#PaymentMethod").select2();
</div> </div>
</div> </div>
<div class="col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;"> <div class="col-md-12" style="padding: 0px 30px 10px 30px;text-align: left;">
<label>Capital Description </label> <label>Capital Description </label>
@ -3840,7 +3839,7 @@ EditRatechange();
$('#AvailableModvat').val(calculateAvailableModvatCharge($('#AfterExcisedutyTax').val(),$('#AfterExcisedutyEDcess').val(),$('#AfterExcisedutySHcess').val(),$('#AfterAdditionalExciseduty').val())); $('#AvailableModvat').val(calculateAvailableModvatCharge($('#AfterExcisedutyTax').val(),$('#AfterExcisedutyEDcess').val(),$('#AfterExcisedutySHcess').val(),$('#AfterAdditionalExciseduty').val()));
$('#Grossexpenses').val(calculateGrossexpensesCharge($('#Grossdutypayable').val(),$('#AvailableModvat').val())); $('#Grossexpenses').val(calculateGrossexpensesCharge($('#Grossdutypayable').val(),$('#AvailableModvat').val()));
if($('#PurQuantity').val()!=''){ if($('#PurQuantity').val()!='' && $('#PurQuantity').val()!='0'){
$('#purchaserate').val(calculatepurchaserate($('#AfterBasicPriceTax').val(),$('#PurQuantity').val())); $('#purchaserate').val(calculatepurchaserate($('#AfterBasicPriceTax').val(),$('#PurQuantity').val()));
$('#CustomDutyExpenses').val(calculateCustomDutyExpenses($('#Grossexpenses').val(),$('#PurQuantity').val())); $('#CustomDutyExpenses').val(calculateCustomDutyExpenses($('#Grossexpenses').val(),$('#PurQuantity').val()));
$('#RMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#purchaserate').val(),$('#CustomDutyExpenses').val())); $('#RMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#purchaserate').val(),$('#CustomDutyExpenses').val()));
@ -3851,6 +3850,19 @@ EditRatechange();
$('#txtTotalOrderValue').val(perKg); $('#txtTotalOrderValue').val(perKg);
}
else {
$('#purchaserate').val('0.00');
$('#CustomDutyExpenses').val('0.00');
$('#RMCIncludingCustomers').val('0.00');
var Rmc = $('#RMCIncludingCustomers').val();
var Quanty =$('#CPQuantity').val();
var BasicAmt = $('#CPTotalAmount').val();
var perKg = parseFloat(BasicAmt).toFixed(2);
$('#txtTotalOrderValue').val(perKg);
} }
} }
@ -5563,7 +5575,7 @@ function clearAfterAddLineItemAdd(){
$('#EditAvailableModvat').val(calculateAvailableModvatCharge($('#EditAfterExcisedutyTax').val(),$('#EditAfterExcisedutyEDcess').val(),$('#EditAfterExcisedutySHcess').val(),$('#EditAfterAdditionalExciseduty').val())); $('#EditAvailableModvat').val(calculateAvailableModvatCharge($('#EditAfterExcisedutyTax').val(),$('#EditAfterExcisedutyEDcess').val(),$('#EditAfterExcisedutySHcess').val(),$('#EditAfterAdditionalExciseduty').val()));
$('#EditGrossexpenses').val(calculateGrossexpensesCharge($('#EditGrossdutypayable').val(),$('#EditAvailableModvat').val())); $('#EditGrossexpenses').val(calculateGrossexpensesCharge($('#EditGrossdutypayable').val(),$('#EditAvailableModvat').val()));
if($('#EditPurQuantity').val()!=''){ if($('#EditPurQuantity').val()!='' && $('#EditPurQuantity').val()!='0'){
$('#Editpurchaserate').val(calculatepurchaserate($('#EditAfterBasicPriceTax').val(),$('#EditPurQuantity').val())); $('#Editpurchaserate').val(calculatepurchaserate($('#EditAfterBasicPriceTax').val(),$('#EditPurQuantity').val()));
$('#EditCustomDutyExpenses').val(calculateCustomDutyExpenses($('#EditGrossexpenses').val(),$('#EditPurQuantity').val())); $('#EditCustomDutyExpenses').val(calculateCustomDutyExpenses($('#EditGrossexpenses').val(),$('#EditPurQuantity').val()));
$('#EditRMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#Editpurchaserate').val(),$('#EditCustomDutyExpenses').val())); $('#EditRMCIncludingCustomers').val(calculateRMCIncludingCustomers($('#Editpurchaserate').val(),$('#EditCustomDutyExpenses').val()));
@ -5574,6 +5586,19 @@ function clearAfterAddLineItemAdd(){
$('#EdittxtTotalOrderValue').val(perKg); $('#EdittxtTotalOrderValue').val(perKg);
}
else {
$('#Editpurchaserate').val('0.00');
$('#EditCustomDutyExpenses').val('0.00');
$('#EditRMCIncludingCustomers').val('0.00');
var Rmc = $('#EditRMCIncludingCustomers').val();
var Quanty =$('#EditCPQuantity').val();
var BasicAmt = $('#EditCPQuantity').val();
var perKg = parseFloat(BasicAmt).toFixed(2);
$('#EdittxtTotalOrderValue').val(perKg);
} }
} }
@ -6887,3 +6912,4 @@ function updateDiscountValuesChange(totAmt,disType,disAmt){
</script> </script>

2
application/views/editServiceAmendPO.php
View File

@ -898,7 +898,7 @@ $(document).ready(function () {
<div class="col-md-4" style="padding:0px;"> <div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;"> <div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
<?php <?php

7
application/views/servicePurchaseorder.php
View File

@ -802,7 +802,7 @@ function clearEditTaxField()
<div class="col-md-4" style="padding:0px;"> <div class="col-md-4" style="padding:0px;">
<div class="col-md-6" style="padding:0px;"> <div class="col-md-6" style="padding:0px;">
<label>Other Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1684,7 +1684,9 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$("#EditFrequencyNo").val(1); $("#EditFrequencyNo").val(1);
} }
else{ else{
$('#EditFrequency').val($('#Frequency'+userid).val()+'-'+$('#FrequencyNo'+userid).val());
$('#EditFrequency').val($('#Frequency'+userid).val());
$("#EditFrequencyNo").val($('#FrequencyValue'+userid).val()); $("#EditFrequencyNo").val($('#FrequencyValue'+userid).val());
} }
@ -2502,3 +2504,4 @@ $('#insuranceNo').val('');
</script> </script>