Commit Graph

10404 Commits

Author SHA1 Message Date
Joan Sanchez e136387fcb Merge pull request '2921 - Changed the ticket url of rocket notifications' (#626) from 2921-notification_url into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #626
2021-05-20 08:27:36 +00:00
Joan Sanchez fbc11b7a39 Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good Details
2021-05-20 08:23:45 +00:00
Javi Gallego b7bcb4bd17 selectores
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 19:15:47 +02:00
Javi Gallego df073cce2f refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 17:04:13 +02:00
Javi Gallego bc887bce8e Merge pull request '2885-ticket_sale_item_family_not_restricted' (#627) from 2885-ticket_sale_item_family_not_restricted into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #627
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2021-05-19 13:39:42 +00:00
Carlos Jimenez Ruiz c16c93a75a updated fixtures for item
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:34:17 +02:00
Carlos Jimenez Ruiz 2494af0113 removed unused relation from item @addSale 2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Carlos Jimenez Ruiz df9373aded e2e amends due to html changes on logs 2021-05-19 14:14:04 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 10:26:58 +02:00
Joan Sanchez 782783b0b4 Merge pull request '2908-logs_no_ellipsize' (#625) from 2908-label_value_full_text into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #625
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-05-18 13:47:27 +00:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:53:33 +00:00
Carlos Jimenez Ruiz 8fb5d66d8d replaced spans with label-value components
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:53:08 +02:00
Joan Sanchez 98d7f246a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:38 +02:00
Joan Sanchez a9e33abacc FIX: Show employee list
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz 137eb52945 Merge branch '2908-label_value_full_text' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:35:57 +02:00
Carlos Jimenez Ruiz c12f352d14 Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:29:32 +00:00
Carlos Jimenez Ruiz e10dc53a9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text 2021-05-18 14:22:36 +02:00
Joan Sanchez 82c64bf096 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:22:13 +02:00
Joan Sanchez dcebe94294 Show supplier name on route-driver report
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:21:49 +02:00
Joan Sanchez 3402bd119d Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz 06d396a76a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Carlos Jimenez Ruiz bf05296b84 made dev debug info window less nav intrusive 2021-05-18 13:20:08 +02:00
Joan Sanchez 5c760b3faa Max height
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:21:01 +02:00
Joan Sanchez c310bfab49 Updated z-index
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 11:58:32 +02:00
Joan Sanchez b87e79b9d3 Changes 2021-05-18 11:58:32 +02:00
Joan Sanchez 6ec28cbc86 Removed transaction block 2021-05-18 11:58:32 +02:00
Joan Sanchez bc7f2d8193 Responsive 2021-05-18 11:58:32 +02:00
Joan Sanchez bb67277c68 #2913, #2914 - Changes to sales monitors 2021-05-18 11:58:32 +02:00
Carlos Jimenez Ruiz a5f4936e60 Merge pull request '#2913, #2914 - Changes to sales monitors' (#624) from 2913-monitor_changes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #624
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-05-18 08:29:29 +00:00
Joan Sanchez ce96e92389 Updated z-index
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:20:15 +02:00
Joan Sanchez 400bf7b4f2 Changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:05:13 +02:00
Joan Sanchez 5d278f416f Removed transaction block
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:04:01 +02:00
Joan Sanchez bf250b77ef Responsive
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 09:12:47 +02:00
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 ea1ff3e5fa Merge pull request '2896-route_tickets_refactor + transactions + unitest + e2e' (#623) from 2896-route_tickets_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #623
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-05-17 10:32:42 +00:00
Carlos Jimenez Ruiz 5843140cf5 minor refactor for code usage instead of description
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz 54d75e0e54 e2e amends for salesPerson
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 11:08:00 +02:00
Carlos Jimenez Ruiz f0fbb13af8 fixtures to english changes + e2e amends
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 10:38:53 +02:00
Carlos Jimenez Ruiz bdcd05ee14 removed commented code and the keep file
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 10:30:39 +02:00
Carlos Jimenez Ruiz e848b94859 removed LEFT from join
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz 3a25dbc3b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:05:15 +02:00
Joan Sanchez 085a5a104b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 08:39:55 +02:00
Joan Sanchez b67c95e5f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:38:04 +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
Carlos Jimenez Ruiz b902a4dd4a front unit test fix 2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz 97e9dc57bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz 799a3c6c36 e2e paths updated to endpoints refactors 2021-05-14 19:22:04 +02:00