Commit Graph

5260 Commits

Author SHA1 Message Date
Alex Moreno 854ed9936d deleted unnecessary comma 2021-11-23 09:05:42 +01:00
Alex Moreno b460579834 feat(entry_latest-buys): add from and to in search-panel 2021-11-23 09:00:46 +01:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys 2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz cae3322c6b Merge branch 'dev' into 3332-item_search-panel 2021-11-22 15:28:21 +00:00
Carlos Jimenez Ruiz ec7cb47ad5 Merge branch 'dev' into 3375-client_descriptor 2021-11-22 14:55:56 +00:00
Joan Sanchez 4ebad6b372 filter order was not properly being applied 2021-11-22 15:54:01 +01:00
Joan Sanchez 3a2e4c54b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli 2021-11-22 15:49:43 +01:00
Joan Sanchez 90ab78d26d Updated unit tests 2021-11-22 15:49:32 +01:00
Carlos Jimenez Ruiz cbcfdd33ec Merge branch 'dev' into 3379-payMethod_ibanRequired 2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz 9fdfe64909 Merge branch 'dev' into 3381-item_diary-claim 2021-11-22 13:51:51 +00:00
Joan Sanchez a940d14256 fix(filterValue): fixed sql injection vulnerability
Refs: 3369
2021-11-22 14:40:03 +01:00
Carlos Jimenez Ruiz ff0a3acd6e Merge branch 'dev' into 3379-payMethod_ibanRequired 2021-11-22 13:32:18 +00:00
Carlos Jimenez Ruiz dd19ac975d Merge branch 'dev' into 3338-worker_calendar 2021-11-22 13:18:53 +00:00
Vicent Llopis cb81ad3722 delete unnecessay space 2021-11-22 14:02:21 +01:00
Vicent Llopis 709a300388 fix: extracting logic gates to constants 2021-11-22 13:44:22 +01:00
Vicent Llopis abf3c1c84b Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar 2021-11-22 13:34:44 +01:00
Vicent Llopis cdf7c20b16 feat(worker_createAbsense): update backTest 2021-11-22 13:34:42 +01:00
Vicent Llopis a5ba02e2ec feat(route_tickets): update frontTest 2021-11-22 13:28:12 +01:00
Vicent Llopis fb6e443f03 feat(routes_tickets): button up when add tickets 2021-11-22 12:52:02 +01:00
Alex Moreno 80f651f37d add entries less than a year ago 2021-11-22 12:34:20 +01:00
Alex Moreno fe46dbd343 feat(entry_last-buys): add filter isFloramondo 2021-11-22 11:49:30 +01:00
Alex Moreno 97a66754a7 feat(item and entry): add back test 2021-11-22 08:58:54 +01:00
Alex Moreno 1e6805a161 remove unnecessary tabulation 2021-11-22 08:30:28 +01:00
Alex Moreno d2729e67e9 feat(item and latest-buys: add supplier filter 2021-11-22 08:27:14 +01:00
Carlos Jimenez Ruiz ca0c3be843 Merge branch 'dev' into 3381-item_diary-claim 2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz fad44c0b74 Merge branch 'dev' into 3374-itemPackingType 2021-11-19 11:59:50 +00:00
Carlos Jimenez Ruiz e5977be502 Merge branch 'dev' into 3374-itemPackingType 2021-11-19 11:47:37 +00:00
Alex Moreno e64e06b9ab feat(client): change phone for payMethod in descriptor 2021-11-19 12:10:53 +01:00
Vicent Llopis 8f2e29787b fix(payMethod): alter colums name 2021-11-19 10:07:33 +01:00
Alex Moreno ac9ed90f4a feat(item): modify item_getBalance and do test 2021-11-19 10:02:40 +01:00
Joan Sanchez 46d7a6e765 Added unit tests 2021-11-19 09:24:49 +01:00
Joan Sanchez 8c5f0d3019 feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago
Refs: 3278
2021-11-19 09:24:31 +01:00
Vicent Llopis 98195bf7b0 fix(route_tickets): dialog show the name of clients 2021-11-19 08:44:56 +01:00
Vicent Llopis 9de3db1961 fix(client_summary): show 10 tickets at least 2021-11-19 08:43:30 +01:00
Javi Gallego c8e9416448 Merge branch 'dev' into 2883-invoiceIn-Booking 2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz 92142c4f93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests 2021-11-18 17:00:33 +01:00
Joan Sanchez c101bbb6be Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-11-18 16:10:11 +01:00
Joan Sanchez 9c5939b661 Updated styles 2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz cdc0d4dbe5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests 2021-11-18 15:26:34 +01:00
Carlos Jimenez Ruiz 52cc927f85 Merge branch 'dev' into 3351-ticket_step-two-two 2021-11-18 14:10:23 +00:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar 2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz 334da3da9d Merge branch 'dev' into 3370-client_create 2021-11-18 14:00:22 +00:00
Carlos Jimenez Ruiz 3eb7b4cf55 refactor(item.filter): buildFilter switch refactor 2021-11-18 14:49:05 +01:00
Alex Moreno caf6320d53 feat(ticket): default ticketAction for salesAssistant 2021-11-18 14:27:05 +01:00
Joan Sanchez c98730e6b9 Updated styles 2021-11-18 14:00:45 +01:00
Carlos Jimenez Ruiz e31f98bfa9 Merge branch 'dev' into 3370-client_create 2021-11-18 12:57:33 +00:00
Carlos Jimenez Ruiz 2bfcaa810c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-18 12:40:50 +01:00
Joan Sanchez ba60523012 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-11-18 12:31:43 +01:00
Joan Sanchez 5d2693f949 Updated latest buys icon 2021-11-18 12:23:21 +01:00
Alex Moreno eea1e39a6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3370-client_create 2021-11-18 12:21:31 +01:00
Alex Moreno 16c28cfa56 fix(client): validate businessType 2021-11-18 12:15:37 +01:00
Carlos Jimenez Ruiz 129e811271 Merge branch 'dev' into 3360-supplier_descriptor 2021-11-18 11:01:25 +00:00
Joan Sanchez 3ffbdc3fde Updated fonts 2021-11-18 11:48:13 +01:00
Carlos Jimenez Ruiz 8676a1df90 updated method description 2021-11-18 11:28:11 +01:00
Carlos Jimenez Ruiz 4fc01e6a0d typos corrected 2021-11-18 11:18:45 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Carlos Jimenez Ruiz e53af13b3c unit tests for smart table and ticket index 2021-11-18 11:04:51 +01:00
Carlos Jimenez Ruiz a40e8ad2d8 Merge branch 'dev' into 3328-item_search-panel 2021-11-18 09:35:39 +00:00
Joan Sanchez e9342af3f5 refactor(theme): enabled dark theme 2021-11-18 10:12:21 +01:00
Vicent Llopis f87f60f00a feat(item-itemPackingType): add model and dumpedFixtures 2021-11-18 09:16:36 +01:00
Javi Gallego d46c590ccb test 2021-11-18 08:21:02 +01:00
Javi Gallego b936272898 Merge branch 'dev' into 2883-invoiceIn-Booking 2021-11-18 07:36:03 +01:00
Vicent Llopis 00a33fabb3 update backTest 2021-11-17 14:38:12 +01:00
Vicent Llopis 651a925708 feat(worker_calendar): only can choose one halfHoliday by year 2021-11-17 14:20:26 +01:00
Alex Moreno 40656da725 fix(zone): calendar event 2021-11-17 13:27:56 +01:00
Alex Moreno 146337b30f change for error 2021-11-17 13:19:22 +01:00
Alex Moreno a35d36b84f fix(zone): calendar event 2021-11-17 13:15:59 +01:00
Alex Moreno 1a95b03359 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3364-zone_events 2021-11-17 12:38:52 +01:00
Alex Moreno 72c724c1e7 refactor(ticket): loadDefaultTicketAction() 2021-11-17 09:59:34 +01:00
Alex Moreno b59cabe41a feat(item): add filterParams in main 2021-11-17 09:11:26 +01:00
Alex Moreno 26815ad5a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-17 08:36:35 +01:00
Alex Moreno b45b8950fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3351-ticket_step-two 2021-11-17 07:20:08 +01:00
Joan Sanchez 5672bfec7a fix(client): businessTypeFk is not longer a required field 2021-11-16 15:23:54 +01:00
Alex Moreno 4981a41d0c fix(supplier): delete verified supplier icon 2021-11-16 14:36:53 +01:00
Alex Moreno 6fa60e597a refactor(item): activeBuyer.spec.js 2021-11-16 14:13:15 +01:00
Alex Moreno f27420c14a refactor(item): activeBuyers 2021-11-16 13:56:09 +01:00
Joan Sanchez 2bc20242e6 fix(salesMonitor): allow scope days to zero 2021-11-16 13:43:30 +01:00
Alex Moreno 23b567046b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-16 12:30:28 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest 2021-11-16 10:09:42 +01:00
Joan Sanchez 7894b32163 Merge pull request 'refactor(entry.buy): moved add button' (#780) from 3281-entry_buys_new into dev
Reviewed-on: #780
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-11-16 09:05:11 +00:00
Carlos Jimenez Ruiz 6c02eca6cd Merge branch 'dev' into 3281-entry_buys_new 2021-11-16 08:20:01 +00:00
Joan Sanchez a6f8a682db fix(fixed-price): confirm on deletion 2021-11-16 08:41:27 +01:00
Joan Sanchez 5b22892500 fix(fixed-price): changed active buyers endpoint and added pagination 2021-11-16 07:45:15 +01:00
Carlos Jimenez Ruiz 3f6e1ce9aa refactor(entry.buy): moved add button 2021-11-15 18:24:01 +01:00
Alex Moreno ec25df39e4 transaction activeWithBuyer.js 2021-11-15 14:50:02 +01:00
Vicent Llopis 7efb19ab83 feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día" 2021-11-15 14:49:14 +01:00
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-15 14:40:50 +01:00
Carlos Jimenez Ruiz bdff28a465 removed unused code 2021-11-15 14:40:35 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel 2021-11-15 13:53:18 +01:00
Alex Moreno 73211c5b3b Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-15 12:14:37 +01:00
Alex Moreno adf295ebf3 fix(item): add ng-model, add fixture and transaction back test 2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz d69ee4a597 Merge branch 'dev' into 3328-item_search-panel 2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz 8c5523a3d1 Merge branch 'dev' into 3317-client_create 2021-11-15 09:28:46 +00:00
Joan Sanchez a41ab4d1dd Merge pull request '3346-item_diary claim cambiar ruta' (#775) from 3346-item_diary into dev
Reviewed-on: #775
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-15 09:19:04 +00:00
Alex Moreno df7980f2f9 separate in two vn-horizontal 2021-11-15 10:16:23 +01:00
Joan Sanchez fac1122438 Merge branch 'dev' into 3261-ticket_request 2021-11-15 09:14:55 +00:00
Carlos Jimenez Ruiz 4ef6e2b23b Merge branch 'dev' into 3346-item_diary 2021-11-15 09:07:58 +00:00
Carlos Jimenez Ruiz 1f8a6b9636 Merge branch 'dev' into 3314-invoice-out_summary 2021-11-15 08:53:25 +00:00
Carlos Jimenez Ruiz 59cdf00134 Merge branch 'dev' into 3312-ibanRequired 2021-11-15 08:24:29 +00:00
Joan Sanchez e62e57bcde Monitor smart-table ammends 2021-11-15 08:45:21 +01:00
Alex Moreno df6d547ad9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-15 08:34:40 +01:00
Alex Moreno 8a5ed6782a feat(ticket): change default ticketUpdateOption for salesAssistant 2021-11-15 08:32:16 +01:00
Carlos Jimenez Ruiz 266b1c8073 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions 2021-11-12 17:32:03 +01:00
Carlos Jimenez Ruiz 2e359fd8b7 Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-12 16:14:14 +01:00
Joan Sanchez 3e35e7e0b8 Changed to single scope for all inputs 2021-11-12 14:15:35 +01:00
Alex Moreno 243113053e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3317-client_create 2021-11-12 13:10:43 +01:00
Alex Moreno 5faef913eb feat(client): add field businessTypeFk and modify her tests 2021-11-12 13:10:11 +01:00
Carlos Jimenez Ruiz aaed7c82f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-12 11:45:57 +01:00
Carlos Jimenez Ruiz 62e03f4752 item create e2e fix 2021-11-12 11:03:23 +01:00
Joan Sanchez 02e651eac8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-11-12 09:45:05 +01:00
Joan Sanchez f32db33ed9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-11-12 09:43:50 +01:00
Joan Sanchez 93c766e3ca fix(supplier): removed everyone read acl 2021-11-12 09:32:42 +01:00
Alex Moreno 6fe7875d73 change route 2021-11-12 09:28:19 +01:00
Alex Moreno 2581ce43a7 refactor(descriptor): separate es.yml 2021-11-12 08:32:15 +01:00
Joan Sanchez c40a73b891 Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-11 17:19:07 +01:00
Joan Sanchez 04da06d778 refactor(smart-table): style changes and added smart-table to sales monitor 2021-11-11 17:18:44 +01:00
Carlos Jimenez Ruiz acd2d2e51f front unit tests fix for lastests buys 2021-11-11 17:18:19 +01:00
Carlos Jimenez Ruiz 4fe7d4f566 ticket index rollback 2021-11-11 17:17:48 +01:00
Carlos Jimenez Ruiz d2dc0bd147 multi check now behaves properly 2021-11-11 16:38:41 +01:00
Alex Moreno dd47f209a2 feat(descriptor-menu): handle error empty input 2021-11-11 14:46:05 +01:00
Alex Moreno 509e002e34 feat(summary): get email 2021-11-11 13:14:34 +01:00
Alex Moreno 5c7efbb838 feat(item): back filter buyer in search panel ans test 2021-11-11 10:33:21 +01:00
Joan Sanchez 95dfd4c2dd Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-11-11 08:27:59 +01:00
Alex Moreno 62cdf52227 refactor(time-control): getWorkedHours.spec 2021-11-11 08:24:57 +01:00
Alex Moreno a3bb3122ed fix(time-control): modify select & refactor dates 2021-11-11 08:24:41 +01:00
Carlos Jimenez Ruiz 0bf553e11e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys 2021-11-10 17:07:16 +01:00
Vicent Llopis 41974669e5 fix(testBack): add context 2021-11-10 15:11:42 +01:00
Alex Moreno 7880fb8de9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary 2021-11-10 14:54:15 +01:00
Alex Moreno f34130cbd7 feat(invoiceOut): separate index.js and jest test 2021-11-10 14:48:17 +01:00
Carlos Jimenez Ruiz 717ea60084 Merge branch 'dev' into 3116-client_balance 2021-11-10 13:40:56 +00:00
Vicent Llopis d3ff60719c fix(last-entries): dateFrom -75 days 2021-11-10 12:34:56 +01:00
Vicent Llopis 0849f40df7 feat: update backTest 2021-11-10 11:44:29 +01:00
Carlos Jimenez Ruiz d8c3113adc Merge branch 'dev' into 3308-supplier_basic-data 2021-11-10 09:57:06 +00:00
Alex Moreno 2ca48f2ae0 refactor(supplier): remove console.log 2021-11-10 10:48:05 +01:00
Carlos Jimenez Ruiz 766d9c6464 Merge branch 'dev' into 3319-worker_time-control 2021-11-10 09:38:54 +00:00
Vicent Llopis 18aec14fe9 update backTest 2021-11-10 08:46:09 +01:00
Alex Moreno 119d5e45b9 feat(supplier): add checkbox isPayMethodChecked 2021-11-10 08:43:25 +01:00
Alex Moreno a52c06057f feat(invoiceOut): separate descriptor 2021-11-09 15:10:43 +01:00
Vicent Llopis 833822978a feat(client_balance): test e2e 2021-11-09 14:36:39 +01:00
Carlos Jimenez Ruiz 469c544536 item.index default columns and filter with like 2021-11-09 11:47:54 +01:00
Alex Moreno 0aa0358b50 refactor(events): name of variable 2021-11-09 10:21:28 +01:00
Alex Moreno f45db68e0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control 2021-11-09 10:10:20 +01:00
Alex Moreno da80fee0e2 refactor(time-control): getWorkedHours.spec 2021-11-09 10:09:44 +01:00
Carlos Jimenez Ruiz 345be297f0 Merge branch 'dev' into 3116-client_balance 2021-11-09 08:26:41 +00:00
Alex Moreno 7009cc0cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar 2021-11-09 08:40:42 +01:00
Alex Moreno 9ab51fc21f feat(eventsFiltered): add backTest & refactor zone 2021-11-09 08:39:20 +01:00
Carlos Jimenez Ruiz e4ea05fd07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-08 17:46:50 +01:00
Carlos Jimenez Ruiz 262e46d7c9 added autocompletes to item index 2021-11-08 17:46:40 +01:00
Vicent Llopis 395ad1c76d fix(ibanRequired): set different ibanRequired for Client and Supplier 2021-11-08 15:04:33 +01:00
Joan Sanchez eb36f86b9d Added smart-table to item index 2021-11-08 14:46:23 +01:00
Alex Moreno 9e4627617d fix(time-control): modify select & refactor dates 2021-11-08 14:08:44 +01:00
Joan Sanchez 2bf7250117 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-11-08 13:40:22 +01:00
Joan Sanchez a48617e267 Group first 2021-11-08 13:39:12 +01:00
Vicent Llopis bfbc9b50c4 feat(client_balance): add maxImport if "cash" 2021-11-08 13:02:42 +01:00
Joan Sanchez 7dc95b8cbf Group first 2021-11-08 12:50:13 +01:00
Alex Moreno 9c877ceb7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar 2021-11-08 11:31:26 +01:00
Alex Moreno 6e2f7d9e0d feat(events): get range date of calendar 2021-11-08 11:30:00 +01:00
Vicent Llopis fbbb1ecdf6 feat(client_balance): add maxImport if "cash" 2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz 8fff96ca05 Merge branch 'dev' into 3295-claim_search-panel 2021-11-08 07:54:10 +00:00
Alex Moreno 3324f4acd2 fix(zone): back remoteMethod 2021-11-04 07:56:12 +01:00
Alex Moreno bb0745532b fix(claim): salesPersonFk where add officeBoss 2021-11-02 11:24:52 +01:00
Alex Moreno b01298ed17 feat(entry_descriptor): add supplier button 2021-11-02 08:25:43 +01:00
Alex Moreno b2dd9e6076 feat(zone): filter calendar 2021-11-02 07:55:35 +01:00
Carlos Jimenez Ruiz 04a31f4cff vn table now receives show buttons options 2021-10-29 16:55:19 +02:00
Carlos Jimenez Ruiz 11f24372e5 autocomplete options added to smart table 2021-10-29 15:52:04 +02:00
Carlos Jimenez Ruiz 89b7f5ed7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-10-28 13:46:41 +02:00
Joan Sanchez dfb2b0b3d8 Updated checked property 2021-10-28 09:09:52 +02:00
Joan Sanchez bfc9228eef Restored ticket table and added table compatibility on contextmenu 2021-10-28 09:06:03 +02:00
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view 2021-10-27 17:11:33 +02:00
Vicent Llopis cd6f0057a1 test 2021-10-27 13:41:59 +02:00
Vicent Llopis b1b6d93c8e change column value : checkbox for text 2021-10-27 13:39:38 +02:00
Vicent Llopis f60fa5a852 change receiver to requesterId 2021-10-27 12:22:32 +02:00
Vicent Llopis d94e2900d0 feat(ticket-request): send rocket message when ticket-reques is denied 2021-10-27 12:16:37 +02:00
Alex Moreno 21686b4a92 feat(test): modify jest test 2021-10-27 09:55:35 +02:00
Carlos Jimenez Ruiz c976f1ed07 multiple search by column feature 2021-10-26 17:16:01 +02:00
Alex Moreno 92b916580e feat(description): concat bank with tickets 2021-10-26 10:20:35 +02:00
Joan Sanchez bf386929d3 Deletion ammends and selection fixed 2021-10-25 17:18:57 +02:00
Carlos Jimenez Ruiz 7ce58c5f33 sorting arrows for multiple columns 2021-10-25 14:20:17 +02:00
Carlos Jimenez Ruiz f62814e81e refactor(order): catalogFilter, confirm and filter transactions 2021-10-25 13:13:05 +02:00
Joan Sanchez 6578a498ca feat(exportation): added exportation report & send report with client invoicing
Refs: 3254
2021-10-25 12:13:33 +02:00
Joan Sanchez 66830f32fd feat(exportation): added exportation report & send report with client invoicing
Refs: 3254
2021-10-25 11:58:23 +02:00
Joan Sanchez d5264486c7 Simplified to one component 2021-10-23 14:26:42 +02:00
Carlos Jimenez Ruiz 13c06bf5be refactor(monitors): added transactions to endpoints 2021-10-22 17:32:10 +02:00
Joan Sanchez e6304d026c feat(smart-table): added smart-table and smart-table-menu components 2021-10-22 15:01:54 +02:00
Joan Sanchez 2cdc22bc4d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-22 11:46:16 +02:00
Joan Sanchez aa27ebffc9 renamed method 2021-10-22 10:47:44 +02:00
Joan Sanchez 8a679b2c8b fix(invoice): fixed error for invoice with incoterms 2021-10-22 10:26:40 +02:00
Carlos Jimenez Ruiz 683f01ddd8 refactor(zone): removed deprecated column m3Max 2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz 14a72b32bd refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max 2021-10-21 11:37:09 +02:00
Carlos Jimenez Ruiz 5ea014aeff feat(monitors): added auto-refresh feature to ticket monitors 2021-10-20 15:42:09 +02:00
Carlos Jimenez Ruiz 1c51d34f7d feat(monitors): added auto-refresh feature to ticket monitors 2021-10-20 14:40:08 +02:00
Vicent Llopis 601d358b51 refactor(entry_summary): ident a line 2021-10-20 10:02:03 +02:00
Vicent Llopis f6de57a9b5 Merge branch '3235-entry_summary' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary 2021-10-20 07:50:55 +02:00
Vicent Llopis 4a5cf187a5 refactor(entry_summary): ident a line 2021-10-20 07:50:51 +02:00
Carlos Jimenez Ruiz 97242031eb Merge branch 'dev' into 3235-entry_summary 2021-10-19 14:43:06 +00:00
Vicent Llopis 1ba7f16ad3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary 2021-10-19 14:53:54 +02:00
Alex Moreno b4986b619a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3105-ticket_sale 2021-10-19 14:50:39 +02:00
Carlos Jimenez Ruiz 5be2eb974f refactor(test): adapted the new thermograph front unit test to expect thermograph data to be defined 2021-10-19 11:08:03 +02:00
Carlos Jimenez Ruiz e3942c0bb9 refactor(thermograph): empty fields handler added and correct usage of thermograph.code 2021-10-19 10:58:58 +02:00
Alex Moreno 1cb0cda3a8 fix(sale): delete :: in image 2021-10-19 10:26:00 +02:00
Carlos Jimenez Ruiz b41a0bd849 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation 2021-10-19 09:57:45 +02:00
Vicent Llopis 788bd76014 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary 2021-10-19 07:34:53 +02:00
Carlos Jimenez Ruiz fa067f94d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries 2021-10-18 16:55:28 +02:00
Vicent Llopis 40ab2ce5bc feat(entry_summary): add reference 2021-10-18 14:00:59 +02:00
Alex Moreno 44f174103c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary 2021-10-18 12:12:17 +02:00
Carlos Jimenez Ruiz cec04a307d refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures 2021-10-18 12:05:38 +02:00
Vicent Llopis e61e74ed36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries 2021-10-18 10:27:59 +02:00
Alex Moreno bf100f339e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary 2021-10-18 10:22:53 +02:00
Joan Sanchez ee1a7952ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv 2021-10-18 09:44:27 +02:00
Carlos Jimenez Ruiz ace1c9c84b fix(transaction): priceDifference now commits its created transaction 2021-10-15 16:02:50 +02:00
Carlos Jimenez Ruiz c4c1aa929a refactor(endpoints): corrected indentation and removed unused code 2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz de7af0fee2 fix(transaction): priceDifference now commits its created transaction 2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz 270b2802c8 refactor(transactions): added transaction to sendChechingPresence and corrected a typo 2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz 05df98939b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-15 14:47:34 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Joan Sanchez d5cf57fbb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-15 14:07:48 +02:00
Joan Sanchez b6a9896cba Fixed monitor problems filter 2021-10-15 12:10:28 +02:00
Joan Sanchez 85b4730c6c feat(monitor): show client risk to future on tickets
Refs: 2624
2021-10-15 10:49:23 +02:00
Vicent Llopis 6d05b046e8 feat(last-entries): add dateTo & delete style.scss 2021-10-15 10:34:32 +02:00
Carlos Jimenez Ruiz 99043bd94e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-14 16:21:55 +02:00
Carlos Jimenez Ruiz b81d6b022c refactor(buy): removed width limit for a column that was breaking e2e behavior 2021-10-14 16:18:04 +02:00
Carlos Jimenez Ruiz 35a2a71602 refactor(sales): transaction correctly passed to findById 2021-10-14 16:16:00 +02:00
Joan Sanchez e278491ad2 refactor(order): index filter optimization 2021-10-14 08:48:57 +02:00
Joan Sanchez d06385fc73 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-13 15:09:34 +02:00
Joan Sanchez c0e1f2f0dc Changed column order 2021-10-13 14:55:53 +02:00
Joan Sanchez 1b9b918812 Fixed format 2021-10-13 14:29:11 +02:00
Joan Sanchez b2cdfd9785 Removed empty spaces 2021-10-13 14:29:01 +02:00
Joan Sanchez 31e160559b fix(salesMonitor): now sorts correctly by practical and theorical hour
Refs: 3219
2021-10-13 14:28:50 +02:00
Joan Sanchez d951ca02f0 Fixed format 2021-10-13 14:21:42 +02:00
Joan Sanchez 491cca2bd6 Removed empty spaces 2021-10-13 14:19:29 +02:00
Joan Sanchez a0a01de937 fix(salesMonitor): now sorts correctly by practical and theorical hour
Refs: 3219
2021-10-13 14:17:45 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance 2021-10-13 14:03:06 +02:00
Alex Moreno a8f8248c41 feat(diary): Add column claim 2021-10-13 12:33:48 +02:00
Joan Sanchez e641a947b3 Updated unit tests 2021-10-08 09:51:42 +02:00
Joan Sanchez e6b60d73f1 Added unit tests 2021-10-07 13:36:23 +02:00
Joan Sanchez 4610ed83d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv 2021-10-07 10:28:06 +02:00
Joan Sanchez 82a14088d0 Added options to invoiceOut 2021-10-07 10:04:50 +02:00
Carlos Jimenez Ruiz 8e05301792 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-07 09:58:32 +02:00
Carlos Jimenez Ruiz cb7d1b24e8 refactor(ticket): all ticket endpoints are using transactions now 2021-10-07 09:57:07 +02:00
Javi Gallego 2dee9fec20 falta test checkToBook 2021-10-05 11:19:48 +02:00
Joan Sanchez 3d57e9a618 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-05 08:13:13 +02:00
Joan Sanchez 1ff3e1f429 Increased date range from +10 to +60 days 2021-10-05 08:12:25 +02:00
Joan Sanchez b299efa63e Changed zone_getShippedWarehouse() to zone_getShipped() 2021-10-04 14:58:38 +02:00
Joan Sanchez bb4a32293d Changed zone_getShippedWarehouse() to zone_getShipped() 2021-10-04 14:45:39 +02:00
Carlos Jimenez Ruiz 0b46e9ce35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 10:21:09 +02:00
Joan Sanchez 6b59bdd01c fix(descriptorMenu): show PDF regeneration option 2021-10-04 10:19:53 +02:00
Carlos Jimenez Ruiz a61a7f7d49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 09:37:27 +02:00
Joan Sanchez 495b06b932 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-04 09:37:15 +02:00
Joan Sanchez b3a34489b0 fix(calendar): Event colors were not showing properly
Refs: 3166
2021-10-04 09:30:55 +02:00
Carlos Jimenez Ruiz 16b27c2074 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-10-04 09:23:28 +02:00
Joan Sanchez 580231d30b Updated unit tests 2021-10-01 14:59:12 +02:00
Joan Sanchez 313db4960e refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:59:08 +02:00
Joan Sanchez 68178bdb1f Updated unit tests 2021-10-01 14:48:25 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
2021-10-01 14:31:42 +02:00
Joan Sanchez 1ec20e250c feat(invoice): Send invoice and delivery-note on CSV format 2021-10-01 12:41:31 +02:00
Joan Sanchez 1c8bb35eae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-01 11:41:55 +02:00
Joan Sanchez 3df03b31a3 fix(invoice): invalid date for PDF storage 2021-10-01 10:56:40 +02:00
Joan Sanchez c80457142f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-01 08:18:56 +02:00
Joan Sanchez a41ae85226 Removed PDF creation on download 2021-10-01 08:11:26 +02:00
Joan Sanchez 26df12a70a fix(invoice): fixed pdf generation condition race 2021-09-30 15:28:34 +02:00
Joan Sanchez 54fa419255 fix(invoice): was storing invoices on incorrect path folder 2021-09-30 14:43:37 +02:00
Joan Sanchez 479d4892ce Updated unit test 2021-09-29 12:23:55 +02:00
Joan Sanchez a7c75fcbd4 fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
2021-09-29 12:23:47 +02:00
Joan Sanchez 458d2670b3 Updated unit test 2021-09-29 12:17:21 +02:00
Joan Sanchez 197ed2009f fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
2021-09-29 12:15:42 +02:00
Carlos Jimenez Ruiz 156ecb32ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-29 08:27:53 +02:00
Carlos Jimenez Ruiz 392c4dcba3 refactor(sale): ticket.sale endpoints now use transactions 2021-09-29 08:27:18 +02:00
Carlos Jimenez Ruiz e690febc7f refactor(updateAll): usage of documented methods as update alias is not documented in loopback 2021-09-29 08:26:10 +02:00
Carlos Jimenez Ruiz 6cf1737c0d refactor(thermograph): temperature column now displays the correct data 2021-09-28 11:59:04 +02:00
Javi Gallego 4f1fd5412d faltan test 2021-09-28 10:57:51 +02:00
Joan Sanchez 06b49f36b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-09-28 10:03:00 +02:00
Joan Sanchez 19d3b19e5a Updated translation 2021-09-28 09:59:00 +02:00
Joan Sanchez ee0e1e122b Removed crudModel default params 2021-09-24 13:02:20 +02:00
Joan Sanchez 4ea0f92c35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-24 12:54:22 +02:00
Joan Sanchez 4545a5c8fa fix(filter): single search results don't use scopeDates 2021-09-24 12:51:20 +02:00
Carlos Jimenez Ruiz 8c446edc9e Merge branch 'dev' into 3098-item_tag_productor 2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz c6692ca951 Merge branch 'dev' into 3059-ticket_index_filter 2021-09-24 07:54:50 +00:00
Carlos Jimenez Ruiz 5f0e2825b8 Merge branch 'dev' into 3059-ticket_index_filter 2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz 7369f4aa54 Merge branch 'dev' into 3010-send_invoice 2021-09-24 07:44:24 +00:00
Carlos Jimenez Ruiz 14b92e530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-24 09:37:37 +02:00
Javi Gallego e5c9ea850b testback done 2021-09-24 08:24:34 +02:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor 2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz 368f54b872 refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present 2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz f74d2cc302 test(tags): moved code used on a single test to the correct place 2021-09-22 15:16:45 +02:00
Carlos Jimenez Ruiz 95ff46db09 refactor(buys): entry buys now show item.subName 2021-09-22 15:15:52 +02:00
Carlos Jimenez Ruiz 23ba5657c5 refactor(sales): ticket sales now shows item.subName 2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz c971d3ee01 refactor(consumption): client consuption now shows item.subName 2021-09-22 15:13:29 +02:00
Javi Gallego 40e589203e test fixed 2021-09-22 07:42:58 +02:00
Carlos Jimenez Ruiz aae54b5707 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-21 18:49:35 +02:00
Carlos Jimenez Ruiz cc90a08f03 refactor(ticket): ticket endpoins now can receive transactions 2021-09-21 18:48:59 +02:00
Joan Sanchez 08cba0a9c8 fix(filter): search limit by date range was not being applied
Refs: 3059
2021-09-21 15:49:59 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 6e89fa1b5e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-09-21 12:56:49 +02:00
Joan Sanchez 689662f9bb fix code duplication 2021-09-21 12:48:51 +02:00
Carlos Jimenez Ruiz 95b4d23599 added agency and route columns to client.summary tickets 2021-09-21 12:39:54 +02:00
Joan Sanchez 786589f214 fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
Refs: 3093
2021-09-21 12:25:22 +02:00
Joan Sanchez cd478a9f7b Removed line break 2021-09-20 14:02:04 +02:00
Joan Sanchez 369b79c6af refactor(invoice): removed unnecessary class 2021-09-20 14:01:40 +02:00
Joan Sanchez a0ac55bc3e refactor(invoice): send invoice to specific email address from descriptor option
Refs: 3010
2021-09-20 13:59:57 +02:00
Joan Sanchez e07e8ec658 Merge branch 'dev' into 2389-calendar_weeks 2021-09-20 08:11:21 +00:00
Joan Sanchez 7223344aa0 Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev
Reviewed-on: #736
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-17 09:59:29 +00:00
Joan Sanchez 01db0f6ece Merge branch 'dev' into 3081-newbankentity_component_refactor 2021-09-17 07:47:25 +00:00
Carlos Jimenez Ruiz b3c70de6e0 Merge branch 'dev' into 3093-fix_dup_tickets 2021-09-17 07:38:12 +00:00
Carlos Jimenez Ruiz 183fe85e07 Merge branch 'dev' into 3086-monitor_index_hours 2021-09-17 07:22:12 +00:00
Joan Sanchez 079f99ca0d fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
Refs: 3093
2021-09-17 08:50:22 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
Refs: 2389
2021-09-16 12:13:20 +02:00
Carlos Jimenez Ruiz 34038b885c refactor(newBankEntity): client.billingData and supplier.account refactor to use newBankEntity Dialog 2021-09-15 17:58:58 +02:00
Carlos Jimenez Ruiz d8a2302b18 refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component 2021-09-15 13:25:26 +02:00
Carlos Jimenez Ruiz 6e67dd408e prevented an error if resultant length is 0 2021-09-13 10:29:35 +02:00
Joan Sanchez b0d291e49c Fixed error for clients without a previous credit 2021-09-09 16:44:15 +02:00
Carlos Jimenez Ruiz f7e2dd25e4 refactor(monitors): added column practicalHour to tickets monitor and renamed two columns 2021-09-09 16:07:46 +02:00
Carlos Jimenez Ruiz 46b59473a3 refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures 2021-09-09 16:06:44 +02:00
Joan Sanchez e8792d5686 refactor(client): added restriction to change the credit amount from zero set by a manager
Refs: 3087
2021-09-09 14:43:18 +02:00
Carlos Jimenez Ruiz 76c55cb551 Merge branch 'dev' into 3049-item_index_show_lastbuy_landed 2021-09-08 09:27:23 +00:00
Carlos Jimenez Ruiz 8370b5dc1d refactor(fiscaldata): isTaxDataChecked checkbox no longer disabled by businessType presence 2021-09-08 11:03:58 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 0472deb9b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3049-item_index_show_lastbuy_landed 2021-09-08 10:40:07 +02:00
Carlos Jimenez Ruiz 538805828e refactor(item): item index now shows last buy landing 2021-09-08 10:39:54 +02:00
Carlos Jimenez Ruiz 398e79c069 Merge branch 'dev' into 3065-client_businessTypeFk_required 2021-09-08 07:55:55 +00:00
Javi Gallego 2fe4fad28a test front ok 2021-09-08 09:44:46 +02:00
Joan Sanchez 903caef155 fix(path): Was not showing the old inactive client 2021-09-08 08:39:37 +02:00
Joan Sanchez db538a3f6f Merge branch 'dev' into 3041-monitor_sort_problems 2021-09-08 06:11:39 +00:00
Joan Sanchez 29bc0c04fb test(monitor): Updated back unit tests 2021-09-08 08:08:10 +02:00
Carlos Jimenez Ruiz 99f4a2ed7d refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked 2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz 2ce79a8d49 Merge branch 'dev' into 3061-send_thermograph 2021-09-07 10:10:09 +00:00
Carlos Jimenez Ruiz 471da0f4da fix(clone): invoiceIn clone now adds (2) to the ref 2021-09-07 11:55:26 +02:00
Carlos Jimenez Ruiz c7558dfb0b refactor(temperatures): added crudmodel autoload for temperatures 2021-09-07 11:54:53 +02:00
Carlos Jimenez Ruiz 8bdb02c0fc refactor(createThermograph): endpoint rollsback only if transaction was created in it 2021-09-07 10:30:53 +02:00
Joan Sanchez 6ca7ced067 refactor(monitor): removed unused code 2021-09-07 10:27:19 +02:00
Joan Sanchez 04a817c4f9 fix(problems): problems filter was not working properly on sales monitor
Refs: 3040
2021-09-07 07:41:57 +02:00
Carlos Jimenez Ruiz c4e51146fd refactor(thermograph): temperatures source updated on frontend 2021-09-06 16:39:44 +02:00
Carlos Jimenez Ruiz 56276783db test(thermograph): e2e and unit tests for the backend of thermograph 2021-09-06 16:39:04 +02:00
Carlos Jimenez Ruiz 1f0bcb63f1 refactor(thermograph): added temperature model + updated thermographs models and endpoints 2021-09-06 16:38:27 +02:00
Joan Sanchez 4db25bf722 refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance
Refs: 3045
2021-09-03 16:30:25 +02:00
Joan Sanchez 13f78359d5 fix(bank): the search by bank was not differentiating between numerical values and string values
Refs: 3084
2021-09-03 14:00:47 +02:00
Joan Sanchez 273086472a test(salesfilter): updated unit test for sales filter 2021-09-03 12:27:19 +02:00
Joan Sanchez 8623f914c7 feat(monitor): Sort by amount of problems on a ticket list 2021-09-03 12:09:37 +02:00
Joan Sanchez 559ff95fd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-09-03 07:36:42 +02:00
Joan Sanchez 681b8afb15 fix(invoice): missing UserError import 2021-09-03 07:23:26 +02:00
Javi Gallego bc34be85ef fix 2021-09-02 17:49:25 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion 2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz 0337a1d6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production 2021-09-02 14:17:50 +02:00
Carlos Jimenez Ruiz f2f81442d9 fix(cloneWithEntries): endpoint was broken due to production changes 2021-09-02 14:17:35 +02:00
Carlos Jimenez Ruiz 85844973d6 refactor(geolocation): create province now uses autonomy instead of country 2021-09-02 11:56:59 +02:00
Joan Sanchez 0b704db353 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-09-02 08:56:19 +02:00
Joan Sanchez b68e99b412 fix(invoice): invoicing was throwing a transaction error
Refs: 3077
2021-09-02 08:55:41 +02:00
Carlos Jimenez Ruiz f5548a82a3 test(clone): invoiceIn clone production trigger broke the test 2021-09-01 15:02:27 +02:00
Carlos Jimenez Ruiz 158c15afa1 fix(filter): removed fixtures that no longer work due to structure changes 2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz ec9c061051 fix(getUpcomingDeliveries) fixtures were broken due to db structure changes 2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests 2021-09-01 11:48:21 +02:00
Joan Sanchez 0370cbf207 feat(Searchbar): You can now filter by a ticket collection
Refs: 3068
2021-09-01 11:27:24 +02:00
Javi Gallego d4fc64484a fix 2021-08-31 16:37:09 +02:00
Carlos Jimenez Ruiz 74a3b5cf89 refactor(basicdata): order basicdata requires address and landed to show agencies 2021-08-31 14:10:37 +02:00
Carlos Jimenez Ruiz 9cdf34642f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies 2021-08-31 13:15:37 +02:00
Carlos Jimenez Ruiz 88aada2895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies 2021-08-31 13:02:24 +02:00
Carlos Jimenez Ruiz 614c23fd77 refactor(basicdata): order basicdata now shows only available agencies 2021-08-31 13:02:14 +02:00
Joan Sanchez 0de6af5633 fix(searchbar): wasn't applying a search by postcode on page refresh
Refs: #3072
2021-08-31 11:41:42 +02:00
Carlos Jimenez Ruiz c00201b236 corrected a typo 2021-08-31 11:01:14 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate 2021-08-31 06:27:23 +00:00
Joan Sanchez 17a732e811 Merge branch 'dev' into 3070_deprecate_item_niches 2021-08-30 13:00:02 +00:00
Joan Sanchez 4dc107bc58 Removed console.log() 2021-08-30 14:51:02 +02:00
Joan Sanchez 3247f35b90 3075 - Show closure hour from an event 2021-08-30 14:14:21 +02:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches 2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz 52e1df2af5 removed the usage of niches from item index and summary 2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz 8a6da66916 removed niche section 2021-08-30 13:31:07 +02:00
Carlos Jimenez Ruiz e6bc856b35 removed niches model, relations and its usages 2021-08-30 13:29:16 +02:00
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name 2021-08-30 11:23:46 +02:00
Javi Gallego 488ef17559 insert mail 2021-08-27 09:01:21 +02:00
Javi Gallego 072f88d1a5 refactor 2021-08-23 14:47:26 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-08-18 12:38:41 +02:00
Javi Gallego bb764e206a test 2021-08-18 12:36:18 +02:00
Javi Gallego d0f0b52b66 minor changes 2021-08-18 08:24:07 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime 2021-08-15 08:35:14 +02:00
Joan Sanchez 23b73aaa41 Merge branch 'dev' into 3038-module_transactions 2021-08-13 15:28:58 +00:00
Carlos Jimenez Ruiz 7a7bbe2ba8 more module transactions 2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz cd334bf967 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-13 16:29:15 +02:00
Carlos Jimenez Ruiz 1a045442d4 added acl to goToUser button on client and worker descriptors 2021-08-13 14:53:39 +02:00
Carlos Jimenez Ruiz e1fe2aa5b5 added the claim icon to the ticket summary lines 2021-08-13 12:30:22 +02:00
Carlos Jimenez Ruiz d5e40320ae removed unwanted console.log 2021-08-13 12:29:48 +02:00
Javi Gallego 249ea918dd Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate 2021-08-13 08:18:34 +02:00
Joan Sanchez 48e6079527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section 2021-08-13 08:04:42 +02:00
Joan Sanchez 4aad4ee2e0 3044 - FIX: Load correct tickets on different situations 2021-08-12 13:55:10 +02:00
Carlos Jimenez Ruiz 2b4afdd04d ticket module transactions + tests 2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz 708c0035c0 deprecated changeWorker as it is no longer in use 2021-08-12 11:06:49 +02:00
Carlos Jimenez Ruiz 2c3f46f394 added throw to catch in many tests 2021-08-12 10:55:04 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 92c3a24b1b dash 2021-08-12 09:24:42 +02:00
Javi Gallego 3b9bdc18bf funciona 2021-08-12 09:23:19 +02:00
Javi Gallego 54634ed22d test okl 2021-08-12 07:39:26 +02:00
Carlos Jimenez Ruiz da7bda2d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-11 16:06:52 +02:00
Joan Sanchez de2bda5284 Removed PDF generation from transaction 2021-08-11 08:47:05 +02:00
Joan Sanchez 6ed0dcc4c5 Removed exclusion 2021-08-10 14:28:37 +02:00
Joan Sanchez b3db1cda13 Updated unit tests 2021-08-10 13:57:03 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements 2021-08-10 11:48:29 +02:00
Carlos Jimenez Ruiz d4c5d54fa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-10 08:29:11 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed 2021-08-10 08:18:52 +02:00
Joan Sanchez cbaba8a075 Ammends 2021-08-09 14:06:23 +02:00
Joan Sanchez 3a45c99594 Merge branch '2985-invoiceOut_manual' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 13:00:41 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Carlos Jimenez Ruiz a9b2e45683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual 2021-08-06 13:30:14 +02:00
Carlos Jimenez Ruiz ec6d4b29c1 Merge branch 'dev' into 2954-order_catalog_types 2021-08-06 10:48:51 +00:00
Joan Sanchez 9048ce238e Added translation 2021-08-06 12:47:46 +02:00
Carlos Jimenez Ruiz 7d442c40ec Merge branch 'dev' into 2985-invoiceOut_manual 2021-08-06 10:39:15 +00:00
Joan Sanchez 9911a6d6a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual 2021-08-06 12:37:25 +02:00
Joan Sanchez 9dc1168ad2 Transaction refactor 2021-08-06 12:24:36 +02:00
Carlos Jimenez Ruiz 3432fab6af now shows only the itemType of available items 2021-08-06 11:53:38 +02:00
Joan Sanchez 886d38ad8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys 2021-08-05 14:33:28 +02:00
Joan Sanchez eba39cc706 Ammends 2021-08-05 13:44:31 +02:00
Joan Sanchez 1b9ca13391 Ammends 2021-08-05 13:42:19 +02:00
Joan Sanchez d4b1105cda Ammends 2021-08-05 13:39:11 +02:00
Carlos Jimenez Ruiz 870314277f add sale and canbeInvoice refactor + tests 2021-08-05 13:32:35 +02:00
Carlos Jimenez Ruiz 82259eee16 added catalog calculate join to show only available item types 2021-08-04 11:48:21 +02:00
Carlos Jimenez Ruiz 51a8077f4d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover 2021-08-03 11:17:07 +02:00
Carlos Jimenez Ruiz 3d2de99129 vn-popover containing non-descriptor components now relocates correctly for ticket.sale 2021-08-03 11:16:43 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint 2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz a771fd584f minor refactors + missing transaction on discount 2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz 9578895f95 backend unit tests adapted 2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Joan Sanchez c9f235df97 Merge branch 'dev' into 3032-ticket_card_components_volume_error 2021-07-28 07:35:28 +00:00
Carlos Jimenez Ruiz 6e3a18a923 removed test for deprecated function 2021-07-27 18:18:32 +02:00
Carlos Jimenez Ruiz 88ecaff1d2 prevented an error if resultant length is 0 2021-07-27 16:17:47 +02:00
Carlos Jimenez Ruiz 6d4b97443e autoload refreshes the model when url is set 2021-07-27 15:59:59 +02:00
Joan Sanchez 8b005ae012 Updated unit tests 2021-07-27 12:24:45 +02:00
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client 2021-07-27 09:07:04 +02:00
Carlos Jimenez Ruiz caedfff34e Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor 2021-07-23 15:18:08 +02:00
Carlos Jimenez Ruiz b837a8c328 fixed a selector for ticket sale 2021-07-23 15:17:30 +02:00
Carlos Jimenez Ruiz 72535f87e1 Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor 2021-07-23 12:47:36 +00:00
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02:00
Carlos Jimenez Ruiz c1162b1b8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes 2021-07-21 10:07:21 +02:00
Carlos Jimenez Ruiz 0676eb5f30 web access inputs can't be modified together anymore 2021-07-21 10:06:50 +02:00
Joan Sanchez 9d855a80d5 3028 - Added visible column on ticket sales 2021-07-20 12:33:27 +02:00
Joan Sanchez f24e7cafce Merge branch 'dev' into 2989-client_debt_sample 2021-07-20 09:07:36 +00:00
Joan Sanchez 1b373503a6 Added translation & removed fields property 2021-07-20 11:07:04 +02:00
Joan Sanchez 3080936963 Merge branch 'dev' into 3025-client_summary_additions 2021-07-20 08:10:42 +00:00
Joan Sanchez 266ffde86b Merge branch 'dev' into 3026-send_invoice 2021-07-20 07:53:56 +00:00
Carlos Jimenez Ruiz af321be095 Merge branch 'dev' into 3026-send_invoice 2021-07-20 07:52:42 +00:00
Carlos Jimenez Ruiz 4cbaf247ed removed unused showfield in model log 2021-07-20 09:33:45 +02:00
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample 2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz 0163b6c21b added agency and route columns to client.summary tickets 2021-07-19 15:59:39 +02:00
Carlos Jimenez Ruiz e784403fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3027-itemBotanical_deprecated_column 2021-07-19 14:46:32 +02:00
Carlos Jimenez Ruiz 29f1f7e89e itemTaxCountry and item bonanical no longer use the bonanical prop 2021-07-19 14:46:18 +02:00
Joan Sanchez 63b502b368 Updated model ACL 2021-07-19 13:01:06 +02:00
Joan Sanchez e9b6c6b63e 3026 - Send invoice PDF 2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz e5b1f47478 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section 2021-07-19 11:20:38 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog 2021-07-15 13:41:29 +02:00
Javi Gallego ee30bc9e1e test fixed 2021-07-15 12:51:10 +02:00
Carlos Jimenez Ruiz 559eaf5853 the absences are now fetched alongside the hours 2021-07-14 11:22:04 +02:00
Carlos Jimenez Ruiz 9f5df91be4 workers without active contract no longer set calendar and timeControl at fault 2021-07-14 11:21:29 +02:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys 2021-07-14 11:14:53 +02:00
Joan Sanchez 675a48d8ad Merge branch 'dev' into 3018-time_control_info 2021-07-14 08:36:09 +00:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours 2021-07-14 10:09:24 +02:00
Javi Gallego c509509963 Merge branch 'dev' into 2940-invoiceInTax-section 2021-07-14 07:57:22 +02:00
Joan Sanchez 4eabba115f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-07-13 11:21:26 +02:00
Joan Sanchez ea78db1441 3012 - Hotfix: Get ticket list 2021-07-13 08:59:36 +02:00
Javi Gallego 3ec8d4583f bug 2021-07-12 15:29:53 +02:00
Javi Gallego 2f265760b4 permisos invoceInTax 2021-07-12 15:27:36 +02:00
Carlos Jimenez Ruiz 98a691c152 minor changes 2021-07-12 15:00:20 +02:00
Carlos Jimenez Ruiz 1835171fe8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-more_module_transactions 2021-07-12 13:56:58 +02:00
Carlos Jimenez Ruiz 21e34de1dd item module transactions 2021-07-12 12:54:59 +02:00
Carlos Jimenez Ruiz dd3473b93d small refactors correcting constants and adding transactions 2021-07-12 12:50:15 +02:00
Joan Sanchez c0d75e20d8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-07-12 08:32:11 +02:00
Joan Sanchez 878e989c02 HOTFIX: Disable address without a province 2021-07-12 08:29:21 +02:00
Carlos Jimenez Ruiz 3b2b4e3819 client module changes for transactions 2021-07-08 15:53:30 +02:00
Javi Gallego 3ca2dd820d Merge branch 'dev' into 2940-invoiceInTax-section 2021-07-08 08:20:30 +02:00
Javi Gallego d57c71dba7 minor fix 2021-07-08 08:19:30 +02:00
Carlos Jimenez Ruiz 10c7aa70d6 claim module transactions for filter, summary and isEditable 2021-07-05 12:00:49 +02:00
Javi Gallego 2ec2a89f88 test ok 2021-07-03 09:19:03 +02:00
Joan Sanchez ae091a3b11 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-07-02 14:41:45 +02:00
Joan Sanchez 35e3c8ce65 HOTFIX: 3009 - Unlock report button 2021-07-02 14:35:24 +02:00
Joan Sanchez 48730be203 Updated unit test 2021-07-02 14:12:37 +02:00
Joan Sanchez 057d138991 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-07-02 13:44:44 +02:00
Joan Sanchez 4849355c9b Changed limit value 2021-07-02 13:22:37 +02:00
Joan Sanchez 9ad54b9622 HOTFIX: Renamed 'in' to 'invalue' 2021-07-02 13:17:48 +02:00
Joan Sanchez eeb9a1861e HOTFIX: Added pagination 2021-07-02 13:10:46 +02:00
Joan Sanchez 249f5074df Show client id 2021-07-02 10:57:17 +02:00
Carlos Jimenez Ruiz d20b717c1b tested controller modifications accordingly 2021-07-01 16:19:59 +02:00
Carlos Jimenez Ruiz 0c71b915ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2967-zone_deliverydays_keep_search_on_url 2021-07-01 15:04:45 +02:00
Carlos Jimenez Ruiz 03b1ab0166 Merge branch 'dev' into 2983-ticket_invoice 2021-07-01 12:30:54 +00:00
Joan Sanchez 3246101574 Updated unit tests 2021-07-01 14:03:28 +02:00
Joan Sanchez 319a168b89 Removed focus 2021-07-01 13:43:13 +02:00
Joan Sanchez 92b6318c79 Ammends 2021-07-01 13:31:04 +02:00
Joan Sanchez 79f20a404d Merge branch 'dev' into 3003-worker_sections_without_contract_faults 2021-07-01 11:18:15 +00:00
Carlos Jimenez Ruiz be850571d9 updated the field name 2021-07-01 13:14:36 +02:00
Carlos Jimenez Ruiz 243636ccf6 item category name as category 2021-07-01 12:34:30 +02:00
Carlos Jimenez Ruiz 8cf2b241cd route delivery days now gets params from url 2021-07-01 12:08:48 +02:00
Carlos Jimenez Ruiz 3ea2772e1e Merge branch 'dev' into 3006-item_filter_category 2021-07-01 09:54:57 +00:00
Joan Sanchez c8bfc911c2 2974 - Get amount unpaid from customer_risk 2021-07-01 08:33:56 +02:00
Joan Sanchez 7e836e570f 2983 - Invoice tickets 2021-06-30 16:10:26 +02:00
Joan Sanchez d30a3490fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice 2021-06-30 15:21:47 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault 2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz d946750113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3006-item_filter_category 2021-06-30 10:48:27 +02:00
Carlos Jimenez Ruiz 2469540f66 item category filter is now working again 2021-06-30 10:48:19 +02:00
Javi Gallego 9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section 2021-06-30 08:30:40 +02:00
Javi Gallego 9371c49922 cambios solicitados 2021-06-30 08:26:03 +02:00
Joan Sanchez 33d03c8f21 Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id 2021-06-30 06:15:05 +00:00
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id 2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz 15c7c0cb4b read acl set on the model 2021-06-29 15:31:58 +02:00
Carlos Jimenez Ruiz a51494e784 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2949-client_basicdata_businesstype 2021-06-29 15:03:56 +02:00
Carlos Jimenez Ruiz 01a9154015 Merge branch 'dev' into 3002-backend_transactions 2021-06-29 10:23:47 +00:00
Carlos Jimenez Ruiz d67e36212f added validation for the dms id field 2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz f30cd1aeda added business type to client basic data 2021-06-29 10:51:27 +02:00
Carlos Jimenez Ruiz f3193f0dc1 added businesType model and relation to client 2021-06-29 10:51:01 +02:00
Javi Gallego 59fac7edfa fixtures 2021-06-29 10:33:01 +02:00
Javi Gallego e217f02321 test front 2021-06-29 08:59:55 +02:00
Carlos Jimenez Ruiz 8ca3e0d120 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing 2021-06-28 16:45:19 +02:00
Carlos Jimenez Ruiz e2ff3ff17f validation message for dup entry 2021-06-28 13:30:49 +02:00
Joan Sanchez c6504140af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-06-28 12:23:11 +02:00
Joan Sanchez 52e6c9d793 CSS fixes 2021-06-28 12:06:21 +02:00
Carlos Jimenez Ruiz 0e47cf72e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing 2021-06-28 11:19:07 +02:00
Carlos Jimenez Ruiz e054145b49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2996-route_tickets_recalc 2021-06-28 10:44:19 +02:00
Carlos Jimenez Ruiz 32d0aa4e10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-backend_transactions 2021-06-28 10:17:30 +02:00
Carlos Jimenez Ruiz e9bcddc29f invoice modules transactions and tests 2021-06-28 10:15:54 +02:00
Joan Sanchez 65ac3fc205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild 2021-06-28 08:58:27 +02:00
Joan Sanchez 66a2563552 Added line break 2021-06-28 08:48:35 +02:00
Joan Sanchez e7dcb54efb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-06-28 08:33:41 +02:00
Joan Sanchez ef9f3b13e4 html fixes 2021-06-28 08:28:31 +02:00
Carlos Jimenez Ruiz 8b9bfb4ba0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing 2021-06-25 10:12:52 +02:00
Carlos Jimenez Ruiz 832452df95 ticketDms import 2021-06-25 10:12:41 +02:00
Carlos Jimenez Ruiz 2548fdc891 #3000 add buyer to ticket isEditable 2021-06-25 09:46:18 +02:00
Javi Gallego 02cd2283a7 summary total 2021-06-25 09:30:24 +02:00
Javi Gallego 82e65ec1c3 rellena campo rate 2021-06-25 07:47:53 +02:00
Joan Sanchez 0941b2423e 2983 - Invoice tickets 2021-06-24 13:33:51 +02:00
Joan Sanchez db30ac3175 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-06-24 11:40:23 +02:00
Carlos Jimenez Ruiz 3bfc08b117 route.summary order by priority 2021-06-24 10:06:31 +02:00
Carlos Jimenez Ruiz 320c04b2d3 update volume is not called when add/remove tickets from route 2021-06-24 09:54:07 +02:00
Joan Sanchez 362c404aba Css fixes 2021-06-24 09:16:59 +02:00
Carlos Jimenez Ruiz 6aae09f070 front unit tests final amend 2021-06-23 14:21:48 +02:00
Carlos Jimenez Ruiz 2da72fc993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild 2021-06-23 14:20:12 +02:00
Carlos Jimenez Ruiz 12c9f3fd7d Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild 2021-06-23 14:18:23 +02:00
Joan Sanchez b2feb5227c Merge branch 'dev' into 2974-client_balance 2021-06-23 12:15:36 +00:00
Carlos Jimenez Ruiz 029b2f2fdd Merge branch 'dev' into 2955-entry_summary_show_receved_sent 2021-06-23 12:12:37 +00:00
Carlos Jimenez Ruiz 9389bbf779 front unit tests fix 2021-06-23 13:32:23 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests 2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz c88033a69d deprecated listWorkers endpoint as it was not in use 2021-06-23 13:22:35 +02:00
Joan Sanchez deaade92b0 Shortened packing type 2021-06-22 14:27:45 +02:00
Joan Sanchez 256203944e HOTFIX: Prevent error on tickets without state 2021-06-22 14:11:33 +02:00
Joan Sanchez a1b4164b5d 2974 - Client balance default company and fixes 2021-06-22 13:57:32 +02:00
Joan Sanchez 79296ac857 2974 - Client balance default company and fixes 2021-06-22 11:57:43 +02:00
Carlos Jimenez Ruiz 565f343e19 added isDelivered, isReceived and removed travel descriptor 2021-06-22 09:39:33 +02:00
Carlos Jimenez Ruiz 0421fd8828 back end unit tests for zone endpoints 2021-06-21 15:04:23 +02:00
Carlos Jimenez Ruiz b651fdebe6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-21 14:35:01 +02:00
Joan Sanchez 8c0171096f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create 2021-06-21 09:19:00 +00:00
Carlos Jimenez Ruiz 48a2bb7b10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-21 09:08:03 +02:00
Carlos Jimenez Ruiz 05c630533a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction 2021-06-18 16:38:33 +02:00
Joan Sanchez 8f24c3f39b Merge branch 'dev' into 2980-invoiceIn_fixes 2021-06-18 14:34:48 +00:00
Joan Sanchez 9506a8fd90 Disabled sortable column 2021-06-18 16:34:34 +02:00
Joan Sanchez 6acf922d3b Merge branch 'dev' into 2980-invoiceIn_fixes 2021-06-18 14:15:42 +00:00
Joan Sanchez dd7f37e36c Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev
Reviewed-on: #663
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-18 14:15:15 +00:00
Joan Sanchez a4f20daf17 Updated unit test 2021-06-18 16:14:30 +02:00
Joan Sanchez a50eebfed4 Replaced salesPerson by packages column 2021-06-18 16:07:13 +02:00
Carlos Jimenez Ruiz 4656b2e25a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias 2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz 1afae3d56d address nickname now gets updated when client or address updates 2021-06-18 15:54:33 +02:00
Carlos Jimenez Ruiz ba0fdcd743 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-18 15:05:10 +02:00
Carlos Jimenez Ruiz 82cb9ed749 zone module endpoints now have transactions 2021-06-18 15:05:03 +02:00
Joan Sanchez 20e933ed07 2980 - Invoice in fixes 2021-06-18 13:29:59 +02:00
Joan Sanchez 0ff114ff36 Ammends 2021-06-18 12:32:37 +02:00
Joan Sanchez c622f24b0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction 2021-06-18 11:12:58 +02:00
Carlos Jimenez Ruiz e74f1f109e Merge branch 'dev' into 2906-deliveryNote_packages 2021-06-18 08:27:46 +00:00
Joan Sanchez 325afe2245 2906 - Number of packages 2021-06-18 08:42:55 +02:00
Joan Sanchez b36b48f4b3 Merge branch 'dev' into 2874-timeEntry_direction 2021-06-18 06:04:33 +00:00
Joan Sanchez bc7c288742 Updated unit tests 2021-06-18 08:03:55 +02:00
Joan Sanchez 8695fadc18 Merge branch 'dev' into 2948-ticket_sale_itemPackingType 2021-06-18 05:21:01 +00:00
Javi Gallego a6c093cf16 Merge branch 'dev' into 2940-invoiceInTax-section 2021-06-18 07:07:52 +02:00
Joan Sanchez bbbf008076 Added done() to async beforeAll() 2021-06-17 16:09:17 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction 2021-06-17 15:09:04 +02:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata 2021-06-17 11:52:12 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Javi Gallego dc0212d2fc chip 2021-06-16 18:36:42 +02:00
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 47ad63c154 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight 2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz 588a499c44 editLatestsBuys now is called only with id and itemFk 2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz f5ad0c9c1c Merge branch 'dev' into 2961-summary_tickets 2021-06-16 10:18:47 +00:00
Joan Sanchez 447d8341e7 Merge branch 'dev' into 2941-salesMonitor_changes 2021-06-16 09:49:12 +00:00
Joan Sanchez 76623d8c95 Merge branch 'dev' into 2941-salesMonitor_changes 2021-06-16 09:47:45 +00:00
Joan Sanchez 0ce782a4de Updated unit tests 2021-06-16 11:40:00 +02:00
Joan Sanchez 3e938fa9fb Updated unit tests 2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz b9cdc5ed6a Merge branch 'dev' into 2965-delete_travel_from_descriptor 2021-06-16 08:19:01 +00:00
Joan Sanchez efc9edb384 Fixes 2021-06-16 10:13:06 +02:00
Joan Sanchez df94190a8c Removed console log 2021-06-16 09:59:54 +02:00
Carlos Jimenez Ruiz 34e0d0b7cf translations update 2021-06-16 09:50:32 +02:00
Joan Sanchez 225bfd09b9 Missing translation 2021-06-16 09:47:54 +02:00
Joan Sanchez c10f792619 Merge branch 'dev' into 2929-entry_latestsbuys_refactor 2021-06-16 07:44:30 +00:00
Joan Sanchez 353d0e352d 2961 - Show tickets on summary 2021-06-16 09:43:07 +02:00
Joan Sanchez 55908c0fca Merge branch 'dev' into 2941-salesMonitor_changes 2021-06-16 07:41:16 +00:00
Carlos Jimenez Ruiz 1a053942a1 Merge branch 'dev' into 2963-creditInsurance_acl 2021-06-15 14:41:52 +00:00
Carlos Jimenez Ruiz 8c1df0743d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor 2021-06-15 16:41:12 +02:00
Carlos Jimenez Ruiz 8aa3d269ea Travel descriptor now shows delete option if there are no entries 2021-06-15 16:41:01 +02:00
Joan Sanchez 9591f04853 Merge branch 'dev' into 2938-entry_buy_style 2021-06-15 12:18:59 +00:00
Joan Sanchez 92e8f528e8 2963 - Show section to all employee 2021-06-15 14:16:12 +02:00
Joan Sanchez 2469409068 2941 - Monitor changes 2021-06-15 13:48:42 +02:00
Carlos Jimenez Ruiz db3d5ca4d8 added missing html closing tag 2021-06-15 13:14:21 +02:00
Carlos Jimenez Ruiz 7004ad5ade removed several columns from bulk edit and added packingOut 2021-06-15 12:47:40 +02:00
Javi Gallego 500b68162b summary con chip 2021-06-15 09:58:21 +02:00
Javi Gallego 5369e8d97e Merge branch 'dev' into 2940-invoiceInTax-section 2021-06-15 09:09:08 +02:00
Javi Gallego a8e01909d0 ancho ok 2021-06-15 09:02:00 +02:00
Carlos Jimenez Ruiz 9c0cff2f3a removed unused code 2021-06-14 16:09:28 +02:00
Carlos Jimenez Ruiz 88a5443d64 table style changes 2021-06-14 15:52:46 +02:00
Carlos Jimenez Ruiz e85b7b9817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination 2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz cdbab4d7bf Merge branch 'dev' into 2567-calendar_rework 2021-06-14 10:00:47 +00:00
Carlos Jimenez Ruiz c09d25ba48 Merge branch 'dev' into 2567-calendar_rework 2021-06-14 09:59:13 +00:00
Joan Sanchez 59e90c2c10 Removed commented block 2021-06-14 11:58:39 +02:00
Joan Sanchez 722c9ad4d4 Merge branch 'dev' into 2957-ticket_summary_postcode 2021-06-14 09:42:40 +00:00
Carlos Jimenez Ruiz 7f69909bbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination 2021-06-14 11:39:04 +02:00
Carlos Jimenez Ruiz f36b54f97b invoiceOut summary tickets pagination + refactor 2021-06-14 11:38:57 +02:00
Joan Sanchez a303b98093 Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route 2021-06-14 09:37:23 +00:00
Javi Gallego 44ce54ede4 seccion en summary 2021-06-14 09:47:04 +02:00
Joan Sanchez de30a2d978 Total holidays fix 2021-06-14 08:09:53 +02:00
Carlos Jimenez Ruiz 5d8a9938d6 formattedAddress tests amended for postcode 2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz 48f80fad8f added postcode to summary + basic data translation 2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz 7bf832079d route.tickets suggested tickets now shows both descriptors 2021-06-11 13:02:18 +02:00
Joan Sanchez 17a6dfc81b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-11 10:58:40 +02:00
Joan Sanchez a72010554c Fixes and E2E updated 2021-06-11 10:58:00 +02:00
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields 2021-06-10 17:08:21 +02:00
Joan Sanchez e8fd1c9c9c Merge branch 'dev' into 2951-fix_unit_test 2021-06-10 14:24:17 +00:00
Joan Sanchez be791d1f00 2951 - Added transaction to updateVolume() method 2021-06-10 16:08:44 +02:00
Joan Sanchez 3f3e5c2735 Unit tests 2021-06-10 16:05:10 +02:00
Joan Sanchez 1b62233ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-10 14:22:13 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor 2021-06-10 11:24:32 +02:00
Carlos Jimenez Ruiz fc3af7b6a6 ticket expedition now shows scan worker and scanned date 2021-06-09 14:25:50 +02:00
Javi Gallego acf03959f5 creada seccion invoiceInTax 2021-06-09 10:20:18 +02:00
Carlos Jimenez Ruiz f969323a86 ticket create now takes clientFk from params 2021-06-08 17:30:00 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects 2021-06-08 16:36:16 +02:00
Carlos Jimenez Ruiz 76e723cc34 Merge branch 'dev' into 2943-timecontrol_now_showing_hours 2021-06-08 07:47:42 +00:00
Javi Gallego 8878a2280a models 2021-06-08 08:04:38 +02:00
Carlos Jimenez Ruiz 238975644f Merge branch 'dev' into 2943-timecontrol_now_showing_hours 2021-06-07 13:02:27 +00:00
Carlos Jimenez Ruiz 3894fe94ec Merge branch 'dev' into 2937-module_transactions 2021-06-07 13:02:20 +00:00
Joan Sanchez 8fa64122f8 Ammends 2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor 2021-06-07 14:26:34 +02:00
Carlos Jimenez Ruiz 8fd7faa47b fixed bug module importation + rewritten tests 2021-06-07 11:12:56 +02:00
Javi Gallego c90fa41fae accountingType.isAutoConciliated == true 2021-06-07 07:57:46 +02:00
Carlos Jimenez Ruiz 647b7a93cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions 2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz b38605442e transactions for entry module endpoints 2021-06-04 17:16:02 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez 2c0fc7e45e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-06-04 11:46:37 +02:00
Joan Sanchez 6b65aa87d8 HOTFIX: Max width for client name field 2021-06-04 11:46:09 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez f8df3f1f3d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-04 11:10:43 +02:00
Joan Sanchez 651a9356f3 Merge branch 'dev' into 2932-invoiceIn_log 2021-06-04 07:54:18 +00:00
Javi Gallego 2604c81533 falta solucionar test 2021-06-04 08:24:33 +02:00
Joan Sanchez e1c1bb8425 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-06-04 08:00:08 +02:00
Joan Sanchez 8bb254e93f HOTFIX: Ticket monitor clientGetDebt 2021-06-03 16:29:45 +02:00
Joan Sanchez edf18938a6 HOTFIX: clientGetDebt 2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table 2021-06-03 16:14:52 +02:00
Joan Sanchez d1daed3540 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-06-03 13:39:51 +02:00
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour 2021-06-03 12:40:27 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz 86631c84d0 moved transferor from fiscal data to basic data + e2e 2021-06-02 17:35:30 +02:00
Joan Sanchez 655380a52c Removed focus 2021-06-02 10:33:10 +02:00
Joan Sanchez 07026a68bb #2934 - HOTFIX: Route suggested tickets 2021-06-02 10:29:56 +02:00
Joan Sanchez a594e63566 Chip color 2021-06-01 11:39:40 +02:00
Javi Gallego 70fc260eae vnConfig solucionado 2021-06-01 10:10:09 +02:00
Javi Gallego 3a5d84b34c rutas reparadas 2021-05-31 08:21:16 +02:00
Joan Sanchez a24cfe0087 Merge branch 'dev' into 2891-ticket_sale_problems 2021-05-27 09:42:27 +00:00
Joan Sanchez 27cd54bef1 Updated icons title 2021-05-27 11:41:45 +02:00
Joan Sanchez 920e7b1daf E2E fixes 2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz 3f167de10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions 2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems 2021-05-25 14:08:02 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests 2021-05-25 13:33:17 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales 2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz e418d6239b fixed getSummary unit test 2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call 2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse 2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 5c18c5c94c ticket module descriptor now takes warehouseFk from the ticket 2021-05-21 15:31:28 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02:00
Joan Sanchez 60185bdf34 Merge branch 'dev' into 2891-ticket_sale_problems 2021-05-21 07:24:34 +00:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale 2021-05-21 08:49:32 +02:00
Joan Sanchez 6f245698f2 Merge branch 'dev' into 2620-mostrar-disponible 2021-05-21 06:29:43 +00:00
Joan Sanchez b7049122fe Url fix 2021-05-20 10:28:37 +02:00
Joan Sanchez fbc11b7a39 Merge branch 'dev' into 2921-notification_url 2021-05-20 08:23:45 +00:00
Javi Gallego df073cce2f refactor tod usa get sales 2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz 2494af0113 removed unused relation from item @addSale 2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices 2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items 2021-05-19 14:15:28 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications 2021-05-19 10:26:58 +02:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text 2021-05-18 12:53:33 +00:00
Joan Sanchez 98d7f246a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-05-18 14:44:38 +02:00
Joan Sanchez a9e33abacc FIX: Show employee list 2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz e10dc53a9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text 2021-05-18 14:22:36 +02:00
Joan Sanchez 3402bd119d Css fixes 2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz 06d396a76a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text 2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Joan Sanchez 5c760b3faa Max height 2021-05-18 12:21:01 +02:00
Joan Sanchez b87e79b9d3 Changes 2021-05-18 11:58:32 +02:00
Joan Sanchez 6ec28cbc86 Removed transaction block 2021-05-18 11:58:32 +02:00
Joan Sanchez bc7f2d8193 Responsive 2021-05-18 11:58:32 +02:00
Joan Sanchez bb67277c68 #2913, #2914 - Changes to sales monitors 2021-05-18 11:58:32 +02:00
Joan Sanchez 400bf7b4f2 Changes 2021-05-18 10:05:13 +02:00
Joan Sanchez 5d278f416f Removed transaction block 2021-05-18 10:04:01 +02:00
Joan Sanchez bf250b77ef Responsive 2021-05-18 09:12:47 +02:00
Joan Sanchez 10387ee40b #2913, #2914 - Changes to sales monitors 2021-05-18 08:41:36 +02:00
Carlos Jimenez Ruiz 5843140cf5 minor refactor for code usage instead of description 2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz e848b94859 removed LEFT from join 2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz 3a25dbc3b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-17 09:05:15 +02:00
Joan Sanchez 085a5a104b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-05-17 08:39:55 +02:00
Joan Sanchez b67c95e5f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-05-17 07:38:04 +02:00
Joan Sanchez 378175224c HOTFIX: Buyer ACL 2021-05-17 07:24:24 +02:00
Carlos Jimenez Ruiz b902a4dd4a front unit test fix 2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz 97e9dc57bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz 1e8ab4d348 added transactions to several endpoints 2021-05-14 19:21:04 +02:00
Joan Sanchez e45af1c60a Updated unit test 2021-05-14 13:56:04 +02:00
Joan Sanchez c0f2590b61 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-05-14 12:56:10 +02:00
Joan Sanchez e39758ee16 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-05-14 12:46:54 +02:00
Joan Sanchez a70b29f9bf #2916 - HOTFIX: Grouping selection limit 2021-05-14 12:44:23 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Joan Sanchez c4357ea577 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-05-13 12:27:01 +02:00
Joan Sanchez e6f7ef41b0 Hotfix: Catalog items without ink 2021-05-13 12:21:12 +02:00
Joan Sanchez ac02f8b309 Ticket request hotfix 2021-05-13 12:18:21 +02:00
Joan Sanchez 24981912e4 2907 - Proper claim rate percentage 2021-05-13 12:13:15 +02:00
Joan Sanchez 6fdb91fdc8 Removed line 2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz 95666ccc1d Merge branch 'dev' into 2905-restore_ticket_date 2021-05-13 07:44:01 +00:00
Joan Sanchez 4a1d286a95 2907 - Proper claim rate percentage 2021-05-13 09:17:49 +02:00
Joan Sanchez af49a66911 Unit test fix 2021-05-13 08:57:49 +02:00
Joan Sanchez e6e91ced99 2905 - Restore ticket shipped and landed 2021-05-13 08:56:26 +02:00
Joan Sanchez 8af66a7ca5 HOTFIX: Sort by column 2021-05-12 15:11:07 +02:00
Joan Sanchez b3cbf9374c Hotfix: Catalog items without ink 2021-05-12 14:22:29 +02:00
Joan Sanchez 9363726d67 Updated unit test 2021-05-12 13:37:01 +02:00
Joan Sanchez 873fc54dff More ammends 2021-05-12 13:18:58 +02:00
Joan Sanchez 65f0cb4612 More ammends 2021-05-12 13:14:41 +02:00
Joan Sanchez 6f5df10413 Removed controller 2021-05-12 13:06:36 +02:00
Joan Sanchez eecba426ee Removed unused class 2021-05-12 13:00:54 +02:00
Joan Sanchez b828609d33 Ammends 2021-05-12 12:39:45 +02:00
Joan Sanchez 2e7d56cc26 Test fixes 2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz 83d6581349 indentation correction 2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Joan Sanchez e22da9b0d5 Merge branch 'dev' into 2863-monitor_module 2021-05-12 07:14:08 +00:00
Joan Sanchez 88616862cb Updated unit tests 2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz d4eedc69e1 indentation on route filter 2021-05-11 12:53:08 +02:00
Joan Sanchez 6ae8b72268 Merge branch 'dev' into 2902-error-getSuggestedTickets 2021-05-11 09:52:42 +00:00
Joan Sanchez d2169000f4 Merge branch 'dev' into 2863-monitor_module 2021-05-11 07:46:18 +00:00
Joan Sanchez dc44af148d 2863 - Added sales monitor 2021-05-11 09:43:15 +02:00
Carlos Jimenez Ruiz ac917b6115 mino changes on translations 2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz 58447c8168 transaltion changes 2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz 657896bce0 increased section width 2021-05-10 10:32:00 +02:00
Javi Gallego 84cd89d7f7 modifica la descripcion de la compensacion 2021-05-07 08:45:20 +02:00
Javi Gallego 19b35f5f6c landed en lugar de shipped 2021-05-07 07:52:03 +02:00
Javi Gallego f1c30ca6d1 cambio landed por created 2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz 245243aa14 routes without vehicle or vehicles without drop off now throw 2021-05-05 13:36:54 +02:00
Joan Sanchez db148c8177 2863 - Added monitor module 2021-05-04 12:44:21 +02:00
Joan Sanchez 1efe8cb683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption 2021-05-03 14:03:41 +02:00
Carlos Jimenez Ruiz 47e36913a1 Merge branch 'dev' into 2770-supplier_address 2021-05-03 11:55:55 +00:00
Joan Sanchez 8f3d2d892d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-05-03 12:13:20 +02:00
Joan Sanchez 03e77685a1 SMS hotfix 2021-05-03 12:09:12 +02:00
Joan Sanchez 4d90006aa6 Updated unit test 2021-04-30 14:27:50 +02:00
Joan Sanchez 07dbeaf515 2727 - Send consumption report to an email address 2021-04-30 13:50:41 +02:00
Joan Sanchez fcc8ab4236 Added model ACL 2021-04-30 10:08:40 +02:00
Joan Sanchez dbe22844a6 Removed unused method 2021-04-30 09:53:20 +02:00
Joan Sanchez 5445764043 Added supplier address fixtures 2021-04-30 08:26:05 +02:00
Joan Sanchez 61a63ad76f Merge branch 'dev' into 2770-supplier_address 2021-04-29 12:42:42 +00:00
Joan Sanchez 330b6bdf8a 2770 - Added supplier addresses section 2021-04-29 14:41:10 +02:00
Joan Sanchez 5a53cb09da Create receipt button changed role to salesAssistant 2021-04-29 08:48:11 +02:00
Carlos Jimenez Ruiz eea8ed9a3c front unit test entry import buys fix 2021-04-28 22:56:02 +02:00
Carlos Jimenez Ruiz 3c280eed2e e2e path for entry buy after entry import path 2021-04-28 18:29:29 +02:00
Carlos Jimenez Ruiz 9ef4497ea6 translations and tittles 2021-04-28 12:11:49 +02:00
Carlos Jimenez Ruiz d3b22d7078 controller refactor to remove repeated code 2021-04-28 11:55:04 +02:00
Carlos Jimenez Ruiz e53298f35c test new uses transaction 2021-04-28 11:24:02 +02:00
Carlos Jimenez Ruiz ddc19ddbcd enpoint now receives all data for a buy + css refactor 2021-04-28 11:15:02 +02:00
Carlos Jimenez Ruiz 65457d6dac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy 2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz daa94e4eb5 entry buy index 2021-04-28 10:32:24 +02:00
Javi Gallego 9ee1385cd1 test ok 2021-04-26 12:33:33 +02:00
Javi Gallego 2395a0af63 done 2021-04-26 12:24:16 +02:00
Javi Gallego 4a7a4f6dcf test ok 2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz 0abb8f2d5f Merge branch 'dev' into 2873-create-supplier-beneficiary 2021-04-21 13:21:16 +00:00
Carlos Jimenez Ruiz 94cd6cfb3e watcher aint looking after data changed to disable test conn button 2021-04-19 13:23:08 +02:00
Carlos Jimenez Ruiz 857c508391 Merge branch 'dev' into 2729-prices_popover 2021-04-19 07:59:09 +00:00
Javi Gallego cd4f93f326 minor fixes 2021-04-16 18:35:03 +02:00
Javi f7fa363fa5 Merge branch 'dev' into 2873-create-supplier-beneficiary 2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz 420f05bb03 mocked api client due to service instability 2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz 56ec7b4729 input number made wider 2021-04-16 10:17:59 +02:00
Carlos Jimenez Ruiz 9a4c056059 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover 2021-04-16 10:07:18 +02:00
Carlos Jimenez Ruiz 17904c4edb only undo and save buttons are disabled until data changed now 2021-04-16 09:20:02 +02:00
Joan Sanchez 2cdafeecf4 Added unit tests 2021-04-15 14:30:47 +02:00
Joan Sanchez bf976a3e8f 2729 - Prices popover refactor 2021-04-15 14:30:30 +02:00
Carlos Jimenez Ruiz 2ebd812a1f updated model + translations 2021-04-15 11:54:40 +02:00
Carlos Jimenez Ruiz 41ab1bbe35 fixed a test where invoiceIn was nested into the summary 2021-04-15 10:50:10 +02:00
Carlos Jimenez Ruiz 38f43eca3b invoiceIn basicData + index preview of summary 2021-04-15 10:47:39 +02:00
Carlos Jimenez Ruiz 69069d5e28 invoiceIn summary frontend 2021-04-15 10:46:23 +02:00
Carlos Jimenez Ruiz ec378a17ae invoiceIn model updated a summary registered 2021-04-15 10:45:27 +02:00
Carlos Jimenez Ruiz 8faa1531c6 summary route + test 2021-04-15 10:44:25 +02:00
Carlos Jimenez Ruiz d8628379dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary 2021-04-14 11:11:40 +02:00
Carlos Jimenez Ruiz b2ecd7d3c2 Merge branch 'dev' into 2878-activeWorkers_refactor 2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id 2021-04-14 09:02:08 +02:00
Joan Sanchez 78313bd9a7 Updated unit tests 2021-04-14 08:15:03 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole 2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz 01f0fed0c3 Merge branch 'dev' into 2483-email_replyTo 2021-04-13 08:41:56 +00:00
Joan Sanchez 7033ec2c11 Added missing translations 2021-04-13 10:39:42 +02:00
Carlos Jimenez Ruiz 90a7c803fd descriptor invoiceIn amount 2021-04-12 16:32:13 +02:00
Carlos Jimenez Ruiz b6f31d7d44 invoiceIn descriptor implementation 2021-04-12 12:43:17 +02:00
Carlos Jimenez Ruiz 6f0c48847a Merge branch 'dev' into 2815-ticket_without_state 2021-04-08 11:53:25 +00:00
Joan Sanchez af0307a419 2859 - Force translation for SMS 2021-04-08 13:39:11 +02:00
Joan Sanchez 418d7a2d12 Updated unit test 2021-04-07 14:14:31 +02:00
Joan Sanchez e40911e833 2815 - Fix ticket without state 2021-04-07 13:39:36 +02:00
Joan Sanchez 465955d0c5 2483 - Added replyTo param when sending an email to client 2021-04-07 13:09:53 +02:00
Carlos Jimenez Ruiz 2d041142c3 Merge branch 'dev' into 2631-notify_incomplete 2021-04-07 09:30:05 +00:00
Joan Sanchez 93399d6de6 Updated description 2021-04-07 11:18:44 +02:00
Joan Sanchez 6c36ab3905 Removed back button 2021-04-07 10:47:31 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete 2021-04-07 07:45:00 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown 2021-04-06 13:46:38 +02:00
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00
Joan Sanchez a2144405ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-04-02 17:04:37 +02:00
Joan Sanchez 9bbf43c590 Replace http with https 2021-04-02 14:34:16 +02:00
Javi Gallego 47a3779c45 Merge branch 'dev' into 2873-create-supplier-beneficiary 2021-04-01 18:39:18 +02:00
Javi Gallego 336472291d test 2021-04-01 18:38:40 +02:00
Javi Gallego eec901684a reviso test 2021-04-01 17:36:27 +02:00
Carlos Jimenez Ruiz 893de63f74 Merge branch 'dev' into 2866-descriptor_photo 2021-04-01 14:51:05 +00:00
Joan Sanchez b4cceff4cb 2866 - Limit descriptor photo size to width 100% 2021-04-01 14:20:00 +02:00
Joan Sanchez fa0b01a0d5 Fixed buttons alignment 2021-04-01 14:00:34 +02:00
Joan Sanchez 91c26ee5a5 Removed filter import 2021-04-01 13:55:01 +02:00
Joan Sanchez 389f10bda0 Removed entry import 2021-04-01 13:51:55 +02:00
Joan Sanchez f89419962d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-04-01 13:42:38 +02:00
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary 2021-04-01 13:14:26 +02:00
Joan Sanchez 41ee6e70a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-01 08:42:02 +02:00
Javi Gallego c036c7c7fe model ok 2021-03-31 07:33:00 +02:00
Carlos Jimenez Ruiz 694055f85c width changed from medium to large 2021-03-30 16:19:54 +02:00
Carlos Jimenez Ruiz 75155c796d removed unused code 2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 4207bfcc70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created 2021-03-30 15:19:38 +02:00
Carlos Jimenez Ruiz 061626e521 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions 2021-03-30 14:51:05 +02:00
Carlos Jimenez Ruiz 847e0bd2c8 tests fixed for production sneaky changes 2021-03-30 14:43:21 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz e025368af1 updaloadFile transaction commit conditional 2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz dbf5296041 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created 2021-03-30 09:56:12 +02:00
Carlos Jimenez Ruiz 70f6728c8f started to created date changes 2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz 8797444553 importTicketSales refactor + tests 2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz 740cc79bc0 uploadFile refactor 2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz de2a17e840 removeFile and filter refactors 2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz 8d8bdacd86 updateClaimAction refactor + tests 2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz 3054cbcadb updateClaim refactor + tests 2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz c4cbc064c9 regularice claim refactor + test 2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz ee79f23185 createFromSales refactor + tests 2021-03-29 15:14:23 +02:00
Joan Sanchez eddd769af0 Excluded unit test 2021-03-29 08:39:33 +02:00
Joan Sanchez 3f0fe15763 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-29 07:50:34 +02:00
Joan Sanchez dbb6ccd89d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-03-29 07:50:16 +02:00
Joan Sanchez 13d71b590a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-29 07:33:49 +02:00
Joan Sanchez 407c0e6280 Supplier "Contacts" changes 2021-03-29 07:33:20 +02:00
Joan Sanchez 320e3143cd Ticket filter hotfix 2021-03-26 12:51:14 +01:00
Joan Sanchez 4dbcc0dd5c HOTFIX: Ticket filter changed ticketGetTotal() args 2021-03-26 12:32:32 +01:00
Carlos Jimenez Ruiz 767665e3c9 endpoint indentation + type updated yo array of objects 2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz f46c18b6b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum 2021-03-26 10:33:58 +01:00
Carlos Jimenez Ruiz 3c8ed85e69 sum is now made on backend and html amends 2021-03-26 10:33:53 +01:00
Carlos Jimenez Ruiz 1cc4e60bad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations 2021-03-24 16:45:57 +01:00
Carlos Jimenez Ruiz 41bb4cbaab deprecated vat and subTotal related methods + tests fixed 2021-03-24 16:43:54 +01:00
jorgebl 393b9ba38c Correct name 2021-03-24 14:17:27 +01:00
jorgebl 81fbc81314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum 2021-03-24 13:54:41 +01:00
jorgebl e01b7420d9 Added total cost of item 2021-03-24 13:54:29 +01:00
Joan Sanchez e767e95729 Loggable fixes 2021-03-24 13:09:35 +01:00
Joan Sanchez c65fbef3df Merge branch 'dev' into 2819-notify_assignment 2021-03-24 11:47:38 +00:00
Joan Sanchez 32805dbafb Added model unit test 2021-03-24 12:45:26 +01:00
Joan Sanchez 0e9b3bd39a Missing translation 2021-03-24 11:12:36 +01:00
Carlos Jimenez Ruiz 409f56ec7f e2e path resurrected for route tickets 2021-03-23 17:19:05 +01:00
Joan Sanchez b3d333368b #2819 - Notify worker assignment 2021-03-23 16:19:45 +01:00
Carlos Jimenez Ruiz 89d123c7f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-23 13:19:30 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests 2021-03-23 13:19:11 +01:00
jorgebl 868a0dbff7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-23 09:43:34 +01:00
Carlos Jimenez Ruiz 84378fd607 tickets already in route are no longer shown + tests 2021-03-22 16:13:12 +01:00
jorgebl e96fd3d1f7 Changed message 2021-03-22 16:11:52 +01:00
Carlos Jimenez Ruiz 0023a88bfc restored the auto state to its previous version 2021-03-22 11:32:57 +01:00
jorgebl 7e903f91a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-22 10:32:33 +01:00
Carlos Jimenez Ruiz 1e247e63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-22 10:32:07 +01:00
Joan Sanchez eb12126603 Rollback test changes 2021-03-22 10:27:07 +01:00
jorgebl 322a12e65c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-22 10:24:01 +01:00
jorgebl 5f95bf4e15 Removed vn-horizontal and styles in the spans 2021-03-22 10:23:52 +01:00
Joan Sanchez 6da84e46c1 Added throw error 2021-03-22 10:20:04 +01:00
jorgebl b7b86cd719 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-22 09:39:06 +01:00
Joan Sanchez 985bcc61b1 Rollback 2021-03-22 09:11:02 +01:00
Joan Sanchez 59bf458ca5 Removed xdescribe 2021-03-22 09:10:45 +01:00
Joan Sanchez 29979d5367 Rollback 2021-03-22 09:10:12 +01:00
Joan Sanchez 7ac4d67f97 Empty value not being logged in 2021-03-22 09:08:27 +01:00
Joan Sanchez 6210e60896 2669 - Changes to the translate values function 2021-03-19 19:20:19 +01:00
Carlos Jimenez Ruiz 674d5df96c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-18 15:03:00 +01:00
jorgebl 18a9d0c786 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-18 13:48:37 +01:00
jorgebl e12be7bf0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message 2021-03-18 13:40:56 +01:00
Carlos Jimenez Ruiz af7f885d2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 14:36:14 +01:00
Carlos Jimenez Ruiz 117ea137c1 ticket index auto-state false for single results 2021-03-16 12:08:48 +01:00
Carlos Jimenez Ruiz 1d521fa9a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 10:57:24 +01:00
jorgebl 684705e3ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-16 08:44:09 +01:00
jorgebl 1fc53f5565 QA removed styles in the html and put the translate 2021-03-16 08:44:05 +01:00
Joan Sanchez 565162740a Updated unit tests 2021-03-15 16:35:55 +01:00
Joan Sanchez 0ec6d273e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report 2021-03-15 13:49:16 +01:00
Joan Sanchez bd081f9fd6 2734 - Make invoice PDF refactor 2021-03-15 13:43:22 +01:00
Carlos Jimenez Ruiz afb8df1429 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance 2021-03-15 11:32:57 +01:00
Carlos Jimenez Ruiz fb418edc7b backend modifications for route tickets 2021-03-15 11:32:17 +01:00
Joan Sanchez 92aa9eb933 Removed ticket total temporary table 2021-03-15 06:52:15 +01:00
Joan Sanchez c3bb099b85 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-15 06:50:42 +01:00
Joan Sanchez 6cb620a41d Ticket filter fix 2021-03-14 17:20:42 +01:00
Joan Sanchez 7b94cc2942 Ticket filter test 2021-03-14 17:12:31 +01:00
Carlos Jimenez Ruiz 2b8286eb28 deprecated dependencies, replaced babel/polyfill 2021-03-12 17:15:26 +01:00
jorgebl d2879087ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message 2021-03-12 12:41:06 +01:00
Carlos Jimenez Ruiz 7c34555afd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time 2021-03-12 12:30:55 +01:00
jorgebl c74b635a1a Translate and show url of item 2021-03-12 12:24:08 +01:00
jorgebl fdecf6510f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-12 10:02:56 +01:00
Joan Sanchez f92db8c5a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys 2021-03-12 08:52:07 +01:00
Joan Sanchez 4c7d95f001 Requested changes + e2e updated 2021-03-12 08:45:41 +01:00
Joan Sanchez be37334f49 Requested changes 2021-03-12 08:17:56 +01:00
Carlos Jimenez Ruiz 674b959bbc minor refactor 2021-03-11 15:14:08 +01:00
Carlos Jimenez Ruiz 05ee2ee2d3 ticket.sale front unit test fix 2021-03-11 10:44:34 +01:00
Joan Sanchez 1ed4dd27d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report 2021-03-11 08:59:02 +01:00
Joan Sanchez 1719f53111 2734 - Recreate invoice 2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz 4c0d583556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT 2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Joan Sanchez e29dd4db42 Updated it description 2021-03-10 11:14:50 +01:00
Joan Sanchez a0358044a1 Acl fix 2021-03-10 11:11:04 +01:00
Joan Sanchez a7c2e08f8f ACl fixes 2021-03-10 11:04:56 +01:00
Joan Sanchez b39ec70a2c Merge branch 'dev' into 2752-entry_import_buys 2021-03-10 09:54:14 +00:00
Joan Sanchez c144d9ed47 Unit test changed query path 2021-03-10 10:53:22 +01:00
Joan Sanchez a4d2c531a3 Changes 2021-03-10 10:29:58 +01:00
jorgebl 2f68509e65 WIP: added styles 2021-03-10 09:49:24 +01:00
jorgebl 45f9c1188d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-10 09:48:17 +01:00
Joan Sanchez 2a2e276c6b Added back unit test plus fixes 2021-03-10 09:01:32 +01:00
Joan Sanchez ab755e29c7 Merge branch 'dev' into 2787-change_css_date_time 2021-03-09 14:01:04 +00:00
Joan Sanchez 31205f4556 Added front unit test 2021-03-09 13:39:22 +01:00
Joan Sanchez 5cbd8d632d Changes 2021-03-09 10:01:40 +01:00
Joan Sanchez 9da59949fd Merge branch 'dev' into 2733-supplier_descriptor_icon 2021-03-09 08:31:03 +00:00
jorgebl 59882cca77 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon 2021-03-09 09:26:02 +01:00
jorgebl 2d36d4e610 Added line break in vn-icon 2021-03-09 09:25:10 +01:00
Joan Sanchez ff6c80aa7e Merge branch 'dev' into 2832-summary_validate_h4 2021-03-09 08:24:10 +00:00
jorgebl 1922280c61 QA rename some descriptions in test and reworked the test 2021-03-08 17:49:04 +01:00
jorgebl 1379691576 Added icon for supplier descriptor 2021-03-08 13:52:11 +01:00
jorgebl 43dc158d7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4 2021-03-08 13:17:38 +01:00
jorgebl 5cb959f5b8 removed controller.data from submit 2021-03-08 13:12:13 +01:00
jorgebl 27816b29e7 Removed ids on controller.data 2021-03-08 13:06:35 +01:00
jorgebl 134365dd9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor 2021-03-08 12:55:44 +01:00
jorgebl d09e47835e Rename the statements for correctly description the action 2021-03-08 12:40:13 +01:00
jorgebl 6e08a66343 Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical 2021-03-08 12:38:54 +01:00
jorgebl 32ea2dbda6 Added permisions from models in table salix ACL 2021-03-08 12:32:35 +01:00
Carlos Jimenez Ruiz 5c776c0f11 Merge branch 'dev' into 2703-ticket_step_one 2021-03-08 09:48:38 +00:00
Joan Sanchez 2aff48c42d 2837 - Updated fonts 2021-03-08 09:34:58 +01:00
jorgebl 192d7627b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4 2021-03-08 09:12:34 +01:00
jorgebl 28b9da82ed change conditional 2021-03-08 09:12:10 +01:00
Joan Sanchez d7651ba4ac 2837 - Updated fonts 2021-03-08 07:53:00 +01:00
jorgebl 1fd18cae5a QA 2021-03-05 11:40:01 +01:00
jorgebl 4ae418698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component 2021-03-05 11:39:25 +01:00
Joan Sanchez 7ec9ddb6d9 Translation fix 2021-03-05 09:23:31 +01:00
jorgebl b6bf61f410 description put correctly 2021-03-05 09:09:09 +01:00
jorgebl 63ac492845 Added message for duplicated names 2021-03-05 08:45:14 +01:00
jorgebl 4cc3fc90c5 conditionals if name already exists 2021-03-04 21:30:56 +01:00
jorgebl 5ebd70a8f0 Fixed error filter on itemBotanical when item hasn't specie and genus data + front test 2021-03-04 20:11:10 +01:00
jorgebl 12ad71d0fe translate some words 2021-03-04 20:08:07 +01:00
jorgebl 300f78f31e added permisions logistic boss 2021-03-04 20:07:45 +01:00
jorgebl 92db67292c Removed botanical field and changes "edi" for "vn" 2021-03-04 07:56:31 +01:00
Joan Sanchez 0b532880c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys 2021-03-04 07:54:15 +01:00
jorgebl cdd903dedf removed line break because the app interpretate it's a space 2021-03-03 15:09:01 +01:00
jorgebl 763eb412c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component 2021-03-03 13:39:47 +01:00
jorgebl 56154181aa QA done 2021-03-03 13:39:25 +01:00
Joan Sanchez b22f58ae80 Issued filter fix 2021-03-03 12:28:37 +01:00
Joan Sanchez e50dcf467f Requested changes 2021-03-03 12:21:04 +01:00
jorgebl 2ba7e922e6 Put time in 00:00 when field "shipped" change 2021-03-03 10:57:00 +01:00
Joan Sanchez 7c7aba86a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index 2021-03-03 09:36:55 +01:00
Joan Sanchez e52f0eea92 Added front unit tests 2021-03-03 07:44:09 +01:00
jorgebl 60ca3e87a5 Test git 2021-03-02 16:53:54 +01:00
jorgebl 3c82a4997b Test gitea 2021-03-02 16:52:14 +01:00
Joan Sanchez fed3657487 Export changes & backtest fixes 2021-03-02 14:59:02 +01:00
jorgebl 022d31c952 remove line break 2021-03-02 14:43:55 +01:00
jorgebl 325a7e7235 Translate note 2021-03-02 12:50:07 +01:00
jorgebl d6c1f73cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component 2021-03-02 12:46:19 +01:00
jorgebl a7973ba276 Resolved question PR 2021-03-01 11:59:05 +01:00
jorgebl 69550dc380 Added number of rows that are going to be modificated 2021-03-01 11:54:02 +01:00
Joan Sanchez 718021cff8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index 2021-03-01 11:49:31 +01:00
jorgebl 094552e0f2 Added ellipsize and align label 2021-02-26 12:32:05 +01:00
jorgebl 3fcd5f9dbc removed line break 2021-02-26 11:40:46 +01:00
jorgebl af8f4e88f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2786-get_tags_from_item 2021-02-26 11:36:56 +01:00
jorgebl f63baafe7d get values from model item 2021-02-26 11:36:22 +01:00
jorgebl 0d7a41f862 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson 2021-02-25 15:52:18 +01:00
jorgebl b9594f5238 Add descriptor popover 2021-02-25 15:51:51 +01:00
jorgebl 4cedd53bce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays 2021-02-25 11:02:51 +01:00
jorgebl c55d65a7fd QA refactor 2021-02-25 10:49:19 +01:00
jorgebl 218a506a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes 2021-02-25 09:54:21 +01:00
Joan Sanchez 89abf424fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-02-25 08:17:26 +01:00
jorgebl c9730929e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary 2021-02-24 16:14:41 +01:00
jorgebl 1f1db53d41 Summary boss shown on descriptor 2021-02-24 16:12:44 +01:00
Joan Sanchez c2a2204437 Regex change 2021-02-24 16:04:09 +01:00
Joan Sanchez ddb77a5c05 Regex change 2021-02-24 15:55:09 +01:00
Joan Sanchez d3879635a8 Regex changes 2021-02-24 15:54:02 +01:00
jorgebl 06dcb4b28c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary 2021-02-24 14:54:23 +01:00
jorgebl f1c481de64 QA refactor 2021-02-24 14:49:58 +01:00
Joan Sanchez 1c819e692e Floramondo image download fixes 2021-02-24 14:37:49 +01:00
jorgebl d551389d3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item 2021-02-24 12:26:05 +01:00
jorgebl df9ca2ad3e Fixed filter description 2021-02-24 12:24:50 +01:00
jorgebl 3af50dfc80 QA refactor 2021-02-24 11:32:31 +01:00
Joan Sanchez 347ac77878 Changes to file names 2021-02-24 09:59:41 +01:00
jorgebl 7895af8a54 Fixed test 2021-02-23 17:00:31 +01:00
jorgebl e32914d990 Fixed error test 2021-02-23 16:27:18 +01:00
jorgebl 3eae322a6a Added scope days and test 2021-02-23 16:09:29 +01:00
jorgebl 71eeaadb43 Removed focus on test 2021-02-23 14:54:07 +01:00
jorgebl 2e75bf376c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes 2021-02-23 11:53:07 +01:00
jorgebl da20eac685 Putting propertie name for order and showing the 3 digits of type 2021-02-23 11:52:29 +01:00
jorgebl 799bb3a955 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-23 11:10:06 +01:00
jorgebl 9855bd14fe Translate Boss 2021-02-23 11:08:57 +01:00
jorgebl 5e549b4d0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary 2021-02-23 10:42:19 +01:00
jorgebl 69f53972d5 Added filter for selection 2021-02-22 16:43:40 +01:00
jorgebl 5ef48919ec Added translate multiplier 2021-02-22 13:41:31 +01:00
jorgebl 3c3dc861ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item 2021-02-22 13:37:43 +01:00
jorgebl 56424925e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time 2021-02-22 13:02:32 +01:00
jorgebl 77d8388c43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee 2021-02-22 09:59:38 +01:00
jorgebl 5692b5f07e Added conditional and test 2021-02-22 09:53:03 +01:00
jorgebl 8deb11d333 Added boss on basic data and summary 2021-02-19 17:45:45 +01:00
Joan Sanchez ddb443ab8f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-02-18 13:17:34 +01:00
Joan Sanchez 8ddbcc24a7 Added priority to image download queue 2021-02-18 13:03:49 +01:00
Jorge Padawan 3763b95f62 Added multiplier in sections and filter selection 2021-02-17 15:38:57 +01:00
Jorge Padawan aa29f546ae put global bank entity model 2021-02-17 15:05:17 +01:00
Jorge Padawan d5e53909c6 Fixed test 2021-02-17 13:32:09 +01:00
Jorge Padawan 29ca6c52af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier 2021-02-17 12:32:26 +01:00
Jorge Padawan f10092d2cf Added autocomplete on bank entity 2021-02-17 12:07:04 +01:00
Jorge Padawan 0732ff38b1 Quit clogs 2021-02-17 11:04:46 +01:00
Jorge Padawan b71b959b49 Formated sql and tests passed 2021-02-17 11:01:50 +01:00
Jorge Padawan aaf77677d1 Aligned title with column 2021-02-16 15:50:48 +01:00
Jorge Padawan ac4a19841d Added shrink for date 2021-02-16 15:40:20 +01:00
Jorge Padawan 2296727f8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee 2021-02-16 08:32:24 +01:00
Javi Gallego 7c0e690f8f sin console 2021-02-15 14:34:13 +01:00
Jorge Padawan bf3391f7f2 added test of lastActiveTickets 2021-02-15 13:20:17 +01:00
Jorge Padawan 4e36fd118e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee 2021-02-15 10:45:46 +01:00
Javi Gallego 737f5a1c91 Merge branch 'dev' into refactor-loopback-context 2021-02-12 18:11:50 +01:00
Jorge Padawan 366f241b3f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-12 17:04:10 +01:00
Jorge Padawan 4bcb948aff Updated code for better read 2021-02-12 16:41:29 +01:00
Jorge Padawan 4b1d86c9b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-02-12 15:12:15 +01:00
Javi Gallego a3d7fc9313 done 2021-02-12 13:18:02 +01:00
Joan Sanchez d7ad90d573 Updated caniuse 2021-02-12 12:25:44 +01:00
Joan Sanchez e7c1dc2210 Changes 2021-02-12 12:19:42 +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 1ef2c2ff0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module 2021-02-12 11:48:00 +01:00
Jorge Padawan dad3e7c155 Requested changes realized 2021-02-12 11:27:24 +01:00
Jorge Padawan 2a2009b287 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-12 11:25:44 +01:00
Jorge Padawan 211ffb8f30 Delete supplierAccount from this branch 2021-02-12 09:50:23 +01:00
Jorge Padawan 433a0094c4 Fixed errors detected 2021-02-12 09:11:43 +01:00
Jorge Padawan eb3ac6de72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-11 18:48:58 +01:00
Jorge Padawan 53b06bc464 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search 2021-02-11 18:41:41 +01:00
Jorge Padawan 1634c81682 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module 2021-02-11 18:38:27 +01:00
Jorge Padawan 0c335b9705 Put bankEntity on global components, and fixed conflict updates 2021-02-11 18:35:23 +01:00
Jorge Padawan a1ca8d90c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-02-11 16:07:04 +01:00
Joan Sanchez c270ec6207 Contextmenu fixes 2021-02-11 15:06:41 +01:00
Carlos Jimenez Ruiz 3374356d58 both created tickets are now discarded after tests 2021-02-11 11:53:30 +01:00
Jorge Padawan f146c6a279 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search 2021-02-11 11:15:10 +01:00
Jorge Padawan 745d25f0c7 Showed filter on browser search bar 2021-02-11 11:14:52 +01:00
Jorge Padawan 31e5d3fd1e Created test and optimized sql query 2021-02-11 08:32:16 +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
Joan Sanchez 84c82ed32d 2595 - Added invoiceIn module 2021-02-10 15:03:11 +01:00
Jorge Padawan 2cf37a9e96 Added permissions to role administrative 2021-02-10 09:10:15 +01:00
Jorge Padawan 1c6bddbfb6 Added functionality to autocomplete the inputs 2021-02-10 08:47:58 +01:00
Joan Sanchez dcad6dc8c8 Merge branch 'dev' into 2725-ticket-create-crear-shimpent 2021-02-10 07:21:29 +00:00
Javi Gallego f87ea1b051 arrow-spacing 2021-02-10 08:13:45 +01:00
Javi Gallego 3a3dae179c done 2021-02-10 07:58:11 +01:00
Carlos Jimenez Ruiz 8b97236f22 texfield no longer performs queries 2021-02-09 12:53:40 +01:00
Carlos Jimenez Ruiz 83ed70abda Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType 2021-02-09 10:43:26 +01:00
Carlos Jimenez Ruiz 3d948ef317 warning color added lines with clientType loses 2021-02-09 10:43:19 +01:00
Joan Sanchez c092bf58b4 Import buys 2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz a62bebd51e minor refactor 2021-02-08 10:14:41 +01:00
Jorge Padawan 1adaeca615 Added controller with sql 2021-02-08 08:41:26 +01:00
Joan Sanchez 411053bbec Merge branch 'dev' into 2752-entry_import_buys 2021-02-05 16:51:50 +00:00
Carlos Jimenez Ruiz 5ce8d8eb8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2737-supplier_basic_data_worker 2021-02-05 15:26:54 +01:00
Carlos Jimenez Ruiz 76d6e2d4b7 worker added to supplier basic data and summary 2021-02-05 15:26:49 +01:00
Jorge Padawan c3109c142a Line breaks have been put for better understanding 2021-02-05 13:11:18 +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 3f4e102860 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-02-05 12:18:32 +01:00
Joan Sanchez 2c9fd45958 2778 - Allow edit order number 2021-02-05 12:09:48 +01:00
Joan Sanchez 4fb466d8b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys 2021-02-05 08:41:30 +01:00
Joan Sanchez 3dd8ff5194 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-02-05 08:28:32 +01:00
Joan Sanchez 5bd7e4a67f Translation fix 2021-02-05 08:05:57 +01:00
Joan Sanchez f041e0d897 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-02-04 18:44:25 +01:00
Joan Sanchez 84cef1949b Image size fix 2021-02-04 18:28:58 +01:00
Carlos Jimenez Ruiz f1704f94f1 invoiceOut advanced search by fiscal id 2021-02-04 13:43:21 +01:00
Carlos Jimenez Ruiz a9b0a5c2bd order fixed 2021-02-04 10:04:16 +01:00
Carlos Jimenez Ruiz 532cb582cf columns moved and no refresh on stateState changes 2021-02-03 17:01:43 +01:00
Joan Sanchez 215e0c9fc4 Image download fix for images without extension 2021-02-03 15:01:09 +01:00
Joan Sanchez a845f53f0a Bug fixes 2021-02-03 12:43:30 +01:00
Carlos Jimenez Ruiz ff94b182a1 error is not a required field 2021-02-03 10:16:46 +01:00
Joan Sanchez 38311f526d Calculate volume 2021-02-03 09:03:03 +01:00
Carlos Jimenez Ruiz dd9e9bac9b removed unused character 2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz a77c5c5b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz a0d6e53dbb polutd test removed 2021-02-02 14:00:35 +01:00
Jorge Padawan 186e59c7ae . 2021-02-02 13:18:17 +01:00
Jorge Padawan b57578f933 Remove parenthesis on expectedParams 2021-02-02 13:12:54 +01:00
Jorge Padawan b576c0ad69 Remove parenthesis on expectedParams 2021-02-02 13:11:17 +01:00
Jorge Padawan 1a87eb3085 Remove bad code 2021-02-02 12:52:24 +01:00
Jorge Padawan 218a19d7da Removed bad code 2021-02-02 12:37:00 +01:00
Jorge Padawan c7424997d5 Removed bad code 2021-02-02 12:22:18 +01:00
Jorge Padawan ee6b694637 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-02-02 11:58:07 +01:00
Jorge Padawan a1a3607d3c Remove bad code 2021-02-02 11:57:42 +01:00
Jorge Padawan 6fed5a21b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 11:50:09 +01:00
Jorge Padawan a2e78a8f25 Merge branch '2617-add_scope_days_on_travel_index' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 11:49:53 +01:00
Jorge Padawan 60015178a6 Remove bad code 2021-02-02 11:49:42 +01:00
Joan Sanchez f6af7f14af Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev
Reviewed-on: #523
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-02-02 10:06:22 +00:00
Carlos Jimenez Ruiz 6a2c131593 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 10:59:59 +01:00
Jorge Padawan f0f96f1ab5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 10:27:52 +01:00
Jorge Padawan db5e786235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-02-02 10:26:27 +01:00
Jorge Padawan 7b7571ae77 Fixed problems with default search 2021-02-02 10:26:10 +01:00
Jorge Padawan 9d96a4a6a1 Fixed problems test e2e 2021-02-02 10:17:13 +01:00
Joan Sanchez dea858c314 Removed focus 2021-02-02 10:12:37 +01:00
Joan Sanchez 524d1274c9 Merge branch 'dev' into 2762-worker_delete_entry 2021-02-02 09:11:48 +00:00
Joan Sanchez a21d8acde6 2762 - Delete entry ass teamBoss 2021-02-02 10:07:13 +01:00
Joan Sanchez 3f4ebdebf6 Merge branch 'dev' into 2723-Format_emails_for_summaries 2021-02-02 08:22:34 +00:00
Joan Sanchez 20116ac620 2741 - Claim detail deletion visual fix 2021-02-02 09:08:11 +01:00
Jorge Padawan 94897a830a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-02 08:48:03 +01:00
Jorge Padawan e1db173185 Changed scope days value to a correct sentence 2021-02-01 13:29:12 +01:00
Jorge Padawan 6bba5ec126 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index 2021-02-01 13:21:16 +01:00
Jorge Padawan 3f963f2d99 changed message 2021-02-01 13:19:26 +01:00
Jorge Padawan 4f644cb708 Changed name of value on scope days test 2021-02-01 13:13:18 +01:00
Jorge Padawan 811edc054b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-02-01 13:09:47 +01:00
Joan Sanchez 4ac207c568 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue 2021-02-01 12:58:50 +01:00
Javi Gallego a08c5c6ff7 error de ruta arreglado 2021-02-01 10:51:17 +01:00
Carlos Jimenez Ruiz 17c784e06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-02-01 09:52:42 +01:00
Joan Sanchez f5f4c5936d 2763 - Notify urgen issues 2021-02-01 09:29:47 +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
Jorge Padawan b600c18950 Add scope days on travel 2021-01-29 11:45:35 +01:00
Joan Sanchez f66a5ecfdc 2748 - Added module keybinds 2021-01-29 09:46:57 +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
Jorge Padawan 81f5192d08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-29 08:55:17 +01:00
Carlos Jimenez Ruiz 5d82d469a7 Merge branch 'dev' into 2580-fetched_tags_refactor 2021-01-28 16:04:37 +00:00
Jorge Padawan 69e8dfc334 Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 16:10:23 +01:00
Joan Sanchez 7bcbf5303e Fix where 2021-01-28 16:08:57 +01:00
Joan Sanchez 9d5d2e9177 Added method prune again 2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz 4ab42e5850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor 2021-01-28 15:10:54 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Jorge Padawan 797f96f4c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-28 14:14:22 +01:00
Jorge Padawan bef8fca529 Rework the test on main section 2021-01-28 14:14:14 +01:00
Joan Sanchez ca47fe6827 2476 - downloadImages() method refactor 2021-01-28 12:23:18 +01:00
Javi Gallego 4b302915b5 fallo validateasync 2021-01-27 09:14:37 +01:00
Bernat Exposito df073094f8 fix test updateVolume 2021-01-26 09:07:00 +01:00
Joan Sanchez 8c71d76988 2752 - Import json file 2021-01-26 07:21:05 +01:00
Javi Gallego 3026ca8d69 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-25 14:16:41 +01:00
Jorge Padawan 2b4f4cf8f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries 2021-01-25 11:04:45 +01:00
Jorge Padawan 6d9967ba9f Add list of emails from client 2021-01-25 10:59:24 +01:00
Carlos Jimenez Ruiz 3f12bfe8ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2745-ticket_descriptor_regenerate_invoice_e2e 2021-01-25 09:28:07 +01:00
Carlos Jimenez Ruiz fb798f4300 regenerate invoice added to descriptor path 2021-01-25 09:28:01 +01:00
Javi Gallego d61ab94398 acl conflicto 2021-01-25 07:49:57 +01:00
Joan Sanchez 7bd89009cb Requested changes 2021-01-25 07:26:35 +01:00
Joan Sanchez 257b61d256 Requested changes 2021-01-25 07:25:02 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-22 15:05:39 +00: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
Javi Gallego 228a642634 Merge branch 'dev' into 2479-factura-ticket 2021-01-22 14:31:28 +01:00
Javi Gallego 7bdfb36f25 minor refactor 2021-01-22 14:30:46 +01:00
Joan Sanchez 4d1c2ff8ee Requested changed 2021-01-22 12:57:21 +01:00
Joan Sanchez d26505d25e Requested changed 2021-01-22 12:56:46 +01:00
Carlos Jimenez Ruiz 9a349e789c added missin icon property to fixedPrice route 2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz 293dbb3948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component 2021-01-22 12:14:19 +01:00
Carlos Jimenez Ruiz 5ea222dc00 fixed translations 2021-01-22 12:02:03 +01:00
Carlos Jimenez Ruiz c3ac7b671f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-22 11:32:35 +01:00
Carlos Jimenez Ruiz 4bf6051e73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-22 10:19:39 +01:00
Joan Sanchez ad7be8f9b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-22 07:27:51 +01:00
Joan Sanchez 1c7325c1c0 2739 - Invoice fix 2021-01-22 07:26:29 +01:00
Bernat Exposito b25ef7016a cr changes 2021-01-21 18:42:40 +01:00
Javi Gallego aab9797d3f Merge branch 'dev' into 2479-factura-ticket 2021-01-21 13:40:55 +01:00
Javi Gallego 3dc50e8a16 test ok 2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz 0cf3f198ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-21 11:50:32 +01:00
Jorge Padawan 05d6484a33 Add message if BIC already exist 2021-01-21 10:48:25 +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
Bernat Exposito 81c14a649b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-01-21 09:46:22 +01:00
Bernat Exposito 678ee0644d delete order by in entry index 2021-01-21 09:45:18 +01:00
Joan Sanchez 5e4c320310 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component 2021-01-21 09:26:02 +01:00
Bernat Exposito eda65c14c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2717-order_index 2021-01-21 08:48:24 +01:00
Carlos Jimenez Ruiz 17b7ffeec3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-20 16:04:13 +01:00
Carlos Jimenez Ruiz 2f5eaf7318 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-20 14:51:37 +01:00
Jorge Padawan e205ebba72 Added main spec and fixed line on search-panel spec 2021-01-20 14:49:06 +01:00
Carlos Jimenez Ruiz 01191b3f0f excluded faling tests for future fixing 2021-01-20 14:43:20 +01:00
Carlos Jimenez Ruiz fcf60ac297 excluded failing test for future fixing 2021-01-20 14:40:32 +01:00
Carlos Jimenez Ruiz fe04f00c28 fixed unit test for upsertFixedPrice 2021-01-20 14:39:23 +01:00
Jorge Padawan d8c4fa1e22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-20 14:37:29 +01:00
Joan Sanchez 6451d9d511 Merge branch 'dev' into 2677-rating_component 2021-01-20 13:03:33 +00:00
Joan Sanchez 5df35ea8e9 Removed unused code 2021-01-20 14:01:57 +01:00
Joan Sanchez f125f7c80d Changed weekly translation 2021-01-20 13:57:48 +01:00
Javi Gallego 4cdbb85e30 primer comit 2021-01-20 13:53:49 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog 2021-01-20 13:51:30 +01:00
Jorge Padawan 0183f956d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2 2021-01-20 13:23:40 +01:00
Jorge Padawan 91979f5d69 Add scopeDays to search bar on route 2021-01-20 13:19:28 +01:00
Bernat Exposito 0f17fca0a1 pr order by changes 2021-01-20 11:42:45 +01:00
Bernat Exposito c1202789dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-01-20 11:31:06 +01:00
Bernat Exposito a3d4f674c6 order index changes 2021-01-20 11:28:15 +01:00
Carlos Jimenez Ruiz 843608c47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-20 09:17:55 +01:00
Joan Sanchez 3a2db713e0 Removed unused $httpBackend 2021-01-20 07:38:09 +01:00
Carlos Jimenez Ruiz 7ec1e4272a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-19 20:56:40 +01:00
Carlos Jimenez Ruiz f946e63a86 e2e path for item fixed price 2021-01-19 20:56:33 +01:00
Carlos Jimenez Ruiz fc0f9730da Merge branch 'dev' into 1823-catalog_no_refresh 2021-01-19 14:13:38 +00:00
Joan Sanchez bbfb230427 Removed clog 2021-01-19 14:30:06 +01:00
Joan Sanchez 9935f7f4ee Updated unit test 2021-01-19 14:27:58 +01:00
Joan Sanchez 6d35a4a160 1823 - Added independent order object from card 2021-01-19 13:57:04 +01:00
Bernat Exposito e9f408d5ba delete comments 2021-01-19 13:44:14 +01:00
Carlos Jimenez Ruiz 4f7c2f3afd added placeholder and fixed css 2021-01-19 13:30:07 +01:00
Joan Sanchez dfbf114161 Merge branch 'dev' into 2708-travel_extracommunity 2021-01-19 12:10:06 +00:00
Joan Sanchez 8c8891f8e3 Requested changes 2021-01-19 13:06:10 +01:00
Bernat Exposito 426249f9bf entry index changes 2021-01-19 12:50:11 +01:00
Carlos Jimenez Ruiz e859a1b837 removed incorrect icon 2021-01-19 11:14:43 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-19 10:20:45 +01:00
Joan Sanchez b99ac2c9d5 Merge branch 'dev' into 2678-Delete_description_on_travel_thermograph 2021-01-19 08:51:38 +00:00
Javi Gallego 49b0bca721 refactor autocomplete 2021-01-19 09:27:15 +01:00
Jorge Padawan aea07832b1 Delete description from thermograph create 2021-01-19 09:24:37 +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 52a1e3f652 fixed price controller tests 2021-01-18 16:32:54 +01:00
Carlos Jimenez Ruiz 3ec641f733 filter unit tests 2021-01-18 15:42:38 +01:00
Joan Sanchez d6ac9dba4c Updated e2e 2021-01-18 14:53:15 +01:00
Joan Sanchez 895fd4c9e8 Updated unit test 2021-01-18 14:22:27 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz 3251d737e6 fixed price index implementation 2021-01-18 14:16:39 +01:00
Joan Sanchez b142d5800e Merge branch 'dev' into 2724-ticket_service_fix 2021-01-18 11:24:11 +00:00
Jorge Benedito 622c43f4a0 Merge branch 'dev' into 2721-Add_column_stem_multiplier 2021-01-18 10:53:49 +00:00
Jorge Padawan 97c8faaf50 Add column multiplier on item section 2021-01-18 11:43:48 +01:00
Joan Sanchez 239e64db48 Updated unit test 2021-01-18 09:08:50 +01:00
Joan Sanchez 783a8dee48 2724 - Fix: Create new service type 2021-01-18 08:55:57 +01:00
Joan Sanchez ddf5993277 2708 - Added report 2021-01-18 08:33:20 +01:00
Bernat Exposito 7da3aad2de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2602-entry_index_searchBar 2021-01-18 08:19:20 +01:00
Bernat Exposito 25535576c5 pr changes resolved 2021-01-18 08:19:17 +01:00
Jorge Padawan fe6124b691 Put log in the section 2021-01-15 13:57:36 +01:00
Jorge Padawan 51627af395 Fixed open popup 2021-01-15 13:13:51 +01:00
Jorge Padawan c5ace0a939 create the tests fields for create Account section 2021-01-15 11:24:32 +01:00
Jorge Padawan daa8bafb09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-15 08:56:20 +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
Bernat Exposito a45a76018b entry search panel changes 2021-01-14 09:26:50 +01:00
Joan Sanchez 33289b3ac1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-01-13 11:18:02 +01:00
Joan Sanchez 5059abca80 Dms edit hotfix 2021-01-13 10:40:51 +01:00
Joan Sanchez 7bcad01bef Disabled loggable 2021-01-12 14:25:47 +01:00
Joan Sanchez dd29b351d2 Disabled loggable 2021-01-12 14:25:01 +01:00
Jorge Padawan 6bc7602d53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:10:05 +01:00
Jorge Padawan 4e1b9b911b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section 2021-01-12 11:05:35 +01:00
Jorge Padawan 1a4c631c70 Fix for good practique code 2021-01-12 11:00:42 +01:00
Jorge Padawan b4899fc0ff Fix for good practique code 2021-01-12 10:17:12 +01:00
Jorge Padawan 9ca2e677bd Fix for good practique code 2021-01-12 10:15:33 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code 2021-01-12 10:11:37 +01:00
Jorge Padawan 809811ea10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries 2021-01-12 07:40:10 +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
Joan Sanchez 7568a1c066 Updated unit tests 2021-01-11 14:54:24 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Bernat Exposito 5f1cdc790a Merge branch '2609-travel_index_addEntry' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-11 10:20:59 +01:00
Joan Sanchez 035bdfb1ad Rounded box 2021-01-11 10:08:33 +01:00
Bernat Exposito 0e0ce9f3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-11 09:44:20 +01:00
Joan Sanchez ffdc753ad4 2691 - Added "or" between date ranges and scope days 2021-01-11 08:48:53 +01:00
Javi Gallego ea6e234cde minor fixes 2021-01-11 08:01:57 +01:00
Jorge Padawan b8827ec63d Fix problems with ACL and the autocomplete of bank entity 2021-01-08 16:45:20 +01:00
Jorge Padawan 403964934d Change order of iban and entity name 2021-01-08 16:01:13 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-08 15:24:05 +01:00
Javi Gallego a9ec319d4f test 2021-01-08 15:22:41 +01:00
Joan Sanchez f8ba2534cc 2691 - Scope days changes 2021-01-08 14:32:48 +01:00
Jorge Padawan 5e201419f8 Second step, add component bankEntity 2021-01-08 10:46:50 +01:00
Joan Sanchez 1cc2710231 Fixes 2021-01-08 10:16:38 +01:00
Jorge Padawan 344840d2c9 First step add-button-edit-summaries 2021-01-08 08:43:28 +01:00
Jorge Padawan 31f18db72d first step bankEntity 2021-01-07 15:14:50 +01:00
Jorge Padawan 6017894ba9 first step bankEntity 2021-01-07 15:14:38 +01:00
Joan Sanchez 88b2041fde Changed order 2021-01-07 14:33:42 +01:00
Joan Sanchez 7172d6bcd1 Merge branch 'dev' into 2609-travel_index_addEntry 2021-01-07 13:32:37 +00:00
Joan Sanchez 56925be41f 2708 - Extra community changes 2021-01-07 14:21:17 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2021-01-07 09:11:34 +01:00
Joan Sanchez c454273405 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-06 12:44:28 +01:00
Joan Sanchez e5b13267e2 2605 - Ticket request send chat notification 2021-01-05 15:03:35 +01:00
Joan Sanchez 94c8c115e5 Font hotfix 2021-01-05 13:51:17 +01:00
Joan Sanchez 062e1514c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2021-01-04 13:50:55 +01:00
Javi Gallego 1291fc4b6c acl 2021-01-04 11:49:32 +01:00
Bernat Exposito ccfeea8e74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry 2021-01-04 10:55:53 +01:00
Bernat Exposito f0fb906670 add in travel index, entry create 2021-01-04 10:54:46 +01:00
Carlos Jimenez Ruiz b843914cec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation 2020-12-31 16:13:40 +01:00
Joan Sanchez a521ad4262 Fixed claim basicData back error 2020-12-31 14:18:06 +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
Carlos Jimenez Ruiz 0471855372 Merge branch 'dev' into 2696-geo_autocomplete 2020-12-31 10:02:52 +00:00
Carlos Jimenez Ruiz 5dd7db23ec submit should always be enabled for creation forms 2020-12-31 10:39:37 +01:00
Joan Sanchez 6bbe33433d 2696 - Geo autocompletion fix 2020-12-31 10:30:51 +01:00
Carlos Jimenez Ruiz 3b73e1bee2 supplier updateFiscalData changed to table config 2020-12-31 10:28:35 +01:00
Carlos Jimenez Ruiz 4754d5481b added street arg to updateFiscalData method 2020-12-31 10:13:42 +01:00
Carlos Jimenez Ruiz 92d9435125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-31 09:27:38 +01:00
Jorge Padawan b403899072 modificated value of "order" on client and supplier 2020-12-30 15:39:27 +01:00
Carlos Jimenez Ruiz e356dd9e5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-30 14:55:14 +01:00
Jorge Padawan f2742b88a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2689-add_id_in_typeTransaction_client_and_supplier 2020-12-30 10:49:58 +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 0d5540b639 Merge branch 'dev' into 2517-clientBalanceCompensaciones 2020-12-29 17:00:45 +01:00
Javi Gallego 3db3d65600 test 2020-12-29 17:00:22 +01:00
Joan Sanchez c2d50c6044 Dup entry error handler 2020-12-29 14:02:26 +01:00
Joan Sanchez a3f17ae302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries 2020-12-29 13:55:06 +01:00
Joan Sanchez 2886e02328 Enabled loggable for locations 2020-12-29 08:50:12 +01:00
Joan Sanchez f4ff31a294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log 2020-12-29 08:09:49 +01:00
Joan Sanchez f29840b37b Buyer ACL 2020-12-29 07:52:36 +01:00
Carlos Jimenez Ruiz 4a60e1da1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation 2020-12-28 15:36:35 +01:00
Joan Sanchez 910caf5689 2661 - Added clone options 2020-12-28 14:53:26 +01:00
Jorge Padawan 5af51763d6 Created back test field for entryObservation 2020-12-28 12:55:28 +01:00
Carlos Jimenez Ruiz e6106b1aa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone 2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz 8ede30398b clone feature for routes index 2020-12-24 11:31:20 +01:00
Joan Sanchez c192a0e125 Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-12-24 08:59:33 +00:00
Jorge Padawan 259842c22d Retirado el parametro required por no utilizarse 2020-12-23 13:32:58 +01:00
Joan Sanchez 87f9a39e50 Merge branch 'dev' into 2666-closure_invalid_email 2020-12-23 12:29:36 +00:00
Bernat Exposito a21476e3df fix searchbar index 2020-12-23 12:42:41 +01:00
Jorge Padawan 2948747da3 Seccion nueva, "Note" mas campo entryObservation 2020-12-23 12:25:12 +01:00
Juan Ferrer d064bc0417 Merge branch 'master' into test 2020-12-23 00:00:38 +01:00
Joan Sanchez 6416b0ad79 2666 - Closure invalid email notification 2020-12-22 14:56:21 +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
Carlos Jimenez Ruiz be1a317df8 Merge branch 'dev' into 2663-route_dragdrop 2020-12-21 14:02:05 +00:00
Joan Sanchez 35dc2a533b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop 2020-12-21 14:52:08 +01:00
Joan Sanchez 1419acb8a7 2663 - Drag & drop ticket to route index 2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz ec0ae8f07c years previous to contrar error corrected 2020-12-21 13:52:37 +01:00
Carlos Jimenez Ruiz 482cbd7195 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor 2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz 369a79b79f route.tickets refactor 2020-12-21 12:37:36 +01:00
Carlos Jimenez Ruiz ffc9b8dba9 Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev
Reviewed-on: #470
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-21 09:55:45 +00:00