Commit Graph

2602 Commits

Author SHA1 Message Date
Joan Sanchez 3730bf86cc Updated destinatary
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 16:05:05 +02:00
Joan Sanchez 86d3e2d689 Changed message destinatary
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 16:03:07 +02:00
Joan Sanchez 611e1a3802 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 15:13:12 +02:00
Joan Sanchez f7e9372bf0 2525 - Change to past date 2020-10-20 15:12:00 +02:00
Joan Sanchez ffcb3629c5 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 15:01:02 +02:00
Joan Sanchez 7d0790684b 2525 - Change to past date
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 14:54:23 +02:00
Javi Gallego 4aea284703 WIP: a falta de e2e
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 14:42:23 +02:00
Bernat Exposito Domenech 7eed2ddd59 export structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 12:47:37 +02:00
Joan Sanchez 12bf0e6df7 Credit insurance hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 11:44:14 +02:00
Joan Sanchez 0acb1e649d Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 10:46:04 +02:00
Joan Sanchez d68aacc78a 2525 - Ticket basic data validate zone 2020-10-20 10:46:03 +02:00
Joan Sanchez ef42e95cef Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 10:29:16 +02:00
Joan Sanchez c61c25fb91 2525 - Ticket basic data validate zone
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-20 10:19:12 +02:00
Bernat Exposito Domenech 256206ace4 supplier summary dscriptor and card
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-20 09:44:44 +02:00
Carlos Jimenez Ruiz 133a4cc907 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData 2020-10-20 09:20:27 +02:00
Joan Sanchez 5f93848afd Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 07:43:36 +02:00
Carlos Jimenez Ruiz a61a6e7c6a e2e path updated + test fix
gitea/salix/pipeline/head This commit looks good Details
2020-10-19 20:49:38 +02:00
Joan Sanchez 011bba1660 Added vn-anchor to client and ticket index
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-19 09:05:38 +02:00
Carlos Jimenez Ruiz cc99c1e980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation 2020-10-16 13:04:58 +02:00
Carlos Jimenez Ruiz b96007aa62 fixed login/out problems at random + others
gitea/salix/pipeline/head This commit looks good Details
2020-10-16 11:16:24 +02:00
Joan Sanchez 6412f29685 2428 - Added anchor directive
gitea/salix/pipeline/head This commit looks good Details
2020-10-16 10:40:45 +02:00
Carlos Jimenez Ruiz c622175192 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz dd6035606f some more tests fixed + refactors 2020-10-15 18:57:27 +02:00
Joan Sanchez 334891cfe9 2497 - Groupped lines
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 14:40:41 +02:00
Joan Sanchez 39ea51764b Some fixes made
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 13:59:28 +02:00
Joan Sanchez ca7601a9f2 2433 - Added sage fields
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 11:53:01 +02:00
Bernat Exposito 0fbbe9b2ae Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-10-15 07:57:57 +00:00
Bernat Exposito Domenech a5b8df2121 fix translate
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 09:41:36 +02:00
Bernat Exposito Domenech cc35998f62 new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 08:15:04 +02:00
Joan Sanchez 9c962cb0b4 Merge branch 'dev' into 2509-add_geolocation
gitea/salix/pipeline/head This commit looks good Details
2020-10-14 09:35:42 +00:00
Joan Sanchez 6fa8aae161 2509 - Added forms to create new locations
gitea/salix/pipeline/head This commit looks good Details
2020-10-14 11:33:42 +02:00
Carlos Jimenez Ruiz 64b65d204a excluded confirm with no easy fix for pollution 2020-10-14 11:16:23 +02:00
Carlos Jimenez Ruiz 30d00d0f63 fix getWasteDetail test 2020-10-14 10:53:20 +02:00
Joan Sanchez 2e3402b0cd Updated method description
gitea/salix/pipeline/head This commit looks good Details
2020-10-14 07:18:39 +02:00
Carlos Jimenez Ruiz 2045e35170 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2473-restore_ticket
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 15:41:04 +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
Carlos Jimenez Ruiz c04b7a0657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 10:31:06 +02:00
Joan Sanchez bcf566ce28 Merge branch 'dev' into 2499-sale_quantity_zero
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:11:56 +00:00
Joan Sanchez f59bb07aaf Merge pull request 'route ticket fixes' (#407) from 2452-route_tickets into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #407
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-10-13 08:11:01 +00:00
Joan Sanchez 7538b1c941 Merge branch 'dev' into 1447-updateClaim_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 06:56:23 +00:00
Bernat Exposito Domenech 8a58017597 fix route/ticket
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:50:47 +02:00
Joan Sanchez 3f8a675785 2499 - Allow zero quantity
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:42:13 +02:00
Bernat Exposito Domenech 6e081df4e8 fix test
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 08:17:00 +02:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Joan Sanchez 498841b274 Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-08 14:22:55 +02:00
Joan Sanchez 355f95ae40 2473 - Added ticket restore option
gitea/salix/pipeline/head This commit looks good Details
2020-10-08 13:42:20 +02:00
Joan Sanchez eceb33cce0 2473 - Added restore method
gitea/salix/pipeline/head This commit looks good Details
2020-10-07 11:00:26 +02:00
Bernat Exposito Domenech e5557be3dc route ticket fixes
gitea/salix/pipeline/head This commit looks good Details
2020-10-07 10:52:28 +02:00
Carlos Jimenez Ruiz 641eb93282 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-06 14:50:23 +02:00
Bernat Exposito Domenech fcebbb68b6 delete comments
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:46:58 +02:00
Joan Sanchez a29d92718a Updated description
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:37:03 +02:00
Joan Sanchez 254c391138 Removed test exclusion
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:32:24 +02:00
Bernat Exposito Domenech 3d39467613 refactor updateclaim
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:23:35 +02:00
Bernat Exposito Domenech 134d1c4385 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1447-updateClaim_refactor 2020-10-06 13:06:43 +02:00
Bernat Exposito Domenech e6b4d21ddb refactor updateClaim
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 10:57:40 +02:00
Carlos Jimenez Ruiz 0dbdb5103e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Joan Sanchez 2856fa63fc Added ACL for module account
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 09:50:40 +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 085df7119f Merge branch 'dev' into 2492-index_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 06:51:11 +00: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
Joan Sanchez f00828cf57 Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 05:44:11 +00:00
Carlos Jimenez Ruiz 27d2c59358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-05 16:09:30 +02:00
Javi Gallego 77064d85a0 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 12:54:02 +00:00
Joan Sanchez 71e29e747a Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 14:45:39 +02:00
Joan Sanchez 86025b88e3 Merge branch 'dev' into 2481-campaign_filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 09:36:02 +00:00
Joan Sanchez d0ece57219 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 10:09:36 +02:00
Carlos Jimenez Ruiz 9c139b49aa enabled jasme random + indentations 2020-10-05 10:04:00 +02:00
Joan Sanchez ad11a92c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar 2020-10-05 10:02:44 +02:00
Javi Gallego e95514d967 reorganiza campos
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 09:24:49 +02:00
Javi Gallego 0294d2a845 Merge branch 'dev' into 2443 2020-10-05 09:07:00 +02:00
Joan Sanchez 0dee59f66f Merge branch 'dev' into 2455-socialname_validation
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 07:01:11 +00:00
Joan Sanchez e3b14405b7 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 08:50:07 +02:00
Joan Sanchez cdde4d95d7 Added filter
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 07:53:03 +02:00
Bernat Exposito Domenech 161313ad15 refactor getComponentSum
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 13:58:48 +02:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Carlos Jimenez Ruiz 9dca47be97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2484-Sale_priceDifference_test_fails 2020-10-02 09:40:15 +02:00
Carlos Jimenez Ruiz ff3b75267a priceDifference test fix + refactor 2020-10-02 09:39:58 +02:00
Javi Gallego 8d1709ea51 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:46:33 +02:00
Javi Gallego 2714857227 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 14:07:38 +02:00
Bernat Exposito Domenech 90e948aeda fix lastActiveTickets
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 13:35:37 +02:00
Bernat Exposito Domenech 1bff4e3c4e fix test and refactor transferlines
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 12:24:33 +02:00
Joan Sanchez 9423216616 Fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 11:19:52 +02:00
Joan Sanchez 503e1d0ed9 2455 - Validate socialname when isDataChecked is changed
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 09:31:01 +02:00
Joan Sanchez 58965a9687 Enabled loggable on calendar model
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 07:38:43 +02:00
Joan Sanchez 5bdc67f96e Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 12:22:11 +00:00
Carlos Jimenez Ruiz 1e55632b94 refactor & fix regularize claim and prices Diff
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz 40abd68734 fix byWarehouse and ticket.filter tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:11:11 +02:00
Carlos Jimenez Ruiz 6afee4924c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test 2020-09-29 08:44:33 +02:00
Joan Sanchez dee7e844ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1047-print_sql_def 2020-09-28 08:36:46 +02:00
Joan Sanchez a1349de32d Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:18:53 +00:00
Joan Sanchez 3e2f85dbd2 Merge branch 'dev' into 2458-ticket_index_pending
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:13:39 +00:00
Joan Sanchez 0438171a47 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech 790c9bfe6f update models and fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 14:50:04 +02:00
Joan Sanchez 4d25fe88cf Added functions to call sql from def
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 14:45:00 +02:00
Javi Gallego c909470f41 merge
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 08:10:37 +02:00
Joan Sanchez f1d36df558 #2458 - Removed states from pending tickets
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 15:00:00 +02:00
Joan Sanchez de3c7acb08 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 12:30:44 +00:00
Joan Sanchez d2dbf417f4 Updated to standard color
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 11:15:35 +02:00
Joan Sanchez d18d7670ec Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:44:12 +02:00
Joan Sanchez 53e729eddd 2366 - Merge event colors
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 10:14:53 +02:00
Joan Sanchez 5265202e65 Merge branch 'dev' into 2449-ticket_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 13:10:32 +00:00
Joan Sanchez 75ac6ad8d3 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 14:20:41 +02:00
Joan Sanchez a8589d6945 Autocomplete warehouse on agency selection
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-23 14:13:44 +02:00
Joan Sanchez c49614b8cf Merge branch 'dev' into 2449-ticket_basicData
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 09:23:09 +00:00
Joan Sanchez 5ec5979a3e Updated tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-23 11:21:25 +02:00
Carlos Jimenez Ruiz 87e4765a1c fixed ticket-weekly backend unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 16:53:47 +02:00
Bernat Exposito Domenech ce1c4e6f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-22 14:00:52 +02:00
Bernat Exposito Domenech 06f03c6b84 mail models and fix checkInbox 2020-09-22 13:59:00 +02:00
Joan Sanchez 89667a18c9 Handle ticket without old state
gitea/salix/pipeline/head This commit looks good Details
2020-09-22 07:50:30 +02:00
Joan Sanchez ae3d00bad1 Added new method
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-22 07:38:20 +02:00
Juan Ferrer 2d1cf566f8 All tests fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 22:54:36 +02:00
Juan Ferrer 6abd707a6d Tests fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 19:16:51 +02:00
Juan Ferrer 3880e21ce3 Test fixes 2020-09-21 16:09:34 +02:00
Juan Ferrer 2b05827be1 Merge 2020-09-21 14:10:26 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Juan Ferrer b9c526c29c LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 13:24:43 +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
Javi Gallego 8fb674819a ticket service
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 10:35:39 +02:00
Joan Sanchez fa344f4ff6 2449 - Autocompletion
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-19 13:02:00 +02:00
Carlos Jimenez Ruiz 5d461b119c tests fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-18 11:50:20 +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
Carlos Jimenez Ruiz bde6c4495d e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 16:10:43 +02:00
Joan Sanchez b6499370e1 Merge branch 'dev' into 2430-catalog_multi_tag
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 09:06:08 +00:00
Joan Sanchez f8ea14ecab Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 10:11:09 +02:00
Joan Sanchez 312faeb3b0 Changes to lag list
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-16 09:54:04 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 19:43:07 +02:00
Joan Sanchez b5b7172b72 Updated test
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:26:23 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:14:13 +02:00
Joan Sanchez 538c217b59 Store tagGroups on catalog url
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-15 10:48:34 +02:00
Carlos Jimenez Ruiz 031e40df51 removed unused dash if empty
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 16:34:11 +02:00
Carlos Jimenez Ruiz 1eb088521c ticket.index ref and state columns merged
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 16:08:37 +02:00
Carlos Jimenez Ruiz 13a5c4c4c9 test enhanced 2020-09-14 13:58:42 +02:00
Carlos Jimenez Ruiz 0b4c53a655 added invoiceOut descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 13:11:53 +02:00
Carlos Jimenez Ruiz a767d256b2 Merge branch 'dev' into 2444-entry_latestBuys_v2
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 10:22:17 +00:00
Joan Sanchez 559a2e9721 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:56:58 +02:00
Joan Sanchez 746bf55bcd Updated dms path
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:54:34 +02:00
Carlos Jimenez Ruiz 22e7e035c3 column tags added
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:44:47 +02:00
Joan Sanchez f94728845e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-14 10:32:34 +02:00
Carlos Jimenez Ruiz 43d011ea60 isIgnored displayed as vn-check
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 09:43:00 +02:00
Joan Sanchez 9bbe50c62b Changes to catalog filters
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-14 07:42:43 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:51:58 +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
Carlos Jimenez Ruiz de184c163e color var
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 17:17:46 +02:00
Carlos Jimenez Ruiz 42abeecede hex color now displayed on catalog
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 16:35:32 +02:00
Carlos Jimenez Ruiz 270e665291 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color 2020-09-10 14:38:48 +02:00
Carlos Jimenez Ruiz ecc7ae398c column order
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 14:32:44 +02:00
Carlos Jimenez Ruiz e8384e3ec9 added packageFk as column
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 13:26:04 +02:00
Bernat Exposito Domenech 0cf99a5a83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 11:34:35 +02:00
Carlos Jimenez Ruiz 12ceedd80c corrected some typos
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 10:46:56 +02:00
Bernat Exposito Domenech d91a354e4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production 2020-09-10 07:51:30 +02:00
Bernat Exposito Domenech 348412c5db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech d4b6d7cd96 cr changes 2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 12:54:10 +02:00
Carlos Jimenez Ruiz 46b67308fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2400-entry_summary_buys
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 11:39:24 +02:00
Carlos Jimenez Ruiz 957096172d entry summary buys listed 2020-09-09 11:39:18 +02:00
Bernat Exposito Domenech 5bb8aacfb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-09 11:12:18 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Joan Sanchez 88cf2e602c Merge branch 'dev' into 2406-catalog_sort_by_occurrences
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:22:45 +00:00
Joan Sanchez 004c9d7341 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:27:08 +02:00
Bernat Exposito Domenech f99fb69d48 front and back test 2020-09-09 08:20:27 +02:00
Joan Sanchez db081501eb 2440 - Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:14:17 +02:00
Joan Sanchez 5ef9afdb53 Empty url fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 15:07:57 +02:00
Joan Sanchez f56b0607ee Filter changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-08 14:19:21 +02:00
Joan Sanchez ff5a942771 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 10:16:30 +02:00
Joan Sanchez 8daa3ae89c html changes 2020-09-08 10:11:22 +02:00
Bernat Exposito Domenech d79cffb2c3 back test for getComponentsSum 2020-09-08 08:13:54 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech 92e14d5292 update getComponentSum 2020-09-08 07:17:16 +02:00
Carlos Jimenez Ruiz 6cfb1a226a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create 2020-09-07 09:46:52 +02:00
Joan Sanchez 03a0a22526 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:53:47 +02:00
Joan Sanchez f8bb4d86fb State fix & supplier search fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 08:15:43 +02:00
Joan Sanchez ba9cfedec7 Worker calendar holiday name
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 07:59:27 +02:00
Carlos Jimenez Ruiz c3c7ef901a version pre-hex in vn.ink table
gitea/salix/pipeline/head This commit looks good Details
2020-09-04 12:40:23 +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
gitea/salix/pipeline/head This commit looks good Details
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 b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Joan Sanchez 5fa9489f9a Added fields as required, added info icon
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 08:09:37 +02:00
Carlos Jimenez Ruiz c796132e77 e2e + fixtures amended + refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 15:20:28 +02:00
Joan Sanchez a3382300f9 2402 - Added create entry section
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz 605fbe7999 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 13:09:30 +02:00
Joan Sanchez e6790f6120 #2406 - Sort by occurrences
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 10:06:25 +02:00
Carlos Jimenez Ruiz 1c0d5dbd76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz 742a1c9ea8 removed focus on test 2020-09-02 09:42:10 +02:00
Joan Sanchez 33aec33cba Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 08:12:32 +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 ecb98dfac5 Descriptor fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-01 12:10:32 +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
Javi Gallego a567738f2c set addressFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 08:33:11 +02:00
Joan Sanchez 0a542a2057 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 07:38:03 +02:00
Joan Sanchez b34545b316 Merge branch 'dev' into 2408-item_request
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 13:11:07 +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