Commit Graph

362 Commits

Author SHA1 Message Date
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 eeb9a1861e HOTFIX: Added pagination 2021-07-02 13:10:46 +02:00
Carlos Jimenez Ruiz 565f343e19 added isDelivered, isReceived and removed travel descriptor 2021-06-22 09:39:33 +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
Joan Sanchez c10f792619 Merge branch 'dev' into 2929-entry_latestsbuys_refactor 2021-06-16 07:44:30 +00:00
Carlos Jimenez Ruiz 7004ad5ade removed several columns from bulk edit and added packingOut 2021-06-15 12:47:40 +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 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
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields 2021-06-10 17:08:21 +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
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table 2021-06-03 16:14:52 +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 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
Joan Sanchez 9363726d67 Updated unit test 2021-05-12 13:37:01 +02:00
Joan Sanchez 2e7d56cc26 Test fixes 2021-05-12 12:11:27 +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 daa94e4eb5 entry buy index 2021-04-28 10:32:24 +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
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole 2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz b6f31d7d44 invoiceIn descriptor implementation 2021-04-12 12:43:17 +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
Joan Sanchez 0e9b3bd39a Missing translation 2021-03-24 11:12:36 +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
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
Joan Sanchez 6210e60896 2669 - Changes to the translate values function 2021-03-19 19:20:19 +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
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 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 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
Joan Sanchez 2a2e276c6b Added back unit test plus fixes 2021-03-10 09:01:32 +01: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 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 69550dc380 Added number of rows that are going to be modificated 2021-03-01 11:54:02 +01:00
jorgebl c55d65a7fd QA refactor 2021-02-25 10:49:19 +01:00
jorgebl da20eac685 Putting propertie name for order and showing the 3 digits of type 2021-02-23 11:52:29 +01:00
Jorge Padawan 2cf37a9e96 Added permissions to role administrative 2021-02-10 09:10:15 +01:00
Joan Sanchez c092bf58b4 Import buys 2021-02-09 07:59:55 +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 38311f526d Calculate volume 2021-02-03 09:03:03 +01:00
Joan Sanchez f66a5ecfdc 2748 - Added module keybinds 2021-01-29 09:46:57 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Joan Sanchez 8c71d76988 2752 - Import json file 2021-01-26 07:21:05 +01:00
Bernat Exposito 678ee0644d delete order by in entry index 2021-01-21 09:45:18 +01:00
Bernat Exposito 0f17fca0a1 pr order by changes 2021-01-20 11:42:45 +01:00
Bernat Exposito e9f408d5ba delete comments 2021-01-19 13:44:14 +01:00
Bernat Exposito 426249f9bf entry index changes 2021-01-19 12:50:11 +01:00
Bernat Exposito 25535576c5 pr changes resolved 2021-01-18 08:19:17 +01:00
Bernat Exposito a45a76018b entry search panel changes 2021-01-14 09:26:50 +01:00
Jorge Padawan 5af51763d6 Created back test field for entryObservation 2020-12-28 12:55:28 +01:00
Jorge Padawan 259842c22d Retirado el parametro required por no utilizarse 2020-12-23 13:32:58 +01:00
Jorge Padawan 2948747da3 Seccion nueva, "Note" mas campo entryObservation 2020-12-23 12:25:12 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Carlos Jimenez Ruiz b071bfd229 entry module refactors 2020-12-15 16:53:56 +01:00
Carlos Jimenez Ruiz 8e13fa7852 entry module refactors 2020-12-14 17:35:32 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Bernat Exposito 96f603a44b refactor descriptors 2020-12-04 13:40:58 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component 2020-11-27 13:10:39 +01:00
Carlos Jimenez Ruiz 4172d0bb9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community 2020-11-23 18:51:16 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity 2020-11-23 13:41:51 +01:00
Joan Sanchez 031051abcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community 2020-11-13 09:33:24 +01:00
Joan Sanchez 4acdfd6d4e Th refactor 2020-11-13 09:30:40 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations 2020-11-10 16:47:39 +01:00
Carlos Jimenez Ruiz c622175192 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-15 18:57:33 +02:00
Joan Sanchez 334891cfe9 2497 - Groupped lines 2020-10-15 14:40:41 +02:00
Carlos Jimenez Ruiz 984a91d544 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-13 11:04:23 +02:00
Joan Sanchez 3f8a675785 2499 - Allow zero quantity 2020-10-13 08:42:13 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 085df7119f Merge branch 'dev' into 2492-index_refactor 2020-10-06 06:51:11 +00:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar 2020-10-06 08:17:12 +02:00
Javi Gallego e95514d967 reorganiza campos 2020-10-05 09:24:49 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz 22e7e035c3 column tags added 2020-09-14 11:44:47 +02:00
Carlos Jimenez Ruiz 43d011ea60 isIgnored displayed as vn-check 2020-09-14 09:43:00 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors 2020-09-11 14:51:58 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz ecc7ae398c column order 2020-09-10 14:32:44 +02:00
Carlos Jimenez Ruiz e8384e3ec9 added packageFk as column 2020-09-10 13:26:04 +02:00
Carlos Jimenez Ruiz 46b67308fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2400-entry_summary_buys 2020-09-09 11:39:24 +02:00
Carlos Jimenez Ruiz 957096172d entry summary buys listed 2020-09-09 11:39:18 +02:00
Joan Sanchez f8bb4d86fb State fix & supplier search fix 2020-09-07 08:15:43 +02:00
Carlos Jimenez Ruiz 0116adeddb Merge branch '2402-entry_create' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-03 16:59:41 +02:00
Joan Sanchez 5b4a3cd370 Travel autocomplete fix 2020-09-03 16:52:35 +02:00
Carlos Jimenez Ruiz a00f64e7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-03 16:29:38 +02:00
Joan Sanchez 5fa9489f9a Added fields as required, added info icon 2020-09-03 08:09:37 +02:00
Carlos Jimenez Ruiz c796132e77 e2e + fixtures amended + refactor 2020-09-02 15:20:28 +02:00
Joan Sanchez a3382300f9 2402 - Added create entry section 2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz 605fbe7999 refactor 2020-09-02 13:09:30 +02:00
Carlos Jimenez Ruiz 0b4f65724e semantics, traductions and small aditions 2020-08-28 10:40:47 +02:00
Carlos Jimenez Ruiz c70ad808a0 refactor 2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz 2f81e41881 grping and pcking shown as per item last entries 2020-08-27 16:42:01 +02:00
Carlos Jimenez Ruiz 58fc25d91f grouping & packaging according to grouping mode 2020-08-27 16:40:08 +02:00
Carlos Jimenez Ruiz 5614a39f91 traductuctions 2020-08-27 15:29:48 +02:00
Carlos Jimenez Ruiz d156ca95ba front and back unit tests 2020-08-27 15:14:30 +02:00
Carlos Jimenez Ruiz 3a82ef0e06 2375 entry lastBuy seccion 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 ede73bfe92 removed id from descriptor 2020-07-30 16:40:40 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working 2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz f9da489a96 excluded unfinished tests WIP 2020-07-20 11:50:21 +02:00
Carlos Jimenez Ruiz f2730dd51c some parts of latestsBuys WIP 2020-07-20 11:31:47 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services 2020-06-12 14:28:29 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to 2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor 2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech 4133021e5c fix translate on plural 2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates 2020-05-19 10:27:22 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed 2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks 2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed 2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed 2020-04-25 11:50:04 +02:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section 2020-03-20 12:00:53 +01:00
Joan Sanchez 88fe9a006e Item refactor 2020-03-17 14:43:46 +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
Joan Sanchez 7496bc923e Updated fonts & changed icons 2020-03-11 08:02:58 +01:00
Carlos Jimenez Ruiz 2a0e437e1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones 2020-03-09 09:19:22 +01:00
Carlos Jimenez Ruiz 5f0ace8f29 removed unused code 2020-03-06 10:21:42 +01:00
Carlos Jimenez Ruiz 11bd861224 section bases 2020-03-06 09:57:05 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print 2020-03-05 13:56:45 +01:00
Bernat Exposito Domenech e40575cc1f fix model entry log 2020-03-04 08:58:57 +01:00
Bernat Exposito Domenech ced8c6e963 traductions 2020-03-04 07:49:21 +01:00
Bernat Exposito Domenech 686382a0e6 entryLog section 2020-03-02 11:57:09 +01:00
Bernat Exposito Domenech 0d23a3894f entry log 2020-03-02 09:28:08 +01:00
Carlos Jimenez Ruiz 0fd012930e #2131 jest.spyOn 2020-02-26 15:02:47 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Bernat Exposito Domenech b37e8da410 fix test 2020-02-25 10:39:21 +01:00
Bernat Exposito Domenech e7cdc58fad translates 2020-02-25 07:51:16 +01:00
Bernat Exposito Domenech 832089de79 entry descriptor, add more options to view entry report 2020-02-24 12:20:53 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Bernat Exposito Domenech 773963e7ab update entry filter 2020-02-21 10:03:08 +01:00
Bernat Exposito Domenech cec1f7b90f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-20 09:48:12 +01:00
Bernat Exposito Domenech 6540ef9598 change Fk to Id 2020-02-18 11:07:55 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor 2020-02-18 10:33:17 +01:00
Bernat Exposito Domenech fac93bd74c summary 2020-02-04 09:34:31 +01:00
Bernat Exposito Domenech 6c4e25bfe3 create entry.index 2020-01-10 11:52:35 +01:00