Commit Graph

623 Commits

Author SHA1 Message Date
Alex Moreno d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-01 14:19:23 +02:00
Alex Moreno e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale 2023-05-25 07:34:54 +02:00
Alex Moreno 292d9e038d typo 2023-05-24 13:38:11 +02:00
Alex Moreno 6b66eb3bb2 refs #5679 typo 2023-05-24 12:59:58 +02:00
Alexandre Riera 856dcf18cb refs #5677 locations 2023-05-24 12:17:41 +02:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed 2023-05-24 12:16:19 +02:00
Alex Moreno 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale 2023-05-24 11:20:07 +02:00
Alexandre Riera e7d16dc8ba refs #4797 fix test, add getList 2023-05-09 11:34:32 +02:00
Alex Moreno 8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-05-09 07:11:09 +02:00
Alex Moreno bf3aac70f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-03 11:37:07 +02:00
Alex Moreno 79e7e7c604 refs #5472 feat: add change-password section 2023-05-02 15:16:13 +02:00
Alexandre Riera 13c37e88ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-05-02 11:38:07 +02:00
Alexandre Riera c2de5c5ff4 refs #4797 added redirection section 2023-05-02 07:28:59 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Alex Moreno 42fc0b62d8 refs #5472 feat(user): add passExpired 2023-04-27 15:18:27 +02:00
Carlos Satorres e1864fec09 arreglo json 2023-04-27 13:26:22 +02:00
Carlos Satorres 08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies 2023-04-27 12:49:01 +02:00
Carlos Satorres 07148f6c29 refs #5540 mon message 2023-04-27 11:31:26 +02:00
Carlos Satorres 67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies 2023-04-24 06:51:41 +00:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alexandre Riera b3a10698af hotfix negativeBases 2023-04-21 08:20:38 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Juan Ferrer 378400c6d2 refs #5553 Image scrubing method improved
Remove & dryRun options, check that collection exists, performance improved, exclusive lock
2023-04-17 18:19:25 +02:00
Joan Sanchez f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-13 12:00:22 +02:00
Joan Sanchez b5f2cf3711 Added unit test & translation fixes 2023-04-13 11:54:56 +02:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert 2023-04-11 09:48:31 +02:00
Joan Sanchez 2e0325e567 Validate code 2023-04-06 14:59:25 +02:00
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails 2023-04-04 14:09:55 +02:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-20 09:54:02 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar 2023-03-16 09:16:50 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix 2023-03-16 08:06:17 +00:00
Carlos Andrés 2a6848c09a refs #5000 invoiceOutGlobal 2023-03-14 09:17:39 +01:00
Alexandre Riera 7c3c3a2d66 refs #4632 added userError 2023-03-09 08:31:38 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Alexandre Riera f2bd0253e2 refs #5092 added unbilled tickets section 2023-03-06 09:27:53 +01:00
Joan Sanchez b8881a050c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-03-02 07:41:16 +01:00
Carlos Andrés 6f5e25493d invoicing test 2023-03-01 10:36:38 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund 2023-03-01 08:29:58 +01:00
Guillermo Bonet 15f2f46e4c refs #4975 Traduction no branch 2023-02-28 14:48:17 +01:00
Guillermo Bonet 656685cd7e refs #4975 Minor changes 2023-02-28 14:35:34 +01:00
Alexandre Riera e9dca9211c refs #5149 checked if ticket has refunds, added translations 2023-02-28 13:42:18 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added 2023-02-27 08:39:46 +01:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC 2023-02-23 09:25:23 +01:00
Vicent Llopis 222032aae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-02-09 08:38:08 +01:00
Alexandre Riera 780018e4df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-02-02 08:40:49 +01:00
Alexandre Riera 62766706b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData 2023-02-01 08:52:03 +01:00
Alexandre Riera 7d7e1a74da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-02-01 08:46:28 +01:00
Alexandre Riera fd440a4db3 refs #5129 better translation tracked sales 2023-01-31 15:42:36 +01:00
Alexandre Riera a358e58171 docuware translation 2023-01-31 12:12:25 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added 2023-01-31 09:04:45 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added 2023-01-30 08:30:39 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-24 08:11:46 +01:00
Alexandre Riera 07d3fef8f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-23 13:44:19 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-20 08:30:30 +01:00
Alexandre Riera 292372395e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 07:15:03 +01:00
Vicent Llopis b7004e6a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-17 12:50:34 +01:00
Guillermo Bonet 3d4600d70d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method 2023-01-16 12:26:10 +01:00
Alexandre Riera b3c6443277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-16 10:33:35 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file 2023-01-13 13:33:59 +01:00
Alexandre Riera 41671e8a3a refs #4927 modified hook to check name & country 2023-01-13 08:38:29 +01:00
Guillermo Bonet 868c2aaaef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method 2023-01-12 15:25:51 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests 2023-01-12 15:16:38 +01:00
Guillermo Bonet e0e34595f4 refs #4975 Added translations 2023-01-09 18:46:19 +01:00
Vicent Llopis 5a5e4c5afb feat: solo coge los tickets que no esten eliminados 2023-01-09 14:47:52 +01:00
Vicent Llopis d16235cba9 fix: show error when is negative base 2023-01-05 10:55:56 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-28 11:49:16 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 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 2022-12-21 08:05:19 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future 2022-12-20 09:54:28 +01:00
Guillermo Bonet dc82e610b7 refs #4975 Minor changes 2022-12-19 11:24:18 +01:00
Guillermo Bonet a46c2ced7c refs #4975: Added last mdbVersion/last method 2022-12-19 07:26:07 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code 2022-12-14 15:03:55 +01:00
Carlos Andrés 41b7b6ab06 Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket 2022-12-12 08:24:11 +00:00
Vicent Llopis 444d495b7f refactor: codigo reducido 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 2022-12-01 07:11:00 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale' 2022-11-30 13:29:39 +01:00
Carlos Andrés 6b76804913 refs #4865 Sintaxis mensajes rocket 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 2022-11-25 07:41:43 +01:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones 2022-11-23 10:56:55 +01:00
Alex Moreno 314e98b838 fix: nested router 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 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 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 2022-11-22 10:15:31 +01:00
Alexandre Riera 463e56b631 corrections 2022-11-21 11:41:17 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table 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 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 2022-11-10 14:40:55 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer 2022-11-09 16:55:29 +01:00
Guillermo Bonet 6744b3f797 added collection-label 2022-11-08 14:40:38 +01:00
Vicent Llopis 1bc8cf52d5 add translate 2022-11-08 08:20:36 +01:00
Vicent Llopis d34a4ae992 add translate 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 2022-11-08 07:40:31 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones 2022-11-07 15:55:17 +01:00
Vicent Llopis 7fc18c89df feat: error handlers 2022-11-07 13:57:54 +01:00
Alex Moreno 36894c31de Merge branch 'dev' into 4077-login_recover-password 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 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 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 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 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 2022-10-31 14:48:37 +01:00
Alex Moreno cf24301bfe feat(account): email-verify refs #4077 2022-10-26 13:28:26 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción 2022-10-26 08:39:07 +02:00
Alex Moreno f65d06fc7d fixes #4073 2022-10-26 08:27:28 +02:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality 2022-10-18 13:45:46 +02:00
Alex Moreno 79b970286c refactor(claim_claimPickupEmail): use text template and external form 2022-10-17 11:22:27 +02:00
Alex Moreno ce2ad32ac9 add email template 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 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 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 2022-10-05 12:36:36 +02:00
Vicent Llopis 197bbf392b refator: updates translations 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 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 2022-09-26 08:23:10 +02:00
Alex Moreno fc5460dc9e feat(account): send verifyEmail when change email and tests 2022-09-26 08:21:58 +02:00
Alex Moreno c79f884526 feat(recover-password): open changePass in front and tests done 2022-09-22 09:22:24 +02:00
Joan Sanchez 284524e3fa Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev
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 2022-09-20 15:21:01 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure 2022-09-19 09:45:28 +02:00
Alex Moreno 4f7218ab76 translation 2022-09-14 13:01:40 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts 2022-08-10 12:13:31 +02:00
Vicent Llopis c3d396b042 fix: test e2e 2022-08-04 13:52:59 +02:00
Joan Sanchez c369453bfc Added model fields 2022-05-31 13:36:27 +02:00
Alex Moreno 5bad0592a5 change errors 2022-05-10 08:48:51 +02:00
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu 2022-04-04 13:26:53 +02:00
Vicent Llopis e29f820e60 feat(ticket_line): new table ticketRefund and update proc ticket_doRefund 2022-03-30 08:56:35 +02:00
Carlos Jimenez Ruiz 39694b31b8 Merge branch 'dev' into 3607-supplier_agencyTerm 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 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 2022-03-23 12:37:34 +01:00
Vicent Llopis e4eed95724 notify rocket when claimState change to canceled 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 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 2022-03-15 15:05:09 +01:00
Vicent Llopis aa5ff474ec solved test e2e 2022-03-11 12:21:39 +01:00
Vicent Llopis a32ebc37da add supplier autonomous 2022-03-09 23:54:23 +01:00
Vicent Llopis 03c8ceffb2 refactor code 2022-03-07 13:54:18 +01:00
Joan Sanchez 87ae05c997 Added translation 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 2022-01-21 11:40:48 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking 2022-01-19 14:19:29 +01:00
Carlos Jimenez Ruiz cc3e2fbc3a can't transfer claimed sales without claimManager role 2022-01-12 10:17:51 +01:00
Alex Moreno 5462af91ee extract to variable 2022-01-10 11:38:02 +01:00
Alex Moreno 860499db82 refactor(ticket): add more text in error when change zone 2022-01-07 08:28:57 +01:00
Joan Sanchez c24df3ade9 Updated translations 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 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 2021-12-14 08:23:11 +01:00
Vicent Llopis 4c064f8a80 feat(worker_calendar): add restrictions to add absence and to add hours recorded 2021-11-30 09:11:23 +01:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar 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 2021-11-19 07:33:54 +01:00
Alex Moreno 16c28cfa56 fix(client): validate businessType 2021-11-18 12:15:37 +01:00
Javi Gallego b936272898 Merge branch 'dev' into 2883-invoiceIn-Booking 2021-11-18 07:36:03 +01:00
Vicent Llopis 7efb19ab83 feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día" 2021-11-15 14:49:14 +01:00
Vicent Llopis d94e2900d0 feat(ticket-request): send rocket message when ticket-reques is denied 2021-10-27 12:16:37 +02:00
Joan Sanchez 197ed2009f fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
2021-09-29 12:15:42 +02:00
Javi Gallego e5c9ea850b testback done 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
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
Javi Gallego 249ea918dd Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate 2021-08-13 08:18:34 +02:00
Javi Gallego 5efcd6a57e translation 2021-08-12 14:00:15 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 3b9bdc18bf funciona 2021-08-12 09:23:19 +02:00
Javi Gallego 54634ed22d test okl 2021-08-12 07:39:26 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements 2021-08-10 11:48:29 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint 2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz a771fd584f minor refactors + missing transaction on discount 2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client 2021-07-27 09:07:04 +02:00
Joan Sanchez 92b6318c79 Ammends 2021-07-01 13:31:04 +02:00
Joan Sanchez 7e836e570f 2983 - Invoice tickets 2021-06-30 16:10:26 +02:00
Carlos Jimenez Ruiz e2ff3ff17f validation message for dup entry 2021-06-28 13:30:49 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Carlos Jimenez Ruiz 01f0fed0c3 Merge branch 'dev' into 2483-email_replyTo 2021-04-13 08:41:56 +00:00
Joan Sanchez de769a2565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-04-12 08:02:35 +02:00
Joan Sanchez 6eba19a1b7 OsTicket notifications 2021-04-12 07:48:29 +02:00
Joan Sanchez 465955d0c5 2483 - Added replyTo param when sending an email to client 2021-04-07 13:09:53 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete 2021-04-07 07:45:00 +02:00
Joan Sanchez de7f1bbc12 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-24 14:26:09 +01:00
Joan Sanchez 302dedef0f Missing translations & attachment fix 2021-03-24 14:25:57 +01:00
Joan Sanchez b3d333368b #2819 - Notify worker assignment 2021-03-23 16:19:45 +01:00
jorgebl e12be7bf0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message 2021-03-18 13:40:56 +01:00
Joan Sanchez bd081f9fd6 2734 - Make invoice PDF refactor 2021-03-15 13:43:22 +01:00
jorgebl c74b635a1a Translate and show url of item 2021-03-12 12:24:08 +01:00
jorgebl 63ac492845 Added message for duplicated names 2021-03-05 08:45:14 +01:00
Jorge Padawan 8800f76684 Translations recovered 2021-02-12 11:35:33 +01:00
Jorge Padawan bb02a0de6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-10 16:59:29 +01:00
Javi Gallego f87ea1b051 arrow-spacing 2021-02-10 08:13:45 +01:00
Javi Gallego 3a3dae179c done 2021-02-10 07:58:11 +01:00
Joan Sanchez 5bd7e4a67f Translation fix 2021-02-05 08:05:57 +01:00
Joan Sanchez 4ac207c568 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue 2021-02-01 12:58:50 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues 2021-02-01 09:29:47 +01:00
Jorge Padawan 7408d22b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-01 09:05:06 +01:00
Carlos Jimenez Ruiz 42e7fa7047 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-21 10:25:39 +01:00
Carlos Jimenez Ruiz f07c91fdc1 translation amends 2021-01-20 09:28:07 +01:00
Carlos Jimenez Ruiz f946e63a86 e2e path for item fixed price 2021-01-19 20:56:33 +01:00
Jorge Padawan c5ace0a939 create the tests fields for create Account section 2021-01-15 11:24:32 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-08 15:24:05 +01:00
Javi Gallego 1884dc8789 fixtures 2021-01-08 09:43:36 +01:00
Joan Sanchez e5b13267e2 2605 - Ticket request send chat notification 2021-01-05 15:03:35 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-22 07:42:28 +01:00
Joan Sanchez 35dc2a533b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop 2020-12-21 14:52:08 +01:00
Joan Sanchez 1419acb8a7 2663 - Drag & drop ticket to route index 2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz 482cbd7195 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor 2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz 369a79b79f route.tickets refactor 2020-12-21 12:37:36 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad 2020-12-16 08:33:08 +01:00
Jorge Benedito Llopis f62d3139bb Supplier.billingData section 2020-12-14 16:09:17 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component 2020-11-27 13:10:39 +01:00
Joan Sanchez 378982389a Requested chagnes 2020-11-11 13:44:42 +01:00
Joan Sanchez 637116b17d Added descriptor-menu component 2020-11-09 14:52:25 +01:00
Carlos Jimenez Ruiz 074e10d4ca translations file was corrupted on merge fix 2020-11-04 15:20:07 +01:00
Joan Sanchez 0570d83a6d Requested changes 2020-11-04 13:38:09 +01:00
Joan Sanchez 146b4f5bcd 2534 - Fill sage data before enable taxDataChecked 2020-10-28 14:12:57 +01:00
Joan Sanchez 537d61e27e Updated locale 2020-10-21 13:53:46 +02:00
Joan Sanchez c87783b446 2528 - Rocket notifications hotfix 2020-10-21 13:25:52 +02:00
Joan Sanchez f7e9372bf0 2525 - Change to past date 2020-10-20 15:12:00 +02:00
Joan Sanchez 355f95ae40 2473 - Added ticket restore option 2020-10-08 13:42:20 +02:00
Joan Sanchez 420dfdbdff Send notification by email 2020-10-02 12:23:48 +02:00
Juan Ferrer b9c526c29c LDAP user & role syncronization 2020-09-21 13:24:43 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez f13c47ce6d Ticket problems filter fix 2020-08-17 14:31:26 +02:00
Bernat Exposito Domenech d414db73de order index add buton and columns 2020-06-30 08:32:04 +02:00
Bernat Exposito Domenech b33f42d05e add restrictions in claim detail 2020-06-16 07:47:46 +02:00
Carlos Jimenez Ruiz 2345a922c8 now we can create thermographs for travelThermograph 2020-05-27 13:11:41 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox 2020-05-13 15:04:57 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed 2020-05-06 14:38:09 +02:00
Joan Sanchez 835c415ba7 1934 - Moved procedure logic to method 2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech d0b0c9d060 pull request changes 2020-03-11 12:03:55 +01:00
Bernat Exposito Domenech 4a5d97996e travel.index clonar 2020-03-10 14:09:26 +01:00
Joan Sanchez 0d7e41b38b Added translation 2020-03-06 13:28:31 +01:00
Joan Sanchez 3c41c4656b 2111 - Drop tickets to route ticket list 2020-03-06 13:06:01 +01:00
Bernat Exposito Domenech bfb8c5e138 route.basicData validations 2020-02-18 12:51:29 +01:00
Joan Sanchez 39470e837b 2094 Regularize claim send chat even if doesn't have destination 2020-02-13 13:20:31 +01:00
Joan Sanchez 20f9f7af24 2084 - Keep categoryId selected on item confirmation 2020-02-06 12:46:44 +01:00
Joan Sanchez 494b14bab4 added translation 2020-02-04 12:28:01 +01:00
Joan Sanchez 499bd082fc changed messages 2020-01-29 14:13:25 +01:00
Joan Sanchez 2eeab485e3 Merge dev 2020-01-24 09:48:59 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms 2020-01-24 09:47:24 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests 2020-01-23 13:31:07 +01:00
Javi Gallego 44304e993a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912 2019-12-13 08:19:22 +01:00
Bernat Exposito Domenech 0ef036caf9 traduccion 2019-12-12 14:31:22 +01:00
Bernat Exposito Domenech 1194f735a6 traduccion 2019-12-12 14:31:08 +01:00
Bernat Exposito Domenech e8c216799c update estructure 2019-12-12 14:28:58 +01:00
Javi Gallego ec081e6a3a campo claimDestinationFk ya no esta como required 2019-12-12 13:53:54 +01:00
Juan Ferrer 4d4e4f31f4 vnZoneEvents refactor 2019-11-18 16:31:37 +01:00
Joan Sanchez c028233012 ticket.sale recalculate sale price #1768 2019-11-14 14:19:39 +01:00
Joan Sanchez 7f2af116bc updated translation 2019-11-13 07:04:47 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test 2019-11-12 08:51:50 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Bernat 1cedd6cbfd merge 2019-10-18 08:38:25 +02:00
Bernat 7a89ab5335 #1778 Refactor worker.phone 2019-10-18 08:36:33 +02:00
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview 2019-10-16 08:56:13 +02:00
Joan Sanchez 8f7b01ca11 translation 2019-10-14 11:49:23 +02:00
Joan Sanchez c12ef09d0b translation 2019-10-14 11:47:48 +02:00
Joan Sanchez 4025c624b3 #15 WIP fixed requested changes 2019-10-08 12:48:12 +02:00
Joan Sanchez 9919f9a46e add & remove childs 2019-10-04 07:41:24 +02:00
Joan Sanchez 2edfb66423 changed fiscal name translation 2019-09-19 09:41:02 +02:00
Joan Sanchez 031dbcb63a Unlocked from autocomplete city and postcode fields #1703 2019-09-18 10:35:46 +02:00
Bernat 8932aa4e5a Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log 2019-09-10 13:27:41 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635 2019-09-09 09:05:13 +02:00
Bernat e8cb57e27a #1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen 2019-09-06 09:47:58 +02:00
Carlos Jimenez Ruiz b9234fc1a8 #1642 order.summary en el descriptor 2019-08-29 13:16:38 +02:00
Joan Sanchez 07af2271c2 ticket.weekly Add ticket #1612 2019-07-29 13:12:36 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604 2019-07-26 11:48:01 +02:00
Joan Sanchez 4f73d1eb5a dms fixes 2019-07-16 13:37:25 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585 2019-07-08 14:07:09 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket 2019-06-25 11:17:58 +02:00
Joan Sanchez dae43bb9b0 transactions refactor #1546 2019-06-21 08:26:59 +02:00
Juan Ferrer edfa112874 Merge with master 2019-06-17 11:33:34 +02:00
Juan Ferrer da01d52756 Secret removed from worker/pbx 2019-06-17 11:14:45 +02:00
Bernat 2504d06bab Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:23:55 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Carlos Jimenez Ruiz 605dabbe19 #1486 back test updateDiscount 2019-06-05 13:39:15 +02:00
Javi Gallego e01765e34e test back-front fixed 2019-05-30 08:41:08 +02:00
Carlos Jimenez Ruiz 40654f94c4 #1475 no borrar servicios de tickets no editables 2019-05-29 13:06:42 +02:00
Carlos Jimenez Ruiz a3311f6093 #1250 ticket.line al mover todas las lineas delete 2019-05-24 15:30:50 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449 2019-05-21 12:56:29 +02:00
Joan Sanchez 183bf137f6 added workerTimeControl #1360 2019-05-17 13:27:51 +02:00
Bernat 91e8b1f81b update fixtures, #1388 ticket descript change shiiped hour 2019-05-03 12:23:57 +02:00
Bernat 37293ad695 #1364 bug create ticket 2019-04-24 11:02:31 +02:00
Bernat 94480a8189 #1329 fix test and fixtures, update ticket-service 2019-04-24 07:43:11 +02:00
Bernat 75c9d1122c #1329 ticket.services validation 2019-04-23 11:25:49 +02:00
Bernat bc005b2310 #1346 fix confirm.js and update item request 2019-04-18 11:02:28 +02:00
Joan Sanchez 353167734e send message to salesPerson #1315 2019-04-11 09:38:53 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest 2019-04-05 15:20:12 +02:00
Gerard ebe269f41e #1249 ticket.invoice 2019-04-05 12:24:39 +02:00
Joan Sanchez d407fc7803 fixed calendar month name display 2019-04-03 12:29:23 +02:00
Carlos Jimenez Ruiz b483ccba27 #1228e2e verifiedData solo cuando el NIF correto 2019-04-01 10:00:15 +02:00
Carlos Jimenez Ruiz 0fb95bc8d2 test repairs plus some traductions 2019-03-29 13:14:48 +01:00
Carlos Jimenez Ruiz 14bd970fbc #1265 worker.pbx da error si no tiene extensión 2019-03-29 10:51:02 +01:00
Joan Sanchez 92170c34d5 worker department #1133 2019-03-12 15:04:09 +01:00
Javi Gallego df48041444 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-12 08:49:20 +01:00
Carlos Jimenez Ruiz 8e28bb4312 #1211 client.billingData 2019-03-07 09:55:22 +01:00
Javi Gallego 159f8fdd6f Quito la traduccion porque ya no existe 2019-03-04 08:34:01 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108 2019-02-28 08:55:34 +01:00
Carlos Jimenez Ruiz c3679b5642 #1077 e2e específico para login 2019-02-21 07:40:22 +01:00
Javi Gallego 6e421d8442 Tarea #808 order.basic-data cr juan 2019-02-06 14:56:36 +01:00
Gerard 6c2fe1d4a3 #1036 order.line 2019-02-05 09:27:01 +01:00
Joan Sanchez a49d937fd9 ita-tag validation error + home shortcuts 2019-01-31 09:47:52 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Carlos Jimenez Ruiz 648bd46862 small e2e refactors 2019-01-23 15:33:25 +01:00
Carlos Jimenez Ruiz 6612d3e3fd traduccion 2019-01-22 16:37:23 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Gerard bbb242b728 #948 alta de cliente 2019-01-08 08:36:08 +01:00
Gerard 7f745de314 #927 order.basic-data 2019-01-07 16:53:34 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00