Carlos Jimenez Ruiz
|
35a24cecfa
|
Merge pull request '3426-ticket_search_panel filter by route' (#821) from 3426-ticket_index into dev
Reviewed-on: #821
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-12-21 11:08:16 +00:00 |
Joan Sanchez
|
9790f0cdb1
|
Updated unit tests
|
2021-12-21 10:37:29 +01:00 |
Joan Sanchez
|
018e3cc8f6
|
Merge branch 'dev' into 3426-ticket_index
|
2021-12-21 08:29:15 +00:00 |
Joan Sanchez
|
79a6e66701
|
Merge pull request '3461-test(ticket_descriptor): repair' (#824) from 3461-e2e_ticket_descriptor into dev
Reviewed-on: #824
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-12-21 08:21:39 +00:00 |
Joan Sanchez
|
76ec1fceae
|
fear(smart-table): now shows the default order with the column arrows
Refs: 3457
|
2021-12-21 09:19:28 +01:00 |
Alex Moreno
|
831bfb0352
|
change route for hasRoute
|
2021-12-21 08:52:39 +01:00 |
Alex Moreno
|
405494c85b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
|
2021-12-21 08:31:17 +01:00 |
Alex Moreno
|
df34debcc6
|
test(ticket_descriptor): repair
|
2021-12-21 08:05:22 +01:00 |
Vicent Llopis
|
e30fb0fb37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
|
2021-12-21 07:10:19 +01:00 |
Alex Moreno
|
412acfbff2
|
refactor(payment_afterInsert): email
|
2021-12-20 14:46:09 +01:00 |
Alex Moreno
|
f67edffcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-20 13:51:44 +01:00 |
Carlos Jimenez Ruiz
|
2e604f61d9
|
Merge pull request '3423-ticket_descriptor add field client.id' (#822) from 3423-ticket_sale into dev
Reviewed-on: #822
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-12-20 10:02:56 +00:00 |
Carlos Jimenez Ruiz
|
1440f29784
|
Merge branch 'dev' into 3423-ticket_sale
|
2021-12-20 10:01:08 +00:00 |
Carlos Jimenez Ruiz
|
9c518e182d
|
Merge pull request '3112 - addd cmr-authorization report' (#817) from 3112-cmr_report into dev
Reviewed-on: #817
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-12-20 10:00:35 +00:00 |
Joan Sanchez
|
f229e5557c
|
Merge branch 'dev' into 3112-cmr_report
|
2021-12-20 09:44:26 +00:00 |
Joan Sanchez
|
227aeeaec4
|
Merge pull request 'feat: add fixtures of ticket and update test' (#815) from 3411-route_ticket_fixtures into dev
Reviewed-on: #815
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-12-20 09:44:19 +00:00 |
Joan Sanchez
|
872f5b488b
|
Merge branch 'dev' into 3411-route_ticket_fixtures
|
2021-12-20 09:40:34 +00:00 |
Joan Sanchez
|
c2f3d35a07
|
Merge pull request '3256-order_transactions' (#778) from 3256-order_transactions into dev
Reviewed-on: #778
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-12-20 09:25:04 +00:00 |
Alex Moreno
|
7a0221c17d
|
test(supplier): add backTest to check changes in isPayMethodChecked
|
2021-12-20 08:02:28 +01:00 |
Alex Moreno
|
9247bc98f1
|
feat(db): sql for supplier isPayMethodChecked
|
2021-12-20 08:01:13 +01:00 |
Alex Moreno
|
bcc50b0618
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-20 07:33:52 +01:00 |
Carlos Jimenez Ruiz
|
d2db3054a5
|
Merge branch 'dev' into 3256-order_transactions
|
2021-12-17 14:15:41 +00:00 |
Carlos Jimenez Ruiz
|
7fbbe2fddd
|
ctx was poluted by tests
|
2021-12-17 15:14:31 +01:00 |
Joan Sanchez
|
f74df7e765
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-12-17 13:21:49 +01:00 |
Joan Sanchez
|
da59a556ca
|
refactor(monitor): limited width to the client and zone columns
Refs: 3458
|
2021-12-17 13:09:00 +01:00 |
Alex Moreno
|
0ea1dea8b5
|
refactor sqls
|
2021-12-17 12:52:37 +01:00 |
Joan Sanchez
|
4cb346c2a8
|
fix(monitor): changed order to prevent row duplication
Refs: 3458
|
2021-12-17 12:40:23 +01:00 |
Carlos Jimenez Ruiz
|
d83995e64e
|
filter worker id refactor
|
2021-12-17 10:41:59 +01:00 |
Alex Moreno
|
7c17250919
|
trigger payment_beforeInsert sql
|
2021-12-16 15:19:56 +01:00 |
Alex Moreno
|
f4a07cab70
|
sql update supplier
|
2021-12-16 12:21:47 +01:00 |
Alex Moreno
|
138f2110e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-16 12:15:47 +01:00 |
Carlos Jimenez Ruiz
|
5a448234d6
|
transtaction commits on several endpoints
|
2021-12-16 10:56:10 +01:00 |
Carlos Jimenez Ruiz
|
2bfc6a5987
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-12-15 15:29:28 +01:00 |
Carlos Jimenez Ruiz
|
b4f1e66fed
|
order module transactions
|
2021-12-15 15:29:22 +01:00 |
Vicent Llopis
|
a6b755138f
|
feat(abono): add option "abono" in ticket_sale
|
2021-12-15 15:24:45 +01:00 |
Joan Sanchez
|
871277acb4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-12-15 09:44:24 +01:00 |
Joan Sanchez
|
2fb1c72887
|
fix(styles): style changes for better readability
|
2021-12-15 09:03:44 +01:00 |
Alex Moreno
|
be3e8ddd98
|
feat(ticket_descriptor): add field client.id
|
2021-12-14 12:59:53 +01:00 |
Alex Moreno
|
5960d40891
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
|
2021-12-14 12:43:40 +01:00 |
Alex Moreno
|
9cfe6b5b7a
|
feat(ticket): filter by route
|
2021-12-14 12:05:06 +01:00 |
Joan Sanchez
|
15b78787df
|
Added version 10400-christmas
|
2021-12-14 10:46:05 +01:00 |
Joan Sanchez
|
b4b30f5243
|
Merge pull request '3415-export database' (#813) from export_production into dev
Reviewed-on: #813
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-12-14 09:30:31 +00:00 |
Joan Sanchez
|
b45263af30
|
Merge branch 'dev' into export_production
|
2021-12-14 09:23:15 +00:00 |
Joan Sanchez
|
7a54484e97
|
Merge pull request 'fix: deleted repeated tickets' (#820) from 3428-item_diary into dev
Reviewed-on: #820
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-12-14 09:22:47 +00:00 |
Vicent Llopis
|
97b7ebd717
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3428-item_diary
|
2021-12-14 10:01:25 +01:00 |
Vicent Llopis
|
9de1d59d98
|
fix: deleted repeated tickets
|
2021-12-14 09:56:38 +01:00 |
Carlos Jimenez Ruiz
|
30e1be3167
|
Merge pull request 'fix(ticketIndex): excluded collectionFk property from date ranges' (#819) from 3431-ticket_collection into dev
Reviewed-on: #819
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-12-14 08:50:30 +00:00 |
Joan Sanchez
|
f2a8992410
|
fix(ticketIndex): excluded collectionFk property from date ranges
Refs: 3431
|
2021-12-14 09:17:00 +01:00 |
Alex Moreno
|
6465a5c460
|
feat(supplier): payMethodChecked for financial
|
2021-12-14 08:23:11 +01:00 |
Joan Sanchez
|
805cdd6418
|
3112 - addd cmr-authorization report
|
2021-12-13 08:23:44 +01:00 |