FIX ADD Agregado filtros de metodo de pago, vendedor y campos en analisis de ventas e historico de ventas

static/src/js/reports/report_purchases_invoice_analysis.js

@@ -543,14 +543,14 @@ function report_purchases_invoice_analysis (reporting){
             var pdfDoc = new jsPDF();
 
             pdfDoc.autoTable(getColumns, rows, {
-                styles: { overflow: 'linebreak', fontSize: 8, columnWidth: 'wrap'},
+                styles: { overflow: 'linebreak', fontSize: 7, columnWidth: 'wrap'},
                 columnStyles: {
-                    number: {fontStyle: 'bold'},
-                    date_create :{columnWidth: '13px'},
-                    partner_name :{columnWidth: '10px'},
+                    number: {fontStyle: 23},
+                    date_create :{columnWidth: 18},
+                    partner_name :{columnWidth: '11px'},
                     ean_product:{columnWidth: '8px'},
                     name :{columnWidth: '10px'},
-                    categ_name : {columnWidth: '10px'},
+                    categ_name : {columnWidth: '8px'},
                     quantity :{halign:'right' },
                     price_unity : {halign:'right' },
                     standar_tot : {halign:'right' },

static/src/js/reports/report_sale_cab.js

@@ -114,6 +114,10 @@ function report_sale_cab(reporting){
                   return self.fecthAccountJournal();
              }).then(function(AccountJournal){
                  self.AccountJournal = AccountJournal;
+                 self.$el.find('#current-journal').append('<option value="9999999">Todas las formas de pagos</option>');
+                 _.each(AccountJournal,function(item){
+                     self.$el.find('#current-journal').append('<option value="' + item.id + '">' + item.name + '</option>');
+                 });
                  return self.fetchInvoiceV2();
              }).then(function (invoices){
                  self.invoices = invoices;
@@ -363,6 +367,7 @@ function report_sale_cab(reporting){
             var desde =this.$el.find('#from').val();
             var hasta =this.$el.find('#to').val();
             var partner= this.$el.find('#partner').val().split('-');
+            var journal = this.$el.find('#current-journal').val();
             var store = this.$el.find('#current-store').val();
             var content = self.content;
 
@@ -420,6 +425,12 @@ function report_sale_cab(reporting){
                 });
             }
 
+            if(journal != 9999999){
+                content =_.filter(content, function (inv){
+                    return inv.journal_id == journal;
+                });
+            }
+
             var amount_total_total = _.reduce(_.map(content,function(map){
                 return(map.amount);
             }),function(memo, num){
@@ -491,7 +502,7 @@ function report_sale_cab(reporting){
                     partner : {columnWidth: '8px'},
                     date_invoice : {columnWidth: '8px'},
                     amount_total : {halign:'right',columnWidth: '8px'},
-                    namejournal : {columnWidth: '6px'},
+                    journal_name : {columnWidth: '6px'},
                     user : {halign:'left',columnWidth: '8px'},
                 },
                 margin: { top: 16, horizontal: 7},

static/src/js/reports/report_sales_invoice_analysis.js

@@ -697,20 +697,20 @@ function report_sales_invoice_analysis (reporting){
             pdfDoc.autoTable(getColumns, rows, {
                 styles: { overflow: 'linebreak', fontSize: 7, columnWidth: 'wrap'},
                 columnStyles: {
-                              number: {columnWidth: '13px'},
-                              date_create :{columnWidth: '30px'},
-                              partner_name:{columnWidth: '8px'},
-                              journal_name:{columnWidth: '8px'},
-                              ean_product:{columnWidth: '7px'},
-                              name :{columnWidth: '6px'},
-                              categ_name : {columnWidth: '3px'},
-                              quantity :{halign:'right',columnWidth: '9px'},
-                              price_unity : {halign:'right',columnWidth: '20px'},
-                              standar_price : {halign:'right',columnWidth: '14px'},
-                              price_tot : {halign:'right' ,columnWidth: '20px'},
-                              standar_tot : {halign:'right' ,columnWidth: '15px'},
-                              utility : {halign:'right',columnWidth: '18px'},
-                              user_name : {columnWidth: '3px'},
+                              number: {columnWidth: 23},
+                              date_create :{columnWidth: 18},
+                              partner_name:{columnWidth: 16},
+                              journal_name:{columnWidth: 25},
+                              ean_product:{columnWidth: 12},
+                              name :{columnWidth: 45},
+                              categ_name : {columnWidth: 40},
+                              quantity :{halign:'right',columnWidth: 9},
+                              price_unity : {halign:'right',columnWidth: '20%'},
+                              standar_price : {halign:'right',columnWidth: '18%'},
+                              price_tot : {halign:'right' ,columnWidth: '20%'},
+                              standar_tot : {halign:'right' ,columnWidth: '18%'},
+                              utility : {halign:'right',columnWidth: 20},
+                              user_name : {columnWidth: '5%'},
                           },
                 margin: { top: 16, horizontal: 7},
                 addPageContent: function (data) {

static/src/reports/report_sale_cab.xml

@@ -61,6 +61,10 @@
                                     <label for="partner">Buscar Cliente:</label>
                                     <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ CI/ Ruc"/>
                                 </div>
+                                <div class="form-group">
+                                    <label for="current-journal">Formas de Pago: </label>
+                                    <select id="current-journal" class="form-control ui-autocomplete-input" name="journal"></select>
+                                </div>
                                 <div class="form-group">
                                     <label for="current-store">Sucursal: </label>
                                     <select id="current-store" class="form-control ui-autocomplete-input" name="store"></select>
@@ -87,7 +91,8 @@
                 <thead>
                     <tr>
                         <th data-field="number" data-sortable="true">Orden</th>
-                        <th data-field="partner">Cliente</th>
+                        <th data-field="partner" data-sortable="true">Cliente</th>
+                        <th data-field="journal_name">Forma Pago</th>
                         <th data-field="date_invoice" data-sortable="true">Fecha</th>
                         <th data-field="amount_total" data-sortable="true" data-align="right">Total</th>
                         <th data-field="user" data-sortable="true">Vendedor</th>