Commit Graph

1011 Commits

Author SHA1 Message Date
Alex Moreno dc03a66c6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price 2022-03-23 12:01:50 +01:00
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Alex Moreno 9a1c0a07fd Merge branch 'dev' into 3680-claim_basic-data_packages 2022-03-23 08:42:52 +00:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e 2022-03-18 10:30:30 +01:00
Vicent Llopis 16be66286e excluded test 2022-03-17 08:13:08 +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
Alex Moreno 39b3e35725 change description 2022-03-15 15:11:58 +01:00
Alex Moreno f337f82b35 feat(claim): add packages, and next button 2022-03-15 12:51:33 +01:00
Alex Moreno 0fd556dd2a fix(worker): fix calendar e2e 2022-03-11 13:23:02 +01:00
Vicent Llopis aa5ff474ec solved test e2e 2022-03-11 12:21:39 +01:00
Alex Moreno 5efb678a53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences 2022-03-02 10:32:18 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences 2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary 2022-03-02 09:17:19 +00:00
Alex Moreno 62286c2f9a refactor(defaulter): simple route 2022-02-25 10:34:17 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests 2022-02-24 13:52:26 +01:00
Alex Moreno a5614e5d5d change client.name for client.socialName 2022-02-23 09:52:45 +01:00
Alex Moreno 4e89c66e2c refactor(client_defaulter): add column date 2022-02-22 08:58:22 +01:00
Alex Moreno 91b6dcee05 fix(test): fixed bugs non compatible ECMA options 2022-02-02 14:33:16 +01:00
Joan Sanchez a4186ce577 Updated e2e 2022-02-01 12:45:06 +01:00
Joan Sanchez a8900b06b7 Merge branch 'dev' into 3258-import_buys 2022-02-01 10:57:39 +00:00
Carlos Jimenez Ruiz 01e269db6d Merge branch 'dev' into 3052-client_defaulter 2022-02-01 09:03:47 +00:00
Alex Moreno 368498d763 refactor(defaulter): array request 2022-02-01 08:49:56 +01:00
Alex Moreno 746cbede4b feat(client_defaulter): move tool-bar up , add column author 2022-01-31 08:17:15 +01:00
Joan Sanchez 78507240ee Merge branch 'dev' into 3258-import_buys 2022-01-28 13:14:14 +00:00
Joan Sanchez db54d92b69 Updated E2E 2022-01-28 14:11:26 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket 2022-01-28 09:15:41 +01:00
Alex Moreno d0c4099255 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:20:39 +01:00
Alex Moreno 8e75a28f7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-26 12:46:59 +01:00
Alex Moreno f67a4355db refactor(ticket_sale): split e2e, change name backTest 2022-01-25 15:09:29 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test 2022-01-25 14:27:30 +01:00
Alex Moreno 6d9afd5f4c feat(ticket_sale): role restriction to create payBack 2022-01-21 11:40:48 +01:00
Alex Moreno 9ddf11c6bc test(ticket): update to advanceable 2022-01-18 12:49:16 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-13 07:20:23 +01:00
Carlos Jimenez Ruiz 7dbf03ed72 front unit test and e2e for change state 2021-12-30 10:45:19 +01:00
Alex Moreno 1e6355cdde fixtures 2021-12-22 08:37:50 +01:00
Alex Moreno 67dc5c2cbc refactor(ticket_basic-data): test e2e 2021-12-22 08:11:33 +01:00
Alex Moreno e609994efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2021-12-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures 2021-12-21 20:58:58 +01:00
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono 2021-12-21 14:45:40 +01:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name 2021-12-21 14:43:53 +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
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures 2021-12-20 09:40:34 +00:00
Alex Moreno 6465a5c460 feat(supplier): payMethodChecked for financial 2021-12-14 08:23:11 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test 2021-12-01 12:49:53 +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
Alex Moreno 8ea3307230 feat(ticket_sale): allow multi-check for recalculatePrice 2021-11-29 08:30:36 +01:00
Alex Moreno eea9413628 fix(item_basic-data): controller, test e2e and model 2021-11-26 08:34:32 +01:00
Alex Moreno 9fce06dfe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data 2021-11-25 11:53:26 +01:00
Carlos Jimenez Ruiz 5914e8e1ac fixed e2e by adding acls where needed 2021-11-25 11:30:55 +01:00
Alex Moreno c03fe359b1 add acl 2021-11-24 14:36:12 +01:00