Commit Graph

903 Commits

Author SHA1 Message Date
Bernat Exposito Domenech a523030c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2388_export-structure 2020-08-12 14:22:55 +02:00
Bernat Exposito Domenech 1e56619c33 export structure and fix test 2020-08-12 13:07:58 +02:00
Joan Sanchez 1486cbb4e7 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 12:00:46 +02:00
Joan Sanchez de9d1268b7 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 11:38:39 +02:00
Joan Sanchez b0df4973e9 2384 - Searchbar filters fixed
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 08:26:00 +02:00
Carlos Jimenez Ruiz 85b3b52e39 took a while to confirm this one
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:54:45 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz e126350079 scroll removed as it comes from layaout 2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Bernat Exposito Domenech 8c926a1a7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable 2020-07-16 13:20:41 +02:00
Bernat Exposito Domenech 064b950773 export production
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech ab8d2be1ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-09 14:14:57 +02:00
Joan Sanchez 3a8d5c192c HOTFIX: Pagination limit
gitea/salix/pipeline/head This commit looks good Details
2020-07-09 12:49:07 +02:00
Bernat Exposito Domenech c31825331d refactor loggable 2020-07-09 11:45:38 +02:00
Carlos Jimenez Ruiz 36f4998e75 e2e nad canCreateTicket unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-02 09:35:52 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez 322085ffd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-18 13:15:45 +02:00
Joan Sanchez 7c45858764 Sms dialog fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 12:59:37 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 15:11:24 +02:00
Javi Gallego 9e62fd78a2 hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:57:18 +02:00
Javi Gallego 552828a1ba hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:47:01 +02:00
Joan Sanchez 279677bda9 Removed report from descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-15 09:07:13 +02:00
Joan Sanchez ed83fd5f73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption 2020-06-15 09:00:24 +02:00
Bernat Exposito e335775cdb Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:24:23 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 48034b234f 2325 - Search address
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 10:53:33 +02:00
Joan Sanchez cba5fb01a6 Removed onused styles
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:28:44 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech f9025bef98 delete test
gitea/salix/pipeline/head This commit looks good Details
2020-06-11 10:37:40 +02:00
Bernat Exposito Domenech 061dceb2b0 test client hook 2020-06-11 08:46:03 +02:00
Joan Sanchez 5fbcb5c439 2290 - Client consumption
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-10 13:35:41 +02:00
Bernat Exposito Domenech d2aca11e16 log web access, create hook in client
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-10 12:09:27 +02:00
Bernat Exposito Domenech ee58aebe16 first step, client hook
gitea/salix/pipeline/head This commit looks good Details
2020-06-10 09:26:51 +02:00
Joan Sanchez 7d53f274de Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-08 14:08:56 +00:00
Bernat Exposito Domenech cc569769b0 fix client balance
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 12:48:23 +02:00
Joan Sanchez 181f2f0148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures Details
2020-06-08 08:19:18 +02:00
Bernat Exposito Domenech 56c9b08101 fix show.descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-08 07:52:23 +02:00
Joan Sanchez 696de03ad1 Changed translation
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 13:42:36 +02:00
Joan Sanchez b7ceeae65a Excluded back unit tests. TLS error
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-03 11:27:14 +02:00
Joan Sanchez 1926f90f4b Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-02 07:47:50 +00:00
Joan Sanchez 90ae1562dd Added filters
gitea/salix/pipeline/head This commit looks good Details
2020-05-29 11:10:58 +02:00
Carlos Jimenez Ruiz 9bf509cd5d customs agent e2e path + small fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 09:54:31 +02:00
Joan Sanchez 0fe78a2b8f 2176 - Added contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-05-28 08:07:26 +02:00
Bernat Exposito Domenech e7fc70a4b4 add column in ticket split
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:43:53 +02:00
Joan Sanchez 2af39d4b67 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 07:43:24 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Joan Sanchez d082f5d6c2 2225 Prevent location override
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 11:14:34 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Juan Ferrer e7cf060e12 Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02:00
Joan Sanchez 6c49fc9b1c Merge pull request 'client descriptor add risk' (#257) from 2250-client_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-05-19 06:26:17 +00:00
Bernat Exposito Domenech f9bc1406e2 delete css
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:14:44 +02:00
Bernat Exposito Domenech b953fa8773 client descriptor add risk
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 11:50:55 +02:00
Joan Sanchez a3203fa81f 2216 Show active client icon on client index
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 10:39:40 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Javi Gallego dbb2257430 test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good Details
2020-04-20 13:49:33 +02:00
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Juan Ferrer eb586c510e E2E focus fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-04-01 16:05:43 +02:00
Juan Ferrer d6fda676f6 E2E fixes: Client balance
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-31 10:19:01 +02:00
Juan Ferrer dfb9d32c2a Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-30 17:30:03 +02:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez 3d23583e0b Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 14:08:04 +01:00
Joan Sanchez 934e057a67 Fixed watcher changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 09:41:23 +01:00
Joan Sanchez f25c8bb644 Ticket refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 08:35:59 +01:00
Joan Sanchez 88fe9a006e Item refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:43:46 +01:00
Joan Sanchez 381f2a08ef Client refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 11:17:50 +01:00
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Carlos Jimenez Ruiz 8688ecc810 eliminado el campo id en advanced search
gitea/salix/pipeline/head This commit looks good Details
2020-03-10 07:38:21 +01:00
Joan Sanchez d173ab6a2b 2171 - Mostrar botón "Pago a cuenta" en índice de tickets
gitea/salix/pipeline/head This commit looks good Details
2020-03-09 11:50:23 +01:00
Joan Sanchez 64f74b4f33 Merge branch '2111-route_drag_drop' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit has test failures Details
2020-03-08 12:45:44 +00:00
Joan Sanchez 3c41c4656b 2111 - Drop tickets to route ticket list
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 13:06:01 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-06 11:19:26 +00:00
Bernat Exposito Domenech da6b3bc5c8 fix test
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 12:01:42 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-05 13:56:45 +01:00
Joan Sanchez f168734b8c Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 13:54:17 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-04 12:15:41 +00:00
Joan Sanchez 5da1c41476 Added ACL
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 12:51:29 +01:00
Joan Sanchez 24becf7872 Updated var names
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 11:17:35 +01:00
Joan Sanchez df3fbf291b Changed format
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:32:18 +01:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:26:12 +01:00
Joan Sanchez 15bedc5f12 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-03-03 15:03:54 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Bernat Exposito Domenech 1d98c44c3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-02 09:51:05 +01:00
Joan Sanchez 04917f980f Updated E2E
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech bd46f6a302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor 2020-03-02 09:28:43 +01:00
Joan Sanchez 5ccc79df8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 08:07:14 +01:00
Joan Sanchez 28b7f5d3a2 2151 - Added thermograph edit section
gitea/salix/pipeline/head This commit has test failures Details
2020-02-28 14:18:55 +01:00
Joan Sanchez 94ebb7fbd2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 13:48:09 +01:00
Joan Sanchez 6dcfc34056 Fix - Find duplicated client
gitea/salix/master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2020-02-27 13:33:40 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable
gitea/salix/2092-ticket_isEditable_refactor This commit looks good Details
2020-02-27 12:31:38 +01:00
Joan Sanchez c920f0bc91 Requested changes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-27 11:21:11 +01:00
Joan Sanchez 893b634d33 Get phone from address and client 2020-02-27 11:18:59 +01:00
Joan Sanchez a86c7c9b8a updated unit tests
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-27 08:08:31 +01:00
Joan Sanchez 21ace6ef4e Merge branch '2131_jest_spyOn' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-27 06:56:43 +00:00
Joan Sanchez 21be73b734 2127 - Disable preview on sepa core sample 2020-02-27 07:40:43 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-26 15:02:47 +01:00
Joan Sanchez 1d326a52c8 updated unit tests
gitea/salix/2127-sample_disable_preview This commit looks good Details
2020-02-26 14:45:47 +01:00
Joan Sanchez d66c53dbf2 2127 - Disable preview on sepa core sample
gitea/salix/2127-sample_disable_preview There was a failure building this commit Details
2020-02-26 14:30:30 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech b37e8da410 fix test
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 10:39:21 +01:00
Bernat Exposito Domenech e7cdc58fad translates
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-25 07:51:16 +01:00
Joan Sanchez 3643709a80 Added datalist auto completion
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-24 11:27:36 +01:00
Bernat Exposito Domenech 0a4adedcdb client descriptor translates 2020-02-24 09:47:26 +01:00
Joan Sanchez 7b57d79f50 Create client geo auto fill
gitea/salix/2034-postcode_autocomplete There was a failure building this commit Details
2020-02-21 12:39:41 +01:00
Joan Sanchez 2dbde24a99 Requested changes
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 09:00:13 +01:00
Joan Sanchez bf4e0d09c5 Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 08:37:37 +01:00
Joan Sanchez 2460725d98 Refactor + updated tests
gitea/salix/2110-client_sample_validation This commit looks good Details
2020-02-18 11:14:02 +01:00
Joan Sanchez 578556b1d5 2121 - Client balance fix balance on pagination
gitea/salix/2121-client_balance_fix This commit looks good Details
2020-02-17 08:38:19 +01:00
Joan Sanchez 84bf95db13 2106 - Sms max length fix
gitea/salix/2106-sms_send_with_dots This commit looks good Details
2020-02-14 12:01:17 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Bernat Exposito Domenech 5375952778 translate
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:52:05 +01:00
Bernat Exposito Domenech 1d73d9f89d refactor campaing report
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:25:41 +01:00
Bernat Exposito Domenech f6674448f8 ticket/client.sms validations
gitea/salix/2090-sms.validations This commit looks good Details
2020-02-10 13:22:43 +01:00
Joan Sanchez f86d3a0052 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 13:23:02 +01:00
Joan Sanchez 041c4966d6 changed line
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 12:29:04 +01:00
Joan Sanchez 494b14bab4 added translation 2020-02-04 12:28:01 +01:00
Joan Sanchez 5b0bb5dc73 updated e2e
gitea/salix/1959-client_fiscal_data_check_phone This commit looks good Details
2020-02-04 11:25:15 +01:00
Bernat Exposito Domenech 668f20c433 update lastActiveTickets 2020-02-03 11:12:04 +01:00
Joan Sanchez b743938fee merge
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit Details
2020-01-31 08:18:54 +01:00
Joan Sanchez 1be640a59d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-29 14:51:37 +01:00
Joan Sanchez 499bd082fc changed messages
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:13:25 +01:00
Joan Sanchez 5ebe800c5f html fix
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2020-01-29 13:41:55 +01:00
Joan Sanchez b0ec7ce15b updated e2e
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-28 11:56:26 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech b244df4807 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-24 12:56:01 +01:00
Joan Sanchez 2eeab485e3 Merge dev
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-24 09:48:59 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-23 14:59:37 +01:00
Joan Sanchez 57acca2f5e refactor & updated tests
gitea/salix/2018-deprecate_message_send This commit looks good Details
2020-01-23 13:31:07 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito Domenech 8ae5a8705e fix test
gitea/salix/2010-worker_phone_refactor This commit looks good Details
2020-01-20 11:17:04 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor
gitea/salix/2011-client_phone This commit looks good Details
2020-01-17 07:24:57 +01:00
Bernat Exposito Domenech ba2300288f sendSms test
gitea/salix/1998-client_sms This commit looks good Details
2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech b42b2ec8c3 refactor sms send
gitea/salix/1998-client_sms Something is wrong with the build of this commit Details
2020-01-15 13:27:14 +01:00
Joan Sanchez 8f449566bb Merge branch '2000-client.sms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-15 08:20:40 +00:00
Bernat Exposito Domenech 1f60aac446 export structure db
gitea/salix/1999-travel_basicData This commit looks good Details
2020-01-15 08:19:22 +01:00
Bernat Exposito Domenech cbda081608 refactor sms component
gitea/salix/2000-client.sms This commit looks good Details
2020-01-14 09:10:54 +01:00
Joan Sanchez 5cf8328476 added more rows to sms textarea
gitea/salix/1975-delivery_note_tags There was a failure building this commit Details
2020-01-09 13:58:50 +01:00
Bernat Exposito Domenech 5511ef2537 client address index
gitea/salix/1983-client_address There was a failure building this commit Details
2020-01-09 12:39:03 +01:00
Bernat Exposito Domenech d432c32577 export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good Details
2020-01-09 10:49:09 +01:00
Bernat Exposito Domenech 36108038df refactor sintaxis 2020-01-08 11:00:50 +01:00
Bernat Exposito Domenech 8b0fd79f15 claim.details isEditable
gitea/salix/1575-claim_details_discountError This commit looks good Details
2020-01-07 13:03:45 +01:00
Bernat Exposito Domenech 8d01cd38c2 refactor client.balance
gitea/salix/1971-frontTest_client.balance This commit looks good Details
2020-01-03 12:48:06 +01:00
Bernat Exposito Domenech b6353f1b5c test client.balance
gitea/salix/1971-frontTest_client.balance There was a failure building this commit Details
2020-01-03 12:29:13 +01:00
Bernat Exposito Domenech b1c23dfca4 delete console.log
gitea/salix/1964-client_balance This commit looks good Details
2020-01-02 15:07:25 +01:00
Bernat Exposito Domenech 68f437071f refactor client.balance
gitea/salix/1964-client_balance This commit looks good Details
2020-01-02 14:44:51 +01:00
Joan Sanchez b471f51482 refactor
gitea/salix/1959-client_fiscal_data_check_phone There was a failure building this commit Details
2019-12-31 10:38:19 +01:00
Bernat Exposito Domenech 0a37f3a1b2 update index filter
gitea/salix/1955-client_index This commit looks good Details
2019-12-26 08:20:16 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good Details
2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good Details
2019-12-20 13:51:04 +01:00
Joan Sanchez 472352e24c Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-20 10:05:38 +00:00
Joan Sanchez 61b9646f5b Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit Details
2019-12-19 14:55:09 +01:00
Joan Sanchez aa809eea8a trigger build
gitea/salix/master This commit looks good Details
2019-12-19 14:21:18 +01:00
Joan Sanchez 8a54da6fd3 fixed dms links 2019-12-19 14:13:24 +01:00
Joan Sanchez a1c6c0ab39 claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-19 11:37:53 +01:00
Bernat Exposito Domenech aab970e667 client.phone section
gitea/salix/1928-client_phone This commit looks good Details
2019-12-17 09:11:28 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one
gitea/salix/1926-delete_bs This commit has test failures Details
2019-12-16 08:48:12 +01:00
Joan Sanchez 676b5198a8 changed discount popover width + refresh discount
gitea/salix/1921-claim_detail_discount This commit looks good Details
2019-12-13 08:01:13 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good Details
2019-12-12 09:46:29 +01:00
Carlos Jimenez Ruiz 4d493c3572 Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-12-12 07:25:22 +00:00
Bernat da2503d4b8 fix test
gitea/salix/1904%2FupgradeStructureDb This commit looks good Details
2019-12-04 11:18:26 +01:00
Javi Gallego 3c36526f12 E2E fix for windows plus refactors 2019-11-28 12:54:34 +01:00
Joan Sanchez 3c144ea0cd transaction changes
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 13:46:38 +01:00
Joan Sanchez 27cab0e722 added sms option to client descriptor
gitea/salix/1875-send-sms-dialog This commit looks good Details
2019-11-21 14:00:27 +01:00
Joan Sanchez 6e5f460fab #1867 show warehouses on summary
gitea/salix/dev This commit looks good Details
2019-11-15 07:35:51 +01:00
Juan Ferrer 4436acec10 Merge 2019-11-14 14:07:48 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-13 08:09:54 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-11-12 11:13:20 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good Details
2019-11-12 08:51:50 +01:00
Joan Sanchez 5b2e407870 dialog styles
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 12:26:22 +01:00
Joan Sanchez 115156f89d updated unit tests
gitea/salix/1466-print_refactor This commit has test failures Details
2019-11-11 11:23:39 +01:00
Joan Sanchez 0838540789 template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-11 11:04:49 +01:00
Juan Ferrer bee50a6b03 Front tests passed 2019-11-10 13:10:52 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +01:00
Joan Sanchez 3cd92211a1 test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 10:55:04 +01:00
Joan Sanchez 3d701f534a updated tests
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-06 09:32:54 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 08:20:45 +01:00
Joan Sanchez cac8cb6a6a dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-05 09:16:16 +01:00
Joan Sanchez 14cb32d1c8 updated reports
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-04 13:55:20 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Juan Ferrer 0a4a22ec87 vnInputFile fixed
gitea/salix/dev This commit looks good Details
2019-10-28 21:40:24 +01:00
Juan Ferrer 1b2c383502 vnDialog opens in body, nightmare extensions with detailed errors 2019-10-28 17:31:33 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Juan Ferrer 5ae558e965 Watchers performance fixes 2019-10-26 12:04:48 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Juan Ferrer 4685b4166b Improved event handling
gitea/salix/dev This commit looks good Details
2019-10-24 10:17:32 +02:00
Joan Sanchez 58a763acf5 added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit Details
2019-10-21 14:21:52 +02:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good Details
2019-10-21 08:31:14 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer 17a150370c Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 21:54:13 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Juan Ferrer e1e65e8b2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-16 08:23:16 +02:00
Carlos Jimenez Ruiz b37e308a4b #1811 send.js unit test 2019-10-16 08:01:34 +02:00
Juan Ferrer a2881e5b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 16:19:38 +02:00
Juan Ferrer 3bf44d08de vnDatePicker refactor 2019-10-15 16:19:35 +02:00
Carlos Jimenez Ruiz 3595524286 #1794 index de balance pierde la companyFk
gitea/salix/dev This commit looks good Details
2019-10-15 13:18:56 +02:00
Carlos Jimenez Ruiz c46797d57e removed third party endpoint test
gitea/salix/dev This commit looks good Details
2019-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz 1086d3d362 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 07:43:51 +02:00
Bernat ed1ed7f50b #1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good Details
2019-10-15 07:23:34 +02:00
Carlos Jimenez Ruiz 5b47eb54b2 #1767 client.balance.index, campo referencia 2019-10-14 15:20:03 +02:00
Joan Sanchez 1f8f5af301 fixed transaction params
gitea/salix/dev Build queued... Details
2019-10-14 11:50:45 +02:00
Carlos Jimenez Ruiz 4a6ff9ca20 removed useless FIXME comments as per #1782
gitea/salix/dev This commit looks good Details
2019-10-14 10:59:10 +02:00
Juan Ferrer a72c12e1c9 Tests passed 2019-10-11 17:38:04 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Juan Ferrer 4f92cafe30 CSS border style classes
gitea/salix/dev This commit has test failures Details
2019-10-06 20:13:24 +02:00
Juan Ferrer c2dcae5577 client.note.index style fixes
gitea/salix/dev This commit has test failures Details
2019-10-05 00:44:25 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Juan Ferrer c6e8498281 ModelProxy.status, Paging removed, locale fixes
gitea/salix/dev This commit looks good Details
2019-10-03 19:34:24 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good Details
2019-10-02 21:02:49 +02:00
Juan Ferrer 87add6cd33 vnDataViewer 2019-10-02 19:24:42 +02:00
Juan Ferrer 34e141e159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-01 16:21:20 +02:00
Juan Ferrer 21992d3e69 Minimal style fixes 2019-10-01 16:21:08 +02:00
Juan Ferrer 76604744d1 Global & client style fixes 2019-10-01 16:17:57 +02:00
Joan Sanchez 1ec2362dbf fiscal name ignore case
gitea/salix/dev This commit looks good Details
2019-10-01 15:12:02 +02:00
Carlos Jimenez Ruiz ae4533c61e #1726 client.index añadir icono de Listado tickets 2019-09-30 13:16:31 +02:00
Carlos Jimenez Ruiz 300dfc5772 #1726 client.index añadir icono de Listado tickets
gitea/salix/dev This commit looks good Details
2019-09-30 11:47:39 +02:00
Bernat 907b4a4991 #1729 client.webPayment mostrar hora
gitea/salix/dev This commit looks good Details
2019-09-27 11:04:27 +02:00
Joan Sanchez a091674f08 allowed numbers on fiscal name
gitea/salix/dev This commit looks good Details
2019-09-24 07:47:06 +02:00
Carlos Jimenez Ruiz 6c1fdb444a removed fdescribe
gitea/salix/dev This commit looks good Details
2019-09-24 07:03:22 +02:00
Joan Sanchez 36d7e514ff Allow spanish characters on socialName #1712 2019-09-23 09:27:58 +02:00
Joan Sanchez 2edfb66423 changed fiscal name translation
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:41:02 +02:00
Joan Sanchez fa549630c4 Bug/Test #1700
gitea/salix/dev This commit has test failures Details
2019-09-19 09:37:02 +02:00
Joan Sanchez 5a4c6bf66f updated back unit tests 2019-09-19 09:17:21 +02:00
Joan Sanchez 73b1f18759 Fixed production errors #1699 2019-09-19 08:58:42 +02:00
Joan Sanchez 86ef44c90d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-09-18 10:35:49 +02:00
Joan Sanchez 031dbcb63a Unlocked from autocomplete city and postcode fields #1703 2019-09-18 10:35:46 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez 8b8463e936 Updated dms colums size #1692
gitea/salix/dev This commit looks good Details
2019-09-12 12:12:39 +02:00
Joan Sanchez 0ed240df0b Server error on change paymethod #1687
gitea/salix/dev There was a failure building this commit Details
2019-09-10 14:12:03 +02:00
Joan Sanchez 197e89ae5a Added fiscal data validate translation
gitea/salix/dev This commit looks good Details
2019-09-09 12:45:09 +02:00
Joan Sanchez 7a1ae9177b Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit Details
2019-09-09 09:05:13 +02:00
Joan Sanchez 176750046a Scroll component #643
gitea/salix/dev This commit looks good Details
2019-09-05 13:06:40 +02:00
Bernat a2228fa15f Tarea #1673 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good Details
2019-09-04 09:06:08 +02:00
Bernat b6edcde589 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-02 09:43:30 +02:00
Bernat 2a21e9d60e #1654 2019-09-02 09:43:22 +02:00
Bernat fb62128a80 Refactor #1652 client.addres.index 2019-09-02 09:25:18 +02:00
Joan Sanchez e2b972431a removed autocompletion on change postal code #1638
gitea/salix/dev This commit looks good Details
2019-09-02 09:11:40 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251
gitea/salix/dev This commit looks good Details
2019-08-09 08:04:44 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Joan Sanchez 3d88d41bd0 fixed fiscal data postcode selection
gitea/salix/dev There was a failure building this commit Details
2019-08-06 12:07:48 +02:00
Joan Sanchez 2c71a983e3 postcode autocompletion fixes
gitea/salix/dev This commit looks good Details
2019-08-02 08:27:55 +02:00
Joan Sanchez efeba38fb4 back errors fixed
gitea/salix/dev There was a failure building this commit Details
2019-08-01 11:52:53 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593
gitea/salix/dev This commit looks good Details
2019-07-30 08:51:38 +02:00
Joan Sanchez 07af2271c2 ticket.weekly Add ticket #1612
gitea/salix/dev This commit looks good Details
2019-07-29 13:12:36 +02:00
Joan Sanchez f4a3b8e9b2 client.create not showing all postcodes, changed autocomplete #1619
gitea/salix/dev This commit looks good Details
2019-07-26 13:05:22 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good Details
2019-07-26 11:48:01 +02:00
Joan Sanchez 970c8ab5ec show dms order number #1601
gitea/salix/dev This commit looks good Details
2019-07-19 08:13:52 +02:00
Joan Sanchez f56423bac9 disabled hasFile checkbox for dms edit forms
gitea/salix/dev This commit looks good Details
2019-07-17 10:55:58 +02:00
Joan Sanchez c51c4383ce fixed unit tests
gitea/salix/dev This commit looks good Details
2019-07-17 07:39:08 +02:00
Joan Sanchez e99bae89b4 fixed e2e tests
gitea/salix/dev There was a failure building this commit Details
2019-07-17 07:33:46 +02:00
Joan Sanchez 145e596d16 fixed dms unit tests
gitea/salix/dev This commit has test failures Details
2019-07-16 14:12:58 +02:00
Joan Sanchez 4f73d1eb5a dms fixes
gitea/salix/dev There was a failure building this commit Details
2019-07-16 13:37:25 +02:00
Joan Sanchez 3c3f4bfeae address.edit fixed location autocompletion
gitea/salix/dev This commit has test failures Details
2019-07-16 08:26:57 +02:00
Joan Sanchez 72fcf807b0 7z mimetype
gitea/salix/dev This commit has test failures Details
2019-07-16 07:22:29 +02:00
Joan Sanchez b85aa6d3da fixed icons column size
gitea/salix/dev This commit has test failures Details
2019-07-15 13:20:50 +02:00
Joan Sanchez dae49f52b6 removed download file conditional
gitea/salix/dev This commit looks good Details
2019-07-15 11:56:17 +02:00
Joan Sanchez 588250b1c1 dms update files
gitea/salix/dev This commit looks good Details
2019-07-15 11:40:11 +02:00
Joan Sanchez 3ce59c0b73 hide download button for dms without a file attached #1590
gitea/salix/dev This commit looks good Details
2019-07-11 09:53:16 +02:00
Joan Sanchez cb23fd28fa updated unit tests 2019-07-11 07:18:07 +02:00
Joan Sanchez 8a5e0c5402 Notify password changes #1588 2019-07-11 07:06:53 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Bernat b98b534eec Tarea #1583 exportar produccio a la local
gitea/salix/dev This commit looks good Details
2019-07-05 14:16:33 +02:00
Bernat 061f0cb39c Refactor #1581 client.balance.create
gitea/salix/dev This commit looks good Details
2019-07-04 10:34:19 +02:00
Carlos Jimenez Ruiz a35533687f removed unused spec files
gitea/salix/dev This commit looks good Details
2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz a2a9dfd7e5 #1567 refactor logs - worker descriptor 2019-07-03 11:08:44 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Bernat fb2545994c Refactor #1563 fixtures item
gitea/salix/dev This commit looks good Details
2019-06-27 12:38:30 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good Details
2019-06-27 09:03:03 +02:00
Javi Gallego b0c34f8e29 #1564 client.summary defaulting cantidad
gitea/salix/dev This commit looks good Details
2019-06-26 12:18:47 +02:00
Bernat 7f2b61b39c Test #1549 fix back test 2019-06-21 07:50:56 +02:00
Joan Sanchez 7fd6c850d7 lock controls #1533
gitea/salix/dev There was a failure building this commit Details
2019-06-20 13:50:58 +02:00
Joan Sanchez e45d95ac10 upload dms files into new folder structure #1548
gitea/salix/dev There was a failure building this commit Details
2019-06-20 07:47:03 +02:00
Carlos Jimenez Ruiz 73ccf9a107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz 560cce7c8c #1537 refactor fixtures 2019-06-19 14:40:47 +02:00
Bernat 82ab9e5ac5 Tarea #1534 Paginar consignatarios
gitea/salix/dev This commit looks good Details
2019-06-18 09:34:32 +02:00
Joan Sanchez 3bd12492b0 updated karma unit test
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-06-17 08:16:25 +02:00
Joan Sanchez 471da18a6c optional bank entity code #1416
gitea/salix/dev There was a failure building this commit Details
2019-06-17 08:14:48 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00
Juan Ferrer ced4578f75 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-06-14 08:33:44 +02:00
Joan Sanchez 9c00e7e67c Autocomplete geolocation from postcode #1519 and #1531
gitea/salix/dev This commit looks good Details
2019-06-13 13:08:11 +02:00
Juan Ferrer 91174d1c8e fdescribe removed, SQL refactor
gitea/salix/master This commit looks good Details
2019-06-13 11:47:32 +02:00
Juan Ferrer 89a563eaf9 Merge 2019-06-13 09:21:36 +02:00
Juan Ferrer 58cc90929f TX fixes, debug disabled, glob transaction timeout
gitea/salix/master This commit looks good Details
2019-06-12 17:31:45 +02:00
Carlos Jimenez Ruiz 921af523f8 #1526 refactor fixtures 2019-06-12 11:38:31 +02:00
Carlos Jimenez Ruiz a8b9e2c374 #1435 unitarios back hasActiveRecovery
gitea/salix/dev This commit looks good Details
2019-06-11 08:54:03 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit Details
2019-06-06 13:59:11 +02:00
Joan Sanchez 073c457abb Merge branch 'test'
gitea/salix/master This commit looks good Details
2019-06-05 08:56:56 +02:00
Bernat d4a3a1a72e export production structure and fixtures updated
gitea/salix/test This commit looks good Details
2019-05-30 13:45:13 +02:00
Javi Gallego e01765e34e test back-front fixed
gitea/salix/test This commit looks good Details
2019-05-30 08:41:08 +02:00
Carlos Jimenez Ruiz cfcadc4f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz 40654f94c4 #1475 no borrar servicios de tickets no editables 2019-05-29 13:06:42 +02:00
Bernat 69434caa52 #1470 update fixtures, client.dms gestdoc
gitea/salix/dev This commit looks good Details
2019-05-28 11:26:54 +02:00
Bernat 59069749a2 1461 fix test back
gitea/salix/dev This commit looks good Details
2019-05-27 09:19:23 +02:00
Joan Sanchez e60ebb283b sms accessType 2019-05-23 11:42:12 +02:00
Joan Sanchez 34542ce12f message send ACL fix #1464
gitea/salix/dev This commit looks good Details
2019-05-23 11:39:14 +02:00
Bernat ae2fa8d0af 1459 export production to local
gitea/salix/dev This commit looks good Details
2019-05-23 09:31:37 +02:00
Bernat 443feef673 #1456 fixtores for dms and model
gitea/salix/dev This commit looks good Details
2019-05-23 09:30:29 +02:00
Carlos Jimenez Ruiz 4c8aa7ff6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-22 11:59:14 +02:00
Bernat 1769b03846 1457 client.sample.index
gitea/salix/dev This commit looks good Details
2019-05-22 07:50:08 +02:00
Carlos Jimenez Ruiz fef62d59a5 removed extraneous code 2019-05-21 13:08:25 +02:00
Bernat b86cf1d98a 1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good Details
2019-05-17 07:34:25 +02:00
Joan Sanchez ecc335d781 client greuge order by shipped and amount #1431 2019-05-16 10:49:17 +02:00
Joan Sanchez 1ae2512169 client greuge order by shipped and amount #1431 2019-05-16 09:24:13 +02:00
Carlos Jimenez Ruiz fa191af14c #1430 client.balance bug fix and e2e fix
gitea/salix/master This commit looks good Details
2019-05-16 07:07:10 +02:00
Carlos Jimenez Ruiz 417dc511f5 #1430 client.balance bug fix and e2e fix
gitea/salix/dev This commit looks good Details
2019-05-15 15:26:13 +02:00
Bernat 1f128797c3 export production to local, fix test and add fixtures
gitea/salix/dev This commit looks good Details
2019-05-09 09:32:04 +02:00
Carlos Jimenez Ruiz c9521d1024 #1407 email core francia LCR 2019-05-08 10:42:26 +02:00
Bernat e43b7be526 1397 client.descriptor change icon to icon-basketadd
gitea/salix/dev This commit looks good Details
2019-05-07 11:55:47 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good Details
2019-05-07 11:32:35 +02:00
Joan Sanchez 2b7287dabb added ticket.dms #1373
gitea/salix/dev This commit looks good Details
2019-05-01 18:49:39 +02:00
Bernat a8a5193a86 1389 update fixtures for invoiceOut and fix test
gitea/salix/dev This commit looks good Details
2019-04-29 11:40:54 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Javi Gallego 59e8990db9 bug solved
gitea/salix/dev This commit looks good Details
2019-04-25 09:26:42 +02:00
Javi Gallego 47e55580ad #1258 ticket.index sumatorio
gitea/salix/dev This commit looks good Details
2019-04-25 07:57:26 +02:00
Carlos Jimenez Ruiz 1f5fe891e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-17 07:16:13 +02:00
Carlos Jimenez Ruiz 85851e7a33 #1306 Renombrar controladores, rutas y carpetas 2019-04-16 13:40:26 +02:00
Carlos Jimenez Ruiz a326fd2a65 #1306 Renombrar controladores, rutas y carpetas 2019-04-16 11:32:45 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Joan Sanchez 6573e61a7c fixed karma tests
gitea/salix/dev This commit looks good Details
2019-04-16 08:21:20 +02:00
Joan Sanchez 90bbe1bd02 Log sent sms #1324 2019-04-16 07:59:12 +02:00
Joan Sanchez 79f9dfb515 error when sending to a salesPerson pay-method changes #1338
gitea/salix/dev This commit looks good Details
2019-04-15 08:46:20 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Joan Sanchez 84151d6527 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-04-11 11:24:46 +02:00
Joan Sanchez bed6721643 changed credit min value to zero
gitea/salix/master This commit looks good Details
2019-04-11 11:24:10 +02:00
Carlos Jimenez Ruiz 9db389329d renamed the it statement 2019-04-10 10:53:00 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311
gitea/salix/master This commit looks good Details
2019-04-09 13:18:55 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-05 15:20:12 +02:00
Carlos Jimenez Ruiz c9cd1b19dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-05 13:59:22 +02:00
Joan Sanchez c312374c3e added sms back unit test
gitea/salix/dev There was a failure building this commit Details
2019-04-05 13:58:50 +02:00
Carlos Jimenez Ruiz 2ba91a6cc2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-05 13:20:47 +02:00
Carlos Jimenez Ruiz 837a7b08cc #1300-1301 client.risk 2019-04-05 13:20:34 +02:00
Gerard ebe269f41e #1249 ticket.invoice
gitea/salix/dev This commit looks good Details
2019-04-05 12:24:39 +02:00
Gerard 00b7442b89 #1247 reparar tests excluidos
gitea/salix/dev This commit looks good Details
2019-04-05 07:52:08 +02:00
Gerard 4861b789f7 Loggable now inserts the correct values for FK values
gitea/salix/master This commit looks good Details
2019-04-04 12:38:54 +02:00
Joan Sanchez c4c5c67b18 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
2019-04-04 11:54:25 +02:00
Joan Sanchez bb039386f2 fixed input focus #1302
gitea/salix/master This commit looks good Details
2019-04-04 11:53:13 +02:00
Gerard a23c636c16 #1279 loggable rawSql
gitea/salix/dev This commit looks good Details
2019-04-02 14:36:49 +02:00
Carlos Jimenez Ruiz 570e2b5732 #1243 ticket.log columna worker 2019-04-02 11:04:53 +02:00
Joan Sanchez 48cd9e2919 price fixes
gitea/salix/dev This commit looks good Details
2019-04-01 09:13:24 +02:00
Joan Sanchez 75cb05865b filter by firstName & lastName
gitea/salix/dev This commit looks good Details
2019-03-29 13:07:06 +01:00
Gerard 8bf4190d12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-03-29 07:37:23 +01:00
Gerard 280efdae50 #732 Loggable now inserts the correct values for FK values 2019-03-29 07:36:26 +01:00
Joan Sanchez 8110325af8 send sms from ticket descriptor & ticket line #991
gitea/salix/dev This commit looks good Details
2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Joan Sanchez 56f352686c added sms endpoint #1149
gitea/salix/dev This commit looks good Details
2019-03-27 08:48:13 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268
gitea/salix/dev This commit looks good Details
2019-03-26 12:05:53 +01:00
Joan Sanchez 500105675c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-26 07:29:57 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura
gitea/salix/dev This commit looks good Details
2019-03-25 15:16:56 +01:00
Bernat 3340163315 refactor worker fixtures
gitea/salix/dev This commit looks good Details
2019-03-25 10:00:49 +01:00
Carlos Jimenez Ruiz 6b11f26296 test refactor to async await
gitea/salix/dev This commit looks good Details
2019-03-21 08:53:12 +01:00
Carlos Jimenez Ruiz 7a5124aca2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz d38ca72fd8 orden de resultados por defecto DESC de id y fecha 2019-03-20 11:49:11 +01:00
Bernat 981800a0e2 import production structure db to local and fix test
gitea/salix/dev This commit looks good Details
2019-03-20 08:52:54 +01:00
Carlos Jimenez Ruiz f4b74abe3b #1179 invoice.index crear el módulo 2019-03-13 14:10:45 +01:00
Joan Sanchez 5f5ce1a765 required if for checked data
gitea/salix/dev This commit looks good Details
2019-03-13 08:35:25 +01:00
Carlos Jimenez Ruiz 6bb4f04bd1 #1211 client.billingData
gitea/salix/dev This commit looks good Details
2019-03-07 12:11:06 +01:00
Carlos Jimenez Ruiz 75fba75688 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz 8e28bb4312 #1211 client.billingData 2019-03-07 09:55:22 +01:00
Bernat b709930db5 cau 10041 update fixtures for workers and fix test
gitea/salix/dev This commit looks good Details
2019-03-07 07:51:29 +01:00
Gerard af960e5f5f fonts updated to 1.26 version
gitea/salix/test This commit looks good Details
2019-03-06 16:28:09 +01:00
Joan Sanchez e7ca55fea3 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-03-05 11:12:44 +01:00
Joan Sanchez 8e45858cd0 Disable & create new mandate when sending a new core sample #1207
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-05 10:10:43 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good Details
2019-03-01 11:50:26 +01:00
Carlos Jimenez Ruiz daa65e967f typo corrected
gitea/salix/dev This commit looks good Details
2019-03-01 11:09:20 +01:00
Carlos Jimenez Ruiz 0762b734fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-01 07:33:31 +01:00
Joan Sanchez dbc582a410 Merge branch 'test' into dev 2019-03-01 07:30:30 +01:00
Joan Sanchez 4fe4c7886b fixed samples visible scope
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-01 07:27:29 +01:00
Carlos Jimenez Ruiz 4026004ecf #987 client.billing-data ALPHA 2019-02-28 14:30:29 +01:00
Gerard 08650a177e client index not being able to open summary popover fixed
gitea/salix/test This commit looks good Details
2019-02-28 11:29:24 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Joan Sanchez d19d360ca6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-28 10:17:28 +01:00
Joan Sanchez d336fd0eb1 fixed address 2019-02-28 10:17:09 +01:00
Carlos Jimenez Ruiz c2b95b093a removed focus describe
gitea/salix/dev This commit has test failures Details
2019-02-28 09:37:42 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good Details
2019-02-28 08:55:34 +01:00
Gerard 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Gerard a37fdd1e33 EQTAX restriction deleted CR Javi 2019-02-26 17:32:58 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge
gitea/salix/dev This commit has test failures Details
2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
Gerard 506c857b70 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-21 10:17:54 +01:00
Gerard 03e168739b updated icons
gitea/salix/test This commit looks good Details
2019-02-21 10:17:13 +01:00
Juan Ferrer 02569aeea4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-02-21 10:10:48 +01:00
Juan Ferrer e42da544cd Styles fixed 2019-02-21 10:10:38 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures Details
2019-02-21 08:43:04 +01:00
Gerard b97cb52abe changed traduction of email
gitea/salix/dev This commit looks good Details
2019-02-20 11:52:36 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Javi Gallego 7f7f47d861 bug no results duplicado 2019-02-15 13:25:23 +01:00
Juan Ferrer 1f759b6b8c Style fixes 2019-02-13 14:01:37 +01:00
Joan Sanchez 108d9d4044 calculate swift on load #1132 2019-02-12 13:26:52 +01:00
Juan Ferrer c0dd1624f6 Table style 2019-02-10 22:52:35 +01:00
Juan Ferrer 20382b2b14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-08 17:49:53 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +01:00
Javi Gallego 394a987a05 defaulter no muestra negativos 2019-02-08 09:37:11 +01:00
Gerard b7f8a642be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 16:38:14 +01:00
Gerard 171716806a #1096 back validaciones crear ticket 2019-02-06 16:37:59 +01:00
Javi Gallego 6e421d8442 Tarea #808 order.basic-data cr juan 2019-02-06 14:56:36 +01:00
Juan Ferrer 2bf9244770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 11:24:31 +01:00
Juan Ferrer 03406a7d9b Style fixes 2019-02-06 11:24:29 +01:00
Joan Sanchez 35bd82c9cb item summary fix & css report fixes 2019-02-06 10:53:12 +01:00
Gerard f59d022da8 #1078 risk.create 2019-02-05 16:46:02 +01:00
Gerard 48bb876bea Revert "#1012 claim.action"
This reverts commit 44893b57e7.
2019-02-05 16:42:28 +01:00
Gerard 44893b57e7 #1012 claim.action 2019-02-05 16:41:36 +01:00
Juan Ferrer 1dbb75a1b8 vnSideMenu, vnBackground, style fixes 2019-02-05 09:13:15 +01:00
Juan Ferrer 84c0002cb1 Hot bugs fixed 2019-02-01 17:11:14 +01:00
Carlos Jimenez Ruiz d109e480a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-31 14:14:52 +01:00
Carlos Jimenez Ruiz 00ccf9a4a0 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:14:39 +01:00
Joan Sanchez 1bcaf27563 changed currency filter, fixed tag value errors 2019-01-31 11:44:03 +01:00
Bernat cd89550678 #9670 export acl fix test 2019-01-31 09:10:40 +01:00
Juan Ferrer f643261a85 Styles fixed, change language moved to user config popover 2019-01-31 00:33:43 +01:00
Juan Ferrer 1dc8cafc73 Style & translation fixes 2019-01-30 23:47:06 +01:00
Carlos Jimenez Ruiz a48fa07cad #1069 activeWrokersWithRole now returns the nickname 2019-01-30 14:27:35 +01:00
Juan Ferrer 259079b051 Translations fixed 2019-01-30 14:13:47 +01:00
Juan Ferrer 84737a0bb9 #997 worker.summary, bugs fixed 2019-01-30 13:32:25 +01:00
Gerard 8aad79886c fdescribe deleted 2019-01-30 08:28:09 +01:00
Joan Sanchez c20a08e99b updated clientSample with new reports uri #1001 2019-01-30 08:09:21 +01:00
Joan Sanchez 8d2f56a547 updated clientBillingData email test #1001 2019-01-30 07:18:33 +01:00
Joan Sanchez c76bbb5a27 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-29 15:04:57 +01:00
Joan Sanchez 7537d35446 uncheck zones,removed treeview model #1066 2019-01-29 15:04:38 +01:00