ADD FIX Actualización de eiru reporting filtros y nuevos reportes y sumatoria solucinado

__openerp__.py

@@ -13,7 +13,6 @@
         'static/src/reports/report_resumen_ingresos.xml',
         'static/src/reports/report_resumen_egresos.xml',
         'static/src/reports/report_crm.xml',
-        'static/src/reports/report_balance.xml',
         'static/src/reports/report_mensajecrm.xml',
         'static/src/reports/report_phonecall.xml',
         'static/src/reports/report_pos.xml',

static/src/js/configuration_reporting.js

@@ -18,11 +18,11 @@ function configuration_reporting (instance, widget) {
                 description: 'Permite visualizar de forma global los egresos realizado por la empresa.',
                 action: 'ReportResumenEngreso'
             },
-            {
-               title: 'Balance de sumas y saldos',
-               description: 'Permite visualizar un balance de Ingreso y Egreso',
-               action: 'ReportBalance'
-            },
+            // {
+            //    title: 'Balance de sumas y saldos',
+            //    description: 'Permite visualizar un balance de Ingreso y Egreso',
+            //    action: 'ReportBalance'
+            // },
             {
                 title: 'Histórico de Pagos',
                 description: 'Permite visualizar de todos los pagos.',
@@ -43,6 +43,11 @@ function configuration_reporting (instance, widget) {
                 description: 'Permite realizar un analisis de las venta en punto de venta.',
                 action: 'ReportPos'
             },
+            // {
+            //     title: 'Ranking Productos más Vendidos de Punto de Venta',
+            //     description: 'Permite realizar un analisis de los Productos más Vendidos de Punto de Venta.',
+            //     action: 'RankingPosOrdersProductcy'
+            // },
             {
                 title: 'Informe de Trabajos',
                 description: 'Permite visualizar los trabajos facturados y no facturados.',

static/src/js/main.js

@@ -25,10 +25,11 @@ openerp.eiru_reporting = function (instance) {
         report_project(reporting);
         reporting_account(reporting);
         reporting_accountpending(reporting);
-        report_balance(reporting);
+        // report_balance(reporting);
         report_works(reporting);
         report_pos(reporting);
         report_mrp(reporting);
+        // ranking_pos_orders_product_cy(reporting);
 
     } catch (e) {
 

static/src/js/reports/ranking_pos_orders_product_cy.js

@@ -0,0 +1,430 @@
+function ranking_pos_orders_product_cy (reporting) {
+    "use strict";
+
+    var instance = openerp;
+
+    reporting.RankingPosOrdersProductcyWidget = reporting.Base.extend({
+        template: 'RankingPosOrdersProductcy',
+        data: [],
+        accountInvoice: [],
+        invoiceLine: [],
+        productProduct: [],
+        ranking: [],
+        content: [],
+        modelId: [],
+
+        events:{
+            'click #toolbar > button' : 'clickOnAction',
+            'click #X' : 'factSearch',
+            'click #A' : 'factSearch',
+            'click #B' : 'factSearch',
+            'click #C' : 'factSearch',
+            'click #D' : 'factSearch',
+            'click #Z' : 'factSearch',
+
+            'click #Y' : 'factSearch',
+            'change #from' : 'factSearch',
+            'change #to' : 'factSearch',
+            'click-row.bs.table #table ' : 'clickAnalysisDetail',
+        },
+        init : function(parent){
+            this._super(parent);
+        },
+        start: function () {
+            var self = this;
+            var table = this.$el.find('#table');
+            table.bootstrapTable({data : self.rowsData});
+            this.fecthFecha();
+            this.submitForm();
+        },
+
+        // Redirecionar
+        renderReport: function () {
+            var self = this;
+
+            var container = this.$el.closest('.oe_form_sheet.oe_form_sheet_width');
+            this.$el.closest('.report_view').remove();
+            container.find('.report_view').show({
+                effect: 'fade',
+                duration: 200,
+            });
+        },
+        // Verificar el modelo
+        checkModel : function(model){
+            var self = this;
+            return _.filter(self.modules,function(item){return item.name === model});
+        },
+        // Lanzar el mensaje
+        showMensaje : function(modelos){
+            var self = this;
+            $("#dialog" ).dialog({
+                autoOpen: true,
+                resizable: false,
+                modal: true,
+                title: 'Atención',
+                width: 500,
+                open: function() {
+                    $(this).html('Reporte in-disponible, contacte con el administrador del sistema ref : '+modelos);
+                },
+                show: {
+                    effect: "fade",
+                    duration: 200
+                },
+                hide: {
+                    effect: "fade",
+                    duration: 200
+                },
+                buttons: {
+                    Aceptar: function() {
+                        $(this).dialog('close');
+                        self.renderReport()
+                    }
+                }
+            });
+            return
+        },
+
+        submitForm: function () {
+            var self = this;
+            self.fecthIrModuleModule().then(function(modules){
+                self.modules = modules;
+                return modules;
+            }).then(function(modules){
+                return self.fecthPosOrder();
+            }).then(function (PosOrder) {
+                self.PosOrder = PosOrder;
+                return self.fecthPosOrderLine(PosOrder);
+            }).then(function (PosOrderLine) {
+                self.PosOrderLine = PosOrderLine;
+                return self.fecthProductProduct(PosOrderLine);
+            }).then(function(productProduct){
+                self.productProduct = productProduct;
+                return self.fetchProductRanking();
+            });
+        },
+
+        // Modelos instalados
+        fecthIrModuleModule: function(){
+            var self = this;
+            var defer = $.Deferred();
+            var fields = ['name','id'];
+            var domain=[['state','=','installed']];
+            var irModule = new instance.web.Model('ir.module.module');
+
+            irModule.query(fields).filter(domain).all().then(function(results){
+                defer.resolve(results);
+            });
+            return defer;
+        },
+
+        fecthFecha: function() {
+            var to;
+            var dateFormat1 = "mm/dd/yy",
+            from = $( "#from" )
+            .datepicker({
+                dateFormat: "dd/mm/yy",
+                changeMonth: true,
+                numberOfMonths: 1,
+            })
+            .on( "change", function() {
+                to.datepicker( "option", "minDate", getDate(this), "dd/mm/yyyy");
+            });
+            to = $( "#to" ).datepicker({
+                dateFormat: "dd/mm/yy",
+                defaultDate: "+7d",
+                changeMonth: true,
+                numberOfMonths: 1,
+            })
+            .on( "change", function() {
+                from.datepicker( "option", "maxDate", getDate(this));
+            });
+
+            function getDate( element ) {
+                var fechaSel =element.value.split('/');
+                var date;
+                try {
+                    date = $.datepicker.parseDate( dateFormat1, (fechaSel[1]+"/"+fechaSel[0]+"/"+fechaSel[2]));
+                } catch( error ) {
+                    date = null;
+                }
+                return date;
+            }
+        },
+
+        // Obtener Pedido
+        fecthPosOrder: function() {
+            var self = this;
+            var desde = moment().format('YYYY-MM-01 00:00:00');
+            var hasta = moment().add(1,'months').format('YYYY-MM-01 00:00:00');
+            var defer = $.Deferred();
+            var modules = self.checkModel('point_of_sale');
+
+            if (modules.length <= 0){
+                self.showMensaje('point_of_sale');
+                return defer;
+            }
+
+            var fields = ['id', 'lines', 'date_order'];
+            var domain = [['date_order', '>=', desde], ['date_order', '<', hasta], ['state', 'in', ['paid','done','invoiced']]];
+            var PosOrder = new model.web.Model('pos.order');
+            PosOrder.query(fields).filter(domain).all().then(function (results) {
+                defer.resolve(results);
+            });
+
+            return defer;
+        },
+        // Obtener linea de la factura
+        fecthPosOrderLine: function(PosOrder) {
+            var self = this;
+            var defer = $.Deferred();
+            var lines = _.flatten(_.map(PosOrder, function (item) {
+                return item.lines;
+            }));
+            var fields = ['id', 'product_id', 'qty'];
+            var domain = [['id','in', lines]];
+            var PosOrderLine = new model.web.Model('pos.order.line');
+            PosOrderLine.query(fields).filter(domain).all().then(function (results) {
+                defer.resolve(results);
+            });
+
+            return defer;
+        },
+        // Obtener Productos
+        fecthProductProduct: function (PosOrderLine) {
+            var self = this;
+            var defer = $.Deferred();
+            var product_id = _.flatten(_.map(PosOrderLine,function (item) {
+                return item.product_id[0];
+            }));
+            var fields = ['id', 'name_template', 'type','attribute_str'];
+            var domain = [['id', 'in', product_id]];
+            var ProductProduct = new model.web.Model('product.product');
+            ProductProduct.query(fields).filter(domain).all().then(function (results) {
+                defer.resolve(results);
+            });
+
+            return defer;
+        },
+        // get line
+        getPosOrderLine: function (product_id) {
+            var self = this;
+            return _.flatten(_.filter(self.PosOrderLine,function (item) {
+                return item.product_id[0] === product_id
+            }));
+        },
+        // Generear el ranking
+        fetchProductRanking: function() {
+            var self = this;
+            var itemProduct;
+            var itemLine;
+            var ranking = [];
+            var cat = 0;
+            var attribute;
+            var lineUnik;
+            console.log(self.productProduct);
+            for (var i = 0; i < self.productProduct.length; i++) {
+                itemProduct = self.productProduct[i];
+                itemLine = self.getPosOrderLine(itemProduct.id);
+                if (itemLine.length > 0) {
+                    cat = _.reduce(_.map(itemLine, function (map) {
+                        return map.qty
+                    }), function (meno,num) {
+                        return meno + num
+                    }, 0);
+
+                    lineUnik = itemLine.shift();
+
+                    if(itemProduct.attribute_str){
+                        attribute = '*' + itemProduct.attribute_str;
+                    }else{
+                        attribute = ' ';
+                    }
+                    ranking.push({
+                        product: itemProduct.name_template + ' ' + attribute,
+                        qty: cat,
+                        id: lineUnik.product_id[0],
+                        type: itemProduct.type
+                    });
+                }
+            }
+
+
+            // ranking.sort(function(a, b) {
+            //     return b.qty - a.qty
+            // });
+
+            self.content = data;
+            this.loadTable(data);
+            // self.$el.unblock();
+            // self.$el.find('.widget-content.widget-loading').css('display','none');
+            // var fecha = new Date();
+            // var meses = new Array ("Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre");
+            // self.$el.find('.widget-title').find('span').text("Ranking de productos y servicios del mes de " + meses[fecha.getMonth()]);
+            // self.ranking = ranking;
+            // self.fetchChart(ranking);
+        },
+
+        factSearch: function(){
+            var self = this;
+            var hoy = moment().format('YYYY-MM-DD');
+            var desde =this.$el.find('#from').val();
+            var hasta =this.$el.find('#to').val();
+            var content = self.content;
+
+            if ($('#A').is(":checked")){
+                content = _.filter(content, function (inv){
+                    return inv.date == hoy;
+                });
+            }
+            if ($('#B').is(":checked")){
+                var date = hoy.split('-');
+                var ayer = date[2] - 1;
+                date.splice(2,0);
+                date[2] = '0'+ayer;
+                content = _.filter(content, function (inv){
+                    return inv.date == date[0]+'-'+date[1]+'-'+date[2];
+                });
+            }
+            if ($('#C').is(":checked")){
+                var date = hoy.split('-');
+                content = _.filter(content, function (inv){
+                    var mes = inv.date.split('-');
+                    return mes[0]+'-'+mes[1] == date[0]+'-'+date[1];
+                });
+            }
+            if ($('#D').is(":checked")){
+                var date = hoy.split('-');
+                var mes = date[1] - 1;
+                var year;
+                date.splice(1,0);
+                if(date[1] == 1){
+                    date[1] = '12';
+                    year = date[0] - 1;
+                    date[0] = year;
+                }else{
+
+                 if(date[1] < 10){
+                     date[1] = '0'+mes;
+                 }else{
+                     date[1] = mes;
+                 }
+                }
+                content = _.filter(content, function (inv){
+                    var mes = inv.date.split('-');
+                    return mes[0]+'-'+mes[1] == date[0]+'-'+date[1];
+                });
+            }
+            if ($('#Z').is(":checked")){
+                $('#datepicker').css('display','block');
+                if (desde.length > 0){
+                    var date= desde.split('/');
+                    content = _.filter(content, function (inv){
+                        return inv.date >= (date[2]+"-"+date[1]+"-"+date[0]);
+                    });
+                }
+                if (hasta.length > 0){
+                    var date= hasta.split('/');
+                    content = _.filter(content, function (inv){
+                        return inv.date <= (date[2]+"-"+date[1]+"-"+date[0]);
+                    });
+                }
+            }else{
+                $('#datepicker').css('display','none');
+            }
+
+            self.loadTable(content)
+        },
+        loadTable:function(rowsTable){
+            var self = this;
+            self.rowsData = rowsTable;
+            var table = this.$el.find('#table');
+            table.bootstrapTable('load',rowsTable);
+        },
+        getObjetPdf: function(rowsTable){
+            var self = this;
+            var rows=self.rowsData;
+
+            return rows;
+        },
+        clickOnAction: function (e) {
+            var self = this;
+            var rowsNew;
+            var action = self.$el.find(e.target).val();
+            var table = self.$el.find("#table");
+            var data2 = table.bootstrapTable('getVisibleColumns');
+            var getColumns=[];
+            var rows=[];
+            rowsNew = self.getObjetPdf();
+            if (action === 'pdf') {
+                var dataNEW = _.map(data2, function (val){
+                    return val.field;
+                });
+                _.each(rowsNew,function (item){
+                    rows.push(_.pick(item, dataNEW));
+                });
+                // Obtener los nombre de la Cabezera
+                _.each(_.map(data2,function(val){
+                        return val;
+                    }), function(item){
+                            getColumns.push([{
+                                        title: item.title,
+                                        dataKey: item.field
+                                    }]);
+                });
+                this.drawPDF(_.flatten(getColumns),rows);
+            }
+        },
+        drawPDF: function (getColumns,rows) {
+            var self = this;
+            var desde =(this.$el.find('#from').val());
+            var hasta =(this.$el.find('#to').val());
+            var totalPagesExp = "{total_pages_count_string}";
+            var pdfDoc = new jsPDF();
+
+            pdfDoc.autoTable(getColumns, rows, {
+                styles: { overflow: 'linebreak', fontSize: 8, columnWidth: 'wrap'},
+                columnStyles: {
+                    product : {columnWidth: '10px'},
+                    qty : {halign:'right',columnWidth: '8px'},
+                    type : {halign:'left',columnWidth: '8px'},
+                },
+                margin: { top: 16, horizontal: 7},
+                addPageContent: function (data) {
+                    pdfDoc.setFontSize(12);
+                    pdfDoc.setFontStyle('bold');
+                    pdfDoc.setTextColor(40);
+                    pdfDoc.text('Producto más vendidos Punto de Venta ', data.settings.margin.left, 10);
+
+                    if(desde.length > 0 || hasta.length > 0){
+                        var fecha='';
+                        if(desde){
+                            fecha=fecha.concat(' Desde '+desde);
+                        }
+                        if (hasta){
+                            fecha=fecha.concat(' Hasta '+hasta);
+                        }
+                        pdfDoc.setFontSize(10);
+                        pdfDoc.setFontStyle('bold');
+                        pdfDoc.setTextColor(40)
+                        pdfDoc.text(fecha, data.settings.margin.left,14);
+                    }
+                    // FOOTER
+                    var str = "Pagina  " + data.pageCount;
+                    // Total page number plugin only available in jspdf v1.0+
+                    if (typeof pdfDoc.putTotalPages === 'function') {
+                        str = str + " de " + totalPagesExp;
+                    }
+                    pdfDoc.setFontSize(9);
+                    pdfDoc.setFontStyle('bold');
+                    pdfDoc.setTextColor(40);
+                    pdfDoc.text(str, data.settings.margin.left, pdfDoc.internal.pageSize.height - 5);
+                    }
+            });
+
+            if (typeof pdfDoc.putTotalPages === 'function') {
+                pdfDoc.putTotalPages(totalPagesExp);
+            }
+            pdfDoc.save('Producto más vendidos Punto de Venta.pdf')
+        },
+    });
+}

static/src/js/reports/report_mrp.js

@@ -265,7 +265,7 @@ function report_mrp(reporting){
                             product_qty: accounting.formatNumber(self.valorNull(item.product_qty),2, ".", ","),
                             qty_produced: accounting.formatNumber(self.valorNull(item.qty_produced),2, ".", ","),
                             state: item.state,
-                            date_planned: moment(item.date_planned).format("YYYY-MM-DD"),
+                            date_planned: moment(item.date_planned).format("DD/MM/YYYY"),
                             product_id : item.product_id[0]
                         });
                     });

