Vicent Llopis
|
7f80c7ed2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 09:30:35 +01:00 |
Vicent Llopis
|
06075aa17b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms
|
2022-12-21 12:15:21 +01:00 |
Vicent Llopis
|
1d7145d74b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 08:05:19 +01:00 |
Alexandre Riera
|
6ef282feda
|
refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 09:54:28 +01:00 |
Guillermo Bonet
|
dc82e610b7
|
refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 11:24:18 +01:00 |
Guillermo Bonet
|
a46c2ced7c
|
refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:26:07 +01:00 |
Alex Moreno
|
156f2b9129
|
feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 15:03:55 +01:00 |
Carlos Andrés
|
41b7b6ab06
|
Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 08:24:11 +00:00 |
Vicent Llopis
|
444d495b7f
|
refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:22:13 +01:00 |
Vicent Llopis
|
ba8fe7dfa8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:11:00 +01:00 |
Vicent Llopis
|
1588492f9a
|
feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 13:29:39 +01:00 |
Carlos Andrés
|
6b76804913
|
refs #4865 Sintaxis mensajes rocket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 10:52:15 +01:00 |
Alex Moreno
|
804db15ece
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-28 07:53:51 +01:00 |
Vicent Llopis
|
dbbce77cc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 07:41:43 +01:00 |
Vicent Llopis
|
f313a53cde
|
refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 10:56:55 +01:00 |
Alex Moreno
|
314e98b838
|
fix: nested router
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 14:57:52 +01:00 |
Alex Moreno
|
660648e01f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-22 14:35:25 +01:00 |
Vicent Llopis
|
32f28e91b5
|
feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 14:29:42 +01:00 |
Alexandre Riera
|
d7843f3298
|
Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 14:24:55 +01:00 |
Alexandre Riera
|
34fb80beec
|
fix translations
|
2022-11-22 14:24:19 +01:00 |
Alexandre Riera
|
2651081838
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:15:31 +01:00 |
Alexandre Riera
|
463e56b631
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:41:17 +01:00 |
Alexandre Riera
|
01607c71b6
|
fix rocket message and order table
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 13:03:55 +01:00 |
Vicent Llopis
|
918ea3030d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:41:12 +01:00 |
Alex Moreno
|
4c216c4556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 14:40:55 +01:00 |
Guillermo Bonet
|
6804c1a756
|
Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 16:55:29 +01:00 |
Guillermo Bonet
|
6744b3f797
|
added collection-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 14:40:38 +01:00 |
Vicent Llopis
|
1bc8cf52d5
|
add translate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:20:36 +01:00 |
Vicent Llopis
|
d34a4ae992
|
add translate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:19:25 +01:00 |
Vicent Llopis
|
51b047eacc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 07:40:31 +01:00 |
Alexandre Riera
|
896a7eb6f0
|
refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 15:55:17 +01:00 |
Vicent Llopis
|
7fc18c89df
|
feat: error handlers
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 13:57:54 +01:00 |
Alex Moreno
|
36894c31de
|
Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 08:39:04 +00:00 |
Vicent Llopis
|
8a4aa6285b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:49:39 +01:00 |
Vicent Llopis
|
6df74facdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-11-02 14:23:20 +01:00 |
Alex Moreno
|
9c671ed3a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:47:00 +01:00 |
Alex Moreno
|
755a1667dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 07:35:04 +01:00 |
Alex Moreno
|
fc7a39e910
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 07:33:07 +01:00 |
Vicent Llopis
|
d9107719fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-10-31 15:04:33 +01:00 |
Vicent Llopis
|
3243d35bd7
|
feat: send email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 14:48:37 +01:00 |
Alex Moreno
|
cf24301bfe
|
feat(account): email-verify refs #4077
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 13:28:26 +02:00 |
Vicent Llopis
|
d4e2783630
|
refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 08:39:07 +02:00 |
Alex Moreno
|
f65d06fc7d
|
fixes #4073
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 08:27:28 +02:00 |
Vicent Llopis
|
9ea427dbfe
|
refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 13:45:46 +02:00 |
Alex Moreno
|
79b970286c
|
refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 11:22:27 +02:00 |
Alex Moreno
|
ce2ad32ac9
|
add email template
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 15:16:56 +02:00 |
Alex Moreno
|
5c4daee35e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 14:20:22 +02:00 |
Vicent Llopis
|
c8d270499b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 11:50:11 +02:00 |
Vicent Llopis
|
aa51fa1722
|
feat: check the client to edit is in vn.client and not in account.account
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-05 12:36:36 +02:00 |
Vicent Llopis
|
197bbf392b
|
refator: updates translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-04 07:50:37 +02:00 |
Alex Moreno
|
81752e7f30
|
quit userError
|
2022-09-28 12:20:29 +02:00 |
Alex Moreno
|
d2cbaa565e
|
add translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:48:46 +02:00 |
Alex Moreno
|
dc605387ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:23:10 +02:00 |
Alex Moreno
|
fc5460dc9e
|
feat(account): send verifyEmail when change email and tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:21:58 +02:00 |
Alex Moreno
|
c79f884526
|
feat(recover-password): open changePass in front and tests done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-22 09:22:24 +02:00 |
Joan Sanchez
|
284524e3fa
|
Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1054
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-21 06:49:44 +00:00 |
Alex Moreno
|
918863ee8e
|
feat(account): recover-password
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-20 15:21:01 +02:00 |
Alex Moreno
|
b3aaa493d5
|
fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-19 09:45:28 +02:00 |
Alex Moreno
|
4f7218ab76
|
translation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 13:01:40 +02:00 |
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +02:00 |
Vicent Llopis
|
c3d396b042
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 13:52:59 +02:00 |
Joan Sanchez
|
c369453bfc
|
Added model fields
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-31 13:36:27 +02:00 |
Alex Moreno
|
5bad0592a5
|
change errors
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 08:48:51 +02:00 |
Vicent Llopis
|
5f2424dc44
|
feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-04 13:26:53 +02:00 |
Vicent Llopis
|
e29f820e60
|
feat(ticket_line): new table ticketRefund and update proc ticket_doRefund
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-30 08:56:35 +02:00 |
Carlos Jimenez Ruiz
|
39694b31b8
|
Merge branch 'dev' into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-28 08:40:32 +00:00 |
Vicent Llopis
|
fd7afc962f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-23 12:53:33 +01:00 |
Vicent Llopis
|
1056060957
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-23 12:37:34 +01:00 |
Vicent Llopis
|
e4eed95724
|
notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 10:02:56 +01:00 |
Vicent Llopis
|
644c24fa3b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-17 11:55:07 +01:00 |
Vicent Llopis
|
a3dbec82bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database
|
2022-03-17 07:59:07 +01:00 |
Vicent Llopis
|
2f53733151
|
refactor translates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-15 15:05:09 +01:00 |
Vicent Llopis
|
aa5ff474ec
|
solved test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-11 12:21:39 +01:00 |
Vicent Llopis
|
a32ebc37da
|
add supplier autonomous
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-03-09 23:54:23 +01:00 |
Vicent Llopis
|
03c8ceffb2
|
refactor code
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-07 13:54:18 +01:00 |
Joan Sanchez
|
87ae05c997
|
Added translation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-02-01 12:51:38 +01:00 |
Alex Moreno
|
8794f8639f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback
|
2022-01-25 15:04:52 +01:00 |
Alex Moreno
|
6d9afd5f4c
|
feat(ticket_sale): role restriction to create payBack
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-21 11:40:48 +01:00 |
Javi Gallego
|
3c8e6a16a2
|
Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-19 14:19:29 +01:00 |
Carlos Jimenez Ruiz
|
cc3e2fbc3a
|
can't transfer claimed sales without claimManager role
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-12 10:17:51 +01:00 |
Alex Moreno
|
5462af91ee
|
extract to variable
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-10 11:38:02 +01:00 |
Alex Moreno
|
860499db82
|
refactor(ticket): add more text in error when change zone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-07 08:28:57 +01:00 |
Joan Sanchez
|
c24df3ade9
|
Updated translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-01-05 16:23:58 +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
|
b4f1e66fed
|
order module transactions
|
2021-12-15 15:29:22 +01:00 |
Javi Gallego
|
a99174e42a
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2021-12-14 09:50:39 +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 |
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 |
Carlos Jimenez Ruiz
|
dd19ac975d
|
Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-22 13:18:53 +00:00 |
Joan Sanchez
|
8c5f0d3019
|
feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago
Refs: 3278
|
2021-11-19 09:24:31 +01:00 |
Javi Gallego
|
c8e9416448
|
Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-19 07:33:54 +01:00 |
Alex Moreno
|
16c28cfa56
|
fix(client): validate businessType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-18 12:15:37 +01:00 |
Javi Gallego
|
b936272898
|
Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-18 07:36:03 +01:00 |
Vicent Llopis
|
7efb19ab83
|
feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-15 14:49:14 +01:00 |
Vicent Llopis
|
d94e2900d0
|
feat(ticket-request): send rocket message when ticket-reques is denied
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 12:16:37 +02:00 |
Joan Sanchez
|
197ed2009f
|
fix(invoicePdf): Create PDF document on invoice download
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: 3109, 3110
|
2021-09-29 12:15:42 +02:00 |
Javi Gallego
|
e5c9ea850b
|
testback done
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-09-24 08:24:34 +02:00 |
Joan Sanchez
|
e8792d5686
|
refactor(client): added restriction to change the credit amount from zero set by a manager
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3087
|
2021-09-09 14:43:18 +02:00 |
Carlos Jimenez Ruiz
|
a0fd0ba8f3
|
refactor(fiscaldata): added translation for the backend error
|
2021-09-08 11:22:59 +02:00 |
Carlos Jimenez Ruiz
|
f2f81442d9
|
fix(cloneWithEntries): endpoint was broken due to production changes
|
2021-09-02 14:17:35 +02:00 |