Quellcode durchsuchen

FIX ADD Agregado en report de utilidad cantidad disponible y no disponible

Sebas vor 6 Jahren
Ursprung
Commit
78b08f98da

+ 2 - 3
static/src/js/reports/report_pos_orders.js

@@ -460,9 +460,8 @@ function report_pos_orders(reporting){
                         id : item.id,
                         order_id : item.order_id[0],
                         order_name : item.order_id[1],
-                        date : order.date_order,
                         partner: order.partner_id[1],
-                        date_order : date,
+                        date : date,
                         table_id : self.valorNull(place_id),
                         table_name : self.valorNull(place_name),
                         floor_id : floor,
@@ -696,7 +695,7 @@ function report_pos_orders(reporting){
                 styles: { overflow: 'linebreak', fontSize: 8, columnWidth: 'wrap'},
                 columnStyles: {
                         order_name: {halign:'left', fontStyle: 'bold'},
-                        date_order :{halign:'left' , columnWidth: '8px'},
+                        date :{halign:'left' , columnWidth: '8px'},
                         partner :{halign:'left' , columnWidth: '8px'},
                         category_name :{halign:'left', columnWidth: '8px'},
                         table_name :{halign:'left', columnWidth: '7px'},

+ 15 - 1
static/src/js/reports/report_resumen_ingresos.js

@@ -9,6 +9,7 @@ function report_resumen_ingresos (reporting){
         resCurrency:[],
         accountJournal:[],
         dataVoucher:[],
+        PosOrder: [],
         currencyRate:[],
         resCompany:[],
         modules:[],
@@ -242,10 +243,23 @@ function report_resumen_ingresos (reporting){
             }
             return valor;
         },
+
+        // Ventas (Point Of Sale)
+        fetchPosOrder: function () {
+            var self = this;
+            var defer = $.Deferred();
+
+            var fields = ['id','name','partner_id','create_date','lines','table_id','sale_journal'];
+            var domain = [['state', 'not in', ['draft','cancel']]];
+            var PosOrder = new model.web.Model('pos.order');
+            PosOrder.query(fields).filter(domain).all().then(function(results){
+                defer.resolve(results);
+            });
+            return defer;
+        },
         // Join object
         fecthDataVoucher:function(objVoucher,objJournal){
             var self=this;
-            console.log(self);
             var item;
             var journal;
             var voucherLine;

+ 1 - 1
static/src/reports/report_pos_orders.xml

@@ -94,7 +94,7 @@
                 <thead>
                     <tr>
                         <th data-field="order_name" data-sortable="true">Pedido</th>
-                        <th data-field="date_order" data-sortable="true">Fecha</th>
+                        <th data-field="date" data-sortable="true">Fecha</th>
                         <th data-field="partner">Cliente</th>
                         <th data-field="category_name" data-sortable="true" >Categoria</th>
                         <th data-field="table_name">Lugar</th>