static/src/js/reports/report_purchases_invoice_analysis.js

@@ -341,7 +341,7 @@ function report_purchases_invoice_analysis (reporting){
                         date[1] = mes;
                     }
                 }
-                self.rowsData = _.filter(content, function (inv){
+                self.rowsData = _.filter(self.rowsData, function (inv){
                     var mes = inv.date.split('-');
                     return mes[0]+'-'+mes[1] == date[0]+'-'+date[1];
                 });
@@ -382,7 +382,7 @@ function report_purchases_invoice_analysis (reporting){
             }
             if (product != ""){
                 self.rowsData = _.filter(self.rowsData, function(inv){
-                
+
                     return inv.id_product == product[0];
                 });
             }

static/src/reports/ranking_pos_orders_product_cy.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template xml:space="preserve">
+    <t t-name="RankingPosOrdersProductcy">
+        <div class="report_view">
+            <div class="reporting_page_header">
+                <h1>Ranking Producto más vendidos Punto de Venta</h1>
+            </div>
+            <button type="button" class="oe_button oe_form_button oe_highlight" aria-label="Left Align" data-toggle="collapse" href="#collapseExample" aria-expanded="false" aria-controls="collapseExample">FILTRAR
+            </button>
+            <div class="collapse" id="collapseExample">
+                <div class="card card-body">
+                    <br/>
+                    <div class="row">
+                        <div class="col-xs-6">
+                            <div class="panel panel-default">
+                                <div class="panel-heading">Fechas</div>
+                                <div class="panel-body">
+                                    <ul>
+                                        <li>
+                                            <input type="radio" name="valores" id="X" value="X" checked="checked"/>
+                                            <label for="X">Sin Filtro</label>
+                                        </li>
+                                        <li>
+                                            <input type="radio" name="valores" id="A" value="A"/>
+                                            <label for="A">Hoy</label>
+                                        </li>
+                                        <li>
+                                            <input type="radio" name="valores" id="B" value="B"/>
+                                            <label for="B">Ayer</label>
+                                        </li>
+                                        <li>
+                                            <input type="radio" name="valores" id="C" value="C"/>
+                                            <label for="C">Mes Actual</label>
+                                        </li>
+                                        <li>
+                                            <input type="radio" name="valores" id="D" value="D"/>
+                                            <label for="D">Mes Pasado</label>
+                                        </li>
+                                        <li>
+                                            <input type="radio" name="valores" id="Z" value="Z"/>
+                                            <label for="Z">Busqueda Avanzada</label>
+                                        </li>
+                                    </ul>
+                                    <div id="datepicker" style="display:none;" class="container">
+                                        <label for="from">Desde: </label>
+                                        <input type="text"  id="from" name="from"/>
+                                        <label for="to" >Hasta: </label>
+                                        <input type="text"  id="to" name="to" />
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+                        <!-- <div class="col-xs-6">
+                            <div class="panel panel-default">
+                                <div class="panel-heading">Características</div>
+                                <div class="panel-body">
+                                    <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>
+                        </div> -->
+                    </div>
+                </div>
+            </div>
+            <div id="toolbar">
+                <button class="oe_button oe_form_button oe_highlight btn-block" value="pdf">PDF</button>
+            </div>
+            <table id="table" class="table_paint_first_row"
+                data-pagination="true"
+                data-toggle="table"
+                data-reorderable-columns="true"
+                data-toolbar="#toolbar"
+                data-show-columns="true"
+                data-buttons-class="oe_button oe_form_button oe_highlight"
+                data-height="auto"
+                data-classes="table table-hover table-condensed"
+                data-row-style="rowStyle"
+                data-search="true">
+                <thead>
+                    <tr>
+                        <th data-field="product">Producto</th>
+                        <th data-field="qty" data-sortable="true" data-align="right">Cantidad</th>
+                        <th data-field="type" data-sortable="true">Tipo</th>
+                    </tr>
+                </thead>
+            </table>
+            <canvas></canvas>
+            <div id="dialog"></div>
+        </div>
+    </t>
+</template>

static/src/reports/report_mrp.xml

@@ -82,7 +82,7 @@
                     <tr>
                         <th data-field="name" data-sortable="true">Orden</th>
                         <th data-field="product">Producto</th>
-                        <th data-field="date" data-sortable="true">Fecha Solicitado</th>
+                        <th data-field="create_date" data-sortable="true">Fecha Solicitado</th>
                         <th data-field="product_qty" data-sortable="true" data-align="right">Cant. a Producir</th>
                         <th data-field="qty_produced" data-sortable="true" data-align="right">Cant. Producido</th>
                         <th data-field="date_planned" data-sortable="true">Fecha Planeado</th>

templates.xml

@@ -19,7 +19,7 @@
                 <!-- Historico de pagos -->
                 <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_vouchers.js" />
                 <!-- Historico de facturas -->
-                <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_invoice_balance.js" />
+                <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_invoice_balance.js" /> -->
                 <!-- Historico de punto de ventas -->
                 <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_pos.js"/>
 
@@ -37,7 +37,7 @@
                  <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_mensajecrm.js"/>
                  <!-- project -->
                  <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_project.js"/>
-                 <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_balance.js"/>
+                 <!-- <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_balance.js"/> -->
                 <!-- account -->
                 <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/reporting_account.js"/>
                 <!-- accountpending -->
@@ -46,6 +46,8 @@
                 <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_works.js"/>
                 <!-- mrp -->
                 <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_mrp.js"/>
+                <!-- Ranking Pos -->
+                <!-- <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/ranking_pos_orders_product_cy.js"/> -->
                 <!-- Analisis de gastos -->
                 <!-- <script type="text/javascript" src="/eiru_reporting/static/src/js/reports/report_expenses_invoice _analysis.js" /> -->
                 <!-- Utilidad de facturas detalladas -->