Commit Graph

11396 Commits

Author SHA1 Message Date
Joan Sanchez 84c4b8b7f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-09-02 08:22:39 +02:00
Joan Sanchez 4f8e319b89 fix(model): Added missing property "isAutoConciliated" to accounting-type model
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 08:22:18 +02:00
Carlos Jimenez Ruiz 84b8ed610d fix(fixtures): dua code dups
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 15:30:07 +02:00
Carlos Jimenez Ruiz f5548a82a3 test(clone): invoiceIn clone production trigger broke the test
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 15:02:27 +02:00
Carlos Jimenez Ruiz 158c15afa1 fix(filter): removed fixtures that no longer work due to structure changes 2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz ec9c061051 fix(getUpcomingDeliveries) fixtures were broken due to db structure changes
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 11:48:21 +02:00
Joan Sanchez 0370cbf207 feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good Details
Refs: 3068
2021-09-01 11:27:24 +02:00
Carlos Jimenez Ruiz 07929af0cb fixed(dua): removed fixtures from duainvoicein as dua has less data on production now
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 16:47:27 +02:00
Javi Gallego d4fc64484a fix
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 16:37:09 +02:00
Carlos Jimenez Ruiz 8de6712eab fix(client): column cplusTerIdNifFk deprecated on production 2021-08-31 16:29:21 +02:00
Joan Sanchez c592212290 fix(structure): Dumped production database
gitea/salix/pipeline/head This commit looks good Details
Dumped database and fixed structure issues
Refs: #3079
2021-08-31 15:15:51 +02:00
Carlos Jimenez Ruiz 559d27e835 Merge pull request '3047-order_basicdata_valid_agencies' (#720) from 3047-order_basicdata_valid_agencies into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #720
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-08-31 12:25:32 +00:00
Carlos Jimenez Ruiz 74a3b5cf89 refactor(basicdata): order basicdata requires address and landed to show agencies
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 14:10:37 +02:00
Carlos Jimenez Ruiz 0de3755d09 fix(e2e): order basic data e2e now uses a valid agency
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 13:51:19 +02:00
Carlos Jimenez Ruiz 9cdf34642f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 13:15:37 +02:00
Carlos Jimenez Ruiz 72cd9f398f Merge pull request 'fix(searchbar): wasn't applying a search by postcode on page refresh' (#719) from 3072-fix_zone_location into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #719
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-31 11:04:11 +00:00
Carlos Jimenez Ruiz 88aada2895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies 2021-08-31 13:02:24 +02:00
Carlos Jimenez Ruiz 614c23fd77 refactor(basicdata): order basicdata now shows only available agencies 2021-08-31 13:02:14 +02:00
Joan Sanchez 0de6af5633 fix(searchbar): wasn't applying a search by postcode on page refresh
gitea/salix/pipeline/head This commit looks good Details
Refs: #3072
2021-08-31 11:41:42 +02:00
Carlos Jimenez Ruiz c00201b236 corrected a typo 2021-08-31 11:01:14 +02:00
Joan Sanchez 1061450385 Merge pull request '2407-eliminar-trigger-ticketAfterUpdate' (#711) from 2407-eliminar-trigger-ticketAfterUpdate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #711
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-08-31 06:49:31 +00:00
Joan Sanchez d2280a783c Changes
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 08:44:31 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 06:27:23 +00:00
Joan Sanchez 4be6dce1e0 Merge pull request '3070_deprecate_item_niches' (#718) from 3070_deprecate_item_niches into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #718
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-08-30 13:05:56 +00:00
Joan Sanchez 17a732e811 Merge branch 'dev' into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:00:02 +00:00
Carlos Jimenez Ruiz b27b82830f Merge pull request '3075 - Show closure hour from an event' (#717) from 3075-delivery_days_hour into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #717
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-30 12:59:45 +00:00
Joan Sanchez 4dc107bc58 Removed console.log()
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 14:51:02 +02:00
Joan Sanchez 3247f35b90 3075 - Show closure hour from an event
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 14:14:21 +02:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz 52e1df2af5 removed the usage of niches from item index and summary 2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz 8a6da66916 removed niche section 2021-08-30 13:31:07 +02:00
Carlos Jimenez Ruiz e6bc856b35 removed niches model, relations and its usages 2021-08-30 13:29:16 +02:00
Carlos Jimenez Ruiz 0b331c4026 adapted a test that was using the niches model 2021-08-30 13:27:51 +02:00
Carlos Jimenez Ruiz 5ca795adb3 removed niche icon 2021-08-30 13:27:18 +02:00
Carlos Jimenez Ruiz aac06e6f32 removed niche usages from e2e paths & selectors 2021-08-30 13:26:54 +02:00
Carlos Jimenez Ruiz d5625d19f1 removed ACL for item niche 2021-08-30 13:24:13 +02:00
Joan Sanchez 73d76848b2 Removed version
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:41:17 +02:00
Carlos Jimenez Ruiz 83dcc54b7e Merge pull request '3063 - Get item from card without a name' (#716) from 3063-item_card_hotfix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #716
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-08-30 09:34:00 +00:00
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego 488ef17559 insert mail
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-27 09:01:21 +02:00
Javi Gallego 072f88d1a5 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-23 14:47:26 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego bb764e206a test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:36:18 +02:00
Javi Gallego d0f0b52b66 minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 08:24:07 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Joan Sanchez c9dcf141c9 Merge pull request '3038-module_transactions' (#713) from 3038-module_transactions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #713
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-08-13 15:43:39 +00:00
Joan Sanchez 23b73aaa41 Merge branch 'dev' into 3038-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 15:28:58 +00:00
Joan Sanchez 63ba467a81 Merge pull request '3042-ticket_summary' (#712) from 3042-ticket_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #712
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-08-13 15:28:43 +00:00
Carlos Jimenez Ruiz fcd71bb48f Merge branch 'dev' into 3042-ticket_summary
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 15:07:40 +00:00