Commit Graph

853 Commits

Author SHA1 Message Date
Joan Sanchez 10387ee40b #2913, #2914 - Changes to sales monitors
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 08:41:36 +02:00
Joan Sanchez e39758ee16 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 12:46:54 +02:00
Joan Sanchez a70b29f9bf #2916 - HOTFIX: Grouping selection limit
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 12:44:23 +02:00
Joan Sanchez 8af66a7ca5 HOTFIX: Sort by column
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 15:11:07 +02:00
Joan Sanchez b828609d33 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:39:45 +02:00
Joan Sanchez 2e7d56cc26 Test fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:11:27 +02:00
Joan Sanchez dc44af148d 2863 - Added sales monitor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 09:43:15 +02:00
Joan Sanchez db148c8177 2863 - Added monitor module
gitea/salix/pipeline/head This commit looks good Details
2021-05-04 12:44:21 +02:00
Joan Sanchez 07dbeaf515 2727 - Send consumption report to an email address
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-30 13:50:41 +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
Joan Sanchez af0307a419 2859 - Force translation for SMS
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 13:39: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
Carlos Jimenez Ruiz 3e47e124dc made the name shorter to fix display issues on firefox
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:10:24 +01:00
Joan Sanchez f889e7942b 2846 - Added title property to descriptor name
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 07:44:38 +01:00
jorgebl 5f95bf4e15 Removed vn-horizontal and styles in the spans 2021-03-22 10:23:52 +01:00
Carlos Jimenez Ruiz afb8df1429 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance 2021-03-15 11:32:57 +01:00
Carlos Jimenez Ruiz 2b8286eb28 deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 17:15:26 +01:00
Joan Sanchez 747ec492d0 Removed npm module as dependency
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 13:03:02 +01:00
Carlos Jimenez Ruiz 7c34555afd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 12:30:55 +01:00
Joan Sanchez be37334f49 Requested changes 2021-03-12 08:17:56 +01:00
Joan Sanchez b39ec70a2c Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:54:14 +00:00
Joan Sanchez 2a2e276c6b Added back unit test plus fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:01:32 +01:00
Joan Sanchez ab755e29c7 Merge branch 'dev' into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 14:01:04 +00:00
Joan Sanchez d7651ba4ac 2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good Details
2021-03-08 07:53:00 +01:00
Joan Sanchez 0b532880c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:54:15 +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
Carlos Jimenez Ruiz 97667595e5 removed unused ACL and fixed typos
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz 177ed24892 css amends and sql fixtures for production
gitea/salix/pipeline/head This commit looks good Details
2021-03-02 09:58:17 +01:00
Carlos Jimenez Ruiz fe7017f83c final amends on tests and model descriptions
gitea/salix/pipeline/head This commit looks good Details
2021-03-01 22:21:04 +01:00
Carlos Jimenez Ruiz d6e440751b e2e path for starred modules
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-01 17:43:34 +01:00
Carlos Jimenez Ruiz cd084a53e5 styling update + acls
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-01 16:13:47 +01:00
Carlos Jimenez Ruiz 0299becbfa css adjusted for the pin icon 2021-03-01 12:41:23 +01:00
Carlos Jimenez Ruiz 23cc4bbfeb starred modules working pre-e2e and css amends 2021-03-01 12:15:13 +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
Carlos Jimenez Ruiz bb2912d05a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2585-pinned_module_icons
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-26 09:10:28 +01:00
Carlos Jimenez Ruiz 3dff5f06ff starred modules front and backend 1st steps 2021-02-26 09:08:31 +01:00
jorgebl 56424925e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 13:02:32 +01:00
jorgebl 77d8388c43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 09:59:38 +01:00
Jorge Padawan f10092d2cf Added autocomplete on bank entity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-17 12:07:04 +01:00
Jorge Padawan ac4a19841d Added shrink for date
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-16 15:40:20 +01:00
Joan Sanchez e7c1dc2210 Changes
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 12:19:42 +01:00
Jorge Padawan 0c335b9705 Put bankEntity on global components, and fixed conflict updates
gitea/salix/pipeline/head This commit looks good Details
2021-02-11 18:35:23 +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
Joan Sanchez 84c82ed32d 2595 - Added invoiceIn module
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 15:03:11 +01:00
Jorge Padawan 25de8904b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-05 13:04:52 +01:00
Jorge Padawan 8dc291798f Added tooltip on address and removed workhouse 2021-02-05 13:04:32 +01:00
Joan Sanchez 4fb466d8b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-02-05 08:41:30 +01:00
Joan Sanchez 3f4ebdebf6 Merge branch 'dev' into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 08:22:34 +00:00
Jorge Padawan 9cf5d73be7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 16:15:26 +01:00
Jorge Padawan d2683683ae Show list of mutiple emails on summary 2021-01-29 16:15:03 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +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
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 07:21:05 +01:00
Jorge Padawan 2b4f4cf8f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 11:04:45 +01:00
Jorge Padawan 6d9967ba9f Add list of emails from client
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 10:59:24 +01:00
Joan Sanchez 54a2ea31fa #2753 - Don't apply description text to autocomplete
gitea/salix/pipeline/head This commit looks good Details
2021-01-25 09:21:27 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 15:05:39 +00:00
Carlos Jimenez Ruiz 293dbb3948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component 2021-01-22 12:14:19 +01:00
Joan Sanchez c8ecdfe380 Worker photo max width and height
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 15:00:44 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:51:30 +01:00
Javi Gallego 043a74b548 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 10:20:45 +01:00
Javi Gallego 49b0bca721 refactor autocomplete
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 09:27:15 +01:00
Jorge Padawan a9eb0355d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 09:17:53 +01:00
Joan Sanchez 4435f5e1b0 Vn-th sortable icon hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 07:45:13 +01:00
Jorge Padawan 809811ea10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 07:40:10 +01:00
Joan Sanchez 7568a1c066 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 14:54:24 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Joan Sanchez ffdc753ad4 2691 - Added "or" between date ranges and scope days
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:48:53 +01:00
Jorge Padawan ef4f7d7ca9 2650 new style icon edit button for summaries 2021-01-08 15:42:43 +01:00
Joan Sanchez 94c8c115e5 Font hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-05 13:51:17 +01:00
Joan Sanchez 9aca59e47a CSS height fix
gitea/salix/pipeline/head This commit looks good Details
2021-01-04 14:16:12 +01:00
Joan Sanchez 6416b0ad79 2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 14:56:21 +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
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz c13e9383ba css refactor + watcher from credit insurance 2020-12-16 13:46:04 +01:00
Carlos Jimenez Ruiz eb19bce1ba client module refactors + dialog css 2020-12-15 16:51:36 +01:00
Carlos Jimenez Ruiz 1ba83e7741 cancel button css + item module refactor 2020-12-15 16:07:34 +01:00
Joan Sanchez d7dde7e4eb Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-12-14 07:46:32 +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 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +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 8eb14a8bdc 2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 14:56:10 +01:00
Joan Sanchez d9e14a0c3a 2629 - Open ticket lines on new window
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 12:10:02 +01:00
Joan Sanchez b2794dc413 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 10:52:35 +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
Carlos Jimenez Ruiz 4172d0bb9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 18:51:16 +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
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00
Joan Sanchez 031051abcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-13 09:33:24 +01:00
Bernat Exposito 6fc14d569c Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 08:32:39 +00:00
Joan Sanchez 4acdfd6d4e Th refactor 2020-11-13 09:30:40 +01:00
Joan Sanchez 0edd6071c8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:43:02 +01:00
Joan Sanchez 2680ad2c07 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:39:24 +01:00
Joan Sanchez d174d7b15b Contextmenu filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:38:18 +01:00
Joan Sanchez cb8e9655af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 07:22:12 +01:00
Juan Ferrer 4b46b0787b User syncronization fixes, improvements, refactor 2020-11-12 23:20:25 +01:00