Merge branch 'dev' into 7039-country-country

modules/invoiceOut/back/methods/invoiceOut/negativeBases.js

@@ -70,7 +70,7 @@ module.exports = Self => {
                         c.hasToInvoice,
                         c.isTaxDataChecked,
                         w.id comercialId,
-                        CONCAT(w.firstName, ' ', w.lastName) comercialName
+                        u.name workerName
                     FROM vn.ticket t
                         JOIN vn.company co ON co.id = t.companyFk
                         JOIN vn.sale s ON s.ticketFk = t.id

modules/invoiceOut/back/models/cplus-rectification-type.json

@@ -15,5 +15,13 @@
         "description": {
             "type": "string"
         }
-    }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
+    ]
 }

modules/invoiceOut/front/negative-bases/index.html

@@ -114,7 +114,7 @@
                             <vn-span
                                 class="link"
                                 ng-click="workerDescriptor.show($event, client.comercialId)">
-                                {{::client.comercialName | dashIfEmpty}}
+                                {{::client.workerName | dashIfEmpty}}
                             </vn-span>
                         </td>
                     </tr>

modules/ticket/back/methods/ticket-request/filter.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;
@@ -135,7 +134,8 @@ module.exports = Self => {
                 tr.requesterFk,
                 tr.isOk,
                 s.quantity saleQuantity,
-                s.itemFk,
+                s.itemFk saleItemFk,
+                i.id itemFk,
                 i.name itemDescription,
                 t.shipped,
                 DATE(t.shipped) shippedDate,