Commit Graph

387 Commits

Author SHA1 Message Date
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Joan Sanchez 47a2f76aa4 3837 - Import data from external service
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 11:58:40 +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
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Vicent Llopis 29036cc39d 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-21 13:17:52 +01:00
Vicent Llopis fae267f539 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data 2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz 728a5de311 Merge branch 'dev' into 3625-ticket_log_routeFk
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 11:56:44 +00: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
Alex Moreno 4dea046c97 feat(ticket_log): add routeFk log
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 10:07:39 +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
Alex Moreno e09e84c36b refactor(setSaleQuantity): rename, remove transaction
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 12:41:55 +01:00
Carlos Jimenez Ruiz 5a9523642d Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:07:41 +00:00
Joan Sanchez 87ae05c997 Added translation
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:51:38 +01:00
Joan Sanchez 67985077e7 fix(loggable): removed private properties from logs 2022-02-01 11:24:04 +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 6d66ab7bea getTotals without transaction
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 10:05:24 +01:00
Joan Sanchez 52d7b4f600 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-20 09:53:40 +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 095e137c06 translate to english
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 10:10:57 +01:00
Vicent Llopis 9b46b31010 translate
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 12:03:53 +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
Alex Moreno 9c4e46f363 export_database
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 13:32:03 +02:00
Carlos Jimenez Ruiz 5e8c216cd2 fix(dependencies): jasmine and it's reporters upgraded 2021-10-15 14:39:45 +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