Commit Graph

3190 Commits

Author SHA1 Message Date
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:14:26 +02:00
Javi Gallego c036c7c7fe model ok
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:33:00 +02:00
Carlos Jimenez Ruiz 694055f85c width changed from medium to large
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 16:19:54 +02:00
Carlos Jimenez Ruiz 75155c796d removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 4207bfcc70 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 15:19:38 +02:00
Carlos Jimenez Ruiz 061626e521 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:51:05 +02:00
Carlos Jimenez Ruiz 847e0bd2c8 tests fixed for production sneaky changes 2021-03-30 14:43:21 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +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
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +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 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
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
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 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 0e9b3bd39a Missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 11:12:36 +01:00
Carlos Jimenez Ruiz 409f56ec7f e2e path resurrected for route tickets
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 17:19:05 +01:00
Joan Sanchez b3d333368b #2819 - Notify worker assignment
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 16:19:45 +01:00
Carlos Jimenez Ruiz 89d123c7f8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:30 +01:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:11 +01:00
jorgebl 868a0dbff7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 09:43:34 +01:00
Carlos Jimenez Ruiz 84378fd607 tickets already in route are no longer shown + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:13:12 +01:00
jorgebl e96fd3d1f7 Changed message
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 16:11:52 +01:00
Carlos Jimenez Ruiz 0023a88bfc restored the auto state to its previous version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-22 11:32:57 +01:00
jorgebl 7e903f91a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:32:33 +01:00
Carlos Jimenez Ruiz 1e247e63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-22 10:32:07 +01:00
Joan Sanchez eb12126603 Rollback test changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:27:07 +01:00
jorgebl 322a12e65c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys 2021-03-22 10:24:01 +01:00