verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

2893-show-expedition.externalId #611

Merged
joan merged 4 commits from 2893-show-expedition.externalId into dev 2021-04-27 07:40:51 +00:00
Conversation 0 Commits 4 Files Changed 4 +6 -2
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/changes/10310-mothersDay/.keep
View File

@ -1 +0,0 @@
Delete me with the first .sql files addition

3
db/changes/10310-mothersDay/00-receiptAcl.sql Normal file
View File

@ -0,0 +1,3 @@
UPDATE salix.ACL
SET principalId = "salesAssistant"
WHERE model = 'Client' AND property = 'createReceipt';

2
modules/client/front/balance/index/index.html
View File

@ -128,7 +128,7 @@
</vn-data-viewer> </vn-data-viewer>
</div> </div>
<vn-float-button <vn-float-button
vn-acl="administrative" vn-acl="salesAssistant"
vn-acl-action="remove" vn-acl-action="remove"
icon="add" icon="add"
vn-tooltip="New payment" vn-tooltip="New payment"

2
modules/ticket/front/expedition/index.html
View File

@ -18,6 +18,7 @@
<vn-th field="name">Name</vn-th> <vn-th field="name">Name</vn-th>
<vn-th field="isBox">Package type</vn-th> <vn-th field="isBox">Package type</vn-th>
<vn-th field="counter" number>Counter</vn-th> <vn-th field="counter" number>Counter</vn-th>
<vn-th field="externalId" number>externalId</vn-th>
<vn-th field="worker">Worker</vn-th> <vn-th field="worker">Worker</vn-th>
<vn-th field="created" expand>Created</vn-th> <vn-th field="created" expand>Created</vn-th>
</vn-tr> </vn-tr>
@ -41,6 +42,7 @@
<vn-td>{{::expedition.packageItemName}}</vn-td> <vn-td>{{::expedition.packageItemName}}</vn-td>
<vn-td>{{::expedition.freightItemName}}</vn-td> <vn-td>{{::expedition.freightItemName}}</vn-td>
<vn-td number>{{::expedition.counter}}</vn-td> <vn-td number>{{::expedition.counter}}</vn-td>
<vn-td number>{{::expedition.externalId}}</vn-td>
<vn-td expand> <vn-td expand>
<span <span
class="link" class="link"