Commit Graph

17904 Commits

Author SHA1 Message Date
Sergio De la torre 756e55f5c2 Merge pull request 'refs #5890 fix: getTickets' (!1852) from 5890_collection_getTickets into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1852
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-23 11:23:15 +00:00
Alex Moreno 4735307f5d refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:49:00 +01:00
Alex Moreno 1277bec801 Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 07:56:02 +00:00
Alex Moreno 217aa1ac77 refs #6491 deploy(2350) init version
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 08:35:08 +01:00
Alex Moreno f4fabb9fff refs #6491 refactor(order_filter): optimized
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 08:26:14 +01:00
Carlos Andrés 800d12e0f2 Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 18:00:34 +00:00
Guillermo Bonet 31c1add02b Merge pull request 'refactor: refs #4502 Deleted zoneEstimatedDelivery' (!1844) from 4502-zoneEstimatedDelivery into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1844
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-22 12:52:36 +00:00
Guillermo Bonet d52c82fb19 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 11:36:07 +00:00
Sergio De la torre 707173d618 refs #5890 fix: getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 07:04:33 +01:00
Alex Moreno f9382a1c22 Merge pull request 'refs #6454 feat: dump db' (!1849) from 6454-dbDump into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1849
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-21 12:26:53 +00:00
Alex Moreno 95a55f612d Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:58:21 +00:00
Pablo Natek bddb787075 Merge pull request 'remove(barcode): refs #5228 remove barcode from report' (!1847) from 5228-fixPalletReport into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1847
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-21 10:44:49 +00:00
Pablo Natek 6fc818deab Merge branch 'dev' into 5228-fixPalletReport
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:33:20 +00:00
Guillermo Bonet b3d1c72adc Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:41 +00:00
Alex Moreno e909c2bc26 Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:17 +00:00
Alex Moreno 02e8b90926 refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:12:07 +01:00
Jorge Penadés 4c287f6a23 Merge pull request 'ref #5835 due day new and fixtures' (!1833) from 5835-newInvoiceInDueDay into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1833
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-21 09:08:59 +00:00
Jorge Penadés dd11cf5327 ref #5835 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:03:25 +01:00
Jorge Penadés 34e5409533 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 08:19:11 +01:00
Pablo Natek c62390fa4a Merge branch 'dev' into 5228-fixPalletReport
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 06:55:51 +00:00
Pablo Natek fc653746f0 remove(barcode): refs #5228 remove barcode from report
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 07:54:25 +01:00
Alex Moreno ee1a0c15ee refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 15:09:55 +01:00
Guillermo Bonet 5fdf18825c Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 13:14:51 +00:00
Alex Moreno e25ca914a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 10:13:02 +01:00
Guillermo Bonet b2b12adb3d Merge branch '4502-zoneEstimatedDelivery' of https://gitea.verdnatura.es/verdnatura/salix into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 09:47:58 +01:00
Guillermo Bonet 61b2d4c5fd refactor: refs #4502 zoneEstimatedDelivery 2023-11-20 09:47:57 +01:00
Guillermo Bonet badb4d69a2 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:15:40 +00:00
Pablo Natek f27fdaa023 Merge pull request 'fix(filter): refs #6461 now is mockDate in local' (!1845) from 6461-fixFilterNegativeBases into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1845
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-17 11:23:24 +00:00
Pablo Natek e2a2454d4e Merge branch 'dev' into 6461-fixFilterNegativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 10:31:35 +00:00
Pablo Natek dc100f7959 fix(filter): refs #6461 now is mockDate in local
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 11:29:57 +01:00
Juan Ferrer bb6f3b4cfd fix: refs #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 08:56:25 +01:00
Alex Moreno 21701c40ae Merge pull request '#6335 -ticketAdvance_splitOrCreate' (!1817) from 6335-ticketAdvance_splitOrCreate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1817
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-17 06:55:58 +00:00
Guillermo Bonet 8da36569f7 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued... Details
2023-11-17 07:44:43 +01:00
Guillermo Bonet 500eb22dc6 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 06:43:58 +00:00
Guillermo Bonet 3d1c69be56 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 07:43:32 +01:00
Guillermo Bonet 2f611391b9 Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good Details
This reverts commit bfd6e1f398.
2023-11-17 07:17:29 +01:00
Juan Ferrer c2e295f777 fix: refs #6432 account sync fixes 2023-11-17 00:08:29 +01:00
Juan Ferrer 14eb14ad3f fix: refs #6432 bookworm upgrade
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 00:00:36 +01:00
Juan Ferrer 6930c2d52e fix: #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 23:13:16 +01:00
Juan Ferrer ea5a881d1f fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:10:30 +01:00
Juan Ferrer 1937560118 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:07:30 +01:00
Juan Ferrer 4f5242e3ae fix: refs #6432 account sync fixes 2023-11-16 23:07:26 +01:00
Alex Moreno aea3f7b2b9 refs #6434 fix: use trim
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 15:10:47 +01:00
Alex Moreno 83ae0379b5 refs #6434 fix: console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 12:28:35 +01:00
Javier Segarra adc1cd887b Merge pull request '#6434 - Usuario accede como otro usuario' (!1843) from 6434-signInLog_issue_MASTER into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1843
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-16 11:06:50 +00:00
Javier Segarra a73453e9ed refs #6434 feat: remove old sql file
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 11:56:59 +01:00
Javier Segarra 9e64939810 refs #6434 feat: add Id property in model 2023-11-16 11:56:48 +01:00
Javier Segarra abf772ae87 refs #6434 feat: check if signIn inserts signInLog
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:43:00 +01:00
Javier Segarra 386b556216 refs #6434 feat: new test user signIn with email
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:29:57 +01:00
Javier Segarra 579cd832c0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER 2023-11-16 10:08:06 +01:00