Merge branch 'dev' into 7258-lastChangesMigrationVn2008

2024-04-24 07:53:47 +00:00 · 2024-04-24 07:53:47 +00:00 · 4cc6b2f4f2
parent f7ebd071bf 88ba6833be
commit 4cc6b2f4f2
3 changed files with 11 additions and 3 deletions
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
+++ b/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
--- a/modules/invoiceOut/back/models/cplus-rectification-type.json
+++ b/modules/invoiceOut/back/models/cplus-rectification-type.json
@ -15,5 +15,13 @@
        "description": {
            "type": "string"
        }
-    }
+    },
+    "acls": [
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
+    ]
 }
--- a/modules/invoiceOut/front/negative-bases/index.html
+++ b/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>