Commit Graph

590 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz e4ea05fd07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
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
Joan Sanchez eb36f86b9d Added smart-table to item index
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 14:46:23 +01:00
Alex Moreno bb0745532b fix(claim): salesPersonFk where add officeBoss
gitea/salix/pipeline/head This commit looks good Details
2021-11-02 11:24:52 +01:00
Carlos Jimenez Ruiz fa067f94d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 16:55:28 +02:00
Vicent Llopis 6d05b046e8 feat(last-entries): add dateTo & delete style.scss
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 10:34:32 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:03:06 +02:00
Alex Moreno a8f8248c41 feat(diary): Add column claim
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 12:33:48 +02:00
Joan Sanchez 3d57e9a618 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-05 08:13:13 +02:00
Joan Sanchez 1ff3e1f429 Increased date range from +10 to +60 days
gitea/salix/pipeline/head This commit looks good Details
2021-10-05 08:12:25 +02:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2021-09-22 15:16:45 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +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 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
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
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 13:41:29 +02:00
Joan Sanchez 9ad54b9622 HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:17:48 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +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 378175224c HOTFIX: Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:24:24 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Joan Sanchez 6c36ab3905 Removed back button
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 10:47:31 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
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 b4cceff4cb 2866 - Limit descriptor photo size to width 100%
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:20:00 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz 3c8ed85e69 sum is now made on backend and html amends 2021-03-26 10:33:53 +01:00
jorgebl 393b9ba38c Correct name 2021-03-24 14:17:27 +01:00
jorgebl e01b7420d9 Added total cost of item 2021-03-24 13:54:29 +01:00
Joan Sanchez ff6c80aa7e Merge branch 'dev' into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 08:24:10 +00:00
jorgebl 1922280c61 QA rename some descriptions in test and reworked the test
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 17:49:04 +01:00
jorgebl 5cb959f5b8 removed controller.data from submit
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:12:13 +01:00
jorgebl 27816b29e7 Removed ids on controller.data
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 13:06:35 +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 28b9da82ed change conditional 2021-03-08 09:12:10 +01:00
Joan Sanchez 7ec9ddb6d9 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 09:23:31 +01:00
jorgebl b6bf61f410 description put correctly
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 09:09:09 +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 92db67292c Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:56:31 +01:00
Joan Sanchez e50dcf467f Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 12:21:04 +01:00
Joan Sanchez 7c7aba86a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-03 09:36:55 +01:00
jorgebl a7973ba276 Resolved question PR
gitea/salix/pipeline/head This commit looks good Details
2021-03-01 11:59:05 +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 3fcd5f9dbc removed line break
gitea/salix/pipeline/head This commit looks good Details
2021-02-26 11:40:46 +01:00
jorgebl f63baafe7d get values from model item 2021-02-26 11:36:22 +01:00
jorgebl 4cedd53bce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 11:02:51 +01:00
jorgebl f1c481de64 QA refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-24 14:49:58 +01:00
jorgebl df9ca2ad3e Fixed filter description 2021-02-24 12:24:50 +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 69f53972d5 Added filter for selection
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 16:43:40 +01:00
jorgebl 5ef48919ec Added translate multiplier
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 13:41:31 +01:00
Jorge Padawan 3763b95f62 Added multiplier in sections and filter selection
gitea/salix/pipeline/head This commit looks good Details
2021-02-17 15:38:57 +01:00
Joan Sanchez c270ec6207 Contextmenu fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-11 15:06:41 +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
Carlos Jimenez Ruiz 8b97236f22 texfield no longer performs queries
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 12:53:40 +01:00
Carlos Jimenez Ruiz 3d948ef317 warning color added lines with clientType loses 2021-02-09 10:43:19 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Carlos Jimenez Ruiz 9a349e789c added missin icon property to fixedPrice route
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz f946e63a86 e2e path for item fixed price 2021-01-19 20:56:33 +01:00
Carlos Jimenez Ruiz 4f7c2f3afd added placeholder and fixed css 2021-01-19 13:30:07 +01:00
Carlos Jimenez Ruiz e859a1b837 removed incorrect icon
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 11:14:43 +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
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 16:32:54 +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
Jorge Padawan 97c8faaf50 Add column multiplier on item section
gitea/salix/pipeline/head This commit looks good Details
2021-01-18 11:43:48 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:11:37 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Jorge Padawan 5a30bf5fa4 2650 add links to edit on summaries 2021-01-08 15:43:33 +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 1ba83e7741 cancel button css + item module refactor 2020-12-15 16:07:34 +01:00
Carlos Jimenez Ruiz cbaa95ebda item module refactors 2020-12-13 13:54:17 +01:00
Joan Sanchez 0a4016be41 Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good Details
2020-12-11 15:04:55 +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
gitea/salix/pipeline/head This commit looks good Details
2020-12-04 13:40:58 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Carlos Jimenez Ruiz cb88265471 removed commented code
gitea/salix/pipeline/head This commit looks good Details
2020-11-17 11:04:17 +01:00
Carlos Jimenez Ruiz 55a1ae0348 added entry descriptor to item last entries 2020-11-16 14:43:35 +01:00
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
Joan Sanchez d2c5ab7297 trigger unit tests
gitea/salix/1949-show_specie_genus This commit looks good Details
2019-12-26 08:43:34 +01:00
Joan Sanchez c95c7192da Added template to specie autocomplete 2019-12-26 08:21:08 +01:00
Joan Sanchez 3d4fc9c18e #1963 Entry & zone style changes
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-12-23 08:05:58 +01:00
Juan Ferrer 4da83ef963 Hotfixes: vnTicketSale menu, vnItemDiary width 2019-12-17 12:23:31 +01:00
Carlos Jimenez Ruiz e6130e78fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer 2019-12-13 15:12:55 +01:00
Joan Sanchez 780f1e4773 renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit Details
2019-12-13 11:59:25 +01:00
Bernat Exposito Domenech eb2cfc5535 updated selectors
gitea/salix/puppeteer There was a failure building this commit Details
2019-12-11 14:14:44 +01:00
Juan Ferrer 1c035ca045 All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-12 14:18:46 +01:00
Juan Ferrer efa6ddc0f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-11 16:25:00 +01:00
Joan Sanchez 6cedfceddd Show ticket state #1836
gitea/salix/dev This commit looks good Details
2019-11-11 13:51:30 +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
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +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 c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Juan Ferrer ee196df2ff vnCompent with most common services as properties
gitea/salix/dev This commit looks good Details
2019-10-24 12:44:36 +02:00
Joan Sanchez 137f701434 changed order
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-10-22 14:20:50 +02:00
Joan Sanchez 2ed4cf3e4a Item request refactor #1818
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-22 13:44:36 +02:00
Joan Sanchez 188f4ae3bf mark item diary line
gitea/salix/dev This commit looks good Details
2019-10-21 11:08:41 +02:00
Bernat 6477a1458d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-21 07:24:56 +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 485bc43b13 Style fixes 2019-10-18 22:07:55 +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
Bernat 7a89ab5335 #1778 Refactor worker.phone 2019-10-18 08:36:33 +02:00
Joan Sanchez e79456374c fixed item-popover width
gitea/salix/dev This commit looks good Details
2019-10-14 14:54:11 +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 fc09d76422 Merge 2019-10-08 23:57:54 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Carlos Jimenez Ruiz 7db4945a6d #1702 Autocomplete data refresh and #1754 watcher
gitea/salix/dev This commit has test failures Details
2019-10-08 17:27:27 +02:00
Juan Ferrer eeef468964 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-10-05 00:17:10 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Carlos Jimenez Ruiz 4fa532abb8 #1744 ticket.index ocultar columnas expendables
gitea/salix/dev This commit looks good Details
2019-10-04 17:49:51 +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
Joan Sanchez 314b609060 fixed family translation
gitea/salix/dev This commit looks good Details
2019-09-24 08:34:14 +02:00
Carlos Jimenez Ruiz 7bcc908708 #1704 item.basicData
gitea/salix/dev There was a failure building this commit Details
2019-09-20 16:39:20 +02:00
Bernat 526e4e34fa skip e2e #1702
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:05:11 +02:00
Bernat 86d793b9ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-18 11:11:53 +02:00
Bernat 7af4f3626d #1691 item.basicData - Añadir campo hasKgPrice 2019-09-18 11:11:47 +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 f6bd915ae6 Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good Details
2019-09-12 11:47:56 +02:00
Joan Sanchez 7ecb67052d item.diary css chip fixed #1676
gitea/salix/dev There was a failure building this commit Details
2019-09-10 08:47:46 +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 b656db3a84 #1645 refactor search panel
gitea/salix/dev This commit looks good Details
2019-08-29 08:32:46 +02:00
Bernat 6daabed202 #1645 first part, delete hasVisible
gitea/salix/dev This commit looks good Details
2019-08-28 12:17:06 +02:00
Carlos Jimenez Ruiz c2573d6853 css amends for item-request
gitea/salix/dev This commit has test failures Details
2019-07-25 11:25:01 +02:00
Carlos Jimenez Ruiz e1cbf781e1 #1608 item.request
gitea/salix/dev This commit has test failures Details
2019-07-25 09:55:09 +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 d742eef7c3 Tarea #1478 item.basicData 2019-05-30 08:04:46 +02:00
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +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 0dbed4e102 fixed translation
gitea/salix/dev This commit looks good Details
2019-05-02 10:40:46 +02:00
Joan Sanchez a2fd8ddc8a buy requests translation & default order
gitea/salix/dev This commit looks good Details
2019-05-02 10:04:02 +02:00