Commit Graph

8424 Commits

Author SHA1 Message Date
Alex Moreno b08dd95e92 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:30:42 +01:00
Javier Segarra 3ff3c812ed refs #2687 fix: remove bad changes file
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 20:15:34 +01:00
Jorge Penadés 32f8d13359 fix: refs #6760 back modified & revoke update on ticket.clientFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 13:15:31 +01:00
Javier Segarra b9a624d9cd refs #2687 feat: create util.procedures
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-02-14 09:30:31 +01:00
Guillermo Bonet bdc6192a7c refactor: refs #5586 Optimized SQL negativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:50:39 +01:00
Guillermo Bonet 42de1a7e51 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:29:46 +01:00
Guillermo Bonet b449da28ef Merge branch 'dev' into 6184-externalCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:42:31 +00:00
Guillermo Bonet 744171dd4c fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:41:26 +01:00
Jorge Penadés c8e13fa858 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:36:07 +01:00
Guillermo Bonet e08fb3d229 fix: refs #6184 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:59:58 +01:00
Guillermo Bonet 97f02187e3 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:35:07 +01:00
Jorge Penadés 534b5bb05a fix: refs #6106 where filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:26:00 +01:00
Javier Segarra e79bdb4456 refs #2687 test: fix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-12 08:45:07 +01:00
Jorge Penadés d60a95feaa fix: refs #6379 await & locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:34:25 +01:00
Jorge Penadés 9cf5edb26e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:45:33 +01:00
Jorge Penadés c3b0a8260a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:38:59 +01:00
Jorge Penadés e61b6b0c13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:36:53 +01:00
Jorge Penadés e0de498f65 fix: refs #6379 add Error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 13:04:27 +01:00
Carlos Satorres e03e871529 Merge branch 'dev' into 6791-negativeNickname
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 11:47:36 +00:00
Carlos Satorres 1597f17230 refs #6791 remove intro
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 12:47:17 +01:00
Jorge Penadés 4075375d6e fix: refs #6379 get mail 2024-02-09 12:12:10 +01:00
Carlos Satorres 3e57bf2b34 refs #6791 remake negativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 11:49:29 +01:00
Jorge Penadés 3f08cdd51c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 09:45:10 +01:00
Jorge Penadés 30069ded15 fix: refs #6806 fix date filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 16:01:34 +01:00
Guillermo Bonet 974228eedd refactor: refs #5586 Optimized SQL negativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 11:37:15 +01:00
Carlos Satorres 7e18bd0a12 refs #6281 vehicles remove where
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-07 13:03:24 +01:00
Carlos Satorres 9ee0669903 hotfix kmMax
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-07 11:27:18 +01:00
Guillermo Bonet ffa9212861 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-07 10:29:42 +01:00
Jorge Penadés aff8ee28ea fix: refs #6272 back & create test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-07 10:16:47 +01:00
Guillermo Bonet f4feb6e8b7 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:13:48 +01:00
Guillermo Bonet 2cab007f57 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:12:45 +01:00
Carlos Satorres 318f74072e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 10:09:11 +01:00
Guillermo Bonet f2946e4168 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:04:19 +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 a0c5b1fff6 feat: refs # test corrective & clone
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 11:59:51 +01:00
Jorge Penadés cd73e5adfe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 09:37:43 +01:00
Jorge Penadés 99fbb95669 fix: refs #6703 test back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 09:35:20 +01:00
Jorge Penadés 05478b43f2 fix: refs #4466 test back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 09:30:29 +01:00
Jorge Penadés 17680b2cc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:49:48 +01:00
Jorge Penadés 86d839ad45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:48:22 +01:00
Jorge Penadés ef5401aa46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:44:23 +01:00
Jorge Penadés 0c356938fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:43:56 +01:00
Jorge Penadés 743f317b20 fix: refs #4466 test & sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:02:16 +01:00
Guillermo Bonet eec36300ad refactor: refs #6184 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:25:48 +01:00
Guillermo Bonet 1d596b63a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:24:28 +01:00
Jorge Penadés c9b28d10bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 11:27:19 +01:00
Alex Moreno 9ac0ffb85a Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 07:30:59 +00:00
Jorge Penadés 7d01449518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:11:48 +01:00
Jorge Penadés a20effc42c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:11:23 +01:00
Carlos Satorres 6576bab305 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 11:48:48 +00:00
Carlos Satorres ffbe0e1261 Merge branch 'dev' into 6318-removeQuantityCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 11:27:08 +00:00
Carlos Satorres e56e5905c2 Merge branch 'dev' into 6757-supplierMayus
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 11:22:47 +00:00
Alex Moreno a9a1f97366 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-01 12:17:48 +01:00
Carlos Satorres 91c3c8f04d Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 10:51:11 +00:00
Alex Moreno 36e8840e6e Merge branch 'dev' into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 09:28:59 +00:00
Jorge Penadés 4490dc7bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch 2024-02-01 08:15:15 +01:00
Jorge Penadés af4af43d9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund 2024-02-01 08:14:50 +01:00
Guillermo Bonet b045584658 Merge branch 'dev' into 6184-saveCmr 2024-02-01 07:11:33 +00:00
Guillermo Bonet 548526964e Merge branch 'dev' into 6184-saveCmr 2024-02-01 06:23:25 +00:00
Carlos Satorres aa993e7386 refs #6757 fix back, fix upperCase, fix e2e back
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 17:01:47 +01:00
Carlos Satorres cbdb089562 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 15:44:57 +00:00
Carlos Satorres 40dd0d4e02 Merge branch 'dev' into 6318-removeQuantityCheck
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 14:50:05 +00:00
Guillermo Bonet 851e5cc5af refactor: refs #6235 Fixed tests back 2024-01-31 13:16:56 +01:00
Carlos Satorres bbf50995c7 Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:21:06 +00:00
Guillermo Bonet e0d15e572c Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:13:57 +00:00
Jorge Penadés be3e7bb8df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:01:21 +01:00
Jorge Penadés 6f306ad18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:59:57 +01:00
Jorge Penadés e6eac54709 fix: refs #6703 tests & front 2024-01-31 09:59:32 +01:00
Jorge Penadés c136395d1e fix: refs #6703 fix conflicts 2024-01-31 09:16:38 +01:00
Jorge Penadés d43976192a fix: refs #6703 fix conflicts 2024-01-31 09:16:26 +01:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00
Sergio De la torre a8b483078f refs #6186 feat:deprecated packingShelve
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 08:52:36 +01:00
Jorge Penadés 9e12bdf4e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 08:49:28 +01:00
Carlos Satorres 5d2f3d1a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack 2024-01-30 16:42:00 +01:00
Jorge Penadés 5690da0a18 fix: refs #6776 add userId
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-30 16:05:56 +01:00
Carlos Satorres 509d5cea14 refs #6270 fix back
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 15:54:03 +01:00
Jorge Penadés afa34c6296 feat: refs #6776 makeMulti
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 14:00:08 +01:00
Carlos Satorres 2fc39d54a0 refs #6318 fix code
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 13:09:15 +01:00
Guillermo Bonet d39d54a514 fix: #6184 Requested changes 2024-01-30 09:50:53 +01:00
Guillermo Bonet 1e56e741e2 fix: #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 09:44:10 +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
Sergio De la torre 0f3ffcfa61 fix: refs #6184 Upload sign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:11:33 +01:00
Guillermo Bonet 1fe6818a0f fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 07:42:58 +01:00
Guillermo Bonet 65268487b9 fix: #6184 Now creates only one dms in saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 07:32:26 +01:00
Carlos Satorres 9b8c58ba7d refs #6270 makeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 16:00:24 +01:00
Carlos Satorres 94cc3ad80e Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:47:52 +00:00
Carlos Satorres f14c239391 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:10:17 +00:00
Javier Segarra 2e0da0881b refs #6174 test: fix method
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:54:19 +01:00
Javier Segarra 9bf08f31ae refs #6174 feat: replace method in salix-front 2024-01-29 14:10:22 +01:00
Carlos Satorres 04f1a03d4d refs #6397 fix back
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:08:43 +01:00
Juan Ferrer 194262a93e fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 13:48:02 +01:00
Guillermo Bonet 65756f98ad fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 08:25:00 +01:00
Guillermo Bonet 990e8ee249 Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 08:14:34 +01:00
Guillermo Bonet 7c80a7bdda fix: #6184 Minor changes 2024-01-29 08:14:33 +01:00
Jorge Penadés 4fc780967f fix: refs #6703 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 15:32:50 +01: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
Guillermo Bonet 567e480e3b feat: #6184 Minor changes
gitea/salix/pipeline/head Build queued... Details
2024-01-26 12:40:42 +01:00
Jorge Penadés ab3fdf4fe4 fix: refs #6703 remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-26 12:33:04 +01:00
Guillermo Bonet 25fa154f60 feat: #6184 Minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 12:25:02 +01:00
Jorge Penadés e33861a80d fix: refs #6703 filter
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 12:15:53 +01:00