Commit Graph

357 Commits

Author SHA1 Message Date
Jorge Penadés 63c615655b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 08:34:05 +01:00
Jorge Penadés 2fb68e81c9 fix: refs #6276 rollback sale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 15:17:39 +01:00
Jorge Penadés 2940c68516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 08:36:05 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Jorge Penadés 9f194f4f63 fix: refs #6276 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 10:28:13 +01:00
Jorge Penadés 21cf05ddd0 fix: refs #6276 fix tests & errors
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-02 09:23:29 +01:00
Jorge Penadés ec7a88c6dd fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 12:56:11 +01:00
Jorge Penadés 8f5a5d9cba fix: refs #6703 tests & backs 2024-01-31 13:11:15 +01:00
Jorge Penadés d43976192a fix: refs #6703 fix conflicts 2024-01-31 09:16:26 +01:00
Jorge Penadés 2a6abffef9 fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 16:07:33 +01:00
Jorge Penadés e17fc91415 fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 14:58:11 +01:00
Jorge Penadés 88dfdb157f 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-30 11:25:17 +01:00
Guillermo Bonet 13b8964e3d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 07:27:34 +00:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00: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
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 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
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
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 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
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
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
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
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 6d0e1cc47c refactor: fix conficts refs #6276 2024-01-04 08:51:18 +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
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
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
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
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 1f2d475f05 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-14 08:41:45 +01:00
Sergio De la torre af83519ee6 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:12:39 +00:00
Jorge Penadés 36a9b0eee4 refs #6276 collectionAddItem
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 16:00:07 +01:00
Jorge Penadés 3109f7722e refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:24:18 +01:00
Jorge Penadés 8acd03f115 refs #6276 saleTrackingReplace
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:01:34 +01:00
Sergio De la torre 3692021b12 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 07:26:22 +00:00
Javier Segarra 1d92bbf4a2 refs #5666 feat: replace base value and add mixins 2023-12-05 07:48:56 +01:00
David Domenech eb0766bafd Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 14:08:47 +00:00
David Domenech 8ab981907d refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:25:00 +01:00
Jorge Penadés 133fe1065a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:44:09 +01:00
Guillermo Bonet 3bdb002034 Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 09:06:17 +00:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 12:42:25 +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
Jorge Penadés 251578146e refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 12:32:36 +01:00