Carlos Jimenez Ruiz
|
707c9c33f7
|
Merge branch 'dev' into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-21 11:27:34 +00:00 |
Joan Sanchez
|
76ec1fceae
|
fear(smart-table): now shows the default order with the column arrows
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3457
|
2021-12-21 09:19:28 +01:00 |
Alex Moreno
|
831bfb0352
|
change route for hasRoute
gitea/salix/pipeline/head This commit looks good
Details
|
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 |
Vicent Llopis
|
e30fb0fb37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-21 07:10:19 +01:00 |
Alex Moreno
|
f67edffcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 13:51:44 +01:00 |
Carlos Jimenez Ruiz
|
1440f29784
|
Merge branch 'dev' into 3423-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 10:01:08 +00:00 |
Joan Sanchez
|
872f5b488b
|
Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 09:40:34 +00:00 |
Alex Moreno
|
7a0221c17d
|
test(supplier): add backTest to check changes in isPayMethodChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-20 08:02:28 +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
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 14:15:41 +00:00 |
Carlos Jimenez Ruiz
|
7fbbe2fddd
|
ctx was poluted by tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 15:14:31 +01:00 |
Joan Sanchez
|
da59a556ca
|
refactor(monitor): limited width to the client and zone columns
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3458
|
2021-12-17 13:09:00 +01:00 |
Joan Sanchez
|
4cb346c2a8
|
fix(monitor): changed order to prevent row duplication
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3458
|
2021-12-17 12:40:23 +01:00 |
Carlos Jimenez Ruiz
|
d83995e64e
|
filter worker id refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-17 10:41:59 +01:00 |
Alex Moreno
|
138f2110e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-16 12:15:47 +01:00 |
Carlos Jimenez Ruiz
|
5a448234d6
|
transtaction commits on several endpoints
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-12-15 15:24:45 +01:00 |
Alex Moreno
|
be3e8ddd98
|
feat(ticket_descriptor): add field client.id
gitea/salix/pipeline/head This commit looks good
Details
|
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
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:43:40 +01:00 |
Alex Moreno
|
9cfe6b5b7a
|
feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 12:05:06 +01:00 |
Joan Sanchez
|
f2a8992410
|
fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3431
|
2021-12-14 09:17:00 +01:00 |
Alex Moreno
|
6465a5c460
|
feat(supplier): payMethodChecked for financial
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-14 08:23:11 +01:00 |
Carlos Jimenez Ruiz
|
6aa3101e42
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-12-02 11:04:44 +01:00 |
Carlos Jimenez Ruiz
|
2ebe6b5342
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 15:26:09 +01:00 |
Carlos Jimenez Ruiz
|
8285a8a8e9
|
refactor(route.tickets): updated error description
|
2021-12-01 15:26:01 +01:00 |
Vicent Llopis
|
ac3dc039fe
|
feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 12:49:53 +01:00 |
Alex Moreno
|
75e32feb16
|
refactor ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 11:39:48 +01:00 |
Alex Moreno
|
77191b6182
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-12-01 11:29:10 +01:00 |
Joan Sanchez
|
7acf7c5bea
|
Changed duplicated button...
gitea/salix/pipeline/head This commit looks good
Details
|
2021-12-01 08:29:05 +01:00 |
Alex Moreno
|
c7e5c25a28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:38 +01:00 |
Alex Moreno
|
decd4b5a95
|
separate sql procedures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 15:13:20 +01:00 |
Vicent Llopis
|
238577ec8f
|
refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:57:17 +01:00 |
Alex Moreno
|
d5c0be5a9d
|
refactor(ticket_sale): logic and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 13:47:16 +01:00 |
Carlos Jimenez Ruiz
|
d760eba446
|
Merge branch 'dev' into 3275-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 11:40:54 +00:00 |
Vicent Llopis
|
21bd625b3b
|
add exceprion to half day absence
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 12:31:02 +01:00 |
Alex Moreno
|
85721dcf45
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-11-30 09:51:30 +01:00 |
Carlos Jimenez Ruiz
|
1176b23bb9
|
Merge branch 'dev' into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 08:16:10 +00:00 |
Joan Sanchez
|
5c342ae463
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:11:40 +01:00 |
Vicent Llopis
|
4c064f8a80
|
feat(worker_calendar): add restrictions to add absence and to add hours recorded
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:11:23 +01:00 |
Joan Sanchez
|
495510efed
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 09:08:19 +01:00 |
Alex Moreno
|
594f258232
|
modify js date format
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-30 07:16:43 +01:00 |
Alex Moreno
|
85e3b47408
|
test(worker_time-control): tested url parameter timestamp
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-29 15:22:16 +01:00 |
Alex Moreno
|
07e092f9bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2676-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 11:52:43 +01:00 |
Joan Sanchez
|
f93da5f60d
|
Merge branch 'dev' into 3387-route_ticket
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 09:21:34 +00:00 |
Alex Moreno
|
49e9fcaa7c
|
remove unnecesary on-accept
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 10:11:47 +01:00 |
Alex Moreno
|
8bd1db2e97
|
remove unnecesary on-accept
|
2021-11-29 10:10:53 +01:00 |
Alex Moreno
|
cff4c90651
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-29 10:10:04 +01:00 |
Alex Moreno
|
8ea3307230
|
feat(ticket_sale): allow multi-check for recalculatePrice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-29 08:30:36 +01:00 |
Joan Sanchez
|
e4d7d957eb
|
Rectified icons
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:48:55 +01:00 |
Joan Sanchez
|
452d4557d1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:11:33 +01:00 |
Joan Sanchez
|
9d6b870940
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 14:08:50 +01:00 |
Joan Sanchez
|
b0cb7e1424
|
Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:53:39 +01:00 |
Alex Moreno
|
65053f5f28
|
feat(worker_time-control): add timestamp url param
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 13:26:48 +01:00 |
Joan Sanchez
|
bcca33bc33
|
Updated icons
|
2021-11-26 13:04:07 +01:00 |
Vicent Llopis
|
e13f2d4ae3
|
feat(route_ticket): add column province and change order other columns
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 10:06:13 +01:00 |
Joan Sanchez
|
c986fe9557
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:59:21 +01:00 |
Joan Sanchez
|
eb101ffc76
|
refactor(fonts): updated fonts and changed invoiceOut icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:59:05 +01:00 |
Joan Sanchez
|
25371ef97b
|
Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 09:06:58 +01:00 |
Alex Moreno
|
2ab5c9818a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:35:00 +01:00 |
Alex Moreno
|
eea9413628
|
fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-26 08:34:32 +01:00 |
Carlos Jimenez Ruiz
|
ba29df16c0
|
Merge branch 'dev' into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 15:02:47 +00:00 |
Vicent Llopis
|
74fbae6510
|
refactor(route_ticket): add style in a style.scss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 15:15:51 +01:00 |
Joan Sanchez
|
6b6a1b4329
|
refactor(fonts): updated fonts and changed invoiceOut icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 14:14:01 +01:00 |
Vicent Llopis
|
6afc694f6c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 14:07:14 +01:00 |
Alex Moreno
|
9fce06dfe0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:53:26 +01:00 |
Carlos Jimenez Ruiz
|
cdbd1964a6
|
Merge branch 'dev' into 3368-export_database
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 10:49:17 +00:00 |
Carlos Jimenez Ruiz
|
5914e8e1ac
|
fixed e2e by adding acls where needed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:30:55 +01:00 |
Alex Moreno
|
815826e891
|
refactor(ticket): modify transferSales.js for avoid unnecessary logs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 11:23:18 +01:00 |
Joan Sanchez
|
0838f34771
|
Show alias section for marketing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 08:14:48 +01:00 |
Joan Sanchez
|
ab3902ebd8
|
Restricted account creation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 08:08:47 +01:00 |
Joan Sanchez
|
4162f239cf
|
Allow basic-data access for hhrr
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 07:50:01 +01:00 |
Joan Sanchez
|
0fc52cbf1d
|
Updated descriptor ACLs
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-25 07:43:32 +01:00 |
Carlos Jimenez Ruiz
|
09c2b813b5
|
ACL update
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 15:27:09 +01:00 |
Joan Sanchez
|
c3e311f076
|
Updated route acls
|
2021-11-24 15:01:44 +01:00 |
Carlos Jimenez Ruiz
|
c4bc89ee29
|
refactor(entry): back unit tests refactor to transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 14:29:15 +01:00 |
Carlos Jimenez Ruiz
|
c3da93bfd3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-11-24 11:22:16 +01:00 |
Joan Sanchez
|
f98b0c7bbe
|
Merge branch 'dev' into 3363-sale_update_price
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 09:15:13 +00:00 |
Alex Moreno
|
00072a7dd1
|
landing searchable false
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 10:02:52 +01:00 |
Alex Moreno
|
8d33041970
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
|
2021-11-24 09:59:10 +01:00 |
Joan Sanchez
|
8ede14ab40
|
fix(sales): update price on any change affecting the ticket total
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3363
|
2021-11-24 09:25:24 +01:00 |
Alex Moreno
|
aaa49bdf78
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 09:22:24 +01:00 |
Alex Moreno
|
02d89e5774
|
feat(item): add field genericFk in basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 08:51:07 +01:00 |
Alex Moreno
|
e319af6556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-24 07:30:10 +01:00 |
Carlos Jimenez Ruiz
|
c544cbfec7
|
Merge branch 'dev' into 3350-Smart_table_unit_tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 15:55:45 +00:00 |
Carlos Jimenez Ruiz
|
320cc6c02c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests
|
2021-11-23 13:52:15 +01:00 |
Alex Moreno
|
abb33c8514
|
feat(client): consumption.decription sortable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 11:39:31 +01:00 |
Carlos Jimenez Ruiz
|
16df8fd2f3
|
Merge branch 'dev' into 3388-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:03:06 +00:00 |
Joan Sanchez
|
07dcdab1ef
|
fix(sale): disabled clear icons
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:57:19 +01:00 |
Carlos Jimenez Ruiz
|
51a3673160
|
Merge branch 'dev' into 3369-filterValue_sqli
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 08:54:50 +00:00 |
Alex Moreno
|
854ed9936d
|
deleted unnecessary comma
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:05:42 +01:00 |
Alex Moreno
|
b460579834
|
feat(entry_latest-buys): add from and to in search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-23 09:00:46 +01:00 |
Carlos Jimenez Ruiz
|
1f2417b55e
|
Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:34:55 +00:00 |
Carlos Jimenez Ruiz
|
cae3322c6b
|
Merge branch 'dev' into 3332-item_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:28:21 +00:00 |
Carlos Jimenez Ruiz
|
ec7cb47ad5
|
Merge branch 'dev' into 3375-client_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 14:55:56 +00:00 |
Joan Sanchez
|
4ebad6b372
|
filter order was not properly being applied
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 15:54:01 +01:00 |
Joan Sanchez
|
3a2e4c54b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli
|
2021-11-22 15:49:43 +01:00 |
Joan Sanchez
|
90ab78d26d
|
Updated unit tests
|
2021-11-22 15:49:32 +01:00 |