Commit Graph

1513 Commits

Author SHA1 Message Date
Javier Segarra 0afc9ab109 refs #6174 test: fix test bug
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 09:55:21 +01:00
Javier Segarra f1cbb6aab3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify 2024-01-26 08:48:05 +01:00
Jorge Penadés e5d466b697 fix: refs #6703 drop & replace sale refund by clone
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 08:30:43 +01:00
Pablo Natek a7faac3ef6 fix. refs #6743 remove consoleLog 2024-01-25 15:07:19 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Guillermo Bonet 9005975f1c feat: #6184 Modified email cmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 13:56:47 +01:00
Alex Moreno 66936d8983 hotFix: saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 11:37:25 +01:00
Alex Moreno 578bcd3cce hotFix: saveSign 2024-01-25 11:09:56 +01:00
Jorge Penadés 01340408c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 08:14:02 +01:00
Jorge Penadés 02e38eb711 fix: refs #6276 fix tests
gitea/salix/pipeline/head Build queued... Details
2024-01-25 08:13:47 +01:00
Carlos Satorres a594fda704 Merge branch 'dev' into 6313-removecanForceQuantity
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 12:50:03 +00:00
Javier Segarra bc6f9bc074 refs #6174 test: new test for new method
gitea/salix/pipeline/head This commit looks good Details
2024-01-23 23:52:45 +01:00
Guillermo Bonet a676607e29 feat: #6184 Added email cmr 2024-01-23 14:13:40 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
Jorge Penadés dcf6232c14 feat: refs #6276 test sale_getFromSectorCollection
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 08:39:30 +01:00
Jorge Penadés efb8bc46c6 refactor: refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 15:13:49 +01:00
Jorge Penadés e3899b2cf7 refactor: refs #6276 saleTracking_mark
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 13:32:50 +01:00
Jorge Penadés ed713e762b feat: refs #6276 test saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 12:36:52 +01:00
Javier Segarra ba2815becb Merge branch 'dev' into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 09:00:55 +00:00
Jorge Penadés f04724a61f feat: refs #6276 new test added
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 07:58:18 +01:00
Jorge Penadés 89d18e29f0 feat: refs #6276 test saleTrackingReplace (updateTracking)
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 07:49:21 +01:00
Jorge Penadés 5c0425b942 feat: refs #6276 test machineWorker_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 09:52:49 +01:00
Jorge Penadés d41d57143f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 13:53:26 +01:00
Guillermo Bonet 9faf889833 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 09:55:04 +00:00
Alex Moreno ef2b156b55 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 08:07:47 +01:00
Jorge Penadés 8e5be5f5da feat: refs #6276 test itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 15:26:04 +01:00
Guillermo Bonet a486b7f2d4 feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:42:38 +01:00
Alex Moreno 3c778216a4 Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:19:18 +00:00
Guillermo Bonet 1a52e58eaa feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:18:31 +01:00
Guillermo Bonet 45fd96cee6 feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:07:26 +01:00
Jorge Penadés 1fbb84ae9f fix: refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 12:58:57 +01:00
Jorge Penadés bf13e85ecc fix: refs #6276 getFromSectorCollection
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 12:14:38 +01:00
Jorge Penadés e69ec2c856 feat: refs #6276 test expeditionPallet_get
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 12:07:22 +01:00
Javier Segarra 3564a77043 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 11:12:04 +01:00
Guillermo Bonet f1b84ee7a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:44:00 +01:00
Javier Segarra 21ce57d217 refs #6174 feat: update back to separate invoice and pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:31:07 +01:00
Jorge Penadés 90b1e8d664 fix: refs #6276 backend tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:18:13 +01:00
Guillermo Bonet 2f67056dbf Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 09:44:32 +01:00
Jorge Penadés 6a78123fca fix: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 09:01:48 +01:00
Jorge Penadés fafc25ed19 refactor: refs #6276 sectorCollection_getSale
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-16 14:50:09 +01:00
Alex Moreno aac3e17d3c Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-16 13:40:37 +00:00
Carlos Satorres b3e1c58918 refs #6313 remove restriction
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 14:50:08 +01:00
Jorge Penadés 54192c54ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 13:56:32 +01:00
Javier Segarra 831d358e41 refs #6174 feat first approach 2024-01-15 10:52:02 +01:00
Jorge Penadés 6236cf0621 hotfix ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 16:18:26 +01:00
Carlos Satorres d0df880c32 Merge branch 'dev' into 6322-futureTicketImporte
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 07:47:23 +00:00
Jorge Penadés ddcecb8f22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 16:52:54 +01:00
Alex Moreno b1530d049e refs #6398 hotFix: use userFk
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 13:29:03 +01:00
Javi Gallego c98baf21bf Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 12:17:59 +00:00
Jorge Penadés c61f5a67b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 09:28:24 +01:00
Guillermo Bonet 81ffc122fc Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 14:09:47 +01:00
Carlos Satorres bf44f82f4f refs #6322 fix code
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:16:14 +01:00
Carlos Satorres 676d95563b refs #6322 importe
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 12:53:58 +01:00
Robert Ferrús ea5483e847 refs #6222 refactor: sale_calculateComponent
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 10:50:37 +01:00
Jorge Penadés ab1dc7af55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-08 16:21:46 +01:00
Pablo Natek 0e29db3b1e Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 13:17:24 +00:00
Pablo Natek 9af27783ed Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-08 08:11:03 +00:00
Carlos Satorres c72311860b refs #647 remove e2e
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 09:06:22 +01:00
Javi Gallego 406cf7335b Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-05 07:12:12 +00:00
Pablo Natek f48500f4b3 Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 18:44:11 +00:00
Pablo Natek e9773b3885 refactor(state): refs #6366 simplify if condition
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 18:56:31 +01:00
Jorge Penadés 8a5da43503 refactor: sectorCollection_getSale refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 16:00:25 +01:00
Pablo Natek 2e5ae062cf Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 14:24:24 +00:00
Jorge Penadés 7a64b57a2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:07:33 +01:00
Javi Gallego 767c6a6ac8 test: refs #3979 fixtures arregladas para que los abonos sean negativos
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 15:01:56 +01:00
Jorge Penadés ad89363db5 fix: mark refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 13:11:39 +01:00
Jorge Penadés da8057e4c7 fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:35:00 +01:00
Jorge Penadés 384d9ec803 fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:27:02 +01:00
Javier Segarra f7d83b15bd Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 08:08:46 +00:00
Jorge Penadés 7d0c11e937 Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:51:46 +01:00
Jorge Penadés 6d0e1cc47c refactor: fix conficts refs #6276 2024-01-04 08:51:18 +01:00
Carlos Satorres 15d6c9a65b Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:39:07 +01:00
Javi Gallego 4cb82524cb test: refs #3979 quito clone parametro group porque no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:37:34 +01:00
Pablo Natek 847623f9c6 Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:28:46 +00:00
Pablo Natek b42aed13c4 Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:15:29 +00:00
Javi Gallego 2fb60aeed3 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 15:37:05 +01:00
Javi Gallego ab341b9b5e test: refs #3979 test de clone 2024-01-03 15:36:39 +01:00
Alex Moreno af784522c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2024-01-03 14:52:16 +01:00
Javier Segarra 4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
David Domenech 3c1237f727 refs #6456
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 13:37:18 +01:00
Sergio De la torre 0b5ffcc81c refs #6276:modify back silex→salix 2024-01-03 12:50:53 +01:00
Alex Moreno ba26237998 refs #5914 refactor: getTaxBases
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 12:19:28 +01:00
Guillermo Bonet f73a447391 refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 11:57:49 +01:00
Alex Moreno 1e3a7e5f91 refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:17:10 +01:00
Jorge Penadés 767894b128 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-02 09:41:47 +01:00
Alex Moreno dd02a932ef Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 06:40:18 +00:00
Pablo Natek ccf5387e04 refactor(state): refs #6366 unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 12:44:24 +01:00
Pablo Natek f7ec64f3c1 merge(dev): refs #6366 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:00:23 +01:00
Pablo Natek 5a1c4ddea0 refactor(ticketSms): refs #6259 ticketSmsToClientSms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 08:20:13 +01:00
Pablo Natek 35750bc93f merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:46:12 +01:00
Pablo Natek 27a369bef4 refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:34:22 +01:00
Javier Segarra 6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 13:06:52 +01:00
Alex Moreno 351a12204a Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 08:07:30 +00:00
Guillermo Bonet 17e177b788 fix: refs #6398 Fix tests back
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:12:03 +01:00
David Domenech d60f2a7f88 fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 09:43:09 +01:00
Jorge Penadés 5c22f51043 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-18 10:29:14 +01:00
Javier Segarra 7723b244d0 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 07:17:51 +00:00
Javier Segarra 8d650cf6c0 refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 08:09:44 +01:00
Javier Segarra c9af8cba81 refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 12:50:05 +01:00
Alex Moreno 21a1dbeae7 refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:56:49 +01:00