Merge branch 'test' into dev

modules/entry/back/methods/entry/buyLabelSupplier.js

@@ -9,6 +9,10 @@ module.exports = Self => {
                 required: true,
                 description: 'The entry id',
                 http: {source: 'path'}
+            }, {
+                arg: 'showEntryLines',
+                type: 'boolean',
+                required: false
             }
         ],
         returns: [

modules/entry/back/methods/entry/labelSupplier.js

@@ -47,8 +47,7 @@ module.exports = Self => {
 
         for (const buy of buys) {
             if (buy.stickers < 1) continue;
-            ctx.args.id = buy.id;
+            ctx.args = {...ctx.args, id: buy.id, showEntryLines: true};
-            ctx.args.copies = buy.stickers;
             const pdfBuffer = await models.Entry.buyLabelSupplier(ctx, myOptions);
             await merger.add(new Uint8Array(pdfBuffer[0]));
         }

modules/invoiceOut/back/methods/invoiceOut/filter.js

@@ -14,6 +14,12 @@ module.exports = Self => {
                 description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
                 http: {source: 'query'}
             },
+            {
+                arg: 'id',
+                type: 'number',
+                description: 'The invoiceOut id',
+                http: {source: 'query'}
+            },
             {
                 arg: 'search',
                 type: 'string',
@@ -106,6 +112,8 @@ module.exports = Self => {
                 return {'i.created': value};
             case 'clientFk':
                 return {'i.clientFk': value};
+            case 'id':
+                return {'i.id': value};
             case 'fi':
                 return {'c.fi': value};
             case 'amount':

modules/monitor/back/methods/sales-monitor/salesFilter.js

@@ -88,6 +88,11 @@ module.exports = Self => {
                 arg: 'alertLevel',
                 type: 'number',
                 description: `The alert level of the tickets`
+            },
+            {
+                arg: 'countryFk',
+                type: 'number',
+                description: 'The country id filter'
             }
         ],
         returns: {
@@ -182,6 +187,7 @@ module.exports = Self => {
                     t.totalWithVat,
                     io.id invoiceOutId,
                     a.provinceFk,
+                    p.countryFk,
                     p.name province,
                     w.name warehouse,
                     am.name agencyMode,
@@ -356,6 +362,7 @@ module.exports = Self => {
                 }
             case 'agencyModeFk':
             case 'warehouseFk':
+            case 'countryFk':
                 param = `f.${param}`;
                 return {[param]: value};
             }

modules/travel/back/methods/travel/extraCommunityFilter.js

@@ -1,4 +1,3 @@
-
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
@@ -115,42 +114,39 @@ module.exports = Self => {
            `CREATE TEMPORARY TABLE tmp.travel
             (INDEX (id))
             ENGINE = MEMORY
-            SELECT
+            SELECT t.id,
-                    t.id,
                     t.ref,
                     t.shipped,
                     t.landed,
                     t.kg,
-                    am.id AS agencyModeFk,
+                    am.id agencyModeFk,
-                    am.name AS agencyModeName,
+                    am.name agencyModeName,
-                    wo.id AS warehouseOutFk,
+                    wo.id warehouseOutFk,
-                    wo.name AS warehouseOutName,
+                    wo.name warehouseOutName,
-                    w.name AS warehouseInFk,
+                    w.name warehouseInFk,
-                    w.name AS warehouseInName,
+                    w.name warehouseInName,
-                    SUM(b.stickers) AS stickers,
+                    SUM(b.stickers) stickers,
-                    s.id AS cargoSupplierFk,
+                    s.id cargoSupplierFk,
-                    s.nickname AS cargoSupplierNickname,
+                    s.nickname cargoSupplierNickname,
-                    s.name AS supplierName,
+                    s.name supplierName,
-                    CAST(SUM(b.weight * b.stickers) as DECIMAL(10,0)) as loadedKg,
+                    CAST(SUM(b.weight * b.stickers) AS DECIMAL(10,0)) loadedKg,
                     CAST(
                         SUM(
                             vc.aerealVolumetricDensity * 
                             b.stickers * 
                             IF(pkg.volume, pkg.volume, pkg.width * pkg.depth * pkg.height) / 1000000
-                        ) as DECIMAL(10,0)
+                        ) AS DECIMAL(10,0)
-                    ) as volumeKg,
+                    ) volumeKg,
-                    GREATEST(
-                        CAST(SUM(b.weight * b.stickers) AS INT),
                     CAST(
+                        GREATEST(
+                            SUM(b.weight * b.stickers) ,
                             SUM(vc.aerealVolumetricDensity * 
                                 b.stickers * 
                                 IF(pkg.volume, 
                                     pkg.volume, 
-                                    pkg.width * pkg.depth * pkg.height
+                                    pkg.width * pkg.depth * pkg.height) / 1000000)
-                                ) / 1000000
+                        ) / t.kg * 100 AS INT
-                            ) AS INT
+                    ) percentageKg
-                    )
-                 / t.kg * 100, 0) percentageKg
                 FROM travel t
                     LEFT JOIN supplier s ON s.id = t.cargoSupplierFk
                     LEFT JOIN entry e ON e.travelFk = t.id

print/templates/reports/buy-label-supplier/buy-label-supplier.html

@@ -86,7 +86,7 @@
             <td>
                 <div class="cell">
                     <span class="lbl">{{$t('boxNum')}}</span>
-                    {{`${buy.labelNum} / ${buy.maxLabelNum}`}}
+                    {{getTotal(buy)}}
                 </div>
             </td>
         </tr>

print/templates/reports/buy-label-supplier/buy-label-supplier.js

@@ -9,7 +9,7 @@ module.exports = {
     mixins: [vnReport],
     async serverPrefetch() {
         const buy = await models.Buy.findById(this.id, null);
-        this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id]);
+        this.buys = await this.rawSqlFromDef('buy', [buy.entryFk, buy.entryFk, buy.entryFk, this.id, this.id]);
         const date = new Date();
         this.weekNum = moment(date).isoWeek();
         this.dayNum = moment(date).day();
@@ -27,6 +27,11 @@ module.exports = {
                 height: 115,
             });
             return new XMLSerializer().serializeToString(svgNode);
+        },
+        getTotal(buy) {
+            return (this.showEntryLines) ?
+                `${buy.entryLabelNum} / ${buy.entryLabels}` :
+                `${buy.buyLabelNum} / ${buy.buyLabels}`;
         }
     },
     props: {
@@ -34,6 +39,10 @@ module.exports = {
             type: Number,
             required: true,
             description: 'The entry id'
+        },
+        showEntryLines: {
+            type: Boolean,
+            required: false
         }
     }
 };

print/templates/reports/buy-label-supplier/sql/buy.sql

@@ -10,7 +10,7 @@ WITH RECURSIVE numbers AS (
 	)
 ),
 labels AS (
-	SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) labelNum,
+	SELECT ROW_NUMBER() OVER(ORDER BY b.id, num.n) entryLabelNum,
 			i.name,
 			i.`size`,
 			i.category,
@@ -33,6 +33,9 @@ labels AS (
 			WHERE b.entryFk = ?
 				AND num.n <= b.stickers
 )
-SELECT *, (SELECT SUM(stickers) FROM buy WHERE entryFk = ?) maxLabelNum
+SELECT *,
+		ROW_NUMBER() OVER(ORDER BY entryLabelNum) buyLabelNum,
+		(SELECT SUM(stickers) FROM buy WHERE entryFk = ?) entryLabels,
+		(SELECT stickers FROM buy WHERE id = ?) buyLabels
 	FROM labels
 	WHERE id = ?