Commit Graph

2327 Commits

Author SHA1 Message Date
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 9a43dff1fd Removed console.log()
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 14:22:22 +02:00
Joan Sanchez 9a0c9d3da2 2262 Remove filter by id from searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 14:18:24 +02:00
Joan Sanchez aa95a9f984 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 12:33:01 +02:00
Joan Sanchez d082f5d6c2 2225 Prevent location override
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 11:14:34 +02:00
Carlos Jimenez Ruiz 245827e8d5 corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:28:50 +02:00
Joan Sanchez f6efa7160e 2141 ReplyTo param
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-20 16:23:53 +02:00
Bernat Exposito Domenech 8ca12d9fdd fix bugs in travel summary 2020-05-20 13:19:02 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech a0f5f073a5 fix order traduction
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 10:26:29 +02:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Javi Gallego 670c5936ce test2
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 13:11:22 +02:00
Javi Gallego 529bd5673c test
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 13:06:59 +02:00
Juan Ferrer ad1c677280 Test focus removed & fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-05-19 12:50:43 +02:00
Juan Ferrer c998097ba1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 12:30:00 +02:00
Javi Gallego 3774d1dd1f Merge branch 'dev' into 2242-test 2020-05-19 12:22:47 +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 ff03133277 test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-19 12:21:02 +02:00
Juan Ferrer e7cf060e12 Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02: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 6c49fc9b1c Merge pull request 'client descriptor add risk' (#257) from 2250-client_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:26:17 +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
Bernat Exposito Domenech f9bc1406e2 delete css
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:14:44 +02:00
Bernat Exposito Domenech 2681060878 update mehod ticket summary
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 14:59:58 +02:00
Bernat Exposito Domenech 369d8d59d8 fix error 2020-05-18 14:58:06 +02:00
Joan Sanchez 309b4dafe9 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 14:03:15 +02: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
Bernat Exposito Domenech b953fa8773 client descriptor add risk
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 11:50:55 +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
Joan Sanchez a3203fa81f 2216 Show active client icon on client index
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 10:39:40 +02:00
Bernat Exposito Domenech c205c173f8 invoiceOut descriptor popover in ticket summary 2020-05-18 10:28:33 +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
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 9b085d13e1 Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 17:32:52 +02:00
Joan Sanchez 2bb17f4a00 Requested changes
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 17:15:54 +02:00
Joan Sanchez e51341102b Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 14:30:43 +02:00
Joan Sanchez 62d27e45e2 Updated unit tests
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 14:01:34 +02:00
Juan Ferrer b94c97d322 Hotfix: Clone option added to vnItemDescriptor
gitea/salix/pipeline/head This commit looks good Details
2020-05-13 17:51:27 +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 07cbac7fcd Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 19:56:39 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Juan Ferrer b14d2f9455 Small fixes in vnOrderCatalog and vnZoneEvents
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 13:23:06 +02: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
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +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
Juan Ferrer e3b7f81c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2026-itemDescriptorPopoverRelocate 2020-04-09 16:24:19 +02:00
Javi Gallego ab9e640b44 Merge branch 'dev' into #2174-ticket.weekly-añadir-campo-agencyModeFk
gitea/salix/pipeline/head This commit looks good Details
2020-04-08 13:15:17 +02:00
Javi Gallego 397872ee19 mejoradas las descripciones de los test 2020-04-08 13:15:07 +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
Juan Ferrer 4336a303c0 Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate 2020-04-07 13:03:57 +02:00
Javi Gallego dad77cfa08 Merge branch 'dev' into #2219-Añadir-menu-wikipedia
gitea/salix/pipeline/head This commit looks good Details
2020-04-06 12:41:07 +02:00
Javi Gallego d835dd60ed 2219 Añadir menu wikipedia 2020-04-06 12:40:21 +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 b6aedd2e6d Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia 2020-04-03 12:26:27 +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
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Juan Ferrer eb586c510e E2E focus fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-04-01 16:05:43 +02:00
Juan Ferrer 5d1e0ee682 E2E fixes: client billing data, invoiceOut descriptor
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 15:15:16 +02:00
Juan Ferrer d6fda676f6 E2E fixes: Client balance
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 10:19:01 +02:00
Juan Ferrer dfb9d32c2a Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-30 17:30:03 +02:00
Javi Gallego 324261dc74 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-30 12:22:09 +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
Javi Gallego 0f977a632f test front arreglados por el cambio de hora
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:01:09 +01:00
Joan Sanchez 59fadf410e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:45:10 +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
Bernat Exposito Domenech 74b27778ab add phones in ticket summary
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:10:20 +01:00
Joan Sanchez 598ebe96d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:06:35 +01:00
Joan Sanchez ef960f6e0f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2206-zone_delivery_days
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:55:10 +01:00
Joan Sanchez 6a66f47cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:19:47 +01:00
Joan Sanchez 64718b5977 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 10:01:03 +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 835c415ba7 1934 - Moved procedure logic to method
gitea/salix/pipeline/head This commit has test failures Details
2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech 6928092594 fix ticket.sale state autocomplete
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 12:00:07 +01:00
Joan Sanchez 92ffccc9a2 2206 - Refactor popover table
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 09:07:17 +01:00
Juan Ferrer 0bd09492d1 #2026 Implemented & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 20:44:59 +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
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:59:41 +01:00
Carlos Jimenez Ruiz f06c7d3d47 front test
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:17:43 +01:00
Carlos Jimenez Ruiz 9b4546edad minor refactor plus path fix after merge
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-25 14:18:51 +01:00
Joan Sanchez 2b7ff6fec0 Removed state vars
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 14:08:45 +01:00
Joan Sanchez 90b437c7ad Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 14:06:13 +01:00
Joan Sanchez c8b6c3f7f3 Fixed conflicts
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-25 13:44:51 +01:00
Joan Sanchez 5b5d7787ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-25 09:25:26 +01:00
Joan Sanchez 61c85cfb9e Updated tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 09:20:26 +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
Bernat Exposito Domenech dcdae825d2 fixex pull request
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 08:43:49 +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
Juan Ferrer 2ec1a5d450 Merge branch 'e2eFixes' of https://gitea.verdnatura.es/verdnatura/salix into e2eFixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:27:55 +01:00
Juan Ferrer 8eb6590285 E2E fixes 2020-03-24 17:27:21 +01:00
Carlos Jimenez Ruiz 12c2b577e6 minor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-24 17:01:11 +01:00
Joan Sanchez 2ed9cbd402 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-24 16:02:58 +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
Joan Sanchez 9bae89a672 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-23 16:03:27 +01:00
Joan Sanchez 27b1376799 changes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 11:21:25 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez b998ed200c Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 09:01:14 +01:00
Joan Sanchez 40df1018e4 Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 15:47:38 +01:00
Joan Sanchez 74b78fee84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:13:10 +01:00
Joan Sanchez 3d23583e0b Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:08:04 +01:00
Joan Sanchez a9c622377e Refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 12:55:22 +01:00
Joan Sanchez 934e057a67 Fixed watcher changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 09:41:23 +01:00
Joan Sanchez f25c8bb644 Ticket refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 08:35:59 +01:00
Joan Sanchez 3cb98eaf5f Route refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 15:24:55 +01:00
Joan Sanchez 526a92fd32 Order refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 15:18:02 +01:00
Joan Sanchez 88fe9a006e Item refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:43:46 +01:00
Juan Ferrer b4a5a88943 E2E fixed
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:01:25 +01:00
Joan Sanchez 381f2a08ef Client refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 11:17:50 +01:00
Juan Ferrer 176e38c144 Merge fixes 2020-03-16 18:54:22 +01:00
Juan Ferrer 27eaa328e5 Merge 2020-03-16 18:33:49 +01:00
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Juan Ferrer 8629bc25cd Back & Front tests passed 2020-03-16 18:08:44 +01:00
Bernat Exposito Domenech 285d930b8e showReport fix
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 12:32:26 +01:00
Joan Sanchez a601a615e2 Claim refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-16 11:58:14 +01:00
Bernat Exposito Domenech f6ca9eee01 ticketlog in componentUpdate
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech 6fabada18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-16 08:54:54 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Joan Sanchez 16cdc419ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 17:23:48 +01:00
Joan Sanchez 7987603d7b Updated filter
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 17:22:59 +01:00
Joan Sanchez dbe7dcd0f2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 15:08:59 +01:00
Joan Sanchez 36ad778a59 Removed default filter
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-13 15:02:51 +01:00
Joan Sanchez 2d24417078 Added translation
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 14:40:00 +01:00
Joan Sanchez 55ff624394 2191 - Added showEmpty filter 2020-03-13 14:39:51 +01:00
Joan Sanchez 920d2c66b0 Added translation
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 14:25:34 +01:00
Joan Sanchez 227760d712 2191 - Added showEmpty filter
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 14:09:22 +01:00
Bernat Exposito Domenech f9abaa409a fix calendar-holiday model
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech fdd1c73485 refactor componentUpdate 2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech dae89489ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-13 12:23:06 +01:00
Joan Sanchez d234647112 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 11:03:34 +01:00
Joan Sanchez db89e3f5d4 Updated unit test 2020-03-13 11:03:24 +01:00
Joan Sanchez d9176728b0 Add line on change item 2020-03-13 11:03:16 +01:00
Joan Sanchez 269bd8e69a 2181 - Ticket sale fix item search 2020-03-13 11:03:05 +01:00
Bernat Exposito 1877a2ff1f Merge branch '2181-ticket_sale_fixes' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:23:36 +00:00
Joan Sanchez 2d755c9094 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:47:41 +01:00
Joan Sanchez f8c69306f4 Updated unit test 2020-03-13 08:44:01 +01:00
Joan Sanchez d51356f11b Add line on change item
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:20:30 +01:00
Bernat Exposito Domenech 3ab80e1479 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos 2020-03-12 12:04:35 +01:00
Bernat Exposito Domenech 6798f9709c update view holiday
gitea/salix/pipeline/head This commit looks good Details
2020-03-12 10:59:41 +01:00
Joan Sanchez b9a482fc37 2181 - Ticket sale fix item search
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 15:56:02 +01:00
Joan Sanchez aba24292cf Module translations
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 13:36:56 +01:00
Bernat Exposito Domenech 67151f8427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 13:23:34 +01:00
Bernat Exposito b3cb2f7c25 Merge branch '2165-travel_index_buttonClon' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:22:14 +00:00
Joan Sanchez 1c8541376b Fixed removed letter
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:54:28 +01:00
Bernat Exposito Domenech d0b0c9d060 pull request changes 2020-03-11 12:03:55 +01:00
Joan Sanchez 8fe6c651e3 Updated translations
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-11 12:02:12 +01:00
Bernat Exposito Domenech e92030ec6e test
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 09:17:14 +01:00
Joan Sanchez 668c337fb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2175-ticket_send_sms 2020-03-11 08:46:22 +01:00
Joan Sanchez 581e2fcd1f Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 08:45:54 +01:00
Bernat Exposito Domenech d35634551b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon 2020-03-11 08:45:11 +01:00
Joan Sanchez 2c39d8d390 Changed icon
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 08:05:38 +01:00
Joan Sanchez 7496bc923e Updated fonts & changed icons
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-11 08:02:58 +01:00
Joan Sanchez 3736dcf792 Added ticket sms options
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 15:01:33 +01:00
Joan Sanchez 0cd4e2ad9e Added autocomplete property
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 14:28:50 +01:00
Bernat Exposito Domenech 4a5d97996e travel.index clonar 2020-03-10 14:09:26 +01:00
Joan Sanchez 6d437d0e2e Allow empty agency on ticket creation
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 11:46:58 +01:00
Joan Sanchez d616b8a535 Merge branch '1969_e2e_diferentes_resoluciones' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 07:01:30 +00:00
Carlos Jimenez Ruiz 8688ecc810 eliminado el campo id en advanced search
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 07:38:21 +01:00
Carlos Jimenez Ruiz ebc0889011 Merge branch '2171-show_payment_button' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 15:51:39 +00:00
Carlos Jimenez Ruiz e111b9a2b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones 2020-03-09 15:01:36 +01:00
Joan Sanchez 209251bf8b 2173 - descriptor_quicklink
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 14:11:43 +01:00
Joan Sanchez d173ab6a2b 2171 - Mostrar botón "Pago a cuenta" en índice de tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 11:50:23 +01:00
Carlos Jimenez Ruiz 2a0e437e1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones 2020-03-09 09:19:22 +01:00
Joan Sanchez 64f74b4f33 Merge branch '2111-route_drag_drop' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit has test failures Details
2020-03-08 12:45:44 +00:00
Juan Ferrer c6b2db9a79 Savepoint 2020-03-07 13:52:02 +01:00
Joan Sanchez 3c41c4656b 2111 - Drop tickets to route ticket list
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 13:06:01 +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 da6b3bc5c8 fix test
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 12:01:42 +01:00
Joan Sanchez 97671fd4a1 Merge branch '1878-print_with_auth' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:34:38 +00:00
Joan Sanchez c329a4380c Merge branch '2037_getWorkedHours_db_test' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:34:06 +00:00
Carlos Jimenez Ruiz 5f0ace8f29 removed unused code
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 10:21:42 +01:00
Carlos Jimenez Ruiz 0dce5c733b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2082_entry_buy
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 09:57:17 +01:00
Carlos Jimenez Ruiz 11bd861224 section bases 2020-03-06 09:57:05 +01:00
Bernat Exposito Domenech 1951e8bcf9 fix setter client
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 08:50:55 +01:00
Bernat Exposito Domenech 666ccbf370 ticket.basicData address
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 08:38:03 +01:00
Joan Sanchez fddc8e7ed1 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-05 14:49:41 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-05 13:56:45 +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
Joan Sanchez f168734b8c Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 13:54:17 +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 5da1c41476 Added ACL
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 12:51:29 +01:00
Joan Sanchez 24becf7872 Updated var names
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 11:17:35 +01:00
Joan Sanchez df3fbf291b Changed format
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:32:18 +01: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
Bernat Exposito Domenech e40575cc1f fix model entry log
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 08:58:57 +01:00
Bernat Exposito Domenech ced8c6e963 traductions
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 07:49:21 +01:00
Bernat Exposito Domenech 6b44715bf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log
gitea/salix/pipeline/head This commit has test failures Details
2020-03-04 07:41:28 +01:00
Carlos Jimenez Ruiz 0f7ed5bbfa get worked hours unit test 2020-03-03 15:14:28 +01:00
Joan Sanchez 15bedc5f12 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-03 15:03:54 +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 7e694c3e80 2073 - Filter by pending tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech 72b7300bf5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log 2020-03-02 10:41:32 +01:00
Bernat Exposito Domenech 1d98c44c3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 09:51:05 +01:00
Bernat Exposito Domenech 42b151c849 fix isEditable spec
gitea/salix/pipeline/head This commit has test failures Details
2020-03-02 09:43:22 +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 bd46f6a302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor 2020-03-02 09:28:43 +01:00
Bernat Exposito Domenech 0d23a3894f entry log 2020-03-02 09:28:08 +01:00
Bernat Exposito Domenech 2accd8fa3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log 2020-03-02 08:51:00 +01:00
Bernat Exposito Domenech 63cd436d3c fix request changes 2020-03-02 08:30:33 +01:00
Joan Sanchez 5ccc79df8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 08:07:14 +01:00
Joan Sanchez 03e952c83e Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 07:57:33 +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 28b7f5d3a2 2151 - Added thermograph edit section
gitea/salix/pipeline/head This commit has test failures Details
2020-02-28 14:18:55 +01:00
Joan Sanchez a2001636d2 Some changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 09:21:00 +01:00
Joan Sanchez dfacb02cdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2151-edit_thermograph 2020-02-28 09:08:01 +01:00
Joan Sanchez 25a1c0d2de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 08:34:42 +01:00
Joan Sanchez a8eea3d8f6 Changed primary key 2020-02-28 08:19:37 +01:00
Joan Sanchez 5169273ccc Added edit section 2020-02-28 08:19:20 +01:00
Joan Sanchez 220f36d795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-02-28 07:34:26 +01:00
Joan Sanchez 442541d0f8 Renamed rgb column 2020-02-28 07:24:36 +01:00
Joan Sanchez 12aa5da355 Changed fields order
gitea/salix/pipeline/head This commit looks good Details
2020-02-28 07:17:19 +01:00
Bernat Exposito 9d513878a1 Merge branch '2150-travel_filter_by_ref' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 12:57:44 +00:00
Joan Sanchez 94ebb7fbd2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 13:48:09 +01:00
Joan Sanchez 6dcfc34056 Fix - Find duplicated client
gitea/salix/master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 13:33:40 +01:00
Joan Sanchez ccd28114ca Updated unit tests
gitea/salix/2150-travel_filter_by_ref This commit looks good Details
2020-02-27 12:39:58 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable
gitea/salix/2092-ticket_isEditable_refactor This commit looks good Details
2020-02-27 12:31:38 +01:00
Joan Sanchez c920f0bc91 Requested changes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-27 11:21:11 +01:00
Joan Sanchez 893b634d33 Get phone from address and client 2020-02-27 11:18:59 +01:00
Joan Sanchez 70210e87c9 Advanced filter by ref
gitea/salix/2150-travel_filter_by_ref This commit looks good Details
2020-02-27 09:03:36 +01:00
Joan Sanchez a86c7c9b8a updated unit tests
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-27 08:08:31 +01:00
Joan Sanchez 21ace6ef4e Merge branch '2131_jest_spyOn' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-27 06:56:43 +00:00
Joan Sanchez 21be73b734 2127 - Disable preview on sepa core sample 2020-02-27 07:40:43 +01:00
Carlos Jimenez Ruiz c9f37d5fcd Merge branch '2127-sample_disable_preview' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-27 06:27:12 +00:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-26 15:02:47 +01:00
Joan Sanchez 1d326a52c8 updated unit tests
gitea/salix/2127-sample_disable_preview This commit looks good Details
2020-02-26 14:45:47 +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 aedd551371 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-26 13:24:41 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Joan Sanchez 37ff99d838 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-26 13:19:32 +01:00
Joan Sanchez e15ef3386e Translation changes
gitea/salix/test This commit looks good Details
2020-02-26 13:18:29 +01:00
Joan Sanchez d401fa8d13 Changed variable name
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 13:06:35 +01:00
Joan Sanchez ce84d26fae Some changes
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 12:24:48 +01:00
Joan Sanchez e09325b3fa Changed test description
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:43:41 +01:00
Joan Sanchez 442c3ba87c unit tests
gitea/salix/2138-zone_event_m3 This commit looks good Details
2020-02-26 11:05:29 +01:00
Joan Sanchez 4add07898f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2138-zone_event_m3 2020-02-26 11:00:40 +01:00
Bernat Exposito Domenech 9cad13f166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model
gitea/salix/1970-test_crud_model This commit looks good Details
2020-02-26 08:24:21 +01:00
Joan Sanchez 9849c60651 Added popover
gitea/salix/2138-zone_event_m3 There was a failure building this commit Details
2020-02-26 07:02:03 +01:00
Bernat Exposito Domenech 85db094f1d componentUpdate 2020-02-25 12:36:33 +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
Bernat Exposito Domenech bbba294b79 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 11:44:46 +01:00
Bernat Exposito Domenech 2fdd275085 log in ticketUpdate 2020-02-25 11:43:50 +01:00
Bernat Exposito Domenech b37e8da410 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 10:39:21 +01:00
Joan Sanchez 447cdc686e 2138 - Added field m3Max to zoneEvent 2020-02-25 08:08:13 +01:00
Bernat Exposito Domenech e7cdc58fad translates
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 07:51:16 +01:00
Bernat Exposito 7c1a13cca8 Merge branch '2134-item_request_load_error' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 13:38:17 +00:00
Joan Sanchez ad1e08ec70 2134 - Irem request load error
gitea/salix/2134-item_request_load_error This commit looks good Details
2020-02-24 14:29:48 +01:00
Joan Sanchez 415316d7d0 2081 - Fix ticket search by order id
gitea/salix/2081-fix_ticket_search_by_order This commit looks good Details
2020-02-24 13:28:59 +01:00
Bernat Exposito Domenech 832089de79 entry descriptor, add more options to view entry report 2020-02-24 12:20:53 +01:00
Joan Sanchez d0c2f88a77 2126 - Search by client name
gitea/salix/2126-ticket_weekly_search_by_name This commit looks good Details
2020-02-24 12:08:53 +01:00
Joan Sanchez 3643709a80 Added datalist auto completion
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 11:27:36 +01:00
Bernat Exposito Domenech 0a4adedcdb client descriptor translates 2020-02-24 09:47:26 +01:00
Joan Sanchez 75d7125426 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 09:41:23 +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
Bernat Exposito Domenech 005adc252d worker dms index 2020-02-24 08:05:26 +01: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
Joan Sanchez 7b57d79f50 Create client geo auto fill
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-21 12:39:41 +01:00
Bernat Exposito Domenech 773963e7ab update entry filter 2020-02-21 10:03:08 +01:00
Bernat Exposito 97716e0ede Merge branch '2130-ticket_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-21 08:50:33 +00:00
Joan Sanchez 2dbde24a99 Requested changes
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 09:00: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
Joan Sanchez bf4e0d09c5 Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 08:37:37 +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 2f089681df Don't throw error if no salesPerson is assigned 2020-02-20 12:52:05 +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
Bernat Exposito Domenech cec1f7b90f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor There was a failure building this commit Details
2020-02-20 09:48:12 +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
Joan Sanchez 9e435e9553 Some changes
gitea/salix/2112-order_catalog_improvements This commit looks good Details
2020-02-19 12:34:33 +01:00
Joan Sanchez c9fd48b0cd 2112 - Catalog improvements
gitea/salix/2112-order_catalog_improvements This commit looks good Details
2020-02-19 11:57:39 +01:00
Carlos Jimenez Ruiz 081c742dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request 2020-02-19 11:48:01 +01:00
Joan Sanchez 346d20b066 Merge branch '2124-route_basic_data' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 12:07:29 +00:00
Bernat Exposito Domenech bfb8c5e138 route.basicData validations
gitea/salix/2124-route_basic_data This commit looks good Details
2020-02-18 12:51:29 +01:00
Joan Sanchez ba06a59ac8 Merge branch '2110-client_sample_validation' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 10:53:44 +00:00
Joan Sanchez af51c2632e Merge branch '2122-entry_index' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 10:20:19 +00:00
Joan Sanchez 2460725d98 Refactor + updated tests
gitea/salix/2110-client_sample_validation This commit looks good Details
2020-02-18 11:14:02 +01:00
Bernat Exposito Domenech 6540ef9598 change Fk to Id
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 11:07:55 +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 7e38100d05 Merge branch '845-order_catalog_datalist' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-18 06:58:54 +00:00
Joan Sanchez 30e3880299 Removed comments
gitea/salix/845-order_catalog_datalist Build started... Details
2020-02-18 07:50:18 +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 1ca3753908 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-17 14:48:11 +01:00
Joan Sanchez a148daa368 2125 - ticket create invalid type fix
gitea/salix/master This commit looks good Details
2020-02-17 14:47:43 +01:00
Bernat Exposito Domenech f900b7ef62 crud model test 2020-02-17 13:50:54 +01:00
Joan Sanchez 7d8e88e884 Updated unit test
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-17 13:32:12 +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
Joan Sanchez 578556b1d5 2121 - Client balance fix balance on pagination
gitea/salix/2121-client_balance_fix This commit looks good Details
2020-02-17 08:38:19 +01:00
Joan Sanchez d9ed7cda38 Added form dialog
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 07:22:55 +01:00
Carlos Jimenez Ruiz 4e2ab537ee unstable with the rest of tests
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-14 14:52:47 +01:00
Joan Sanchez 84bf95db13 2106 - Sms max length fix
gitea/salix/2106-sms_send_with_dots This commit looks good Details
2020-02-14 12:01:17 +01:00
Joan Sanchez fd45c41210 removed focus
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 15:01:24 +01:00
Joan Sanchez 5360c407d5 updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:46:18 +01:00
Joan Sanchez be07e33e5f updated unit test
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 14:39:33 +01:00
Joan Sanchez 39470e837b 2094 Regularize claim send chat even if doesn't have destination
gitea/salix/2094-claim_send_chat This commit looks good Details
2020-02-13 13:20:31 +01:00
Joan Sanchez c5840f322f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 845-order_catalog_datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-13 11:38: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 c78c154ab0 Added datalist
gitea/salix/845-order_catalog_datalist This commit looks good Details
2020-02-11 14:41:59 +01:00
Bernat Exposito Domenech 5375952778 translate
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:52:05 +01:00
Bernat Exposito Domenech 1d73d9f89d refactor campaing report
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:25:41 +01:00
Carlos Jimenez Ruiz 420f059211 Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-11 08:30:08 +00:00
Joan Sanchez 91210c3a0d 1684 - Log old quantity value
gitea/salix/1684-ticket_transfer_salesLog This commit looks good Details
2020-02-11 08:19:03 +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
Joan Sanchez 8ad2344735 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2020-02-10 14:54:21 +01:00
Bernat Exposito Domenech d26597c395 fix ticket.sale sms
gitea/salix/master This commit looks good Details
2020-02-10 14:34:53 +01:00
Bernat Exposito Domenech d1c8c8ad58 ticket/client.sms validations 2020-02-10 14:33:38 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit Details
2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech f6674448f8 ticket/client.sms validations
gitea/salix/2090-sms.validations This commit looks good Details
2020-02-10 13:22:43 +01:00
Joan Sanchez cdef356e8f Merge branch '2091-ticket_sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 08:52:34 +00:00
Joan Sanchez 829f9a67bc Merge branch '2007-e2e-invoiceout-summary' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-10 08:47:49 +00:00
Bernat Exposito Domenech bafec3ce90 fix ticket.sale sms
gitea/salix/2091-ticket_sms This commit looks good Details
2020-02-10 09:36:40 +01:00
Bernat Exposito Domenech 7a643eff34 fix index step-two
gitea/salix/2041-ticket_datos_basico This commit looks good Details
2020-02-10 07:03:09 +01:00
Carlos Jimenez Ruiz 0a554afdb2 2007 e2e invoiceOut summary
gitea/salix/2007-e2e-invoiceout-summary This commit looks good Details
2020-02-07 15:42:11 +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
Carlos Jimenez Ruiz f28a80b855 #2078 ticket. step-one 2020-02-07 11:25:56 +01:00
Carlos Jimenez Ruiz ca94f03c58 Merge branch '2036-claim_action_show_snackbar' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2020-02-07 08:27:36 +00:00
Joan Sanchez b192cb15c0 Show data save snackbar on auto-save
gitea/salix/2036-claim_action_show_snackbar This commit looks good Details
2020-02-07 07:47:11 +01:00
Bernat Exposito Domenech 2f81727594 reload_card_volume
gitea/salix/2080-reload_card_volume This commit looks good Details
2020-02-07 07:43:22 +01:00
Joan Sanchez 4deda8588b Merge branch '2029-fix_item_request_filters' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-07 06:09:02 +00:00
Joan Sanchez b623646f25 removed console
gitea/salix/2029-fix_item_request_filters This commit looks good Details
2020-02-07 07:02:27 +01:00
Javi Gallego 5d0f72af4e zoneDoCalc
gitea/salix/test This commit looks good Details
2020-02-06 16:04:23 +01:00
Bernat Exposito Domenech 5cd3bde306 ticketRequest front test
gitea/salix/2054-ticket_request_frontTest This commit looks good Details
2020-02-06 14:59:00 +01:00
Joan Sanchez 3e0fd10b41 2029 - Item request fixes & searchbar filters working
gitea/salix/2029-fix_item_request_filters This commit looks good Details
2020-02-06 14:33:28 +01:00
Carlos Jimenez Ruiz a3a7b4cbaa Merge branch '2084-order_catalog_keep_category' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
n1ce
2020-02-06 12:52:00 +00:00
Carlos Jimenez Ruiz 652e0e6071 Merge branch '2076-item_tags_refactor' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-06 12:50:40 +00:00
Joan Sanchez b647379443 removed line
gitea/salix/2084-order_catalog_keep_category This commit looks good Details
2020-02-06 13:42:28 +01:00
Carlos Jimenez Ruiz b6a2344e14 Merge branch '2059-zone_index_searchPanel' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-06 12:14:31 +00:00
Bernat Exposito Domenech 73c4e310f0 2059 zone.index buscador avanzado
gitea/salix/2059-zone_index_searchPanel This commit looks good Details
2020-02-06 13:07:01 +01:00
Joan Sanchez 20f9f7af24 2084 - Keep categoryId selected on item confirmation
gitea/salix/2084-order_catalog_keep_category This commit looks good Details
2020-02-06 12:46:44 +01:00
Bernat Exposito Domenech bb09fc9746 update ticket.isEditable
gitea/salix/2070-ticket_tracking_update_permissions This commit looks good Details
2020-02-06 11:50:32 +01:00
Joan Sanchez 462cf46753 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor
gitea/salix/2076-item_tags_refactor This commit has test failures Details
2020-02-06 11:26:22 +01:00
Bernat Exposito Domenech 7bb5b19398 refactor table holidayType and holidayDetail
gitea/salix/2040-update_view_holidays This commit looks good Details
2020-02-06 09:33:36 +01:00
Carlos Jimenez Ruiz 1e8059c9f5 Merge branch '2023-ticket_index_advanced_search' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-06 07:26:39 +00:00
Joan Sanchez 4d723a721e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor
gitea/salix/2076-item_tags_refactor This commit looks good Details
2020-02-06 08:02:59 +01:00
Joan Sanchez e3b1a4b58a 2076 - Item tags refactor
gitea/salix/2076-item_tags_refactor This commit looks good Details
2020-02-06 07:41:51 +01:00
Carlos Jimenez Ruiz 610c21f23d corrected a typo
gitea/salix/1944-ticket-summary This commit looks good Details
2020-02-06 07:39:00 +01:00
Bernat Exposito Domenech 8193b0ffc0 update ticket.filter
gitea/salix/2023-ticket_index_advanced_search This commit looks good Details
2020-02-06 07:37:41 +01:00
Carlos Jimenez Ruiz 06c3580bc4 #1944 ticket.summary 2020-02-05 13:37:36 +01:00
Carlos Jimenez Ruiz 76fc5a3311 #1944 ticket.summary 2020-02-05 12:44:14 +01:00
Joan Sanchez 218ed38b54 changed comment
gitea/salix/2069-ticket_index_scope_days This commit looks good Details
2020-02-05 08:24:29 +01:00
Joan Sanchez bee814f6a6 #2069 bug-fix ticket scope days
gitea/salix/2069-ticket_index_scope_days This commit looks good Details
2020-02-05 08:23:23 +01:00
Joan Sanchez f86d3a0052 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 13:23:02 +01:00
Joan Sanchez 041c4966d6 changed line
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 12:29:04 +01:00
Joan Sanchez 494b14bab4 added translation 2020-02-04 12:28:01 +01:00
Joan Sanchez 5b0bb5dc73 updated e2e
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 11:25:15 +01:00
Bernat Exposito Domenech 89dc8e27e0 update models
gitea/salix/2040_view_holiday This commit looks good Details
2020-02-04 11:20:05 +01:00
Bernat Exposito Domenech fac93bd74c summary
gitea/salix/2056-entry_descriptor There was a failure building this commit Details
2020-02-04 09:34:31 +01:00
Bernat Exposito Domenech eab2593306 update ticket.dms.create
gitea/salix/2075-ticket_gestdoc This commit looks good Details
2020-02-03 14:36:04 +01:00
Bernat Exposito Domenech 759ac5b5c7 add icon in worker.index
gitea/salix/2020-worker_index This commit looks good Details
2020-02-03 14:03:09 +01:00
Bernat Exposito Domenech 0681f5efc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2071-ticket_sale_split
gitea/salix/2071-ticket_sale_split This commit looks good Details
2020-02-03 11:12:09 +01:00
Bernat Exposito Domenech 668f20c433 update lastActiveTickets 2020-02-03 11:12:04 +01:00
Bernat Exposito Domenech 6265796260 add icon in ticket.basicData
gitea/salix/2039-ticket_basicData This commit looks good Details
2020-02-03 09:24:49 +01:00
Joan Sanchez b743938fee merge
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit Details
2020-01-31 08:18:54 +01:00
Joan Sanchez 43693c35ad removed fdescribe
gitea/salix/2064-catalog_refactor This commit looks good Details
2020-01-30 14:35:21 +01:00
Joan Sanchez 8f851d5c15 refactor
gitea/salix/2064-catalog_refactor This commit looks good Details
2020-01-30 13:53:14 +01:00
Joan Sanchez 31349b2ebf Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-30 11:54:51 +01:00
Bernat Exposito Domenech c07d5f337a fix getWorkerdHours
gitea/salix/fixGetWorkerHours This commit looks good Details
2020-01-30 11:20:41 +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 499bd082fc changed messages
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:13:25 +01:00
Joan Sanchez 5ebe800c5f html fix
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 13:41:55 +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
Joan Sanchez b27d514918 percentage hotfix
gitea/salix/2049-hotfix_percentage This commit looks good Details
2020-01-29 11:09:42 +01:00
Joan Sanchez b0ec7ce15b updated e2e
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-28 11:56:26 +01:00
Bernat Exposito Domenech 35b9820e73 update ticket request
gitea/salix/2044-ticket.request There was a failure building this commit Details
2020-01-28 09:05:01 +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
Carlos Jimenez Ruiz 87ad594f8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-27 14:31:33 +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
Carlos Jimenez Ruiz a1fd5a01a7 #1976 Implementar Puppeteer
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-27 00:48:00 +01:00
Carlos Jimenez Ruiz 7fef6dc2b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-26 21:59:46 +01:00
Bernat Exposito Domenech 9f73c68210 udate client.log styles
gitea/salix/1997-client_log This commit looks good Details
2020-01-24 14:22:11 +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 b244df4807 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-24 12:56:01 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Carlos Jimenez Ruiz f74792dbe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-24 10:17:08 +01:00
Joan Sanchez 2eeab485e3 Merge dev
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-24 09:48:59 +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 f6ad5696b4 Merge branch '2018-deprecate_message_send' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-23 13:14:21 +00:00
Bernat Exposito Domenech 439f9009ff fix model componentType
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 13:47:00 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests
gitea/salix/2018-deprecate_message_send This commit looks good Details
2020-01-23 13:31:07 +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
Juan Ferrer 23f066b3f4 vnZoneWarehouses: remove bug fixed
gitea/salix/master This commit looks good Details
2020-01-22 16:32:01 +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 960b3c3f75 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-22 09:51:35 +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 c36e62a97b added front unit tests
gitea/salix/1982-travel_add_thermograph This commit looks good Details
2020-01-22 09:04:26 +01:00
Joan Sanchez 2339d347f7 Added back unit tests
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-22 08:26:54 +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 1d6edabb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-01-21 09:23:58 +01:00
Joan Sanchez e93e9d2947 getWasteDetail() now calls weekWaste_getDetail()
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-21 09:17:55 +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
Bernat Exposito Domenech 8ae5a8705e fix test
gitea/salix/2010-worker_phone_refactor This commit looks good Details
2020-01-20 11:17:04 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +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 65a227db9e uploadFile args
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-17 09:23:32 +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
Bernat Exposito e1aefc795b Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-16 13:42:12 +00: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 ba2300288f sendSms test
gitea/salix/1998-client_sms This commit looks good Details
2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech b42b2ec8c3 refactor sms send
gitea/salix/1998-client_sms Something is wrong with the build of this commit Details
2020-01-15 13:27:14 +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
Joan Sanchez 8f449566bb Merge branch '2000-client.sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-15 08:20:40 +00: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 cbda081608 refactor sms component
gitea/salix/2000-client.sms This commit looks good Details
2020-01-14 09:10:54 +01:00
Bernat Exposito Domenech f4e3649d9e new section thermograph
gitea/salix/1981-travel_thermograph This commit looks good Details
2020-01-13 11:53:10 +01:00
Joan Sanchez 048fcb733d added zone name to ticket summary
gitea/salix/1995-ticket_summary_with_zone This commit looks good Details
2020-01-13 07:42:41 +01:00
Joan Sanchez de05cadef4 Merge branch '1975-delivery_note_tags' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-10 11:09:29 +00: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
Joan Sanchez e235bf94a6 removed syntax error
gitea/salix/1975-delivery_note_tags This commit looks good Details
2020-01-10 11:31:12 +01:00
Joan Sanchez 16a9a1f5f8 updated styles
gitea/salix/1975-delivery_note_tags This commit looks good Details
2020-01-10 11:29:11 +01:00
Joan Sanchez 5cf8328476 added more rows to sms textarea
gitea/salix/1975-delivery_note_tags There was a failure building this commit Details
2020-01-09 13:58:50 +01:00
Carlos Jimenez Ruiz cb2f94cdaf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
gitea/salix/puppeteer There was a failure building this commit Details
2020-01-09 13:10:27 +01:00
Bernat Exposito Domenech 5511ef2537 client address index
gitea/salix/1983-client_address There was a failure building this commit Details
2020-01-09 12:39:03 +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 78fab48840 update models
gitea/salix/1980-models_Thermograph There was a failure building this commit Details
2020-01-09 11:27:53 +01:00
Joan Sanchez 6f3359c76e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1985-apply_item_type_filter
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-09 11:24:01 +01:00
Joan Sanchez 7df41fc63c solved bug ordering by tag
gitea/salix/1985-apply_item_type_filter This commit looks good Details
2020-01-09 11:21:54 +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
Bernat Exposito Domenech 99f5fbec3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph 2020-01-09 10:17:23 +01:00
Joan Sanchez c830bc6e8a fixed order by tag
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-09 09:23:59 +01:00
Carlos Jimenez Ruiz ff7c6bea6a Merge branch '1986-claim_draggable_pictures' of verdnatura/salix into dev
gitea/salix/dev Build queued... Details
2020-01-09 08:00:35 +00:00
Joan Sanchez 436673986c removed focus
gitea/salix/1985-apply_item_type_filter This commit looks good Details
2020-01-09 08:43:33 +01:00
Joan Sanchez a2e6719e1e updated unit tests
gitea/salix/1985-apply_item_type_filter This commit looks good Details
2020-01-09 08:42:58 +01:00