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

Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-11-19 08:57:19 +01:00
parent c20cb9af37 2e974db1e8
commit 622a44f133
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/claim/src/action/index.html
View File

@ -141,7 +141,6 @@
<vn-crud-model <vn-crud-model
vn-id="lastTicketsModel" vn-id="lastTicketsModel"
url="/claim/api/Tickets" url="/claim/api/Tickets"
filter="{}"
data="lastTickets" auto-load="false"> data="lastTickets" auto-load="false">
</vn-crud-model> </vn-crud-model>
<!-- Transfer Popover --> <!-- Transfer Popover -->

1
client/client/src/web-payment/index.html
View File

@ -1,7 +1,6 @@
<vn-crud-model <vn-crud-model
vn-id="model" vn-id="model"
url="/client/api/clients/getTransactions" url="/client/api/clients/getTransactions"
filter="{}"
link="{clientFk: $ctrl.$stateParams.id}" link="{clientFk: $ctrl.$stateParams.id}"
limit="20" limit="20"
data="transactions"> data="transactions">

1
client/ticket/src/sale-tracking/index.html
View File

@ -1,7 +1,6 @@
<vn-crud-model <vn-crud-model
vn-id="model" vn-id="model"
url="/ticket/api/SaleTrackings/listSaleTracking" url="/ticket/api/SaleTrackings/listSaleTracking"
filter="{}"
link="{ticketFk: $ctrl.$stateParams.id}" link="{ticketFk: $ctrl.$stateParams.id}"
limit="20" limit="20"
data="sales"> data="sales">

3
client/travel/routes.json
View File

@ -15,7 +15,8 @@
"url": "/index?q", "url": "/index?q",
"state": "travel.index", "state": "travel.index",
"component": "vn-travel-index", "component": "vn-travel-index",
"description": "List" "description": "List",
"acl": ["developer"]
} }
], ],
"menu": [] "menu": []