Commit Graph

310 Commits

Author SHA1 Message Date
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 52241e6f2c update itemLastENtries 2020-05-21 15:26:00 +02:00
Joan Sanchez 80a5200281 Unified sql
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 17:03:29 +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 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
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
Javi Gallego 7fe9c7babc getWarehouse
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 11:36:14 +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 85ac133d00 update db test 2020-03-05 15:01:03 +01:00
Bernat Exposito Domenech 686382a0e6 entryLog section 2020-03-02 11:57:09 +01:00
Bernat Exposito Domenech 5e86f67b37 dbtest workerTimeControCheck 2020-03-02 08:18:41 +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
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
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 64e4593156 Renamed version number
gitea/salix/dev This commit looks good Details
2020-02-20 10:46:43 +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
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
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +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 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
Javi Gallego 5bd31eb082 zoneClosure
gitea/salix/master This commit looks good Details
2020-01-22 10:41:09 +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 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 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 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
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
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 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
Joan Sanchez 0ece53a35e Send chat message with user avatar
gitea/salix/1958-send_chat_with_avatar This commit looks good Details
2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good Details
2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good Details
2019-12-20 13:51:04 +01:00
Joan Sanchez 472352e24c Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 10:05:38 +00:00
Joan Sanchez 72d591e143 sql changes
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:59:17 +01:00
Joan Sanchez b9415c0335 updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:40:12 +01:00
Joan Sanchez 61b9646f5b Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit Details
2019-12-19 14:55:09 +01:00
Joan Sanchez a1c6c0ab39 claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-19 11:37:53 +01:00
Bernat Exposito Domenech aab970e667 client.phone section
gitea/salix/1928-client_phone This commit looks good Details
2019-12-17 09:11:28 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good Details
2019-12-13 09:06:39 +01:00
Bernat Exposito c65364cda4 Merge branch '1907manaSpellers' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 07:57:36 +00:00
Bernat Exposito Domenech dd86961542 update structure
gitea/salix/1907manaSpellers This commit looks good Details
2019-12-13 08:46:40 +01:00
Javi Gallego 44304e993a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912
gitea/salix/1912 This commit looks good Details
2019-12-13 08:19:22 +01:00
Javi Gallego ec081e6a3a campo claimDestinationFk ya no esta como required
gitea/salix/1912 This commit looks good Details
2019-12-12 13:53:54 +01:00