Commit Graph

941 Commits

Author SHA1 Message Date
Jorge Padawan 4bcb948aff Updated code for better read 2021-02-12 16:41:29 +01:00
Javi Gallego a3d7fc9313 done 2021-02-12 13:18:02 +01:00
Jorge Padawan 1512a34a73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee 2021-02-12 11:57:54 +01:00
Jorge Padawan bb02a0de6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-10 16:59:29 +01:00
Javi Gallego 3a3dae179c done 2021-02-10 07:58:11 +01:00
Jorge Padawan 25de8904b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee 2021-02-05 13:04:52 +01:00
Jorge Padawan 8dc291798f Added tooltip on address and removed workhouse 2021-02-05 13:04:32 +01:00
Joan Sanchez 3f4ebdebf6 Merge branch 'dev' into 2723-Format_emails_for_summaries 2021-02-02 08:22:34 +00:00
Javi Gallego a08c5c6ff7 error de ruta arreglado 2021-02-01 10:51:17 +01:00
Jorge Padawan 7408d22b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-01 09:05:06 +01:00
Jorge Padawan 9cf5d73be7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries 2021-01-29 16:15:26 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Javi Gallego 4b302915b5 fallo validateasync 2021-01-27 09:14:37 +01:00
Jorge Padawan 6d9967ba9f Add list of emails from client 2021-01-25 10:59:24 +01:00
Javi Gallego 16931693c7 slice error 2021-01-22 15:46:03 +01:00
Javi Gallego 93417e9676 refactor 2021-01-22 14:45:02 +01:00
Javi Gallego 161514582d movido de directorio 2021-01-22 14:41:40 +01:00
Carlos Jimenez Ruiz 42e7fa7047 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-21 10:25:39 +01:00
Carlos Jimenez Ruiz 9fc14c70ae bug fixed 2021-01-21 10:25:25 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-19 10:20:45 +01:00
Javi Gallego 49b0bca721 refactor autocomplete 2021-01-19 09:27:15 +01:00
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Jorge Padawan c5ace0a939 create the tests fields for create Account section 2021-01-15 11:24:32 +01:00
Joan Sanchez 8fed9dacd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-14 13:56:35 +01:00
Joan Sanchez efb0d2f380 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-14 13:42:09 +01:00
Joan Sanchez 53e80d29c8 Consumption hotfix 2021-01-14 13:41:50 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code 2021-01-12 10:11:37 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Javi Gallego 6acfe7f1cf minorBugs 2021-01-11 17:18:37 +01:00
Javi Gallego d3b5300553 test 2021-01-11 16:30:14 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Javi Gallego ea6e234cde minor fixes 2021-01-11 08:01:57 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Javi Gallego a9ec319d4f test 2021-01-08 15:22:41 +01:00
Jorge Padawan 344840d2c9 First step add-button-edit-summaries 2021-01-08 08:43:28 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-07 09:11:34 +01:00
Javi Gallego 1291fc4b6c acl 2021-01-04 11:49:32 +01:00
Carlos Jimenez Ruiz fee454ca44 Merge branch 'dev' into 2696-geo_autocomplete 2020-12-31 11:53:50 +00:00
Carlos Jimenez Ruiz 4e7d64e5ca re-enabled working unit test 2020-12-31 11:17:42 +01:00
Joan Sanchez 6bbe33433d 2696 - Geo autocompletion fix 2020-12-31 10:30:51 +01:00
Jorge Padawan b403899072 modificated value of "order" on client and supplier 2020-12-30 15:39:27 +01:00
Jorge Padawan c9ae5989f9 Add id on description of typeTransiction on client and supplier 2020-12-30 10:49:02 +01:00
Javi Gallego 3db3d65600 test 2020-12-29 17:00:22 +01:00
Javi Gallego 0c7ddd863d xdiario test ok 2020-12-22 10:08:11 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-22 07:42:28 +01:00
Javi Gallego 3a6d62ac7d xdiario 2020-12-21 09:52:27 +01:00
Joan Sanchez 6717853efb Updated front tests 2020-12-18 18:02:41 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2 2020-12-18 17:23:04 +01:00
Javi Gallego 87adbbfa3c Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-18 08:21:36 +01:00
Jorge Benedito Llopis 7b3128d646 Remove manager restriction to edit client credits 2020-12-17 10:07:17 +01:00
Javi Gallego 9abf23072a frontTest 2020-12-16 16:25:19 +01:00
Carlos Jimenez Ruiz c13e9383ba css refactor + watcher from credit insurance 2020-12-16 13:46:04 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad 2020-12-16 08:33:08 +01:00
Carlos Jimenez Ruiz eb19bce1ba client module refactors + dialog css 2020-12-15 16:51:36 +01:00
Carlos Jimenez Ruiz 3ad6534160 client module refactors 2020-12-13 14:57:42 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Bernat Exposito 96f603a44b refactor descriptors 2020-12-04 13:40:58 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component 2020-11-27 13:10:39 +01:00
Bernat Exposito 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production 2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Joan Sanchez 8eb14a8bdc 2588 - No ellipsize on summary notes or address 2020-11-24 14:56:10 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon 2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity 2020-11-23 13:41:51 +01:00
Joan Sanchez 93ca804573 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-11-23 11:25:15 +01:00
Joan Sanchez 3acc943d85 2639 - Permisos para añadir greuge con rol claimManager 2020-11-23 11:10:16 +01:00
Carlos Jimenez Ruiz e8df57dae2 hasToInvoice gets enabled with isActive 2020-11-19 10:51:28 +01:00
Carlos Jimenez Ruiz fcca5c5eab added a quick link to invoices 2020-11-18 17:22:40 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations 2020-11-10 16:47:39 +01:00
Joan Sanchez bcd5e6ea76 2584 - Client consumption fixes 2020-11-06 08:21:25 +01:00
Carlos Jimenez Ruiz c826c1ccc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-04 15:19:07 +01:00
Joan Sanchez c5421ee543 Merge branch 'dev' into 2534-sage_taxDataChecked 2020-11-04 12:39:30 +00:00
Joan Sanchez 0570d83a6d Requested changes 2020-11-04 13:38:09 +01:00
Joan Sanchez fd05455027 Postcode auto-fill fix 2020-11-04 11:37:54 +01:00
Joan Sanchez 15b7280222 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 14:31:39 +01:00
Joan Sanchez 590de622f5 Added model validations 2020-11-02 14:30:33 +01:00
Javi Gallego 3fdc9c315d Merge branch 'dev' into 2510-client-address-create-test 2020-10-30 08:40:47 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Joan Sanchez 146b4f5bcd 2534 - Fill sage data before enable taxDataChecked 2020-10-28 14:12:57 +01:00
Bernat Exposito Domenech 1699e0619c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-26 08:43:20 +01:00
Bernat Exposito Domenech d06d935c70 fix client fiscal data 2020-10-26 08:43:08 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary 2020-10-26 08:38:43 +01:00
Joan Sanchez 5ba439d9bf 2524 - Added search by socialName 2020-10-26 08:13:13 +01:00
Bernat Exposito Domenech e3757e9191 changes supplier models 2020-10-22 13:00:11 +02:00
Bernat Exposito Domenech fe2f12cd8f first test step 2020-10-22 09:35:11 +02:00
Javi Gallego 7dfe7ee379 Merge branch 'dev' into 2510-client-address-create-test 2020-10-21 12:35:09 +02:00
Joan Sanchez 5daee49382 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-10-21 11:52:02 +02:00
Carlos Jimenez Ruiz 1b4015a4dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData 2020-10-21 10:46:38 +02:00
Joan Sanchez 3c37f0e993 Merge branch 'dev' into 2428-anchor_directive 2020-10-21 08:32:31 +00:00
Javi Gallego ef7a886d86 Merge branch 'dev' into 2510-client-address-create-test 2020-10-21 10:13:04 +02:00
Carlos Jimenez Ruiz e989ef6a06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData 2020-10-21 09:06:52 +02:00
Bernat Exposito Domenech 0f6e1eae24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-21 08:22:51 +02:00
Javi Gallego 4aea284703 WIP: a falta de e2e 2020-10-20 14:42:23 +02:00
Bernat Exposito Domenech 7eed2ddd59 export structure and fix test 2020-10-20 12:47:37 +02:00
Joan Sanchez 12bf0e6df7 Credit insurance hotfix 2020-10-20 11:44:14 +02:00
Bernat Exposito Domenech 256206ace4 supplier summary dscriptor and card 2020-10-20 09:44:44 +02:00
Carlos Jimenez Ruiz 133a4cc907 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData 2020-10-20 09:20:27 +02:00
Joan Sanchez 5f93848afd Added unit test 2020-10-20 07:43:36 +02:00
Carlos Jimenez Ruiz a61a6e7c6a e2e path updated + test fix 2020-10-19 20:49:38 +02:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index 2020-10-19 09:05:38 +02:00
Carlos Jimenez Ruiz cc99c1e980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation 2020-10-16 13:04:58 +02:00
Joan Sanchez 6412f29685 2428 - Added anchor directive 2020-10-16 10:40:45 +02:00
Joan Sanchez 39ea51764b Some fixes made 2020-10-15 13:59:28 +02:00
Joan Sanchez ca7601a9f2 2433 - Added sage fields 2020-10-15 11:53:01 +02:00
Joan Sanchez 6fa8aae161 2509 - Added forms to create new locations 2020-10-14 11:33:42 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Carlos Jimenez Ruiz 0dbdb5103e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar 2020-10-06 08:17:12 +02:00
Joan Sanchez 71e29e747a Requested changes 2020-10-05 14:45:39 +02:00
Joan Sanchez 86025b88e3 Merge branch 'dev' into 2481-campaign_filter 2020-10-05 09:36:02 +00:00
Joan Sanchez 0dee59f66f Merge branch 'dev' into 2455-socialname_validation 2020-10-05 07:01:11 +00:00
Joan Sanchez e3b14405b7 Added unit tests 2020-10-05 08:50:07 +02:00
Joan Sanchez cdde4d95d7 Added filter 2020-10-05 07:53:03 +02:00
Bernat Exposito Domenech 90e948aeda fix lastActiveTickets 2020-09-30 13:35:37 +02:00
Bernat Exposito Domenech 1bff4e3c4e fix test and refactor transferlines 2020-09-30 12:24:33 +02:00
Joan Sanchez 9423216616 Fix 2020-09-30 11:19:52 +02:00
Joan Sanchez 503e1d0ed9 2455 - Validate socialname when isDataChecked is changed 2020-09-30 09:31:01 +02:00
Juan Ferrer 6abd707a6d Tests fixed 2020-09-21 19:16:51 +02:00
Juan Ferrer 3880e21ce3 Test fixes 2020-09-21 16:09:34 +02:00
Juan Ferrer 2b05827be1 Merge 2020-09-21 14:10:26 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz 5d461b119c tests fix 2020-09-18 11:50:20 +02:00
Carlos Jimenez Ruiz ea077e8d4a added auto-load to some combos 2020-09-17 20:12:52 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation 2020-09-15 19:43:07 +02:00
Joan Sanchez 559a2e9721 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-09-14 11:56:58 +02:00
Joan Sanchez 746bf55bcd Updated dms path 2020-09-14 11:54:34 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
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
Bernat Exposito Domenech 9ff7232b50 export production and fix test 2020-09-09 12:54:10 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname 2020-09-03 15:11:16 +02:00
Joan Sanchez 914407012a Fixed bank search expression 2020-08-27 11:58:28 +02:00
Joan Sanchez f14b484faf Added ACL to td-editable 2020-08-27 11:23:39 +02:00
Joan Sanchez ac181bb845 Updated unit tests 2020-08-27 11:16:36 +02:00
Joan Sanchez 17542472da 2391 - Editable description 2020-08-27 08:24:21 +02:00
Joan Sanchez 957c1c01b9 Html changes 2020-08-24 07:54:30 +02:00
Bernat Exposito Domenech a523030c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2388_export-structure 2020-08-12 14:22:55 +02:00
Bernat Exposito Domenech 1e56619c33 export structure and fix test 2020-08-12 13:07:58 +02:00
Joan Sanchez 1486cbb4e7 Updated unit test 2020-08-12 12:00:46 +02:00
Joan Sanchez de9d1268b7 Updated unit test 2020-08-12 11:38:39 +02:00
Joan Sanchez b0df4973e9 2384 - Searchbar filters fixed 2020-08-12 08:26:00 +02:00
Carlos Jimenez Ruiz 85b3b52e39 took a while to confirm this one 2020-07-29 10:54:45 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept 2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz e126350079 scroll removed as it comes from layaout 2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working 2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused 2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02: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
Bernat Exposito Domenech 064b950773 export production 2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech ab8d2be1ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable 2020-07-09 14:14:57 +02:00
Joan Sanchez 3a8d5c192c HOTFIX: Pagination limit 2020-07-09 12:49:07 +02:00
Bernat Exposito Domenech c31825331d refactor loggable 2020-07-09 11:45:38 +02:00
Carlos Jimenez Ruiz 36f4998e75 e2e nad canCreateTicket unit tests 2020-07-02 09:35:52 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez 322085ffd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-06-18 13:15:45 +02:00
Joan Sanchez 7c45858764 Sms dialog fix 2020-06-18 12:59:37 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests 2020-06-16 15:11:24 +02:00
Javi Gallego 9e62fd78a2 hasta precio 2020-06-16 10:57:18 +02:00
Javi Gallego 552828a1ba hasta precio 2020-06-16 10:47:01 +02:00
Joan Sanchez 279677bda9 Removed report from descriptor 2020-06-15 09:07:13 +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
Bernat Exposito e335775cdb Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:24:23 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services 2020-06-12 14:28:29 +02:00
Joan Sanchez 48034b234f 2325 - Search address 2020-06-12 10:53:33 +02:00
Joan Sanchez cba5fb01a6 Removed onused styles 2020-06-12 09:28:44 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section 2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech f9025bef98 delete test 2020-06-11 10:37:40 +02:00
Bernat Exposito Domenech 061dceb2b0 test client hook 2020-06-11 08:46:03 +02:00
Joan Sanchez 5fbcb5c439 2290 - Client consumption 2020-06-10 13:35:41 +02:00
Bernat Exposito Domenech d2aca11e16 log web access, create hook in client 2020-06-10 12:09:27 +02:00
Bernat Exposito Domenech ee58aebe16 first step, client hook 2020-06-10 09:26:51 +02:00
Joan Sanchez 7d53f274de Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 14:08:56 +00:00
Bernat Exposito Domenech cc569769b0 fix client balance 2020-06-08 12:48:23 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu 2020-06-08 08:19:18 +02:00
Bernat Exposito Domenech 56c9b08101 fix show.descriptor 2020-06-08 07:52:23 +02:00
Joan Sanchez 696de03ad1 Changed translation 2020-06-03 13:42:36 +02:00
Joan Sanchez b7ceeae65a Excluded back unit tests. TLS error 2020-06-03 11:27:14 +02:00
Joan Sanchez 1926f90f4b Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 07:47:50 +00:00
Joan Sanchez 90ae1562dd Added filters 2020-05-29 11:10:58 +02:00
Carlos Jimenez Ruiz 9bf509cd5d customs agent e2e path + small fixes 2020-05-28 09:54:31 +02:00
Joan Sanchez 0fe78a2b8f 2176 - Added contextmenu 2020-05-28 08:07:26 +02:00
Bernat Exposito Domenech e7fc70a4b4 add column in ticket split 2020-05-26 10:43:53 +02:00
Joan Sanchez 2af39d4b67 Updated unit tests 2020-05-25 07:43:24 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to 2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor 2020-05-22 15:20:55 +02:00
Joan Sanchez d082f5d6c2 2225 Prevent location override 2020-05-21 11:14:34 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
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 4133021e5c fix translate on plural 2020-05-20 08:52:20 +02:00
Juan Ferrer e7cf060e12 Merge fixes 2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates 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
Joan Sanchez 6c49fc9b1c Merge pull request 'client descriptor add risk' (#257) from 2250-client_descriptor into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:26:17 +00:00
Bernat Exposito Domenech f9bc1406e2 delete css 2020-05-19 08:14:44 +02:00
Bernat Exposito Domenech b953fa8773 client descriptor add risk 2020-05-18 11:50:55 +02:00
Joan Sanchez a3203fa81f 2216 Show active client icon on client index 2020-05-18 10:39:40 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed 2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks 2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed 2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed 2020-04-25 11:50:04 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo 2020-04-20 13:49:33 +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 2020-04-01 16:05:43 +02:00
Juan Ferrer d6fda676f6 E2E fixes: Client balance 2020-03-31 10:19:01 +02:00
Juan Ferrer dfb9d32c2a Client & ticket E2E fixes 2020-03-30 17:30:03 +02:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section 2020-03-20 12:00:53 +01:00
Joan Sanchez 3d23583e0b Fixes 2020-03-18 14:08:04 +01:00
Joan Sanchez 934e057a67 Fixed watcher changes 2020-03-18 09:41:23 +01:00
Joan Sanchez f25c8bb644 Ticket refactor 2020-03-18 08:35:59 +01:00
Joan Sanchez 88fe9a006e Item refactor 2020-03-17 14:43:46 +01:00
Joan Sanchez 381f2a08ef Client refactor 2020-03-17 11:17:50 +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 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Carlos Jimenez Ruiz 8688ecc810 eliminado el campo id en advanced search 2020-03-10 07:38:21 +01:00
Joan Sanchez d173ab6a2b 2171 - Mostrar botón "Pago a cuenta" en índice de tickets 2020-03-09 11:50:23 +01:00
Joan Sanchez 64f74b4f33 Merge branch '2111-route_drag_drop' of verdnatura/salix into dev 2020-03-08 12:45:44 +00:00
Joan Sanchez 3c41c4656b 2111 - Drop tickets to route ticket list 2020-03-06 13:06:01 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev 2020-03-06 11:19:26 +00:00
Bernat Exposito Domenech da6b3bc5c8 fix test 2020-03-06 12:01:42 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print 2020-03-05 13:56:45 +01:00
Joan Sanchez f168734b8c Updated E2E 2020-03-04 13:54:17 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev 2020-03-04 12:15:41 +00:00
Joan Sanchez 5da1c41476 Added ACL 2020-03-04 12:51:29 +01:00
Joan Sanchez 24becf7872 Updated var names 2020-03-04 11:17:35 +01:00
Joan Sanchez df3fbf291b Changed format 2020-03-04 09:32:18 +01:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty 2020-03-04 09:26:12 +01:00
Joan Sanchez 15bedc5f12 Updated unit tests 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 1d98c44c3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor 2020-03-02 09:51:05 +01:00
Joan Sanchez 04917f980f Updated E2E 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
Joan Sanchez 5ccc79df8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-02 08:07:14 +01:00
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section 2020-02-28 14:18:55 +01:00
Joan Sanchez 94ebb7fbd2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-02-27 13:48:09 +01:00
Joan Sanchez 6dcfc34056 Fix - Find duplicated client 2020-02-27 13:33:40 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable 2020-02-27 12:31:38 +01:00
Joan Sanchez c920f0bc91 Requested changes 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 a86c7c9b8a updated unit tests 2020-02-27 08:08:31 +01:00
Joan Sanchez 21ace6ef4e Merge branch '2131_jest_spyOn' of verdnatura/salix into dev 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 6c668131a4 replaced returnValur for returnThis 2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn 2020-02-26 15:02:47 +01:00
Joan Sanchez 1d326a52c8 updated unit tests 2020-02-26 14:45:47 +01:00
Joan Sanchez d66c53dbf2 2127 - Disable preview on sepa core sample 2020-02-26 14:30:30 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech b37e8da410 fix test 2020-02-25 10:39:21 +01:00
Bernat Exposito Domenech e7cdc58fad translates 2020-02-25 07:51:16 +01:00
Joan Sanchez 3643709a80 Added datalist auto completion 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 7b57d79f50 Create client geo auto fill 2020-02-21 12:39:41 +01:00
Joan Sanchez 2dbde24a99 Requested changes 2020-02-21 09:00:13 +01:00
Joan Sanchez bf4e0d09c5 Get phone from address and client 2020-02-21 08:37:37 +01:00
Joan Sanchez 2460725d98 Refactor + updated tests 2020-02-18 11:14:02 +01:00
Joan Sanchez 578556b1d5 2121 - Client balance fix balance on pagination 2020-02-17 08:38:19 +01:00
Joan Sanchez 84bf95db13 2106 - Sms max length fix 2020-02-14 12:01:17 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Bernat Exposito Domenech 5375952778 translate 2020-02-11 13:52:05 +01:00
Bernat Exposito Domenech 1d73d9f89d refactor campaing report 2020-02-11 13:25:41 +01:00
Bernat Exposito Domenech f6674448f8 ticket/client.sms validations 2020-02-10 13:22:43 +01:00
Joan Sanchez f86d3a0052 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone 2020-02-04 13:23:02 +01:00
Joan Sanchez 041c4966d6 changed line 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 2020-02-04 11:25:15 +01:00
Bernat Exposito Domenech 668f20c433 update lastActiveTickets 2020-02-03 11:12:04 +01:00
Joan Sanchez b743938fee merge 2020-01-31 08:18:54 +01:00
Joan Sanchez 1be640a59d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-29 14:51:37 +01:00
Joan Sanchez 499bd082fc changed messages 2020-01-29 14:13:25 +01:00
Joan Sanchez 5ebe800c5f html fix 2020-01-29 13:41:55 +01:00
Joan Sanchez b0ec7ce15b updated e2e 2020-01-28 11:56:26 +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 2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech b244df4807 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db 2020-01-24 12:56:01 +01:00
Joan Sanchez 2eeab485e3 Merge dev 2020-01-24 09:48:59 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms 2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models 2020-01-23 14:59:37 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests 2020-01-23 13:31:07 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito Domenech 8ae5a8705e fix test 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 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev 2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor 2020-01-17 07:24:57 +01:00
Bernat Exposito Domenech ba2300288f sendSms test 2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech b42b2ec8c3 refactor sms send 2020-01-15 13:27:14 +01:00
Joan Sanchez 8f449566bb Merge branch '2000-client.sms' of verdnatura/salix into dev 2020-01-15 08:20:40 +00:00
Bernat Exposito Domenech 1f60aac446 export structure db 2020-01-15 08:19:22 +01:00
Bernat Exposito Domenech cbda081608 refactor sms component 2020-01-14 09:10:54 +01:00
Joan Sanchez 5cf8328476 added more rows to sms textarea 2020-01-09 13:58:50 +01:00
Bernat Exposito Domenech 5511ef2537 client address index 2020-01-09 12:39:03 +01:00
Bernat Exposito Domenech d432c32577 export production and create new models 2020-01-09 10:49:09 +01:00
Bernat Exposito Domenech 36108038df refactor sintaxis 2020-01-08 11:00:50 +01:00
Bernat Exposito Domenech 8b0fd79f15 claim.details isEditable 2020-01-07 13:03:45 +01:00
Bernat Exposito Domenech 8d01cd38c2 refactor client.balance 2020-01-03 12:48:06 +01:00
Bernat Exposito Domenech b6353f1b5c test client.balance 2020-01-03 12:29:13 +01:00
Bernat Exposito Domenech b1c23dfca4 delete console.log 2020-01-02 15:07:25 +01:00
Bernat Exposito Domenech 68f437071f refactor client.balance 2020-01-02 14:44:51 +01:00
Joan Sanchez b471f51482 refactor 2019-12-31 10:38:19 +01:00
Bernat Exposito Domenech 0a37f3a1b2 update index filter 2019-12-26 08:20:16 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql 2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db 2019-12-20 13:51:04 +01:00
Joan Sanchez 472352e24c Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev 2019-12-20 10:05:38 +00:00
Joan Sanchez 61b9646f5b Merge branch 'test' into dev 2019-12-19 14:55:09 +01:00
Joan Sanchez aa809eea8a trigger build 2019-12-19 14:21:18 +01:00
Joan Sanchez 8a54da6fd3 fixed dms links 2019-12-19 14:13:24 +01:00
Joan Sanchez a1c6c0ab39 claim regularize refactor 2019-12-19 11:37:53 +01:00
Bernat Exposito Domenech aab970e667 client.phone section 2019-12-17 09:11:28 +01:00
Joan Sanchez ef95244d07 stowaway refactor 2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one 2019-12-16 08:48:12 +01:00
Joan Sanchez 676b5198a8 changed discount popover width + refresh discount 2019-12-13 08:01:13 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures 2019-12-12 09:46:29 +01:00
Carlos Jimenez Ruiz 4d493c3572 Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev 2019-12-12 07:25:22 +00:00
Bernat da2503d4b8 fix test 2019-12-04 11:18:26 +01:00
Javi Gallego 3c36526f12 E2E fix for windows plus refactors 2019-11-28 12:54:34 +01:00
Joan Sanchez 3c144ea0cd transaction changes 2019-11-22 13:46:38 +01:00
Joan Sanchez 27cab0e722 added sms option to client descriptor 2019-11-21 14:00:27 +01:00
Joan Sanchez 6e5f460fab #1867 show warehouses on summary 2019-11-15 07:35:51 +01:00
Juan Ferrer 4436acec10 Merge 2019-11-14 14:07:48 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-13 08:09:54 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local 2019-11-12 11:13:20 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test 2019-11-12 08:51:50 +01:00
Joan Sanchez 5b2e407870 dialog styles 2019-11-11 12:26:22 +01:00
Joan Sanchez 115156f89d updated unit tests 2019-11-11 11:23:39 +01:00
Joan Sanchez 0838540789 template mso compatibility 2019-11-11 11:04:49 +01:00
Juan Ferrer bee50a6b03 Front tests passed 2019-11-10 13:10:52 +01:00
Juan Ferrer 515234187a First working version 2019-11-10 11:08:44 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component 2019-11-07 11:19:05 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table 2019-11-06 10:55:04 +01:00
Joan Sanchez 3d701f534a updated tests 2019-11-06 09:32:54 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print 2019-11-06 08:20:45 +01:00
Joan Sanchez cac8cb6a6a dev pull request 2019-11-05 09:16:16 +01:00
Joan Sanchez 14cb32d1c8 updated reports 2019-11-04 13:55:20 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Juan Ferrer 0a4a22ec87 vnInputFile fixed 2019-10-28 21:40:24 +01:00
Juan Ferrer 1b2c383502 vnDialog opens in body, nightmare extensions with detailed errors 2019-10-28 17:31:33 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Juan Ferrer 5ae558e965 Watchers performance fixes 2019-10-26 12:04:48 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Juan Ferrer 4685b4166b Improved event handling 2019-10-24 10:17:32 +02:00
Joan Sanchez 58a763acf5 added quicklinks to worker descriptor 2019-10-21 14:21:52 +02:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters 2019-10-21 08:31:14 +02:00