Переглянути джерело

[FIX] Corrección en la sintaxis cambiar ( = por in)

Adrielso 7 роки тому
батько
коміт
758ad55032

+ 18 - 17
static/src/js/eiru_reporting.js

@@ -193,7 +193,7 @@ openerp.eiru_reporting = function (instance, local) {
             var defer = $.Deferred();
             var currency_Rate = new instance.web.Model('res.currency.rate');
             var fields = ['id', 'name', 'currency_id', 'rate', 'create_date'];
-            var domain = [['currency_id', '=', [166 , 20, 7, 3]]];
+            var domain = [['currency_id', 'in', [166 , 20, 7, 3]]];
             currency_Rate.query(fields).filter(domain).all().then(function (results) {
                 defer.resolve(results);
             });
@@ -201,12 +201,12 @@ openerp.eiru_reporting = function (instance, local) {
           },
         // Invoice (FACTURAS)
         fetchInvoiceV2: function () {
-            var filter ="[['state', '=',['open','paid']],['type', '=', 'out_invoice']";
+            var filter ="[['state', 'in',['open','paid']],['type', '=', 'out_invoice']";
             var journal_ids = _.flatten(_.map(this.accountJournal, function (item) {
                 return item.id;
             }));
             if (journal_ids){
-                filter=filter.concat(",['journal_id', '=',["+journal_ids+"]]");
+                filter=filter.concat(",['journal_id', 'in',["+journal_ids+"]]");
             }
             filter=filter.concat("]");
             var field =['id', 'type', 'number', 'origin', 'state', 'journal_id', 'currency_id', 'invoice_line','date_invoice'];
@@ -236,7 +236,7 @@ openerp.eiru_reporting = function (instance, local) {
                 return item.product_id[0];
             }));
             var ProductProdcut =  new instance.web.Model('product.product');
-            var fields = ['id', 'default_code', 'name_template', 'factory_code', 'factory_reference', 'factory_barcode', 'standard_price','type'];
+            var fields = ['id', 'default_code', 'name_template','ean13', 'standard_price','type'];
             ProductProdcut.query(fields).filter([['id', 'in', porductIDS]]).all().then(function (results) {
                 defer.resolve(results)
             });
@@ -732,7 +732,7 @@ openerp.eiru_reporting = function (instance, local) {
             }
 
             var journal = new instance.web.Model('res.store');
