소스 검색

[FIX] correxiones en las vistas

Rodney Enciso Arias 7 년 전
부모
커밋
badf6da76b

BIN
__init__.pyc


BIN
controllers.pyc


BIN
models.pyc


+ 12 - 12
static/src/js/reports/report_purchases_invoice _analysis.js

@@ -195,9 +195,9 @@ function report_purchases_invoice_analysis (reporting){
             var porductIDS = _.flatten(_.map(self.AccountInvoiceLine, function (item) {
                 return item.product_id[0];
             }));
-            var ProductProdcut =  new model.web.Model('product.product');
-            var fields = ['id','name', 'default_code', 'name_template','ean13', 'standard_price','type'];
-            ProductProdcut.query(fields).filter([['id', 'in', porductIDS]]).all().then(function (results) {
+            var ProductProduct =  new model.web.Model('product.product');
+            var fields = ['id','name', 'default_code', 'name_template','ean13', 'standard_price','type','attribute_str'];
+            ProductProduct.query(fields).filter([['id', 'in', porductIDS]]).all().then(function (results) {
                 defer.resolve(results)
             });
             return defer;
@@ -394,24 +394,24 @@ function report_purchases_invoice_analysis (reporting){
                 minLength:0,
                 search: function(event, ui) {
                     if (!(self.$('#partner').val())){
-                        self.fectSearch();
+                        self.factSearch();
                     }
                 },
                 close: function( event, ui ) {
-                        self.fectSearch();
+                        self.factSearch();
                 },
                 select: function(event, ui) {
-                    self.fectSearch();
+                    self.factSearch();
                 }
             });
         },
         searchProduct: function () {
             var self = this;
-            var results = self.productProduct;
+            var results = self.ProductProduct;
             results = _.map(results, function (item) {
                 return {
-                        label: item.id + '-'+ item.name,
-                        value: item.id + '-'+ item.name
+                    label: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) ' ,
+                    value: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) '
                 }
             });
             self.$('#product').autocomplete({
@@ -419,14 +419,14 @@ function report_purchases_invoice_analysis (reporting){
                 minLength:0,
                 search: function(event, ui) {
                     if (!(self.$('#product').val())){
-                        self.fectSearch();
+                        self.factSearch();
                     }
                 },
                 close: function( event, ui ) {
-                        self.fectSearch();
+                        self.factSearch();
                 },
                 select: function(event, ui) {
-                    self.fectSearch();
+                    self.factSearch();
                 }
             });
         },

+ 3 - 3
static/src/js/reports/report_sales_invoice _analysis.js

@@ -221,7 +221,7 @@ function report_sale_invoice_analysis (reporting){
                 return item.product_id[0];
             }));
             var ProductProdcut =  new model.web.Model('product.product');
-            var fields = ['id','name', 'default_code', 'name_template','ean13', 'standard_price','type'];
+            var fields = ['id','name', 'default_code', 'name_template','ean13', 'standard_price','type','attribute_str'];
             ProductProdcut.query(fields).filter([['id', 'in', porductIDS]]).all().then(function (results) {
                 defer.resolve(results)
             });
