diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php index a41f5676..0e5a0e1b 100755 --- a/application/models/dahsboard_model.php +++ b/application/models/dahsboard_model.php @@ -1753,7 +1753,7 @@ function ireport_year_wise($a,$b){ // group by month(CreatedDate) // "; //echo $sql; - $sql="select dat as CreatedDate,sum(quantity)as quantity,sum(value) as value,materialrcvddate + $sql="select materialrcvddate,sum(quantity)as quantity,sum(value) as value,materialrcvddate from year_inward where status != 'ST030' and date(materialrcvddate) >= '$a-04-01' and date(materialrcvddate) <= '$b-03-31' group by month(materialrcvddate)"; diff --git a/application/views/Report_Material_Master_ReceiptValue.php b/application/views/Report_Material_Master_ReceiptValue.php index 3d4571ae..fbeaf6d8 100755 --- a/application/views/Report_Material_Master_ReceiptValue.php +++ b/application/views/Report_Material_Master_ReceiptValue.php @@ -1,12 +1,5 @@ - - -
+ +
@@ -58,7 +50,7 @@ if(!empty($mms)) Quantity - Value  () + Value  (₹) @@ -168,6 +160,9 @@ if(!empty($mms)) // Set up your table $(document).ready(function() { table = $('#cc').DataTable( { + "language": { + "emptyTable":"
Data Not Found !
" + }, "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", @@ -185,7 +180,39 @@ $(document).ready(function() { }, 'colvis' - ] + ], + "footerCallback": function ( row, data, start, end, display ) { + var api = this.api(), data; + + // Remove the formatting to get integer data for summation + var intVal = function ( i ) { + return typeof i === 'string' ? + parseFloat(i.replace(/[^0.00-9.00]+/g,"")*1) : + typeof i === 'number' ? + parseFloat(i) : 0; + }; + + TotalQTY = api + .column( 2, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 2 ).footer() ).html( TotalQTY.toFixed().bold() ); + + TotalVALUE = api + .column( 3, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 3 ).footer() ).html( TotalVALUE.toFixed(2).bold() ); + + + } + } ); } ); $('#mySelect').on('change',function(){ diff --git a/application/views/Report_consolidate_month.php b/application/views/Report_consolidate_month.php index 2a75a21e..07262730 100755 --- a/application/views/Report_consolidate_month.php +++ b/application/views/Report_consolidate_month.php @@ -1,12 +1,3 @@ - - - - - - - - - - - -
-
- -
- -
- -
- - - - - id; - - } - } - if(!empty($mappingcashbook)) - { - foreach($mappingcashbook as $mc) - { - $bankid=$mc->bankid; - - } - } - - - if(!empty($paidcbook)){ - - foreach($paidcbook as $pc) - { - $pcamount=$pc->total; - - } + .dataTables_filter { + width: 50%; + float: right; + text-align: right; } - - if(!empty($invoiceramount)) - { - foreach($invoiceramount as $ia) - { - $inamount=$ia->amountreceived; - - } - } - - - $totalamount=$pcamount+$inamount; - //echo $totalamount; - ?> -
-

Bank Credit Amount Paid Report

-
-
-
- -
- - - - - - - - - - - - - - - - - - - - -
Payment IDPayment ModePayment Amount (₹)
bankid?>Bank

- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - + } + + + - - - - - - - - - - - - - - - - - - - - - +
+ +
+ + id; + + } + } + if(!empty($mappingcashbook)) + { + foreach($mappingcashbook as $mc) + { + $bankid=$mc->bankid; - - - - - --> -
DateINVOICE NOCustomer NameTotal Amount (₹)Balance To ReceivedReceived Amount
indate),'d-m-Y');?>invoiceno?>customername?>totinvoiceamount?>balancetoreceived?>amountreceived?>
-

Cashbook Reports

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + } + } + - - - + foreach($paidcbook as $pc) + { + $pcamount=$pc->total; + + } + } + + if(!empty($invoiceramount)) + { + foreach($invoiceramount as $ia) + { + $inamount=$ia->amountreceived; + + } + } + -
DateAccount NameBankidAmount TypeTotal Amount (₹)Option (₹)
date?>name?>bankid?>amounttype?>total?>cashtype?>
-
-
+ $totalamount=$pcamount+$inamount; + + ?> +
+

Bank Credit Amount Paid Report

+
+
+ + +
+ + + + + + + + + + + + + + + + + +
Payment IDPayment ModePayment Amount (₹)
bankid?>Bank
+ +
- +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateINVOICE NOCustomer NameTotal Amount (₹)Balance To ReceivedReceived Amount
indate),'d-m-Y');?>invoiceno?>customername?>totinvoiceamount?>balancetoreceived?>amountreceived?>
+

