Commit Graph

11741 Commits

Author SHA1 Message Date
Alex Moreno 5a906d075a Merge branch '3622-client_defaulter' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter 2022-03-01 11:39:20 +01:00
Alex Moreno 772c85e5cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter 2022-03-01 11:39:09 +01:00
Joan Sanchez eb9d349b17 Merge pull request '#3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route' (#884) from 3015-route_tickets_unlink into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #884
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-01 10:18:21 +00:00
Joan Sanchez 10af48a739 Merge branch 'dev' into 3015-route_tickets_unlink
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 10:13:41 +00:00
Carlos Jimenez Ruiz 4b0ad8ae36 Merge pull request '3634 - refactor(chat): check rocketchat status before sending message' (#882) from 3634-rocketchat_status into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #882
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-03-01 10:13:29 +00:00
Joan Sanchez 3512e287ae Updated endpoints description
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 11:09:10 +01:00
Joan Sanchez b71e7440b3 Merge branch 'dev' into 3634-rocketchat_status
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 09:49:11 +00:00
Alex Moreno a27a48f251 fix(supplier_account): fix setWireTransfer and add test
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 10:44:46 +01:00
Alex Moreno 2137a34b36 feat(supplier-account): isPayMethodChecked false when change model 2022-03-01 10:44:04 +01:00
Joan Sanchez b7dd4952df Merge branch 'dev' into 3622-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 09:33:38 +00:00
Joan Sanchez 73d853cb53 Merge pull request '3352-docuware' (#880) from 3352-docuware into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #880
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-28 13:44:46 +00:00
Joan Sanchez 1a95489568 Merge pull request '3623-reportInvoice_intrastat' (#878) from 3623-reportInvoice_intrastat into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #878
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-28 13:41:59 +00:00
Alex Moreno 3f483d36f2 refactor(order_search-panel): change orderFk to ticketFk
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 14:28:16 +01:00
Alex Moreno 4046617eab short form
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:37:44 +01:00
Alex Moreno cf9851c8dc typo
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:27:03 +01:00
Alex Moreno ab6b5aa803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:14:34 +01:00
Alex Moreno c9188658ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 12:40:52 +01:00
Alex Moreno 60e908d82a feat(claim_summary): parentReload(), and test 2022-02-28 12:40:44 +01:00
Carlos Jimenez Ruiz d2871ff3a6 Merge branch 'dev' into 3623-reportInvoice_intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:12:36 +00:00
Carlos Jimenez Ruiz 8f1f9c3f9b Merge pull request '3595-item-waste-folding' (#877) from 3595-item-waste-folding into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #877
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-28 10:12:10 +00:00
Carlos Jimenez Ruiz 2647b4e423 Merge branch 'dev' into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:05:07 +00:00
Carlos Jimenez Ruiz 00088d9781 Merge pull request '3609-ticket_basic-data' (#875) from 3609-ticket_basic-data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #875
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-28 10:04:40 +00:00
Carlos Jimenez Ruiz d1c884deb2 Merge branch 'dev' into 3609-ticket_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 09:58:27 +00:00
Carlos Jimenez Ruiz 4b963804c6 added transalation to item waste
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz bf0734ca67 excluded 3 test suites until db export
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:46:14 +01:00
Carlos Jimenez Ruiz a2d2e79738 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding 2022-02-28 10:21:21 +01:00
Alex Moreno 5434dd3baf feat(claim_index): implemented smart-table and change state in summary
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-28 07:57:46 +01:00
Alex Moreno 62286c2f9a refactor(defaulter): simple route
gitea/salix/pipeline/head This commit looks good Details
2022-02-25 10:34:17 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis 90dc3bc5b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-25 08:22:15 +01:00
Vicent Llopis 72bfc1ef6e export db
gitea/salix/pipeline/head This commit looks good Details
2022-02-25 08:21:53 +01:00
Vicent Llopis 7aa6601ec1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-02-25 07:52:22 +01:00
Juan Ferrer c3e480b2e7 MariaDB user sync disabled in dev environment
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 15:02:16 +01:00
Vicent Llopis 19887bdd16 feat: add section autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-24 14:52:32 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 13:52:26 +01:00
Carlos Jimenez Ruiz 9ba13f90d3 #3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 16:12:29 +01:00
Vicent Llopis ca40eee5ad feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 14:53:49 +01:00
Alex Moreno c33b8fbb83 refactor(worker): absences return one or all abscences
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 14:50:59 +01:00
Vicent Llopis b3263fb97e add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:58:09 +01:00
Vicent Llopis dedecb492e sql modify 2022-02-23 12:58:01 +01:00
Vicent Llopis 9e06538fd0 fix: execute updatePortfolio after submit changes 2022-02-23 12:57:43 +01:00
Alex Moreno 52cf79516a refactor(claim_summary): move responsability and improve fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:23:47 +01:00
Joan Sanchez 9d298c2a5e Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:07:05 +01:00
Alex Moreno a5614e5d5d change client.name for client.socialName
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:52:45 +01:00
Vicent Llopis c7db8c6b06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data 2022-02-23 09:12:25 +01:00
Vicent Llopis 30763e5c08 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:05:53 +01:00
Vicent Llopis 591194d710 export db 2022-02-23 09:05:31 +01:00
Alex Moreno 8a8951b8b0 feat(client_defaulter): add columns to search
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 08:53:25 +01:00
Alex Moreno f3ff64c44d refactor(docuware): name for code
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 08:11:54 +01:00
Alex Moreno 4606b0d7ea change name for code
gitea/salix/pipeline/head This commit looks good Details
2022-02-22 15:23:23 +01:00