Browse Source

[FIX] ajustes varios

Rodney Elpidio Enciso Arias 6 years ago
parent
commit
8bad2ba2a1

+ 2 - 2
__openerp__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 {
-    'name': "Eiru Reports",
+    'name': "Eiru Reports - Ventas",
     'author': "Eiru",
     'category': 'report',
     'version': '1.1',
@@ -11,7 +11,7 @@
         'stock',
         'eiru_assets',
         'account_journal_active',
-        # 'category_expense',
+        'category_expense',
         'multi_store',
         'multi_store_stock',
     ],

BIN
controller/helpers/account_invoice_line.pyc


+ 0 - 1
controller/helpers/pos_order_line.py

@@ -119,7 +119,6 @@ def get_pos_order_line():
             (array_agg(attr_rel.att_id)) AS attr_rel,
             (array_agg(attr_value.name)) AS attr_value,
             (array_agg(attr.id)) AS attr,
-            template.product_brand_id,
             product.id,
             customer.name,
             customer.id,

BIN
controller/helpers/pos_order_line.pyc


+ 0 - 69
static/src/js/chart.js

@@ -5,75 +5,6 @@ function chart(reporting) {
 
     reporting.ReportSaleChartWidget = reporting.Base.extend({
 
-        BuildLineChart: function (label,data,CurrencyBase) {
-            var self = this;
-            Chart.scaleService.updateScaleDefaults('linear', {
-                ticks: {
-                    callback: function(tick) {
-                        return tick.toLocaleString('de-DE');
-                    }
-                }
-            });
-            Chart.defaults.global.tooltips.callbacks.label = function(tooltipItem, data) {
-                var dataset = data.datasets[tooltipItem.datasetIndex];
-                var datasetLabel = dataset.label || '';
-                return datasetLabel +  dataset.data[tooltipItem.index].toLocaleString('de-DE');
-            };
-            var chart = new Chart($(".reporting-chart"), {
-                type: 'line',
-                data: {
-                    labels: label,
-                    datasets: [
-                        {
-                            label: false,
-                            data: data,
-                            backgroundColor: '#bbdefb',
-                            borderColor: '#0288d1',
-                            borderWidth: 1,
-                            fill: true,
-                        }
-                    ]
-                },
-                options: {
-                    responsive: true,
-                    responsiveAnimationDuration:10,
-                    maintainAspectRatio:false,
-                    title: {
-                        display: false,
-                    },
-                    hover: {
-                        mode: 'nearest',
-                        intersect: true
-                    },
-                    legend: {
-                       display: false,
-                    },
-                    layout: {
-                        padding: {
-                            top: 0,
-                            bottom: 0,
-                            left : 0,
-                            rigth: 0,
-                        }
-                    },
-                    events: ['click'],
-                    tooltips: {
-                        callbacks: {
-                            label: function(tooltipItem, data) {
-                                var label = data.datasets[tooltipItem.datasetIndex].label || '';
-
-                                if (label) {
-                                    label += ': ';
-                                }
-                                label += accounting.formatMoney(tooltipItem.yLabel, CurrencyBase.symbol, CurrencyBase.decimal_places, CurrencyBase.thousands_separator, CurrencyBase.decimal_separator);
-                                return label;
-                            }
-                        }
-                    }
-                }
-            });
-        },
-
         BuildBarChart: function (data,CurrencyBase,label,body) {
             var self = this;
             Chart.scaleService.updateScaleDefaults('linear', {

+ 2 - 2
static/src/js/reports/report_sale.js

@@ -640,9 +640,9 @@ function report_sale(reporting){
                     CONFIGURACION DEL PDF
                 ============================================================
                 */
-                var pdf_title = 'Facturas de Venta.';
+                var pdf_title = 'Facturas de Ventas.';
                 var pdf_type = '';
-                var pdf_name = 'facturas_de_venta_';
+                var pdf_name = 'facturas_de_ventas_';
                 var pdf_columnStyles = {
                     number:{columnWidth: 25,halign:'left'},
                     origin:{columnWidth: 15, halign:'center'},

+ 2 - 2
static/src/js/reports/report_sale_analytic.js

@@ -762,9 +762,9 @@ function report_sale_analytic(reporting){
                     CONFIGURACION DEL PDF
                 ============================================================
                 */
-                var pdf_title = 'Analisis de Venta.';
+                var pdf_title = 'Analisis de Ventas.';
                 var pdf_type = 'l';
-                var pdf_name = 'analisis_de_venta_';
+                var pdf_name = 'analisis_de_ventas_';
                 var pdf_columnStyles = {
                     number:{columnWidth: 25, halign:'center'},
                     date:{columnWidth: 20, halign:'center'},