Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut

Merge pull request '5660-changeRolDeliveryAssistant' (!1607 ) from 5660-changeRolDeliveryAssistant into dev
Reviewed-on: #1607 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-20 15:25:20 +02:00 · 2023-09-20 11:04:30 +00:00 · 2023-09-20 09:52:32 +00:00 · 2023-09-19 11:02:12 +02:00 · 2023-09-18 12:24:29 +02:00 · 2023-09-18 12:24:26 +02:00
22 changed files with 5227 additions and 5209 deletions
--- a/db/changes/232601/00-useSpecificsAcls.sql
+++ b/db/changes/232601/00-useSpecificsAcls.sql
@ -3,11 +3,11 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
        ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssistant'),
        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
        ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
        ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
-        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryBoss'),
+        ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
        ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
        ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),
--- a/db/changes/234001/01-deliveryAssistantACL.sql
+++ b/db/changes/234001/01-deliveryAssistantACL.sql
@ -0,0 +1,16 @@
+--  Auto-generated SQL script. Actual values for binary/complex data types may differ - what you see is the default string representation of values.
+INSERT INTO `account`.`role` (name,description)
+	VALUES ('deliveryAssistant','Jefe auxiliar repartos');
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+    SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
+FROM account.roleInherit ri
+    JOIN account.role r2 ON r2.id = ri.`role`
+WHERE r2.name = 'deliveryBoss';
+
+INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
+		SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
+		(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
+
+
+CALL `account`.`role_syncPrivileges`();
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
--- a/e2e/paths/02-client/01_create_client.spec.js
+++ b/e2e/paths/02-client/01_create_client.spec.js
@ -8,7 +8,7 @@ describe('Client create path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
-        await page.loginAndModule(' deliveryBoss', 'client');
+        await page.loginAndModule('deliveryAssistant', 'client');
    });

    afterAll(async() => {
--- a/e2e/paths/03-worker/06_create.spec.js
+++ b/e2e/paths/03-worker/06_create.spec.js
@ -45,7 +45,7 @@ describe('Worker create path', () => {

        // should create a new worker and go to worker basic data'
        await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
-        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryBoss');
+        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssistant');
        await page.waitToClick(selectors.workerCreate.createButton);
        message = await page.waitForSnackbar();
        await page.waitForState('worker.card.basicData');
--- a/e2e/paths/11-zone/01_basic-data.spec.js
+++ b/e2e/paths/11-zone/01_basic-data.spec.js
@ -8,7 +8,9 @@ describe('Zone basic data path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone'); // turns up the zone module name and route aint the same lol
+
+        await page.loginAndModule('deliveryAssistant',
+            'zone'); // turns up the zone module name and route aint the same lol
        await page.accessToSearchResult('10');
        await page.accessToSection('zone.card.basicData');
    });
--- a/e2e/paths/11-zone/02_descriptor.spec.js
+++ b/e2e/paths/11-zone/02_descriptor.spec.js
@ -8,7 +8,7 @@ describe('Zone descriptor path', () => {
    beforeAll(async() => {
        browser = await getBrowser();
        page = browser.page;
-        await page.loginAndModule('deliveryBoss', 'zone');
+        await page.loginAndModule('deliveryAssistant', 'zone');
        await page.accessToSearchResult('13');
    });

--- a/modules/client/front/address/create/index.html
+++ b/modules/client/front/address/create/index.html
@ -31,7 +31,7 @@
            <vn-check
                vn-one
                label="Default" ng-model="$ctrl.address.isDefaultAddress">
-            </vn-check> 
+            </vn-check>
        </vn-horizontal>
        <vn-horizontal>
            <vn-textfield
@ -60,7 +60,7 @@
                show-field="code"
                rule>
                <tpl-item>
-                    {{code}} - {{town.name}} ({{town.province.name}}, 
+                    {{code}} - {{town.name}} ({{town.province.name}},
                    {{town.province.country.country}})
                </tpl-item>
                <append>
@ -68,12 +68,12 @@
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
            </vn-datalist>
-            <vn-datalist vn-id="town" vn-one 
+            <vn-datalist vn-id="town" vn-one
                label="City"
                ng-model="$ctrl.address.city"
                selection="$ctrl.town"
@ -158,7 +158,7 @@
 </vn-geo-postcode>

 <!-- Create custom agent dialog -->
-<vn-dialog class="edit" 
+<vn-dialog class="edit"
    vn-id="customAgent"
    on-accept="$ctrl.onCustomAgentAccept()"
    message="New customs agent">
@ -190,4 +190,4 @@
        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
        <button response="accept" translate>Create</button>
    </tpl-buttons>
-</vn-dialog>
+</vn-dialog>
--- a/modules/client/front/address/edit/index.html
+++ b/modules/client/front/address/edit/index.html
@ -73,20 +73,20 @@
                show-field="code"
                rule>
                <tpl-item>
-                    {{code}} - {{town.name}} ({{town.province.name}}, 
+                    {{code}} - {{town.name}} ({{town.province.name}},
                    {{town.province.country.country}})
                </tpl-item>
                <append>
-                    <vn-icon-button 
+                    <vn-icon-button
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
            </vn-datalist>
-            <vn-datalist vn-id="town" vn-one 
+            <vn-datalist vn-id="town" vn-one
                label="City"
                ng-model="$ctrl.address.city"
                selection="$ctrl.town"
@ -178,14 +178,14 @@
                        icon="delete"
                        ng-click="$ctrl.removeObservation($index)"
                        tabindex="-1">
-                    </vn-icon-button>  
+                    </vn-icon-button>
                </vn-none>
            </vn-horizontal>
            <vn-icon-button
                vn-bind="+"
                vn-tooltip="Add note"
                icon="add_circle"
-                ng-if="types.length > observations.length" 
+                ng-if="types.length > observations.length"
                ng-click="model.insert()">
            </vn-icon-button>
        </div>
@ -197,12 +197,12 @@
 </form>

 <!-- New postcode dialog -->
-<vn-geo-postcode vn-id="postcode" 
+<vn-geo-postcode vn-id="postcode"
    on-response="$ctrl.onResponse($response)">
 </vn-geo-postcode>

 <!-- Create custom agent dialog -->
-<vn-dialog class="edit" 
+<vn-dialog class="edit"
    vn-id="customAgent"
    on-accept="$ctrl.onCustomAgentAccept()"
    message="New customs agent">
@ -234,4 +234,4 @@
        <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
        <button response="accept" translate>Create</button>
    </tpl-buttons>
-</vn-dialog>
+</vn-dialog>
--- a/modules/client/front/create/index.html
+++ b/modules/client/front/create/index.html
@ -73,7 +73,7 @@
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
--- a/modules/client/front/fiscal-data/index.html
+++ b/modules/client/front/fiscal-data/index.html
@ -94,7 +94,7 @@
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
--- a/modules/client/front/postcode/index.html
+++ b/modules/client/front/postcode/index.html
@ -27,7 +27,7 @@
                        icon="add_circle"
                        vn-tooltip="New city"
                        ng-click="city.open($event)"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
@ -45,7 +45,7 @@
                        icon="add_circle"
                        vn-tooltip="New province"
                        ng-click="province.open($event)"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
@ -73,4 +73,4 @@
 <vn-geo-city
    vn-id="city"
    on-response="$ctrl.onCityResponse($response)">
-</vn-geo-city>
+</vn-geo-city>
--- a/modules/route/front/descriptor/index.html
+++ b/modules/route/front/descriptor/index.html
@ -15,14 +15,14 @@
        </vn-item>
        <vn-item
            ng-click="updateVolumeConfirmation.show()"
-            vn-acl="deliveryBoss"
+            vn-acl="deliveryAssistant"
            vn-acl-action="remove"
            translate>
            Update volume
        </vn-item>
        <vn-item
            ng-click="$ctrl.deleteCurrentRoute()"
-            vn-acl="deliveryBoss"
+            vn-acl="deliveryAssistant"
            vn-acl-action="remove"
            translate>
            Delete route
@ -31,23 +31,23 @@
    <slot-body>
        <div class="attributes">
            <vn-label-value
-                label="Date" 
+                label="Date"
                value="{{$ctrl.route.created | date: 'dd/MM/yyyy'}}">
            </vn-label-value>
            <vn-label-value
-                label="Agency" 
+                label="Agency"
                value="{{$ctrl.route.agencyMode.name}}">
            </vn-label-value>
            <vn-label-value
-                label="Zone" 
+                label="Zone"
                value="{{$ctrl.route.zone.name}}">
            </vn-label-value>
            <vn-label-value
-                label="Volume" 
+                label="Volume"
                value="{{$ctrl.route.m3 | dashIfEmpty}} / {{$ctrl.route.vehicle.m3  | dashIfEmpty}} m³">
            </vn-label-value>
            <vn-label-value
-                label="Description" 
+                label="Description"
                value="{{$ctrl.route.description}}">
            </vn-label-value>
        </div>
@ -72,4 +72,4 @@
 </vn-confirm>
 <vn-popup vn-id="summary">
    <vn-route-summary route="$ctrl.route"></vn-route-summary>
-</vn-popup>
+</vn-popup>
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@ -37,7 +37,7 @@
                    icon="format_list_numbered">
                </vn-button>
                <vn-button
-                    vn-acl="deliveryBoss"
+                    vn-acl="deliveryAssistant"
                    vn-acl-action="remove"
                    disabled="!$ctrl.isChecked"
                    icon="sms"
--- a/modules/supplier/front/address/create/index.html
+++ b/modules/supplier/front/address/create/index.html
@ -42,7 +42,7 @@
                show-field="code"
                rule>
                <tpl-item>
-                    {{code}} - {{town.name}} ({{town.province.name}}, 
+                    {{code}} - {{town.name}} ({{town.province.name}},
                    {{town.province.country.country}})
                </tpl-item>
                <append>
@ -50,12 +50,12 @@
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
            </vn-datalist>
-            <vn-datalist vn-id="town" vn-one 
+            <vn-datalist vn-id="town" vn-one
                label="City"
                ng-model="$ctrl.address.city"
                selection="$ctrl.town"
@ -106,4 +106,4 @@
 <!-- New postcode dialog -->
 <vn-geo-postcode vn-id="postcode"
    on-response="$ctrl.onResponse($response)">
-</vn-geo-postcode>
+</vn-geo-postcode>
--- a/modules/supplier/front/address/edit/index.html
+++ b/modules/supplier/front/address/edit/index.html
@ -40,20 +40,20 @@
                show-field="code"
                rule>
                <tpl-item>
-                    {{code}} - {{town.name}} ({{town.province.name}}, 
+                    {{code}} - {{town.name}} ({{town.province.name}},
                    {{town.province.country.country}})
                </tpl-item>
                <append>
-                    <vn-icon-button 
+                    <vn-icon-button
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
            </vn-datalist>
-            <vn-datalist vn-id="town" vn-one 
+            <vn-datalist vn-id="town" vn-one
                label="City"
                ng-model="$ctrl.address.city"
                selection="$ctrl.town"
@ -99,6 +99,6 @@
 </form>

 <!-- New postcode dialog -->
-<vn-geo-postcode vn-id="postcode" 
+<vn-geo-postcode vn-id="postcode"
    on-response="$ctrl.onResponse($response)">
-</vn-geo-postcode>
+</vn-geo-postcode>
--- a/modules/supplier/front/fiscal-data/index.html
+++ b/modules/supplier/front/fiscal-data/index.html
@ -150,7 +150,7 @@
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
--- a/modules/worker/front/create/index.html
+++ b/modules/worker/front/create/index.html
@ -72,7 +72,7 @@
                        icon="add_circle"
                        vn-tooltip="New postcode"
                        ng-click="postcode.open()"
-                        vn-acl="deliveryBoss"
+                        vn-acl="deliveryAssistant"
                        vn-acl-action="remove">
                    </vn-icon-button>
                </append>
--- a/modules/zone/front/basic-data/index.html
+++ b/modules/zone/front/basic-data/index.html
@ -12,9 +12,9 @@
    <vn-card class="vn-pa-lg">
        <vn-horizontal>
            <vn-textfield
-                label="Name" 
+                label="Name"
                ng-model="$ctrl.zone.name"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-textfield>
        </vn-horizontal>
@ -26,7 +26,7 @@
                show-field="name"
                value-field="id"
                label="Agency"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-autocomplete>
            <vn-input-number
@ -34,7 +34,7 @@
                label="Max m³"
                ng-model="$ctrl.zone.itemMaxSize"
                min="0"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-input-number>
            <vn-input-number
@ -42,7 +42,7 @@
                label="Maximum m³"
                ng-model="$ctrl.zone.m3Max"
                min="0"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-input-number>
        </vn-horizontal>
@ -52,13 +52,13 @@
                ng-model="$ctrl.zone.travelingDays"
                min="0"
                step="1"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-input-number>
            <vn-input-time
                label="Closing"
                ng-model="$ctrl.zone.hour"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-input-time>
        </vn-horizontal>
@ -68,16 +68,16 @@
                ng-model="$ctrl.zone.price"
                min="0"
                step="0.01"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-input-number>
            <vn-input-number
                label="Bonus"
                ng-model="$ctrl.zone.bonus"
                step="0.01"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
-            </vn-input-number> 
+            </vn-input-number>
        </vn-horizontal>
        <vn-horizontal>
            <vn-input-number
@ -86,14 +86,14 @@
                ng-model="$ctrl.zone.inflation"
                min="0"
                step="0.01"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-input-number>
            <vn-check
                vn-one
                label="Volumetric"
                ng-model="$ctrl.zone.isVolumetric"
-                vn-acl="deliveryBoss"
+                vn-acl="deliveryAssistant"
                rule>
            </vn-check>
        </vn-horizontal>
@ -101,7 +101,7 @@
    <vn-button-bar>
        <vn-submit
            disabled="!watcher.dataChanged()"
-            vn-acl="deliveryBoss"
+            vn-acl="deliveryAssistant"
            label="Save">
        </vn-submit>
        <vn-button
--- a/modules/zone/front/index/index.html
+++ b/modules/zone/front/index/index.html
@ -32,7 +32,7 @@
                            vn-click-stop="clone.show(zone)"
                            vn-tooltip="Clone"
                            icon="icon-clone"
-                            vn-acl="deliveryBoss"
+                            vn-acl="deliveryAssistant"
                            vn-acl-action="remove">
                        </vn-icon-button>
                        <vn-icon-button
@ -50,7 +50,7 @@
 <vn-popup vn-id="summary">
    <vn-zone-summary zone="$ctrl.selectedZone"></vn-zone-summary>
 </vn-popup>
-<vn-confirm 
+<vn-confirm
    vn-id="clone"
    on-accept="$ctrl.onCloneAccept($data)"
    question="Do you want to clone this zone?"
@ -62,7 +62,7 @@
    fixed-bottom-right>
    <vn-float-button
        icon="add"
-        vn-acl="deliveryBoss"
+        vn-acl="deliveryAssistant"
        vn-acl-action="remove">
    </vn-float-button>
 </a>
--- a/modules/zone/front/location/index.html
+++ b/modules/zone/front/location/index.html
@ -16,12 +16,12 @@
        root-label="Locations"
        fetch-func="$ctrl.onFetch($item)"
        sort-func="$ctrl.onSort($a, $b)">
-        <vn-check acl-role="deliveryBoss"
+        <vn-check acl-role="deliveryAssistant"
            ng-model="item.selected"
-            on-change="$ctrl.onSelection(value, item)" 
+            on-change="$ctrl.onSelection(value, item)"
            triple-state="true"
            ng-click="$event.preventDefault()"
-            label="{{::item.name}}"> 
+            label="{{::item.name}}">
        </vn-check>
    </vn-treeview>
    </vn-card>
Author	SHA1	Message	Date
Jorge Penadés	5b818cef0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut gitea/salix/pipeline/head There was a failure building this commit Details	2023-09-20 15:25:20 +02:00
Carlos Satorres	5e46e8a748	Merge pull request '5660-changeRolDeliveryAssistant' (!1607 ) from 5660-changeRolDeliveryAssistant into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #1607 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-20 11:04:30 +00:00
Carlos Satorres	f92acdfe6f	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head This commit looks good Details	2023-09-20 09:52:32 +00:00
Carlos Satorres	9524ff6932	refs #5660 fix sql gitea/salix/pipeline/head This commit looks good Details	2023-09-19 11:02:12 +02:00
Carlos Satorres	b6e0b6ac8a	Merge branch '5660-changeRolDeliveryAssistant' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head This commit looks good Details	2023-09-18 12:24:29 +02:00
Carlos Satorres	63068ddfb8	refs #5660 call and insert	2023-09-18 12:24:26 +02:00
Carlos Satorres	cfd080530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 11:49:03 +02:00
Alex Moreno	6a33a15765	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head There was a failure building this commit Details	2023-09-18 08:11:34 +00:00
Carlos Satorres	fa87757d0f	refs #5560 sql fix gitea/salix/pipeline/head There was a failure building this commit Details	2023-09-18 08:56:25 +02:00
Carlos Satorres	0912bd40f3	refs #5660 sql fix gitea/salix/pipeline/head This commit looks good Details	2023-09-15 09:15:48 +02:00
Carlos Satorres	2a1e828e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-15 07:30:46 +02:00
Carlos Satorres	a9b2aef27a	refs #5660 join and value gitea/salix/pipeline/head This commit looks good Details	2023-09-13 12:02:25 +02:00
Carlos Satorres	0ddcb57209	refs #5660 fix e2e gitea/salix/pipeline/head This commit looks good Details	2023-09-12 10:40:10 +02:00
Carlos Satorres	49e635ff4b	refs #5660 dump dumpedFixtures	2023-09-11 13:49:18 +02:00
Carlos Satorres	d3e5e187e1	refs #5660 change acl	2023-09-11 13:46:52 +02:00
Carlos Satorres	62a4469803	refs #5660 cambios structure gitea/salix/pipeline/head There was a failure building this commit Details	2023-09-11 11:34:23 +02:00
Carlos Satorres	815ea6f67e	Merge branch '5660-changeRolDeliveryAssistant' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head There was a failure building this commit Details	2023-09-11 10:47:44 +02:00
Carlos Satorres	9d0e4e7558	refs #5660 change sql	2023-09-11 10:47:39 +02:00
Carlos Satorres	544259df9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:21 +02:00
Carlos Satorres	29b7f7d8ef	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head This commit looks good Details	2023-09-04 10:47:44 +00:00
Carlos Satorres	c8a60cab40	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head There was a failure building this commit Details	2023-08-11 08:27:54 +00:00
Carlos Satorres	3b1f10d466	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head This commit looks good Details	2023-08-10 10:45:08 +00:00
Alex Moreno	7c0eb16e5b	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head This commit looks good Details	2023-08-03 07:23:59 +00:00
Carlos Satorres	0546ae99eb	refs #5660 add fixtures gitea/salix/pipeline/head This commit looks good Details	2023-07-27 17:27:06 +02:00
Carlos Satorres	d3aa6ddf6b	refs change fixtures acls	2023-07-27 17:26:36 +02:00
Carlos Satorres	af60412232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-07-27 17:24:50 +02:00
Carlos Satorres	b19c15bd68	refs #5660 rol fix and inherits rol gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-28 12:28:25 +02:00
Carlos Satorres	3bea23c52a	refs #5660 delivery acls gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-28 11:30:45 +02:00
Carlos Satorres	39f8212529	refs #5660 fixtures acls	2023-06-28 11:30:22 +02:00
Carlos Satorres	d32563eec7	refs #5660 delivery gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-28 08:37:30 +02:00
Carlos Satorres	68b65105fd	refs #5660 role mod gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-28 08:02:31 +02:00
Carlos Satorres	eaf3f5e3ea	refs #5660 change sql gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-27 13:17:00 +02:00
Carlos Satorres	a930963ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-06-27 12:34:37 +02:00
Carlos Satorres	9870cc7b14	refs #5660 change assist gitea/salix/pipeline/head There was a failure building this commit Details	2023-06-21 13:34:27 +02:00
Carlos Satorres	0eca606de0	Merge branch 'dev' into 5660-changeRolDeliveryAssistant gitea/salix/pipeline/head This commit looks good Details	2023-06-16 07:29:30 +00:00
Carlos Satorres	ee5677ecb6	refs #5660 fix line gitea/salix/pipeline/head This commit looks good Details	2023-06-16 09:28:56 +02:00
Carlos Satorres	908799adee	refs #5660 deliveryAssit gitea/salix/pipeline/head This commit looks good Details	2023-06-12 14:58:28 +02:00
Carlos Satorres	c9c9b64884	refs #5660 deliveryAssit	2023-06-12 14:57:41 +02:00