Commit Graph

10551 Commits

Author SHA1 Message Date
Jorge Benedito 2e49e1e772 Merge pull request '2279-save_button_if_new_data' (#478) from 2279-save_button_if_new_data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #478
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
2020-12-16 14:40:10 +00:00
Carlos Jimenez Ruiz 9d2f9e45ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 14:53:29 +01:00
Carlos Jimenez Ruiz 5f74c7434a e2e adapted to html refactors 2020-12-16 14:53:14 +01:00
Bernat Exposito a13b554a26 supplier consumption email and fix report
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 14:42:57 +01:00
Carlos Jimenez Ruiz c13e9383ba css refactor + watcher from credit insurance 2020-12-16 13:46:04 +01:00
Joan Sanchez 4bb9ec7be6 Merge pull request 'Añadir bloque fitosanitario en albaranes' (#479) from 2664-note_phytosanitary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #479
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-16 11:40:40 +00:00
Joan Sanchez 8ee68d9fae Added unit test & updated translation
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 12:21:15 +01:00
Joan Sanchez 56ec7714ed Updated reports
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 11:40:51 +01:00
Carlos Jimenez Ruiz ec7ad986ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 11:36:21 +01:00
Carlos Jimenez Ruiz 6261f10576 last account module refactors 2020-12-16 11:36:11 +01:00
Carlos Jimenez Ruiz 57a6df762a zone module refactors 2020-12-16 11:22:13 +01:00
Carlos Jimenez Ruiz 2a63a3b0a4 account or user module refactors 2020-12-16 11:07:06 +01:00
Carlos Jimenez Ruiz e9f73c3299 worker module refactors 2020-12-16 10:32:32 +01:00
Carlos Jimenez Ruiz 2e9267a25e route module refactors 2020-12-16 10:21:35 +01:00
Carlos Jimenez Ruiz 0258c4a276 ticket module refactors 2020-12-16 10:21:20 +01:00
Joan Sanchez 5ecd589106 Updated delivery note
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 09:24:11 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:33:08 +01:00
Bernat Exposito e1ac64a8d9 supplier consumption 2020-12-16 08:05:41 +01:00
Carlos Jimenez Ruiz 116730a3b2 claim module refactors 2020-12-15 17:24:13 +01:00
Carlos Jimenez Ruiz 5295d3ed06 supplier module refactors 2020-12-15 17:09:05 +01:00
Carlos Jimenez Ruiz 975e5c3b00 travel module refactors 2020-12-15 17:05:15 +01:00
Carlos Jimenez Ruiz b071bfd229 entry module refactors 2020-12-15 16:53:56 +01:00
Carlos Jimenez Ruiz eb19bce1ba client module refactors + dialog css 2020-12-15 16:51:36 +01:00
Carlos Jimenez Ruiz 6f29dabec4 order module refactor 2020-12-15 16:16:02 +01:00
Carlos Jimenez Ruiz 1ba83e7741 cancel button css + item module refactor 2020-12-15 16:07:34 +01:00
Carlos Jimenez Ruiz 21a2ba25b4 Merge pull request '2547-supplier_billing_data' (#477) from 2547-supplier_billing_data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #477
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-15 09:10:15 +00:00
Jorge Benedito Llopis 8e11cef8eb Code review refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-15 09:59:53 +01:00
Carlos Jimenez Ruiz 8e13fa7852 entry module refactors 2020-12-14 17:35:32 +01:00
Carlos Jimenez Ruiz e1a77b7d43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data 2020-12-14 17:28:16 +01:00
Jorge Benedito Llopis 927f92dfea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2547-supplier_billing_data
gitea/salix/pipeline/head This commit looks good Details
2020-12-14 16:11:59 +01:00
Jorge Benedito Llopis f62d3139bb Supplier.billingData section 2020-12-14 16:09:17 +01:00
Joan Sanchez 032a88a163 Merge pull request '2503-jest' (#476) from 2503-backend_unit_jest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #476
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-14 08:38:09 +00:00
Joan Sanchez d7dde7e4eb Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-12-14 07:46:32 +01:00
Carlos Jimenez Ruiz 3ad6534160 client module refactors 2020-12-13 14:57:42 +01:00
Carlos Jimenez Ruiz c0289f87e9 order module refactors 2020-12-13 13:55:54 +01:00
Carlos Jimenez Ruiz cbaa95ebda item module refactors 2020-12-13 13:54:17 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +01:00
Carlos Jimenez Ruiz f3d1891c17 jest refactor
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 11:00:03 +01:00
Carlos Jimenez Ruiz 1e02024b95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2503-backend_unit_jest 2020-12-11 10:02:02 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Javi Gallego f48abfe7d4 Merge pull request 'ticket descriptor translate' (#475) from 2630-ticket_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #475
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-12-09 15:31:44 +00:00
Bernat Exposito a1d8b3175e ticket descriptor translate
gitea/salix/pipeline/head This commit looks good Details
2020-12-09 15:26:57 +01:00
Juan Ferrer 6f6f23bec4 LDAP user sync only syncs changed attributes
gitea/salix/pipeline/head This commit looks good Details
2020-12-09 12:28:18 +01:00
Javi Gallego ccc651a445 Merge pull request 'refactor descriptors' (#474) from 2651-descriptor_icons_visible into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #474
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-12-09 07:58:56 +00:00
Bernat Exposito 96f603a44b refactor descriptors
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Joan Sanchez 4f40075c2e Merge branch 'dev' into 2657-zone_log
gitea/salix/pipeline/head This commit looks good Details
2020-12-03 11:16:18 +00:00
Javi Gallego 5bfc8a546d Merge pull request 'fix ticket component' (#473) from 2656-ticket_component into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #473
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-12-03 09:30:53 +00:00
Bernat Exposito aaee855da3 fix ticket component
gitea/salix/pipeline/head Build started... Details
2020-12-03 10:26:49 +01:00