From da4951285743503601d9a534705b3b6ccb061210 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 28 Jul 2017 16:28:13 +0530 Subject: [PATCH] revenue bug fixed --- application/views/alterpurchaseorder.php | 15 +++++----- application/views/capitalpopdf.php | 6 ++-- application/views/capitalpurchaseorder.php | 15 ++++++++-- application/views/editCapitalPo.php | 2 +- application/views/purchaseorder.php | 34 +++++++++++++++------- application/views/revenuepopdf.php | 11 ++++--- application/views/servicepopdf.php | 21 +++++++------ 7 files changed, 66 insertions(+), 38 deletions(-) diff --git a/application/views/alterpurchaseorder.php b/application/views/alterpurchaseorder.php index e473ae40..d3e18b16 100755 --- a/application/views/alterpurchaseorder.php +++ b/application/views/alterpurchaseorder.php @@ -2412,7 +2412,7 @@ function populateValueMainFormForDeleteItem(rowid)
'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control num' ); + $data = array('name' => 'EdittxtSpcialInstructionSingle','value' => set_value('EdittxtSpcialInstructionSingle'),'id'=>'EdittxtSpcialInstructionSingle', 'class' => 'form-control' ); echo form_input($data); ?>
@@ -3384,7 +3384,7 @@ function populateValueMainFormForDeleteItem(rowid)
'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control num' ); + $data = array('name' => 'txtSpcialInstructionSingle','value' => set_value('txtSpcialInstructionSingle'),'id'=>'txtSpcialInstructionSingle', 'class' => 'form-control' ); echo form_input($data); ?>
@@ -4781,7 +4781,7 @@ function populateValueMainFormForDeleteItem(rowid)
'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control num' ,'rows' => '4', 'cols' => '40' ); + $data = array('name' => 'ScopeOfWork','value' => set_value('ScopeOfWork'),'id'=>'ScopeOfWork', 'class' => 'form-control num' ,'rows' => '4', 'cols' => '40' ); echo form_textarea($data); ?>
@@ -5868,7 +5868,7 @@ function populateValueMainFormForDeleteItem(rowid) $('#EditTotalOrderValue').val(cellval[9].innerHTML); $('#EditOtherAllowances').val($('#OtherAmt'+userid).val()); $('#EdittxtSpcialInstructionSingle').val($('#ItemServiceDescription'+userid).val()); - if($('#Frequency'+userid).val()!='Recurring'){ + if($('#FrequencySchedule'+userid).val()!='Recurring'){ $('#EditFrequencyChange').val('One time'); @@ -6207,7 +6207,7 @@ $('#content').loader('hide'); stat = ''; } - + tinyMCE.triggerSave(); var splinstr = $('#ScopeOfWork').val(); $('#ScopeOfWork').val(splinstr); var deladd = $('#DeliveryAddr').val(); @@ -6217,7 +6217,7 @@ $('#content').loader('hide'); var TextRowCount = $('#txtRowCount').val(); var TextDeletedRowCount = $('#txtDeletedRow').val(); var TextTotalOrderValueSummaryService = $('#txtTotalOrderValueSummaryService').val(); - var TextSpcialInstruction = $('#txtSpcialInstruction').val(); + var TextSpcialInstruction = $('#ScopeOfWork').val(); var TextStatus = stat; var PaymentMethod = $('#PaymentMethod').val(); @@ -6934,5 +6934,4 @@ function calculateRevenueEditTaxValue() return tot; } - - \ No newline at end of file + \ No newline at end of file diff --git a/application/views/capitalpopdf.php b/application/views/capitalpopdf.php index 15bf1d73..a9fd68a4 100755 --- a/application/views/capitalpopdf.php +++ b/application/views/capitalpopdf.php @@ -231,8 +231,8 @@ MaterialName ; ?> Quantity ; ?> UOM ; ?> - Rate),2) ; ?> - Quantity * $record->Rate),2);?> + Rate),2, '.', '') ; ?> + Quantity * $record->Rate),2, '.', '');?> @@ -258,7 +258,7 @@ Total Amount In Words

