[FIX] ajustes varios

static/src/js/reports/report_amortization_and_interest.js

@@ -210,12 +210,14 @@ function report_amortization_and_interest(reporting){
             columns.push({
                 field:'description',
                 title:'Descripcion',
+                align:'center',
                 footerFormatter:'Totales'
             });
 
             columns.push({
                 field:'date_maturity',
                 title:'Vencimiento',
+                align:'center',
             });
 
             columns.push({
@@ -260,7 +262,7 @@ function report_amortization_and_interest(reporting){
                 title:'Capital Recuperado',
                 align:'right',
                 with:'12%',
-                // footerFormatter:'TotalFormatter'
+                footerFormatter:'CapitalReceiveFormatter'
             });
 
             columns.push({
@@ -268,11 +270,9 @@ function report_amortization_and_interest(reporting){
                 title:'Interes Cobrado',
                 align:'right',
                 with:'12%',
-                // footerFormatter:'TotalFormatter'
+                footerFormatter:'InterestReceiveFormatter'
             });
 
-
-
             var AccountMoveLine = self.getAccountMoveLine(number);
             var AccountInvoice =  _.flatten(_.filter(self.AccountInvoice,function (item){
                 return item.number == number;
@@ -325,6 +325,12 @@ function report_amortization_and_interest(reporting){
                                 }
                                 if(saldo < i.debit && band == true){
                                     residual = i.debit - saldo;
+                                    if(interest_amount >= saldo){
+                                        interest_receive = saldo;
+                                    }else{
+                                        interest_receive = interest_amount;
+                                        capital_receive = saldo - interest_amount;
+                                    }
                                     band = false;
                                 }
                             });
@@ -357,8 +363,10 @@ function report_amortization_and_interest(reporting){
                                 DATOS FORMATADOS
                             ########################
                             */
-                            'residual_value': residual,
-                            'amount_value': item.debit,
+                            residual_value:residual,
+                            amount_value:item.debit,
+                            capital_receive_value:capital_receive,
+                            interest_receive_value:interest_receive,
                         });
                     }
                 }

static/src/reports/report_amortization_and_interest.xml

@@ -112,13 +112,6 @@
                 </div>
             </div>
             <script>
-                function AmountFooter(rowsTable) {
-                    var quantity =  _.reduce(_.map(rowsTable,function(item){
-                        return (item.amount_float);
-                    }), function(memo, num){
-                    return memo + num; },0)
-                    return accounting.formatNumber(quantity,0,'.',',');
-                }
 
                 function TotalFormatter(rowsTable) {
                     var amount =  _.reduce(_.map(rowsTable,function(item){
@@ -136,6 +129,22 @@
                     return accounting.formatNumber(amount,0,'.',',');
                 }
 
+                function CapitalReceiveFormatter(rowsTable) {
+                    var amount =  _.reduce(_.map(rowsTable,function(item){
+                        return (item.capital_receive_value);
+                    }), function(memo, num){
+                    return memo + num; },0)
+                    return accounting.formatNumber(amount,0,'.',',');
+                }
+
+                function InterestReceiveFormatter(rowsTable) {
+                    var amount =  _.reduce(_.map(rowsTable,function(item){
+                        return (item.interest_receive_value);
+                    }), function(memo, num){
+                    return memo + num; },0)
+                    return accounting.formatNumber(amount,0,'.',',');
+                }
+
                 function footerStyle(row, index) {
                     return {
                         css: {