Commit Graph

348 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz a62698330a small refactor
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 09:45:41 +01:00
Carlos Jimenez Ruiz 95a62f66ad 2548 item diary columns width
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 16:58:56 +01:00
Carlos Jimenez Ruiz 9a8a32ee9b denied & accepted no longer show deny icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 16:08:27 +01:00
Joan Sanchez b65f48f0d9 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-04 14:35:27 +01:00
Joan Sanchez a325ef2a78 2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 11:29:10 +01:00
Joan Sanchez 770b6a30bb Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-27 14:35:04 +01:00
Joan Sanchez 3d86e59890 #2540 - Added entry descriptor popover to referenced places
gitea/salix/pipeline/head This commit looks good Details
2020-10-27 12:02:49 +01:00
Joan Sanchez 0466d50c00 2518 - Item tag search
gitea/salix/pipeline/head This commit looks good Details
2020-10-22 07:50:01 +02:00
Carlos Jimenez Ruiz b8b32d20bc Merge branch 'dev' into 2486-last_entries_fix
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 07:12:00 +00:00
Joan Sanchez 6ecf595a11 2486 - Changed date filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:52:11 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz ed905341b3 removed autoload for where/searchF
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 11:17:40 +02:00
Carlos Jimenez Ruiz aff6784662 corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 10:57:59 +02:00
Carlos Jimenez Ruiz c5dc84cbc2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1988-autocomplete_prefetch
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 20:16:29 +02:00
Carlos Jimenez Ruiz ea077e8d4a added auto-load to some combos 2020-09-17 20:12:52 +02:00
Javi Gallego 1b13e58e10 item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:58:00 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Carlos Jimenez Ruiz 605fbe7999 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 13:09:30 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Joan Sanchez cb4fe1f610 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:37:48 +00:00
Joan Sanchez 5a16a10b8f Merge branch 'dev' into 2409-last_entries_contextmenu
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:55:13 +00:00
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:49:09 +00:00
Joan Sanchez 8aa9918d84 2409 - Added filter by selection
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 15:03:00 +02:00
Javi Gallego daee9081d1 test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:29:51 +02:00
Joan Sanchez baf9ec6e70 2416 - Item request - Added state filter
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 08:32:30 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 16:33:47 +02:00
Carlos Jimenez Ruiz dee3ab166a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-08-17 14:18:44 +02:00
Carlos Jimenez Ruiz 6007506633 wider space for tags
gitea/salix/pipeline/head This commit looks good Details
2020-07-31 11:43:56 +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 f2730dd51c some parts of latestsBuys WIP
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-20 11:31:47 +02:00
Joan Sanchez ca19581a5d Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-03 11:09:19 +00:00
Bernat Exposito Domenech 1cd9c75468 fix item diary descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 12:37:01 +02:00
Joan Sanchez 613937dc8d Fixed order
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 12:21:03 +02:00
Joan Sanchez f71a2a3665 Removed isOk param
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 11:58:53 +02:00
Bernat Exposito Domenech 0b3608433c item diary, fix ticket descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 10:37:17 +02:00
Joan Sanchez 16d7186829 Fixed initial filters
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 14:42:58 +02:00
Joan Sanchez a0767a6ea2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 10:56:40 +02:00
Juan Ferrer 3e5bab41d3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-01 13:47:33 +02:00
Juan Ferrer 3fcb76246d Merge branch 'master' into test 2020-06-01 13:38:59 +02:00
Joan Sanchez 3d8bc3b7b4 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-01 13:32:35 +02:00
Joan Sanchez c188da88e8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-01 13:31:08 +02:00
Javi Gallego 5188f80da5 Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:47:48 +02:00
Javi Gallego d8871c0bce cr
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:37:52 +02:00
Bernat Exposito 17ef761ba4 Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-05-26 07:59:17 +00:00
Joan Sanchez 44160d2f3c Changed order
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 08:11:36 +02:00
Joan Sanchez 4d2d57d646 2265 Changes to filter
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 08:08:09 +02:00
Javi Gallego 0f718ad065 Merge branch 'dev' into 2242-test
gitea/salix/pipeline/head This commit looks good Details
2020-05-22 07:56:00 +02:00
Bernat Exposito Domenech 52241e6f2c update itemLastENtries 2020-05-21 15:26:00 +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
Javi Gallego 670c5936ce test2
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 13:11:22 +02:00
Javi Gallego 529bd5673c test
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 13:06:59 +02:00
Javi Gallego ff03133277 test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-19 12:21:02 +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 b94c97d322 Hotfix: Clone option added to vnItemDescriptor
gitea/salix/pipeline/head This commit looks good Details
2020-05-13 17:51:27 +02:00
Juan Ferrer 07cbac7fcd Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 19:56:39 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Juan Ferrer 4336a303c0 Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate 2020-04-07 13:03:57 +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 0bd09492d1 #2026 Implemented & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 20:44:59 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 15:59:41 +01:00
Juan Ferrer 8eb6590285 E2E fixes 2020-03-24 17:27:21 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez 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 526a92fd32 Order refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 15:18:02 +01:00
Joan Sanchez 88fe9a006e Item refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-17 14:43:46 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Joan Sanchez ad1e08ec70 2134 - Irem request load error
gitea/salix/2134-item_request_load_error This commit looks good Details
2020-02-24 14:29:48 +01:00
Carlos Jimenez Ruiz 081c742dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request 2020-02-19 11:48:01 +01:00
Joan Sanchez fe8a0b4583 Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-18 07:21:35 +01:00
Joan Sanchez 7d8e88e884 Updated unit test
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-17 13:32:12 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 12:47:03 +01:00
Joan Sanchez d9ed7cda38 Added form dialog
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 07:22:55 +01:00
Carlos Jimenez Ruiz 4e2ab537ee unstable with the rest of tests
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-14 14:52:47 +01:00
Joan Sanchez b623646f25 removed console
gitea/salix/2029-fix_item_request_filters This commit looks good Details
2020-02-07 07:02:27 +01:00
Joan Sanchez 3e0fd10b41 2029 - Item request fixes & searchbar filters working
gitea/salix/2029-fix_item_request_filters This commit looks good Details
2020-02-06 14:33:28 +01:00
Joan Sanchez e3b1a4b58a 2076 - Item tags refactor
gitea/salix/2076-item_tags_refactor This commit looks good Details
2020-02-06 07:41:51 +01:00
Carlos Jimenez Ruiz f74792dbe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2020-01-24 10:17:08 +01:00
Joan Sanchez 1d6edabb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-01-21 09:23:58 +01:00
Joan Sanchez e93e9d2947 getWasteDetail() now calls weekWaste_getDetail()
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-21 09:17:55 +01:00
Joan Sanchez 826dfe8092 changes to percentage filter
gitea/salix/master This commit looks good Details
2020-01-17 11:46:45 +01:00
Joan Sanchez 3a4c379033 Added waste section 2020-01-17 11:44:05 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Joan Sanchez 708789502d Added waste section
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:07:33 +01:00
Carlos Jimenez Ruiz e922a05e50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2019-12-31 11:40:15 +01:00
Joan Sanchez f2e9dbd597 added category name to item type autocompletes
gitea/salix/1945-item_type_category This commit looks good Details
2019-12-26 11:27:44 +01:00