@@ -410,8 +410,8 @@ function report_sale_invoice_analysis (reporting){
             var results = self.productProduct;
             results = _.map(results, function (item) {
                 return {
-                        label: item.id + '-'+ item.name,
-                        value: item.id + '-'+ item.name
+                    label: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) ' ,
+                    value: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) '
                 }
             });
             self.$('#product').autocomplete({

+ 3 - 3
static/src/js/reports/report_stock.js

@@ -108,7 +108,7 @@ function report_stock (reporting){
             var ids = _.flatten(_.map(self.StockQuant, function (item) {
                 return item.product_id[0];
             }));
-            var fields = ['id','name','name_template', 'standard_price','type','attribute_value_ids', 'lst_price','ean13','categ_id'];
+            var fields = ['id','name','name_template', 'standard_price','type','attribute_value_ids', 'lst_price','ean13','categ_id','attribute_str'];
             var ProductProduct =  new instance.web.Model('product.product');
             ProductProduct.query(fields).filter([['id', 'in', ids]]).all().then(function (results) {
               defer.resolve(results)
@@ -187,8 +187,8 @@ function report_stock (reporting){
             var results = self.ProductProduct;
             results = _.map(results, function (item) {
                 return {
-                        label: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' ] ' + ' - ' + item.name + ' ( ' + self.valorNull(item.ean13) + ' )',
-                        value: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' ] ' + ' - ' + item.name + ' ( ' + self.valorNull(item.ean13) + ' ) '
+                        label: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) ' ,
+                        value: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) '
                 }
             });
             self.$('#product').autocomplete({

+ 3 - 3
static/src/js/reports/report_stock_move.js

@@ -171,7 +171,7 @@ function report_stock_move(reporting){
             var self = this;
             var defer = $.Deferred();
             var ProductProduct = new instance.web.Model('product.product');
-            ProductProduct.query(['id', 'name',]).filter([['active', '=', true]]).all().then(function (results) {
+            ProductProduct.query(['id', 'name','ean13','default_code','attribute_str']).filter([['active', '=', true]]).all().then(function (results) {
                 defer.resolve(results);
             });
             return defer;
@@ -217,8 +217,8 @@ function report_stock_move(reporting){
             var results = self.ProductProduct;
             results = _.map(results, function (item) {
                 return {
-                        label: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' ] ' + ' - ' + item.name + ' ( ' + self.valorNull(item.ean13) + ' )',
-                        value: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' ] ' + ' - ' + item.name + ' ( ' + self.valorNull(item.ean13) + ' ) '
+                        label: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) ' ,
+                        value: item.id + '- '+ ' [ ' + self.valorNull(item.default_code) + ' - ' + self.valorNull(item.ean13) + ' ] ' + item.name + ' ( ' +  self.valorNull(item.attribute_str) + ' ) '
                 }
             });
             self.$('#product').autocomplete({

+ 76 - 78
static/src/reports/report_invoice_balance.xml

@@ -8,101 +8,99 @@
             </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">
+            <div class="collapse" id="collapseExample">  
+                <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 class="list-unstyled">
+                                    <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">
+                                <div class="col-xs-6">
+                                    <h3>Tipo</h3>
                                     <ul class="list-unstyled">
                                         <li>
-                                            <input type="radio" name="valores" id="X" value="X" checked="checked"/> 
-                                            <label for="X">Sin Filtro</label>  
+                                            <input type="radio" name="cateritica" id="Y" value="Y" checked="checked"/> 
+                                            <label for="Y">Sin Filtro</label>  
                                         </li>
                                         <li>
-                                            <input type="radio" name="valores" id="A" value="A"/> 
-                                            <label for="A">Hoy</label>  
+                                            <input type="radio" name="cateritica" id="sale" value="sale"/> 
+                                            <label for="sale">Factura de venta</label>  
                                         </li>
                                         <li>
-                                            <input type="radio" name="valores" id="B" value="B"/>
-                                            <label for="B">Ayer</label>
+                                            <input type="radio" name="cateritica" id="purchase" value="purchase"/>
+                                            <label for="purchase">Factura de compra</label>
                                         </li>
                                         <li>
-                                            <input type="radio" name="valores" id="C" value="C"/>
-                                            <label for="C">Mes Actual</label>
+                                            <input type="radio" name="cateritica" id="expense" value="expense"/>
+                                            <label for="expense">Factura de gasto</label>
+                                        </li>
+                                    </ul>
+                                </div>
+                                <div class="col-xs-6">
+                                    <h3>Estado</h3>
+                                    <ul class="list-unstyled">
+                                        <li>
+                                            <input type="radio" name="estado" id="W" value="W" checked="checked"/> 
+                                            <label for="W">Sin Filtro</label>  
                                         </li>
                                         <li>
-                                            <input type="radio" name="valores" id="D" value="D"/>
-                                            <label for="D">Mes Pasado</label>
+                                            <input type="radio" name="estado" id="open" value="open"/> 
+                                            <label for="open">Abierto</label>  
                                         </li>
                                         <li>
-                                            <input type="radio" name="valores" id="Z" value="Z"/>
-                                            <label for="Z">Busqueda Avanzada</label>
+                                            <input type="radio" name="estado" id="paid" value="paid"/>
+                                            <label for="paid">Pagado</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">
-                                    <div class="col-xs-6">
-                                        <h3>Tipo</h3>
-                                        <ul class="list-unstyled">
-                                            <li>
-                                                <input type="radio" name="cateritica" id="Y" value="Y" checked="checked"/> 
-                                                <label for="Y">Sin Filtro</label>  
-                                            </li>
-                                            <li>
-                                                <input type="radio" name="cateritica" id="sale" value="sale"/> 
-                                                <label for="sale">Factura de venta</label>  
-                                            </li>
-                                            <li>
-                                                <input type="radio" name="cateritica" id="purchase" value="purchase"/>
-                                                <label for="purchase">Factura de compra</label>
-                                            </li>
-                                            <li>
-                                                <input type="radio" name="cateritica" id="expense" value="expense"/>
-                                                <label for="expense">Factura de gasto</label>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="col-xs-6">
-                                        <h3>Estado</h3>
-                                        <ul class="list-unstyled">
-                                            <li>
-                                                <input type="radio" name="estado" id="W" value="W" checked="checked"/> 
-                                                <label for="W">Sin Filtro</label>  
-                                            </li>
-                                            <li>
-                                                <input type="radio" name="estado" id="open" value="open"/> 
-                                                <label for="open">Abierto</label>  
-                                            </li>
-                                            <li>
-                                                <input type="radio" name="estado" id="paid" value="paid"/>
-                                                <label for="paid">Pagado</label>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                    <div class="col-xs-12"> 
-                                        <div class="form-group">
-                                            <label for="partner">Buscar Cliente / Proveedor:</label>
-                                            <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ CI/ Ruc"/>
-                                        </div>
+                                <div class="col-xs-12"> 
+                                    <div class="form-group">
+                                        <label for="partner">Buscar Cliente / Proveedor:</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>
                 </div>
             </div>

+ 67 - 70
static/src/reports/report_purchases_invoice_analysis.xml

@@ -8,79 +8,76 @@
             <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 class="list-unstyled">
-                                        <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>
-
+                <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 class="list-unstyled">
+                                    <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 class="col-xs-6">
-                            <div class="panel panel-default">
-                                <div class="panel-heading">Características</div>
-                                <div class="panel-body">
-                                    <ul class="list-unstyled">
-                                        <li>
-                                            <input type="radio" name="tipo" id="Y" value="Y" checked="checked"/> 
-                                            <label for="Y">Sin Filtro</label>  
-                                        </li>
-                                        <li>
-                                            <input type="radio" name="tipo" id="purchase" value="purchase"/> 
-                                            <label for="purchase">Facturas de compra</label>  
-                                        </li>
-                                        <li>
-                                            <input type="radio" name="tipo" id="expense" value="expense"/>
-                                            <label for="expense">Facturas de gasto</label>
-                                        </li>
-                                    </ul>
-                                    <div class="form-group">
-                                        <label for="partner">Buscar Proveedor</label>
-                                        <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off"/>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="product">Buscar Producto</label>
-                                        <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off"/>
-                                    </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">
+                                <ul class="list-unstyled">
+                                    <li>
+                                        <input type="radio" name="tipo" id="Y" value="Y" checked="checked"/> 
+                                        <label for="Y">Sin Filtro</label>  
+                                    </li>
+                                    <li>
+                                        <input type="radio" name="tipo" id="purchase" value="purchase"/> 
+                                        <label for="purchase">Facturas de compra</label>  
+                                    </li>
+                                    <li>
+                                        <input type="radio" name="tipo" id="expense" value="expense"/>
+                                        <label for="expense">Facturas de gasto</label>
+                                    </li>
+                                </ul>
+                                <div class="form-group">
+                                    <label for="partner">Buscar Proveedor</label>
+                                    <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off"/>
                                 </div>
-                            </div> 
-                        </div>
+                                <div class="form-group">
+                                    <label for="product">Buscar Producto</label>
+                                    <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ Referencia/ Codigo de barras"/>   
+                                </div>  
+                            </div>
+                        </div> 
                     </div>
                 </div>
             </div>

+ 26 - 28
static/src/reports/report_resumen_egresos.xml

@@ -9,35 +9,33 @@
             <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">
-                                    <div id="datepicker" 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>
-                                    
+                <br/>
+                <div class="row">
+                    <div class="col-xs-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Fechas</div>
+                            <div class="panel-body">
+                                <div id="datepicker" 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 class="col-xs-6" style="display:none;">
-                            <div class="panel panel-default">
-                                <div class="panel-heading">Características</div>
-                                <div class="panel-body">
-                                    <label for="current-journal">Sucursal: </label>
-                                    <select id="current-journal" class="form-control ui-autocomplete-input"  name="journal"></select>
-                                    <br/>
-                                    <label for="current-currency">Moneda: </label>
-                                    <select id="current-currency" class="form-control ui-autocomplete-input"  name="currency"></select>     
-                                </div>
-                            </div> 
-                        </div>
+                                
+                            </div>
+                        </div> 
+                    </div>
+                    <div class="col-xs-6" style="display:none;">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Características</div>
+                            <div class="panel-body">
+                                <label for="current-journal">Sucursal: </label>
+                                <select id="current-journal" class="form-control ui-autocomplete-input"  name="journal"></select>
+                                <br/>
+                                <label for="current-currency">Moneda: </label>
+                                <select id="current-currency" class="form-control ui-autocomplete-input"  name="currency"></select>     
+                            </div>
+                        </div> 
                     </div>
                 </div>
             </div>

+ 27 - 29
static/src/reports/report_resumen_ingresos.xml

@@ -9,37 +9,35 @@
             <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">
-                                    <div id="datepicker" 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>
-                                    
+                <br/>
+                <div class="row">
+                    <div class="col-xs-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Fechas</div>
+                            <div class="panel-body">
+                                <div id="datepicker" 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 class="col-xs-6">
-                            <div class="panel panel-default" style="display:none;">
-                                <div class="panel-heading">Características</div>
-                                <div class="panel-body">
-                                    <label for="current-journal">Sucursal: </label>
-                                    <select id="current-journal" class="form-control ui-autocomplete-input"  name="journal"></select>
-                                    <br/>
-                                    <label for="current-currency">Moneda: </label>
-                                    <select id="current-currency" class="form-control ui-autocomplete-input"  name="currency"></select>     
-                                </div>
-                            </div> 
-                        </div>
+                                
+                            </div>
+                        </div> 
+                    </div>
+                    <div class="col-xs-6">
+                        <div class="panel panel-default" style="display:none;">
+                            <div class="panel-heading">Características</div>
+                            <div class="panel-body">
+                                <label for="current-journal">Sucursal: </label>
+                                <select id="current-journal" class="form-control ui-autocomplete-input"  name="journal"></select>
+                                <br/>
+                                <label for="current-currency">Moneda: </label>
+                                <select id="current-currency" class="form-control ui-autocomplete-input"  name="currency"></select>     
+                            </div>
+                        </div> 
                     </div>
-                </div>
+                </div> 
             </div>
             <div id="toolbar">
                 <button class="oe_button oe_form_button oe_highlight" value="pdf" id="pdf">PDF</button>

+ 54 - 57
static/src/reports/report_sales_invoice_analysis.xml

@@ -9,70 +9,67 @@
           <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 class="list-unstyled">
-                                        <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>
-                                    
+                <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 class="list-unstyled">
+                                    <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 class="col-xs-6">
-                            <div class="panel panel-default">
-                                <div class="panel-heading">Características</div>
-                                <div class="panel-body">
-                                    <div class="form-group">
-                                        <label for="partner">Buscar Cliente</label>
-                                        <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off"/>   
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="product">Buscar Producto</label>
-                                        <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off"/>
-                                    </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">
+                                <div class="form-group">
+                                    <label for="partner">Buscar Cliente</label>
+                                    <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off"/>   
                                 </div>
-                            </div> 
-                        </div>
+                                <div class="form-group">
+                                    <label for="product">Buscar Producto</label>
+                                    <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ Referencia/ Codigo de barras"/>
+                                </div>     
+                            </div>
+                        </div> 
                     </div>
                 </div>
             </div>
           <div id="toolbar">
             <button class="oe_button oe_form_button oe_highlight" value="pdf">PDF</button>
-            <!-- <button class="oe_button oe_form_button oe_highlight" value="chart">Graficar</button> -->
         </div>
         <table id="table" class="table_paint_first_row"
             data-pagination="true"

+ 16 - 18
static/src/reports/report_stock.xml

@@ -8,26 +8,24 @@
                 <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-12">
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">Características</div>
-                                    <div class="panel-body">
-                                        <div class="col-xs-6">
-                                            <div class="form-group">
-                                                <label for="current-category">Todas la categorias: </label>
-                                                <select id="current-category" class="form-control ui-autocomplete-input"  name="current-category"></select>    
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="product">Buscar Producto:</label>
-                                                <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ Referencia/ Codigo de barras"/>    
-                                            </div>   
+                    <br/>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <div class="panel panel-default">
+                                <div class="panel-heading">Características</div>
+                                <div class="panel-body">
+                                    <div class="col-xs-6">
+                                        <div class="form-group">
+                                            <label for="current-category">Todas la categorias: </label>
+                                            <select id="current-category" class="form-control ui-autocomplete-input"  name="current-category"></select>    
                                         </div>
+                                        <div class="form-group">
+                                            <label for="product">Buscar Producto:</label>
+                                            <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ Referencia/ Codigo de barras"/>    
+                                        </div>   
                                     </div>
-                                </div> 
-                            </div>
+                                </div>
+                            </div> 
                         </div>
                     </div>
                 </div>

+ 62 - 64
static/src/reports/report_stock_move.xml

@@ -9,72 +9,70 @@
             <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 class="list-unstyled">
-                                        <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>
-                                    
+                <br/>
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Fechas</div>
+                            <div class="panel-body">
+                                <ul class="list-unstyled">
+                                    <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 class="col-xs-6">
-                            <div class="panel panel-default">
-                                <div class="panel-heading">Características</div>
-                                <div class="panel-body">
-                                    <div class="form-group">
-                                        <label for="current-location-origin">Ubicacion de origen: </label>
-                                        <select id="current-location-origin" class="form-control ui-autocomplete-input"  name="current-location-origin"></select>    
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="current-location-destiny">Ubicacion de destino: </label>
-                                        <select id="current-location-destiny" class="form-control ui-autocomplete-input"  name="current-location-destiny"></select>    
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="partner">Buscar Cliente/Proveedor:</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="product">Buscar Producto:</label>
-                                        <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre / Referencia / Codigo de barras"/>
-                                    </div>
+                                
+                            </div>
+                        </div> 
+                    </div>
+                    <div class="col-md-6">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Características</div>
+                            <div class="panel-body">
+                                <div class="form-group">
+                                    <label for="current-location-origin">Ubicacion de origen: </label>
+                                    <select id="current-location-origin" class="form-control ui-autocomplete-input"  name="current-location-origin"></select>    
+                                </div>
+                                <div class="form-group">
+                                    <label for="current-location-destiny">Ubicacion de destino: </label>
+                                    <select id="current-location-destiny" class="form-control ui-autocomplete-input"  name="current-location-destiny"></select>    
+                                </div>
+                                <div class="form-group">
+                                    <label for="partner">Buscar Cliente/Proveedor:</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="product">Buscar Producto:</label>
+                                    <input id="product" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre / Referencia / Codigo de barras"/>
                                 </div>
-                            </div> 
-                        </div>
+                            </div>
+                        </div> 
                     </div>
                 </div>
             </div>

+ 70 - 72
static/src/reports/report_vouchers.xml

@@ -8,81 +8,79 @@
             <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 class="list-unstyled">
-                                        <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>
-                                    
+                <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 class="list-unstyled">
+                                    <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 class="col-xs-6">
-                            <div class="panel panel-default">
-                                <div class="panel-heading">Características</div>
-                                <div class="panel-body">
-                                    <h3>Tipo</h3>
-                                    <ul class="list-unstyled">
-                                        <li>
-                                            <input type="radio" name="tipo" id="Y" value="Y" checked="checked"/> 
-                                            <label for="Y">Sin Filtro</label>  
-                                        </li>
-                                        <li>
-                                            <input type="radio" name="tipo" id="customer" value="customer"/> 
-                                            <label for="customer">Pagos de cliente</label>
-                                        </li>
-                                        <li>
-                                            <input type="radio" name="tipo" id="supplier" value="supplier"/>
-                                            <label for="supplier">Pagos a proveedores</label>
-                                        </li>
-                                    </ul>
-                                    <div class="form-group">
-                                        <label for="current-journal">Metodo de pago: </label>
-                                        <select id="current-journal" class="form-control ui-autocomplete-input"  name="current-journal"></select>    
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="partner">Buscar Cliente / Proveedor:</label>
-                                        <input id="partner" type="text" class="form-control ui-autocomplete-input" autocomplete="off" placeholder="Nombre/ CI/ Ruc"/>    
-                                    </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">
+                                <h3>Tipo</h3>
+                                <ul class="list-unstyled">
+                                    <li>
+                                        <input type="radio" name="tipo" id="Y" value="Y" checked="checked"/> 
+                                        <label for="Y">Sin Filtro</label>  
+                                    </li>
+                                    <li>
+                                        <input type="radio" name="tipo" id="customer" value="customer"/> 
+                                        <label for="customer">Pagos de cliente</label>
+                                    </li>
+                                    <li>
+                                        <input type="radio" name="tipo" id="supplier" value="supplier"/>
+                                        <label for="supplier">Pagos a proveedores</label>
+                                    </li>
+                                </ul>
+                                <div class="form-group">
+                                    <label for="current-journal">Metodo de pago: </label>
+                                    <select id="current-journal" class="form-control ui-autocomplete-input"  name="current-journal"></select>    
+                                </div>
+                                <div class="form-group">
+                                    <label for="partner">Buscar Cliente / Proveedor:</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>
+                </div>   
             </div>
             <div id="toolbar">
                 <button class="oe_button oe_form_button oe_highlight" value="pdf" id="pdf">PDF</button>