- Total Order Amount in Total Order Amount in
+ Total Order Amount in Total Order Amount in
diff --git a/application/views/capitalpurchaseorder.php b/application/views/capitalpurchaseorder.php index 9d0fa0a5..0bc880b7 100755 --- a/application/views/capitalpurchaseorder.php +++ b/application/views/capitalpurchaseorder.php @@ -166,10 +166,10 @@ function vaildateBeforeOpenModal() $('#currencytype').focus(); return false; } - else if($('#ExchangeRate').val() == '') + else if($('#ExchangeRt').val() == '') { alert('Please Enter the Exchange Rate'); - $('#ExchangeRate').focus(); + $('#ExchangeRt').focus(); return false; } @@ -1144,6 +1144,15 @@ function vaildateBeforeOpenModal() ?> +
+ +
+ 'EditCapitalbudAmt','value' => set_value('EditCapitalbudAmt'),'id'=>'EditCapitalbudAmt', 'class' => 'form-control' ,'readonly' => 'true'); + echo form_input($data); + ?> +
+
@@ -1835,7 +1844,7 @@ function vaildateBeforeOpenModal() 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder'),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + $data = array('name' => 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder'),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:left;'); echo form_input($data); ?>
diff --git a/application/views/editCapitalPo.php b/application/views/editCapitalPo.php index bc767c79..859cc728 100755 --- a/application/views/editCapitalPo.php +++ b/application/views/editCapitalPo.php @@ -2705,7 +2705,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block'; 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;'); + $data = array('name' => 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:left;'); echo form_input($data); ?> diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php index 60408718..c9711565 100755 --- a/application/views/purchaseorder.php +++ b/application/views/purchaseorder.php @@ -1756,7 +1756,7 @@ return true; var txtQuantity = parseFloat( $('#EditQuantity').val()); var txtUnitPrice = parseFloat($('#EditRate').val()); var Tot = txtQuantity * txtUnitPrice - $('#txtEditBasicValue').val(Tot); + $('#txtEditBasicValue').val(parseFloat(Tot).toFixed(2)); if($("#EditCgst").val()!=''){ @@ -1771,10 +1771,16 @@ return true; $('#EditAfterIgst').val(calculateIgstTax($('#txtEditBasicValue').val(),$('#EditIgst').val())); } - calculateDiscount(1); - calculatePackaging(1); - - calculateFreight(1); + if ($("#DiscountType").val()!=0) { + calculateDiscount(1); + } + if ($("#PackagingType").val()!=0) { + calculatePackaging(1); + } + if($("#drpFreight").val()!=0){ + calculateFreight(1); + + } calculateEditTotalValue($('#isEdit').val()); } @@ -3177,7 +3183,8 @@ $('.AddRevenue').click(function(){ var AfterFreightVal = $("#txtAfterFreight").val(); var basicval = $("#txtBasicValue").val(); - var Insval = parseFloat($("#txtInsurance").val()).toFixed(2); + var Insval = parseFloat($('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val()).toFixed(2); + var TotalOrderValue = $("#txtTotalOrderValue").val(); var Cgst = $("#Cgst").val(); var AfterCgst = $("#AfterCgst").val(); @@ -3722,11 +3729,18 @@ function change(){ $('#AfterIgst').val(calculateIgstTax($('#txtBasicValue').val(),$('#Igst').val())); } - - calculateDiscount(0); - calculatePackaging(0); + if ($("#DiscountType").val()!=0) { + calculateDiscount(0); + } + if ($("#PackagingType").val()!=0) { + calculatePackaging(0); + } + if($("#drpFreight").val()!=0){ + calculateFreight(0); + + } + - calculateFreight(0); calculateTotalValue(); diff --git a/application/views/revenuepopdf.php b/application/views/revenuepopdf.php index 984e0a60..d5482ef2 100755 --- a/application/views/revenuepopdf.php +++ b/application/views/revenuepopdf.php @@ -204,7 +204,7 @@ AfterPackagingValue;?> AfterFreightValue;?> Insurance;?> - + -Total Amount Before Tax In INR +Total Amount Before Tax In INR -Total Tax Amount In INR +Total Tax Amount In INR -Total Amount After Tax In INR +Total Amount After Tax In INR @@ -284,6 +284,8 @@ +
+

Special Instruction:

--> +

 

Released By : FirstName;?>
Released On : format('d-m-Y');?>
diff --git a/application/views/servicepopdf.php b/application/views/servicepopdf.php index 1d361576..9f2a10a1 100755 --- a/application/views/servicepopdf.php +++ b/application/views/servicepopdf.php @@ -186,7 +186,7 @@ # -Item Name +Item Code Service Description @@ -227,19 +227,19 @@ ?> - MaterialName ; ?> + MaterialCode ; ?> ServiceMaterialDescription ; ?> UOM ; ?> Quantity ; ?> - Rate ; ?> + Rate, 2, '.', ''); ?> NumberOfService==0 || $record->NumberOfService==''){ - echo $record->BasicValue; + echo number_format($record->BasicValue, 2, '.', ''); $TotalAmount = $record->BasicValue + $record->Taxamount + $record->otherallowance; $SubTotalAmount = $SubTotalAmount + $record->BasicValue + $record->otherallowance; } else{ - echo $record->BasicValue * $record->NumberOfService; + echo number_format($record->BasicValue * $record->NumberOfService, 2, '.', ''); $TotalAmount = $record->BasicValue * $record->NumberOfService + $record->Taxamount + $record->otherallowance; $SubTotalAmount = $SubTotalAmount + $record->BasicValue * $record->NumberOfService + $record->otherallowance; } @@ -248,7 +248,7 @@ After_CGST ; ?> After_IGST ; ?> otherallowance ; ?> - + Total Amount Before Tax In INR - +Total Amount Before Tax In INR - @@ -318,7 +318,7 @@ -Total Tax Amount In INR - +Total Tax Amount In INR - @@ -330,7 +330,7 @@ -Total Amount After Tax In INR - +Total Amount After Tax In INR - @@ -384,6 +384,8 @@ +
+

Scope Of Work:

@@ -413,6 +415,7 @@ --> +

 

Released By : FirstName;?>
Released On : format('d-m-Y');?>