浏览代码

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

Sebas 7 年之前
父节点
当前提交
914d425f66

+ 4 - 0
static/src/js/reports/report_sales_invoice_analysis.js

@@ -288,6 +288,7 @@ function report_sales_invoice_analysis (reporting){
                         utility : accounting.formatNumber(((item.quantity * (item.price_unit / invoice.rate)) - (item.quantity * producto.standard_price)),2, ".", ","),
                         journal_id :(invoice.journal_id[0]),
                         journal_name :(invoice.journal_id[1]),
+                        date_create :moment(invoice.date_invoice).format("DD/MM/YYYY"),
                         date_invoice : (invoice.date_invoice),
                         partner_id : invoice.partner_id[0],
                         partner_name : invoice.partner_id[1]
@@ -531,6 +532,7 @@ function report_sales_invoice_analysis (reporting){
             });
             rowsPdf.push({
                         number : "TOTAL "+company,
+                        date_create : " ",
                         name : " ",
                         quantity: accounting.formatNumber(quantity,0, ".", ","),
                         price_unity : accounting.formatNumber(precio_unit,2, ".", ","),
@@ -542,6 +544,7 @@ function report_sales_invoice_analysis (reporting){
 
             rowsPdf.unshift({
                         number : "TOTAL "+company,
+                        date_create : " ",
                         name : " ",
                         quantity: accounting.formatNumber(quantity,0, ".", ","),
                         price_unity : accounting.formatNumber(precio_unit,2, ".", ","),
@@ -555,6 +558,7 @@ function report_sales_invoice_analysis (reporting){
                 styles: { overflow: 'linebreak', fontSize: 8, columnWidth: 'wrap'},
                 columnStyles: {
                               number: {fontStyle: 'bold'},
+                              date_create :{columnWidth: '12px'},
                               name :{columnWidth: '10px'},
                               quantity :{halign:'right' },
                               price_unity : {halign:'right' },

+ 11 - 10
static/src/reports/report_sales_invoice_analysis.xml

@@ -17,12 +17,12 @@
                             <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>  
+                                        <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>  
+                                        <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"/>
@@ -45,11 +45,11 @@
                                     <label for="from">Desde: </label>
                                     <input type="text"  id="from" name="from"/>
                                     <label for="to" >Hasta: </label>
-                                    <input type="text"  id="to" name="to" />    
+                                    <input type="text"  id="to" name="to" />
                                 </div>
-                                
+
                             </div>
-                        </div> 
+                        </div>
                     </div>
                     <div class="col-xs-6">
                         <div class="panel panel-default">
@@ -57,14 +57,14 @@
                             <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"/>   
+                                    <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" placeholder="Nombre/ Referencia/ Codigo de barras"/>
-                                </div>     
+                                </div>
                             </div>
-                        </div> 
+                        </div>
                     </div>
                 </div>
             </div>
@@ -85,6 +85,7 @@
             <thead>
               <tr>
                 <th data-field="number" data-sortable="true">Factura</th>
+                <th data-field="date_create" data-sortable="true">Fecha</th>
                 <th data-field="partner_name" >Cliente</th>
                 <th data-field="name" >Producto</th>
                 <th data-field="quantity" data-sortable="true" data-align="right">Cantidad</th>