Merge branch 'dev' into 6921_addFromDelivery

db/versions/10944-tealLaurel/00-firstScript.sql

@@ -0,0 +1,8 @@
+REVOKE UPDATE ON vn.entry FROM entryEditor;
+GRANT UPDATE ON vn.entry TO administrative;
+GRANT UPDATE (id, supplierFk, dated, invoiceNumber, isExcludedFromAvailable, 
+	isConfirmed, isOrdered, isRaid,commission, created, evaNotes, travelFk, 
+	currencyFk,companyFk, gestDocFk, invoiceInFk, loadPriority,
+	kop, sub, pro, auction, invoiceAmount, buyerFk, typeFk, reference,
+	observationEditorFk, clonedFrom, editorFk, lockerUserFk, locked
+) ON vn.entry TO entryEditor;

modules/entry/front/basic-data/index.html

@@ -123,7 +123,9 @@
             </vn-check>
             <vn-check
                 label="Booked"
-                ng-model="$ctrl.entry.isBooked">
+                ng-model="$ctrl.entry.isBooked"
+                vn-acl="administrative"
+                >
             </vn-check>
         </vn-horizontal>
     </vn-card>

modules/route/back/methods/route/filter.js

@@ -67,6 +67,12 @@ module.exports = Self => {
                 type: 'string',
                 description: 'The description filter',
                 http: {source: 'query'}
+            },
+            {
+                arg: 'isOk',
+                type: 'boolean',
+                description: 'The isOk filter',
+                http: {source: 'query'}
             }
         ],
         returns: {
@@ -102,6 +108,8 @@ module.exports = Self => {
             case 'agencyModeFk':
                 param = `r.${param}`;
                 return {[param]: value};
+            case 'isOk':
+                return {'r.isOk': value};
             }
         });