-            var field=['id', 'name','out_invoice_id','journal_ids'];
+            var field=['id', 'name','journal_ids'];
 
             journal.query(field).order_by('id').all().then(function(results){
                 defer.resolve(results);
@@ -768,7 +768,7 @@ openerp.eiru_reporting = function (instance, local) {
             var defer = $.Deferred();
             var currency_Rate = new instance.web.Model('res.currency.rate');
             var fields = ['id', 'name', 'currency_id', 'rate', 'create_date'];
-            var domain = [['currency_id', '=', [166 , 20, 7, 3]]];
+            var domain = [['currency_id', 'in', [166 , 20, 7, 3]]];
             currency_Rate.query(fields).filter(domain).all().then(function (results) {
               defer.resolve(results);
             });
@@ -779,7 +779,7 @@ openerp.eiru_reporting = function (instance, local) {
             var self= this;
             var defer = $.Deferred();
             var voucher = new instance.web.Model('account.voucher');
-            var field = ['id', 'reference', 'number', 'partner_id', 'payment_rate_currency_id', 'currency_id', 'company_id',' state',' pre_line', 'payment_rate', 'type', 'date', 'name', 'journal_id', 'amount'];
+            var field = ['id', 'reference', 'number', 'partner_id', 'payment_rate_currency_id', 'currency_id', 'company_id','state','pre_line', 'payment_rate', 'type', 'date', 'name', 'journal_id', 'amount'];
             var domain =[['type', '=', 'payment']];
             voucher.query(field).filter(domain).order_by('id').all().then(function(results){
                 defer.resolve(results);
@@ -1094,6 +1094,7 @@ openerp.eiru_reporting = function (instance, local) {
         currencyRate:[],
         resCompany:[],
         modules:[],
+
         events:{
           'click #toolbar > button' : 'clickOnAction',
           'change #current-journal': 'fectSearch',
@@ -1262,7 +1263,7 @@ openerp.eiru_reporting = function (instance, local) {
             }
 
             var journal = new instance.web.Model('res.store');
-            var field=['id', 'name','out_invoice_id','journal_ids'];
+            var field=['id', 'name','journal_ids'];
 
             journal.query(field).order_by('id').all().then(function(results){
                 defer.resolve(results);
@@ -1286,7 +1287,7 @@ openerp.eiru_reporting = function (instance, local) {
             var defer = $.Deferred();
             var currency_Rate = new instance.web.Model('res.currency.rate');
             var fields = ['id', 'name', 'currency_id', 'rate', 'create_date'];
-            var domain = [['currency_id', '=', [166 , 20, 7, 3]]];
+            var domain = [['currency_id', 'in', [166 , 20, 7, 3]]];
             currency_Rate.query(fields).filter(domain).all().then(function (results) {
               defer.resolve(results);
             });
@@ -1297,7 +1298,7 @@ openerp.eiru_reporting = function (instance, local) {
             var self= this;
             var defer = $.Deferred();
             var voucher = new instance.web.Model('account.voucher');
-            var field = ['id', 'reference', 'number', 'partner_id', 'payment_rate_currency_id', 'currency_id', 'company_id',' state',' pre_line', 'payment_rate', 'type', 'date', 'name', 'journal_id', 'amount'];
+            var field = ['id', 'reference', 'number', 'partner_id', 'payment_rate_currency_id', 'currency_id', 'company_id','state','pre_line', 'payment_rate', 'type', 'date', 'name', 'journal_id', 'amount'];
             var domain =[['type', '=', 'receipt']];
             voucher.query(field).filter(domain).order_by('id').all().then(function(results){
                 defer.resolve(results);
@@ -1650,15 +1651,15 @@ openerp.eiru_reporting = function (instance, local) {
         fecthStockQuant : function(){
             var self = this;
             var defer = $.Deferred();
-            var location = _.map(self.stockLocation,function(item){
+            var location = _.flatten(_.map(self.stockLocation,function(item){
                 return item.id;
-            });
+            }));
             var company_id =(_.map(self.stockLocation, function(item){
                 return item.company_id[0];
             })).shift();
             var quant = new instance.web.Model('stock.quant');
             var fields = ['id', 'product_id', 'qty', 'cost','location_id'];
-            var domain =[['company_id', '=', company_id],['location_id', '=',location]];
+            var domain =[['company_id', '=', company_id],['location_id', 'in',location]];
             quant.query(fields).filter(domain).all().then(function(results){
                 defer.resolve(results);
             })
@@ -1946,7 +1947,7 @@ openerp.eiru_reporting = function (instance, local) {
             }))
             var currency_Rate = new instance.web.Model('res.currency.rate');
             var fields = ['id', 'name', 'currency_id', 'rate', 'create_date'];
-            var domain = [['currency_id', '=', currency_id]];
+            var domain = [['currency_id', 'in', currency_id]];
             currency_Rate.query(fields).filter(domain).all().then(function (results) {
                 defer.resolve(results);
             });
@@ -1968,7 +1969,7 @@ openerp.eiru_reporting = function (instance, local) {
             var journal_ids = _.flatten(_.map(this.accountJournal, function (item) {
                 return item.id;
             }));
-            var filter =[['state', '=',['open','paid']],['type', '=', 'in_invoice'],['origin', '!=', false],['journal_id', '=',journal_ids]];
+            var filter =[['state', 'in',['open','paid']],['type', '=', 'in_invoice'],['origin', '!=', false],['journal_id', 'in',journal_ids]];
             var field =['id', 'type', 'number', 'origin', 'state', 'journal_id', 'currency_id', 'supplier_invoice_number','date_invoice','partner_id','amount_total','user_id'];
             var defer = $.Deferred();
             var Invoice = new instance.web.Model('account.invoice');
@@ -2416,7 +2417,7 @@ openerp.eiru_reporting = function (instance, local) {
             }))
             var currency_Rate = new instance.web.Model('res.currency.rate');
             var fields = ['id', 'name', 'currency_id', 'rate', 'create_date'];
-            var domain = [['currency_id', '=', currency_id]];
+            var domain = [['currency_id', 'in', currency_id]];
             currency_Rate.query(fields).filter(domain).all().then(function (results) {
                 defer.resolve(results);
             });
@@ -2438,7 +2439,7 @@ openerp.eiru_reporting = function (instance, local) {
             var journal_ids = _.flatten(_.map(this.accountJournal, function (item) {
                 return item.id;
             }));
-            var filter =[['state', '=',['open','paid']],['type', '=', 'in_invoice'],['origin', '=', false],['journal_id', '=',journal_ids]];
+            var filter =[['state', 'in',['open','paid']],['type', '=', 'in_invoice'],['origin', '=', false],['journal_id', 'in',journal_ids]];
             var field =['id', 'type', 'number', 'origin', 'state', 'journal_id', 'currency_id', 'supplier_invoice_number','date_invoice','partner_id','amount_total','user_id'];
             var defer = $.Deferred();
             var Invoice = new instance.web.Model('account.invoice');

+ 0 - 9
static/src/reports/all_customers.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<template xml:space="preserve">
-    <t t-name="AllCustomers">
-        <t t-call="EiruReportingBase">
-            <h2>customers</h2>
-        </t>
-    </t>
-</template>

+ 0 - 36
static/src/reports/all_products.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<template xml:space="preserve">
-    <t t-name="AllProducts">
-        <div class="report_view">
-            <div class="reporting_page_header">
-                <h1>Productos</h1>
-            </div>
-            <div id="toolbar">
-                <button class="oe_button oe_form_button oe_highlight" value="pdf">Exportar a PDF</button>
-                <button class="oe_button oe_form_button oe_highlight" value="chart">Graficar</button>
-            </div>
-            <table id="table"
-                data-classes="table table-hover table-condensed"
-                data-buttons-class="oe_button oe_form_button oe_highlight"
-                data-reorderable-columns="true"
-                data-height="500"
-                data-pagination="true"
-                data-search="true"
-                data-show-columns="true"
-                data-toolbar="#toolbar"
-                data-id-field="id">
-                <thead>
-                    <tr>
-                        <th data-field="id" data-sortable="true">ID</th>
-                        <th data-field="name" data-sortable="true">Nombre</th>
-                        <th data-field="code">Ref.</th>
-                        <th data-field="ean13">Cód. de Barras</th>
-                        <th data-field="list_price" data-sortable="true">Precio</th>
-                    </tr>
-                </thead>
-            </table>
-            <canvas></canvas>
-        </div>
-    </t>
-</template>