verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
18,169 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

18169 Commits

Author SHA1 Message Date
Javi Gallego aa0794e136 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 06:31:25 +01:00
Javi Gallego 4a62588464 Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-23 14:01:53 +00:00
Jorge Penadés 1f9030c36d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 13:35:46 +01:00
Jorge Penadés eeef279483 refs #5811 replace decription
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 13:34:29 +01:00
Jorge Penadés 5f09907c98 Merge branch '5835-fixGetTotals' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 13:21:09 +01:00
Jorge Penadés 025e4f3f87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals 2023-11-23 13:21:00 +01:00
Jorge Penadés f4a1d09ef8 Merge branch 'dev' into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 12:04:05 +00:00
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
Jorge Penadés 6b2c1e09de refs #5835 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:31:00 +01:00
Javi Gallego 5b145a57e6 error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:29:53 +01:00
Jorge Penadés 048e3089cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:26:41 +01:00
Jorge Penadés db15285858 refs #5811 test updated
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:21:56 +01:00
Jorge Penadés 2e67ef4f5d refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:32:07 +01:00
Jorge Penadés 900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:26:28 +01:00
Javi Gallego f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 09:44:47 +01:00
Javi Gallego 5b289ec083 Merge branch 'dev' into 6028_route_getRouteByWorker 2023-11-23 09:21:44 +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
Jorge Penadés 6580896dcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 08:46:11 +01: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
Jorge Penadés da7b670d74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 08:28:56 +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
Carlos Satorres 2b455488a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 18:35:16 +01:00
Carlos Satorres 6b07ee4eb1 hotfix workerhours 2023-11-22 18:35:14 +01:00
Javi Gallego e856de0cfd feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:54:38 +01:00
Jorge Penadés 26a8cc6a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:41:24 +01: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
Javi Gallego e146c0ea46 Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 12:42:20 +01:00
Javi Gallego a0a9e299d9 feat: refs #6275 getTickets with phone
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 12:39:21 +01: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
Jorge Penadés a27bb53089 refs #5835 getTotals fixed
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 08:57:45 +01: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
Jorge Penadés 3f8d1ff617 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:17:31 +01: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
Juan Ferrer bf7c67dbde fix: refs #6197 add definer to events
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:26:02 +01: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
Juan Ferrer 0a2fd9cf5d fix: refs #6432, #5848 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 18:39:37 +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