Cashbook Reports

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateAccount NameBankidAmount TypeTotal Amount (₹)Option (₹)
date?>name?>bankid?>amounttype?>total?>cashtype?>
+
+
+
-
- -
-
- - - - - + + + + +
+ - - - - - - - + + + + + + + - - - - diff --git a/application/views/cashbook_cumulative_month_report.php b/application/views/cashbook_cumulative_month_report.php index 201edff8..e2f2d1c4 100755 --- a/application/views/cashbook_cumulative_month_report.php +++ b/application/views/cashbook_cumulative_month_report.php @@ -142,32 +142,32 @@ if (date('m') >= 4) { Total - Receipt  () - Payment  () - Receipt  () - Payment  () - Recepit  () - Payment  () - Receipt  () - Payment  () - Receipt  () - Payment  () - Recepit  () - Payment  () - Receipt  () - Payment  () - Receipt  () - Payment  () - Recepit  () - Payment  () - Receipt  () - Payment  () - Receipt  () - Payment  () - Recepit  () - Payment  () - Recepit  () - Payment  () + Receipt  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Recepit  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Recepit  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Recepit  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Recepit  (₹) + Payment  (₹) + Recepit  (₹) + Payment  (₹) @@ -267,6 +267,9 @@ if (date('m') >= 4) { // Set up your table $(document).ready(function() { table = $('#ccmonthwise').DataTable( { + "language": { + "emptyTable": "
Data Not Found !
" + }, "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", diff --git a/application/views/cashbook_cumulative_report.php b/application/views/cashbook_cumulative_report.php index 8cdae107..89c7b886 100755 --- a/application/views/cashbook_cumulative_report.php +++ b/application/views/cashbook_cumulative_report.php @@ -54,12 +54,12 @@ - Receipt  () - Payment  () - Receipt  () - Payment  () - Recepit  () - Payment  () + Receipt  (₹) + Payment  (₹) + Receipt  (₹) + Payment  (₹) + Recepit  (₹) + Payment  (₹) Data Not Found ! " + }, "dom": "<'row'<'col-md-6'l><'col-md-6'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", @@ -139,7 +142,73 @@ $(document).ready(function() { }, 'colvis' - ] + ], + "footerCallback": function ( row, data, start, end, display ) { + var api = this.api(), data; + + // Remove the formatting to get integer data for summation + var intVal = function ( i ) { + return typeof i === 'string' ? + parseFloat(i.replace(/[^0.00-9.00]+/g,"")*1) : + typeof i === 'number' ? + parseFloat(i) : 0; + }; + + TotalDailyRcpt = api + .column( 1, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 1 ).footer() ).html( TotalDailyRcpt.toFixed(2).bold() ); + + TotalDailyPmt = api + .column( 2, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 2 ).footer() ).html( TotalDailyPmt.toFixed(2).bold() ); + + TotalMthyRcpt = api + .column( 3, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 3 ).footer() ).html( TotalMthyRcpt.toFixed(2).bold() ); + + TotalMthyPmt = api + .column( 4, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 4 ).footer() ).html( TotalMthyPmt.toFixed(2).bold() ); + + TotalYrlyRcpt = api + .column( 5, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 5 ).footer() ).html( TotalYrlyRcpt.toFixed(2).bold() ); + + TotalYrlyPmt = api + .column( 6, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 6 ).footer() ).html( TotalYrlyPmt.toFixed(2).bold() ); + + } } ); } ); $('#mySelect').on('change',function(){ diff --git a/application/views/cashbookmonthlydep.php b/application/views/cashbookmonthlydep.php index 710c553c..d9aa9fdc 100755 --- a/application/views/cashbookmonthlydep.php +++ b/application/views/cashbookmonthlydep.php @@ -59,18 +59,15 @@ if(!empty($Indiancurrency))
- +
- + - - - - + + - - + @@ -176,8 +173,12 @@ if(!empty($Indiancurrency)) // Bootstrap datepicker // Set up your table $(document).ready(function() { - table = $('#req').DataTable( { - $.fn.dataTable.moment( 'DD-MM-YYYY' ); + $.fn.dataTable.moment( 'DD-MM-YYYY' ); + + table = $('#cb').DataTable( { + "language": { + "emptyTable":"
Data Not Found !
" + }, "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", @@ -195,10 +196,29 @@ $(document).ready(function() { }, 'colvis' - ] + ], + "footerCallback": function ( row, data, start, end, display ) { + var api = this.api(), data; + + // Remove the formatting to get integer data for summation + var intVal = function ( i ) { + return typeof i === 'string' ? + parseFloat(i.replace(/[^0.00-9.00]+/g,"")*1) : + typeof i === 'number' ? + parseFloat(i) : 0; + }; + + TotalPmt = api + .column( 4, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 4 ).footer() ).html( TotalPmt.toFixed(2).bold() ); + } + } ); } ); - - \ No newline at end of file diff --git a/application/views/cashbookmonthlyexp.php b/application/views/cashbookmonthlyexp.php index 520ec87b..25418187 100755 --- a/application/views/cashbookmonthlyexp.php +++ b/application/views/cashbookmonthlyexp.php @@ -183,6 +183,9 @@ if(!empty($Indiancurrency)) $(document).ready(function() { $.fn.dataTable.moment( 'DD-MM-YYYY' ); table = $('#req').DataTable( { + "language": { + "emptyTable":"
Data Not Found !
" + }, "dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" + "<'row'<'col-md-6'><'col-md-6'>>" + "<'row'<'col-md-12't>><'row'<'col-md-4'i><'col-md-8'p>>", @@ -200,10 +203,29 @@ $(document).ready(function() { }, 'colvis' - ] + ], + "footerCallback": function ( row, data, start, end, display ) { + var api = this.api(), data; + + // Remove the formatting to get integer data for summation + var intVal = function ( i ) { + return typeof i === 'string' ? + parseFloat(i.replace(/[^0.00-9.00]+/g,"")*1) : + typeof i === 'number' ? + parseFloat(i) : 0; + }; + + TotalPmt = api + .column( 4, { search:'applied' } ) + .data() + .reduce( function (a, b) { + return intVal(a) + intVal(b); + }, 0 ); + + $( api.column( 4 ).footer() ).html( TotalPmt.toFixed(2).bold() ); + } } ); } ); - - \ No newline at end of file + \ No newline at end of file diff --git a/application/views/cashbookyearmonthwise.php b/application/views/cashbookyearmonthwise.php index 19ff26c2..84b5b83d 100755 --- a/application/views/cashbookyearmonthwise.php +++ b/application/views/cashbookyearmonthwise.php @@ -1,15 +1,3 @@ - -FontCode2000; - }} - ?> -
DateAccount NameTypeAccount NameType Paid To Payment Payment Description Action