Commit Graph

10249 Commits

Author SHA1 Message Date
Joan Sanchez d9834ae740 Removed old versions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:02:15 +02:00
Joan Sanchez 50f1fd30aa Risk tolerance fixture
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 13:15:42 +02:00
Joan Sanchez d66cf68e89 Fixed table error
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 12:28:43 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz e025368af1 updaloadFile transaction commit conditional
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz dbf5296041 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:56:12 +02:00
Carlos Jimenez Ruiz 70f6728c8f started to created date changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz 8797444553 importTicketSales refactor + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:29 +02:00
Javi Gallego 3cb0859f85 Merge branch 'dev' into 2785-getBalance-tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:22 +02:00
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +02:00
Javi Gallego de3f338629 test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:31:00 +02:00
Carlos Jimenez Ruiz 740cc79bc0 uploadFile refactor 2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz de2a17e840 removeFile and filter refactors 2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz 8d8bdacd86 updateClaimAction refactor + tests 2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz 3054cbcadb updateClaim refactor + tests 2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz c4cbc064c9 regularice claim refactor + test 2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz ee79f23185 createFromSales refactor + tests 2021-03-29 15:14:23 +02:00
Joan Sanchez eddd769af0 Excluded unit test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 08:39:33 +02:00
Joan Sanchez 3f0fe15763 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:50:34 +02:00
Joan Sanchez dbb6ccd89d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:50:16 +02:00
Joan Sanchez 13d71b590a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:33:49 +02:00
Joan Sanchez 407c0e6280 Supplier "Contacts" changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:33:20 +02:00
Joan Sanchez 320e3143cd Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 12:51:14 +01:00
Joan Sanchez 4dbcc0dd5c HOTFIX: Ticket filter changed ticketGetTotal() args
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 12:32:32 +01:00
Carlos Jimenez Ruiz 8a5c675266 Merge pull request '2844-item last entries show the total cost in the "cost" column' (#585) from 2844-item_lastEntries_sum into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #585
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-26 11:26:24 +00:00
Carlos Jimenez Ruiz 767665e3c9 endpoint indentation + type updated yo array of objects
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz f46c18b6b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum 2021-03-26 10:33:58 +01:00
Carlos Jimenez Ruiz 3c8ed85e69 sum is now made on backend and html amends 2021-03-26 10:33:53 +01:00
Joan Sanchez 1da245ba46 Merge pull request '2840-ticket_card_sale_deprecations' (#586) from 2840-ticket_card_sale_deprecations into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #586
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-25 09:11:44 +00:00
Carlos Jimenez Ruiz 1cc4e60bad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 16:45:57 +01:00
Carlos Jimenez Ruiz 41bb4cbaab deprecated vat and subTotal related methods + tests fixed 2021-03-24 16:43:54 +01:00
Joan Sanchez de7f1bbc12 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 14:26:09 +01:00
Joan Sanchez 302dedef0f Missing translations & attachment fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 14:25:57 +01:00
jorgebl 393b9ba38c Correct name 2021-03-24 14:17:27 +01:00
jorgebl 81fbc81314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 13:54:41 +01:00
jorgebl e01b7420d9 Added total cost of item 2021-03-24 13:54:29 +01:00
Joan Sanchez 2c1b155122 Added missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 13:48:14 +01:00
Carlos Jimenez Ruiz ba7818ff43 Merge pull request '2819-notify_assignment' (#584) from 2819-notify_assignment into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #584
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-24 12:40:33 +00:00
Joan Sanchez e767e95729 Loggable fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 13:09:35 +01:00
Joan Sanchez c65fbef3df Merge branch 'dev' into 2819-notify_assignment
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:47:38 +00:00
Joan Sanchez 32805dbafb Added model unit test
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 12:45:26 +01:00
Joan Sanchez 412dd34229 Merge pull request 'e2e for account create and home firefox fix' (#583) from 2841-e2e_account_create_and_basic_data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #583
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-24 10:21:56 +00:00
Joan Sanchez 23facc8a50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2841-e2e_account_create_and_basic_data
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:14:20 +01:00
Joan Sanchez 00aeaafc49 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:12:51 +01:00
Joan Sanchez 0e9b3bd39a Missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:12:36 +01: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 7a35e60b8a Merge branch 'dev' into 2841-e2e_account_create_and_basic_data
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 10:10:22 +00:00
Carlos Jimenez Ruiz 81ae63356a removed the edition steps to avoid errors 2021-03-24 11:09:58 +01:00
Carlos Jimenez Ruiz a62c030166 made the name shorter to fix display issues on firefox
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:06:48 +01:00