Joan Sanchez
|
c9f1f2ed2a
|
Merge pull request '3002-backend_transactions' (#679) from 3002-backend_transactions into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #679
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-29 11:01:19 +00:00 |
Carlos Jimenez Ruiz
|
01a9154015
|
Merge branch 'dev' into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:23:47 +00:00 |
Joan Sanchez
|
1d04cfad43
|
Merge pull request '2999-ticket_dms_import_from_existing + buyer to ticket.isEditable' (#678) from 2999-ticket_dms_import_from_existing into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #678
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-29 10:13:21 +00:00 |
Carlos Jimenez Ruiz
|
d67e36212f
|
added validation for the dms id field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 11:59:21 +02:00 |
Carlos Jimenez Ruiz
|
f30cd1aeda
|
added business type to client basic data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:51:27 +02:00 |
Carlos Jimenez Ruiz
|
f3193f0dc1
|
added businesType model and relation to client
|
2021-06-29 10:51:01 +02:00 |
Javi Gallego
|
59fac7edfa
|
fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:33:01 +02:00 |
Javi Gallego
|
e217f02321
|
test front
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 08:59:55 +02:00 |
Carlos Jimenez Ruiz
|
8ca3e0d120
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 16:45:19 +02:00 |
Carlos Jimenez Ruiz
|
7e4e6fae21
|
e2e path for ticket dms import
|
2021-06-28 16:04:21 +02:00 |
Carlos Jimenez Ruiz
|
e2ff3ff17f
|
validation message for dup entry
|
2021-06-28 13:30:49 +02:00 |
Joan Sanchez
|
c6504140af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 12:23:11 +02:00 |
Joan Sanchez
|
52e6c9d793
|
CSS fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 12:06:21 +02:00 |
Carlos Jimenez Ruiz
|
0e47cf72e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
|
2021-06-28 11:19:07 +02:00 |
Joan Sanchez
|
e61bf1ff52
|
Merge pull request '2996-route_tickets_recalc' (#677) from 2996-route_tickets_recalc into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #677
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-28 09:18:16 +00:00 |
Carlos Jimenez Ruiz
|
e054145b49
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2996-route_tickets_recalc
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 10:44:19 +02:00 |
Carlos Jimenez Ruiz
|
32d0aa4e10
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 10:17:30 +02:00 |
Carlos Jimenez Ruiz
|
e9bcddc29f
|
invoice modules transactions and tests
|
2021-06-28 10:15:54 +02:00 |
Joan Sanchez
|
9a56cb90a8
|
Updated e2e selector
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 09:26:15 +02:00 |
Carlos Jimenez Ruiz
|
b9f8bc56e4
|
Merge pull request '2997-export_production_rebuild' (#676) from 2997-export_production_rebuild into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #676
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-28 07:11:26 +00:00 |
Joan Sanchez
|
65ac3fc205
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:58:27 +02:00 |
Joan Sanchez
|
888e2cc4bf
|
Removed package-lock
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:55:14 +02:00 |
Joan Sanchez
|
66a2563552
|
Added line break
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-28 08:48:35 +02:00 |
Joan Sanchez
|
e7dcb54efb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:33:41 +02:00 |
Joan Sanchez
|
ef9f3b13e4
|
html fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:28:31 +02:00 |
Carlos Jimenez Ruiz
|
8b9bfb4ba0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 10:12:52 +02:00 |
Carlos Jimenez Ruiz
|
832452df95
|
ticketDms import
|
2021-06-25 10:12:41 +02:00 |
Carlos Jimenez Ruiz
|
2548fdc891
|
#3000 add buyer to ticket isEditable
|
2021-06-25 09:46:18 +02:00 |
Javi Gallego
|
02cd2283a7
|
summary total
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 09:30:24 +02:00 |
Javi Gallego
|
82e65ec1c3
|
rellena campo rate
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 07:47:53 +02:00 |
Joan Sanchez
|
0941b2423e
|
2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 13:33:51 +02:00 |
Joan Sanchez
|
db30ac3175
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 11:40:23 +02:00 |
Carlos Jimenez Ruiz
|
3bfc08b117
|
route.summary order by priority
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 10:06:31 +02:00 |
Carlos Jimenez Ruiz
|
320c04b2d3
|
update volume is not called when add/remove tickets from route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 09:54:07 +02:00 |
Joan Sanchez
|
362c404aba
|
Css fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 09:16:59 +02:00 |
Joan Sanchez
|
6e879a54a6
|
Added preffer-offline again
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:38:41 +02:00 |
Joan Sanchez
|
8f5e499425
|
Removed prefer-offline
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:35:35 +02:00 |
Joan Sanchez
|
29ceb38a06
|
Added force param
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:32:36 +02:00 |
Joan Sanchez
|
6662a0abfc
|
Clean npm cache
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:31:40 +02:00 |
Carlos Jimenez Ruiz
|
6aae09f070
|
front unit tests final amend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:21:48 +02:00 |
Carlos Jimenez Ruiz
|
2da72fc993
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
|
2021-06-23 14:20:12 +02:00 |
Carlos Jimenez Ruiz
|
790c3729aa
|
Merge pull request '2974- Set user company as default on client balance' (#674) from 2974-client_balance into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #674
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-06-23 12:18:48 +00:00 |
Carlos Jimenez Ruiz
|
12c9f3fd7d
|
Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
|
2021-06-23 14:18:23 +02:00 |
Joan Sanchez
|
b2feb5227c
|
Merge branch 'dev' into 2974-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-23 12:15:36 +00:00 |
Joan Sanchez
|
0267220e1f
|
Merge pull request 'added isDelivered, isReceived and removed travel descriptor' (#672) from 2955-entry_summary_show_receved_sent into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #672
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-23 12:15:13 +00:00 |
Carlos Jimenez Ruiz
|
029b2f2fdd
|
Merge branch 'dev' into 2955-entry_summary_show_receved_sent
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-23 12:12:37 +00:00 |
Joan Sanchez
|
adbef4f1cf
|
Merge pull request '2978-pagination_style_update' (#673) from 2978-pagination_style_update into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #673
|
2021-06-23 11:55:58 +00:00 |
Carlos Jimenez Ruiz
|
625722e4da
|
package-lock up to date in all services
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:40:22 +02:00 |
Carlos Jimenez Ruiz
|
9389bbf779
|
front unit tests fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:32:23 +02:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:24:23 +02:00 |