Commit Graph

809 Commits

Author SHA1 Message Date
Juan Ferrer 81de97c071 Merge branch 'dev' into 2381-mariaDB 2020-09-21 18:33:28 +02:00
Juan Ferrer 9528fe0a19 Merge branch 'dev' into 2381-mariaDB 2020-09-21 17:47:55 +02:00
Juan Ferrer 5e056c315f Tests fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 17:46:40 +02:00
Juan Ferrer 1c621cff85 Fixtures fixes 2020-09-21 16:43:17 +02:00
Juan Ferrer 3880e21ce3 Test fixes 2020-09-21 16:09:34 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Juan Ferrer b9c526c29c LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 13:24:43 +02:00
Javi Gallego 8fb674819a ticket service
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 10:35:39 +02:00
Carlos Jimenez Ruiz f50f4514fd fixtures enhanced for tags
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 11:11:18 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:14:13 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:51:58 +02:00
Juan Ferrer 61f3f82117 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:39:02 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz 270e665291 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color 2020-09-10 14:38:48 +02:00
Bernat Exposito Domenech 0cf99a5a83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech 87fab5f57c delete duplicated fixtures 2020-09-10 11:34:32 +02:00
Bernat Exposito Domenech 4f50106e92 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech fb3f01151c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 13:49:03 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech ed926c39a1 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 11:27:00 +02:00
Bernat Exposito Domenech d90fb3444c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-08 08:30:00 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Joan Sanchez 3efe14fc53 Removed unused vars
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 12:52:27 +02:00
Joan Sanchez ee52581a06 Updated param description 2020-09-07 12:52:21 +02:00
Joan Sanchez 8faddef7e8 Renamed sql file 2020-09-07 12:52:13 +02:00
Joan Sanchez 812847d82e Changed sql folder 2020-09-07 12:52:06 +02:00
Joan Sanchez e6804f6ee3 Removed procedures 2020-09-07 12:51:58 +02:00
Joan Sanchez c3e8c0cc58 Changes 2020-09-07 12:51:49 +02:00
Joan Sanchez fa634d2dad 2285 - Added closure paths 2020-09-07 12:51:38 +02:00
Joan Sanchez bb092b1de9 Removed unused vars
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 12:16:20 +02:00
Joan Sanchez c10e24b7cd Updated param description
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 11:50:23 +02:00
Joan Sanchez 173aac0ba6 Renamed sql file
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 11:45:54 +02:00
Joan Sanchez 13b3353e9a Changed sql folder
gitea/salix/pipeline/head Build queued... Details
2020-09-07 11:45:29 +02:00
Joan Sanchez 7b42497f88 Removed procedures
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 11:44:44 +02:00
Joan Sanchez f3a7fc514a Changes
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 10:54:39 +02:00
Joan Sanchez 66f4674392 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure 2020-09-07 10:05:52 +02:00
Joan Sanchez 52cbcf1fa3 Updated description
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:34:04 +02:00
Carlos Jimenez Ruiz c3c7ef901a version pre-hex in vn.ink table
gitea/salix/pipeline/head This commit looks good Details
2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz c796132e77 e2e + fixtures amended + refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 15:20:28 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Joan Sanchez cb4fe1f610 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:37:48 +00:00
Joan Sanchez 5a16a10b8f Merge branch 'dev' into 2409-last_entries_contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:55:13 +00:00
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:49:09 +00:00
Joan Sanchez 8ae7871318 Removed procedure
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:56:56 +02:00
Javi Gallego daee9081d1 test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:29:51 +02:00
Javi Gallego 8b26c41b7f campo packageFk
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz c70ad808a0 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz d156ca95ba front and back unit tests 2020-08-27 15:14:30 +02:00
Joan Sanchez 17542472da 2391 - Editable description
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 08:24:21 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 16:33:47 +02:00
Joan Sanchez 4d8a84e774 Fixed back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 08:45:03 +02:00
Joan Sanchez 7fdfd92a1c Removed sql
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:13:16 +02:00
Joan Sanchez f0818acf32 2387 - Fixed error when deleting a zone
gitea/salix/pipeline/head This commit looks good Details
2020-08-19 13:04:12 +02:00
Carlos Jimenez Ruiz 3a723a2e3d zone descriptor e2e
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 15:35:50 +02:00
Bernat Exposito Domenech 0d689a8c01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 10:43:25 +02:00
Bernat Exposito Domenech 689245c27d fix test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech f180b73656 delete deprecated sql
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech 1e56619c33 export structure and fix test 2020-08-12 13:07:58 +02:00
Bernat Exposito Domenech 96af9bdcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 11:12:52 +02:00
Bernat Exposito Domenech 9a4e20bb31 new models and fixtures 2020-08-11 11:03:43 +02:00
Joan Sanchez e2c742c893 #2383 - Changed model
gitea/salix/pipeline/head This commit looks good Details
2020-08-10 14:29:25 +02:00
Juan Ferrer bbc5193970 #2381 First working version
gitea/salix/pipeline/head This commit looks good Details
2020-08-07 14:35:20 +02:00
Carlos Jimenez Ruiz 9402f368f6 ticket index and zone descriptor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 12:51:19 +02:00
Joan Sanchez 0348b79f0d Merge branch 'dev' into 1880-refactor_loggable
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 12:03:22 +00:00
Bernat Exposito Domenech 8c926a1a7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable 2020-07-16 13:20:41 +02:00
Joan Sanchez cfceaa531e Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:18:22 +00:00
Joan Sanchez 171deeb82c Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:12:34 +00:00
Joan Sanchez fa43c2ea2f Merge branch 'dev' into 2369-export_db
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 10:45:15 +00:00
Bernat Exposito Domenech 064b950773 export production
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Bernat Exposito Domenech 02c82f894a fix e2e errors 2020-07-09 14:14:11 +02:00
Bernat Exposito Domenech 7d6ac265b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index 2020-07-09 08:17:03 +02:00
Joan Sánchez 01b32d2b89 Calendar changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-08 15:05:56 +02:00
Joan Sánchez dd8e03dd0f Added absence selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-07 14:29:57 +02:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good Details
2020-07-07 06:19:12 +00:00
Bernat Exposito Domenech 122dacffb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech c42c6c19d6 changes in order index
gitea/salix/pipeline/head This commit looks good Details
2020-07-02 07:46:55 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 11:57:16 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Javi Gallego db06626675 refactor
gitea/salix/pipeline/head This commit has test failures Details
2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech ea1eb16060 export structure
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 07:32:08 +02:00
Joan Sanchez beb1dd4973 absenceType fixture
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-27 12:16:56 +02:00
Javi Gallego 962436b8bb 2344 ticket sale descuento usuario
gitea/salix/pipeline/head This commit has test failures Details
2020-06-25 17:12:53 +02:00
Joan Sanchez b46cc20511 Min TLS v1.0
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 14:03:14 +02:00
Joan Sanchez dd7e6e5716 2300 - WaitForHealthy
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:27:17 +02:00
Joan Sanchez 5d9ed49451 2285 - Added closure paths
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:17:01 +02:00
Joan Sanchez ed83fd5f73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption 2020-06-15 09:00:24 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Carlos Jimenez Ruiz d4f1a90f87 ip botained for ci and localhost
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:55 +02:00
Carlos Jimenez Ruiz 477b1c8e1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2266_refactor_gulpfile_docker 2020-06-11 10:13:54 +02:00
Javi Gallego b40be5cca9 2035
gitea/salix/pipeline/head Build queued... Details
2020-06-05 10:01:21 +02:00
Carlos Jimenez Ruiz 3ea3f707bc gulpfile refactor and removed unused code
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-04 21:09:06 +02:00
Joan Sanchez 0637302a0b Removed focus
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 09:49:13 +02:00
Bernat Exposito Domenech b3eba1c75a fix dbtest and export production
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 13:53:54 +02:00
Joan Sanchez 751f79373a Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 09:28:14 +00:00
Bernat Exposito Domenech 546272cc3f zone delete
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 08:59:04 +02:00
Carlos Jimenez Ruiz 9deb518064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:55:05 +02:00
Carlos Jimenez Ruiz 9bf509cd5d customs agent e2e path + small fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:54:31 +02:00
Joan Sanchez 5c3e8e9465 Added insert ignore
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 08:09:12 +02:00
Joan Sanchez a3e7771295 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix 2020-05-28 08:08:00 +02:00
Carlos Jimenez Ruiz 2345a922c8 now we can create thermographs for travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 13:11:41 +02:00
Bernat Exposito Domenech 89ce963a4c update db
gitea/salix/pipeline/head This commit looks good Details
2020-05-27 08:35:24 +02:00
Joan Sanchez d24f04912e 2205 - Prevent relations to being logged in
gitea/salix/pipeline/head This commit has test failures Details
2020-05-26 14:37:34 +02:00
Bernat Exposito Domenech 41bf237289 dbtest zone_getEvent 2020-05-26 12:07:52 +02:00
Bernat Exposito 26930c5091 Merge pull request 'test ticket_makecomponentupdate' (#277) from 2229-dbtest_ticket_componentMakeUpdate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-26 08:46:54 +00:00
Bernat Exposito Domenech 9e85e8187c skipped
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:58:08 +02:00
Bernat Exposito Domenech a77467fb0e skip test
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:53:30 +02:00
Bernat Exposito Domenech 1de6b2bd77 test ticket_makecomponentupdate
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 09:28:41 +02:00
Bernat Exposito Domenech 8c2f57e380 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech 52241e6f2c update itemLastENtries 2020-05-21 15:26:00 +02:00
Joan Sanchez ce43c1f2d9 Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-21 12:27:14 +00:00
Joan Sanchez 80a5200281 Unified sql
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 17:03:29 +02:00
Bernat Exposito Domenech d4dd5eae0c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 14:06:51 +02:00
Bernat Exposito Domenech 8ca12d9fdd fix bugs in travel summary 2020-05-20 13:19:02 +02:00
Bernat Exposito Domenech bf9ebe21b6 comment test skipped
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 10:38:11 +02:00
Bernat Exposito Domenech 84f804eaf4 skip dbTest until the procedure works fine
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 14:42:32 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego a7e6e3d4b7 cr juan
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:46:42 +02:00
Bernat Exposito 5f8a2a24f5 Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-05-19 06:42:07 +00:00
Joan Sanchez af0d0f1fbe Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:18:23 +00:00
Joan Sanchez 4aea769797 2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 13:46:45 +02:00
Joan Sanchez 53b55468fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 11:45:43 +02:00
Bernat Exposito Domenech 37d5cf5975 delete old db changes
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 10:29:57 +02:00
Joan Sanchez 42bec3a944 1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 14:47:19 +02:00
Bernat Exposito Domenech 5ceb26c6da update structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 13:11:23 +02:00
Javi Gallego 3815edfbea falta CR
gitea/salix/pipeline/head This commit has test failures Details
2020-05-15 12:17:34 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Juan Ferrer 58be5ef78e Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 10:16:31 +00:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Javi Gallego ceb3d1f4cf all filters tested 2020-04-30 07:20:43 +02:00
Javi Gallego 6dacf20bd9 ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good Details
2020-04-23 17:59:46 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Joan Sanchez 2ad14230b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz
gitea/salix/pipeline/head This commit looks good Details
2020-04-17 14:22:46 +02:00
Javi Gallego 09e425c33c 2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 12:33:36 +02:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Javi Gallego 0b966cbb76 Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 08:28:49 +02:00
Ainki 42f3bfb86d test, fitxures and changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-30 14:28:29 +02:00
Javi Gallego 729daf8b34 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:16:47 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:22:00 +01:00
Joan Sanchez d4ca58edad Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:10:30 +01:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:41:40 +01:00
Joan Sanchez f231fabef1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 16:14:13 +01:00
Bernat Exposito 77e8bbc2ce Merge branch '2182_worker_log' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 07:53:23 +00:00
Javi Gallego 0561f19313 version 1
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-24 17:34:23 +01:00
Javi Gallego a30a4bf961 quitado el campo provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:32:30 +01:00
Bernat Exposito Domenech 423f59dfb0 worker log
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 12:20:53 +01:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 23:57:11 +01:00
Joan Sanchez 27b1376799 changes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 11:21:25 +01:00
Javi Gallego 7fe9c7babc getWarehouse
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 11:36:14 +01:00
Bernat Exposito Domenech a19a0578e9 structure DB
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 10:25:49 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-06 11:19:26 +00:00
Bernat Exposito Domenech ead7a20ecd traductions
gitea/salix/pipeline/head This commit has test failures Details
2020-03-06 11:47:14 +01:00
Bernat Exposito Domenech 0f8d199d2f workerTimeControlCheck dbTest fix
gitea/salix/pipeline/head This commit has test failures Details
2020-03-06 07:14:40 +01:00
Bernat Exposito Domenech 85ac133d00 update db test 2020-03-05 15:01:03 +01:00
Bernat Exposito Domenech 63faeab909 fix db test 2020-03-05 14:06:55 +01:00
Bernat Exposito Domenech f3e4bc7aeb workerTImeControlCheck test
gitea/salix/pipeline/head This commit has test failures Details
2020-03-05 10:50:07 +01:00
Carlos Jimenez Ruiz 0f3ceea653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 15:13:03 +01:00
Carlos Jimenez Ruiz 0179461cb3 timeBusiness and timeControl db tests 2020-03-04 15:12:36 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-04 12:15:41 +00:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:26:12 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Bernat Exposito Domenech 686382a0e6 entryLog section 2020-03-02 11:57:09 +01:00
Joan Sanchez 04917f980f Updated E2E
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech 5e86f67b37 dbtest workerTimeControCheck 2020-03-02 08:18:41 +01:00
Joan Sanchez 28553a1c0d Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 07:50:07 +01:00
Joan Sanchez 8a4e2620c2 Changed sprint
gitea/salix/dev This commit looks good Details
2020-02-27 07:55:21 +01:00
Joan Sanchez 886bc45525 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-02-27 07:54:22 +01:00
Joan Sanchez a063722fbe Changed SQL sprint
gitea/salix/test There was a failure building this commit Details
2020-02-27 07:53:38 +01:00
Joan Sanchez 21be73b734 2127 - Disable preview on sepa core sample 2020-02-27 07:40:43 +01:00
Joan Sanchez d66c53dbf2 2127 - Disable preview on sepa core sample
gitea/salix/2127-sample_disable_preview There was a failure building this commit Details
2020-02-26 14:30:30 +01:00
Carlos Jimenez Ruiz 0bf0ed78ee Merge branch '2056-entry_descriptor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-25 10:49:40 +00:00
Joan Sanchez 70b0143f0a Renamed sql version
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-25 08:53:09 +01:00
Joan Sanchez 447cdc686e 2138 - Added field m3Max to zoneEvent 2020-02-25 08:08:13 +01:00
Bernat Exposito Domenech 79fca8b70b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-24 09:25:39 +01:00
Joan Sanchez 224241a954 Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 08:02:51 +00:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Javi Gallego 4d389176fe Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-21 08:50:50 +01:00
Javi Gallego a8137c8a6b zoneClosure 3
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-20 15:15:50 +01:00
Joan Sanchez 54bc1bc281 Merge branch '1835-e2e-item-request' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-20 10:10:18 +00:00
Joan Sanchez 64e4593156 Renamed version number
gitea/salix/dev This commit looks good Details
2020-02-20 10:46:43 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech aecfe2b8a9 report entry-order 2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez 61b3ce184c Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 06:32:17 +00:00
Joan Sanchez fe8a0b4583 Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-18 07:21:35 +01:00
Joan Sanchez a9b8fab51d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit Details
2020-02-17 14:55:26 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 12:47:03 +01:00
Javi Gallego 03f0a415f9 zoneClosure fase 2
gitea/salix/test This commit looks good Details
2020-02-17 12:01:11 +01:00
Bernat Exposito Domenech b78858eb7c export structure db
gitea/salix/2105-export_structure_db This commit looks good Details
2020-02-13 09:30:18 +01:00
Bernat Exposito Domenech 1887cc8c60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db 2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech 4b48a89eaa ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good Details
2020-02-13 08:31:29 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz 2a7f826cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary
gitea/salix/2006-e2e-route-summary This commit looks good Details
2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good Details
2020-02-12 10:39:46 +01:00
Joan Sanchez f2fdce11cd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 14:54:59 +01:00
Bernat Exposito Domenech dd368a8c3f refactor ticket.basicData steps
gitea/salix/2041-ticket_datos_basico This commit looks good Details
2020-02-07 13:38:32 +01:00
Javi Gallego 5d0f72af4e zoneDoCalc
gitea/salix/test This commit looks good Details
2020-02-06 16:04:23 +01:00
Joan Sanchez 1be640a59d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-29 14:51:37 +01:00
Joan Sanchez c174d0a29e acl fix
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:50:53 +01:00
Joan Sanchez a6d94737af changed version
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 13:15:24 +01:00
Joan Sanchez a078898627 Merge branch '2049-hotfix_percentage' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2020-01-29 10:29:35 +00:00
Bernat Exposito Domenech 58717a7c46 fix order e2e
gitea/salix/2050-order_lines_e2e This commit looks good Details
2020-01-28 11:59:36 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData
gitea/salix/2022-update_model_zone This commit looks good Details
2020-01-27 09:45:13 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-23 14:59:37 +01:00
Bernat Exposito Domenech 937ddd7880 fix table componentType
gitea/salix/2014-remove_bi_from_db This commit has test failures Details
2020-01-23 13:53:39 +01:00
Bernat Exposito Domenech cf130b800a fix db test
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 13:01:29 +01:00
Bernat Exposito Domenech 6700daf0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito 6c0cc3d204 Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-23 10:00:58 +00:00
Bernat Exposito Domenech 2790cc8057 update structure
gitea/salix/2012-2013_update_structure_bi This commit looks good Details
2020-01-22 14:34:45 +01:00
Javi Gallego 5bd31eb082 zoneClosure
gitea/salix/master This commit looks good Details
2020-01-22 10:41:09 +01:00
Bernat Exposito Domenech 0b848adf03 fix back test
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-22 09:43:10 +01:00
Joan Sanchez 77f6333aba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-21 12:23:10 +01:00
Joan Sanchez f0b4c26aea added travel thermograph create & remove methods
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 12:21:53 +01:00
Joan Sanchez 20b4f6ec74 updated tests
gitea/salix/dev This commit looks good Details
2020-01-21 09:33:26 +01:00
Joan Sanchez 5e4ab8b128 Loggable errors
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 09:00:42 +01:00
Joan Sanchez 41e69a2e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-20 13:05:06 +01:00
Joan Sanchez 3ff1fb7d2d Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good Details
2020-01-20 11:59:15 +01:00
Joan Sanchez 3226081081 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2015-chat_sendCheckingPresence 2020-01-20 11:46:57 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 59d0ecca67 send message to worker or channel
gitea/salix/2015-chat_sendCheckingPresence This commit has test failures Details
2020-01-20 07:33:24 +01:00
Joan Sanchez 826dfe8092 changes to percentage filter
gitea/salix/master This commit looks good Details
2020-01-17 11:46:45 +01:00
Joan Sanchez 3a4c379033 Added waste section 2020-01-17 11:44:05 +01:00
Joan Sanchez 4002b51565 added section
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-17 08:43:10 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor
gitea/salix/2011-client_phone This commit looks good Details
2020-01-17 07:24:57 +01:00
Joan Sanchez 3cba6f0293 Translated family names
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 14:35:40 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech 1307f6c5fb update structure
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:43:38 +01:00
Joan Sanchez 708789502d Added waste section
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:07:33 +01:00
Bernat Exposito Domenech 1f60aac446 export structure db
gitea/salix/1999-travel_basicData This commit looks good Details
2020-01-15 08:19:22 +01:00
Bernat Exposito Domenech 6c4e25bfe3 create entry.index
gitea/salix/1990-create_entry_section This commit looks good Details
2020-01-10 11:52:35 +01:00
Carlos Jimenez Ruiz 83d2ec40d4 Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech d432c32577 export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good Details
2020-01-09 10:49:09 +01:00
Joan Sanchez 5a7bd4e18f filters refactor
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-08 12:27:18 +01:00
Bernat Exposito Domenech 730b8e160f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data 2020-01-07 08:30:55 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good Details
2020-01-03 08:43:03 +01:00
Joan Sanchez a5eb8e5315 extended worker contract ranges & fixed invoice
gitea/salix/dev There was a failure building this commit Details
2020-01-02 11:10:26 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good Details
2019-12-31 14:01:05 +01:00