Commit Graph

206 Commits

Author SHA1 Message Date
Pako Natek 9c14836bc7 BlueMonkey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 13:18:13 +01:00
Guillermo Bonet 950d7a2461 refactor: refs #6874 Changed params item_getSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 12:48:39 +01:00
Guillermo Bonet 00d5d06c6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:38:15 +01:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:37:06 +01:00
Guillermo Bonet d2f451c613 ticket #162561 hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:33:28 +01:00
Sergio De la torre 726558d5a7 refs #6607 feat:[checking boxes]
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 10:37:15 +01:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Guillermo Bonet 05380df4f8 Merge pull request 'refactor: refs #6874 Proc itemProposal' (!2123) from 6874-itemProposalRefactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2123
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-05 06:35:04 +00:00
Guillermo Bonet 489d126f79 Merge branch 'dev' into 6494-procRefactor3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:44:47 +00:00
Guillermo Bonet 2c7913a3be Merge branch 'dev' into 6499-procRefactor7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 12:41:50 +00:00
Guillermo Bonet fa70eeb75c refactor: refs #6499 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:42:11 +01:00
Guillermo Bonet e65fc06a30 Merge branch 'dev' into 6494-procRefactor3
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 12:33:49 +00:00
Guillermo Bonet a96743c3b9 refactor: refs #6494 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 13:34:42 +01:00
Guillermo Bonet cf810fe497 refactor: refs #6874 Proc itemProposal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:14:41 +01:00
Guillermo Bonet 24efc1dd28 Merge branch 'dev' into 6874-itemProposalRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 11:43:36 +00:00
Javier Segarra 753525d0ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 11:57:16 +01:00
Ivan Mas bd5d88f5ef refs #6969 Error packaging
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-04 08:41:09 +01:00
Guillermo Bonet 28dbb200fc refactor: refs #6874 Proc itemProposal
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 08:38:24 +01:00
Ivan Mas 1ccec1e0fb refs #6499 procRefactor part 6 2024-03-04 08:11:06 +01:00
Guillermo Bonet df7427d83c Merge branch 'dev' into 6499-procRefactor7
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 06:07:56 +00:00
Guillermo Bonet b29a001c7f Merge branch 'dev' into 6496-cleanVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 06:07:53 +00:00
Guillermo Bonet 0b63991303 Merge branch 'dev' into 6494-procRefactor3
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 06:07:24 +00:00
Alex Moreno a3052c1cf9 refs #6925 hotFix(invoice) parenthesis & handle incoterms error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 15:05:12 +01:00
Guillermo Bonet 1f9f10323b refactor: refs #6494 Migrated and deleted residual procs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 11:21:04 +01:00
Robert Ferrús 594780d6cb feat: refs #6958 delete sale_checkNoComponents
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 13:44:49 +01:00
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +01:00
Guillermo Bonet 96bab9b27d refactor: refs #6496 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 07:37:23 +01:00
Guillermo Bonet 7a43ccaa36 refactor: refs #6496 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 07:32:19 +01:00
Robert Ferrús 82445683a7 fix: refs #6501 entry_getTransferFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-28 09:19:57 +01:00
Guillermo Bonet 9f2d1a8c0f refactor: refs #6499 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 09:13:01 +01:00
Guillermo Bonet b8e6cc9f9c refactor: refs #6499 Added comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 09:08:47 +01:00
Guillermo Bonet cba0e55846 refactor: refs #6499 Added comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:39:49 +01:00
Guillermo Bonet b9c5930f68 refactor: refs #6499 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:29:12 +01:00
Guillermo Bonet 6c67462943 refactor: refs #6499 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:26:17 +01:00
Guillermo Bonet 80ecd698f8 refactor: refs #6499 Migrated procs to vn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 08:23:58 +01:00
Guillermo Bonet fefc193ec0 refactor: refs #6496 Deleted clean vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 13:59:21 +01:00
Guillermo Bonet 554f6c4695 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 14:28:46 +01:00
Guillermo Bonet 57dd1a4e56 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-26 14:28:08 +01:00
Ivan Mas e3b735d80b Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 13:14:15 +00:00
Alex Moreno b1a8fcf968 refs #6925 fix(invoice): incoterms error 2024-02-26 11:50:46 +01:00
Guillermo Bonet 89a9cc26d3 fix: ticket #158883
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-26 09:50:03 +01:00
Jorge Penadés 6e161dfee8 fix: refs #6878 column name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:45:58 +01:00
Ivan Mas 03fc7cfb4e Merge branch 'dev' into 6784-delete-clientTypeFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 08:24:12 +00:00
Alex Moreno 1d4c48e149 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 08:39:26 +01:00
Alex Moreno f51df43d17 Merge branch 'master' into 6878-hotfix-addManualTimeEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:32:18 +00:00
Guillermo Bonet 6345d1ae42 fix refs #6780 XDiario
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-23 08:14:58 +01:00
Sergio De la torre 131ae6b522 refs #6193 feat:modify inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:44:25 +01:00
Robert Ferrús 6580fd44cd fix: refs #6371 bankPolicy_notifyExpired accountingFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:18:32 +01:00
Ivan Mas a0cb32ea10 refs #6784 Delete unnecessary JOINs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:01:19 +01:00
Jorge Penadés 76b1433099 fix: refs #6878 use clockIn procedure on update time
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-22 12:48:07 +01:00
Javier Segarra d0c82f694e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 07:08:41 +01:00
Pako Natek 10bdc21829 Merge branch 'dev' into 6906-workerActivity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 16:16:41 +00:00
Alex Moreno 01f1bd0088 Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
2024-02-21 14:44:34 +01:00
Javier Segarra 7bf89cd448 Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 13:27:38 +00:00
Javier Segarra e00133458b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-21 13:48:53 +01:00
Ivan Mas 84270d29b8 refs #6626 modify invoiceInTax
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 13:15:46 +01:00
Ivan Mas f30a5a7597 refs #6626 invoiceInTax different transactions 2024-02-21 13:13:28 +01:00
Pako Natek 40a3df18e8 Merge branch 'dev' into 6906-workerActivity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 11:14:35 +00:00
Pako Natek 3463b8fcb1 done
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:09:52 +01:00
Sergio De la torre 448763ee72 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 07:15:43 +01:00
Sergio De la torre 614652c357 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 07:08:45 +01:00
Sergio De la torre be81835474 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 16:11:59 +01:00
Sergio De la torre b9fe990003 refs #6834 feat:handle Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 16:10:16 +01:00
Javier Segarra 811a49275d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-20 13:53:18 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00
Guillermo Bonet 6daa7a03ff Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 06:26:16 +00:00
Jorge Penadés d127354905 Merge branch 'dev' into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 12:21:48 +00:00
Jorge Penadés 882c179e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti 2024-02-19 11:14:02 +01:00
Pablo Natek 2e01b6ee0a refactor(packing): refs #6875 add restriction on vn.buy.packing field not null and > 0
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-19 09:55:54 +01:00
Pako Natek ad1010f3fc Merge branch 'dev' into 6358-boxPicking-BluePinguin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 07:37:54 +00:00
Pako Natek 3ef26bfd7d packing
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 08:34:17 +01:00
Sergio De la torre f4ea220578 Merge branch 'dev' into 6559_getSectors
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 12:54:45 +00:00
Jorge Penadés 8cecff36ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:14:59 +01:00
Pako Natek f048412ad5 Merge branch 'dev' into 6358-boxPicking_ultimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 11:13:10 +00:00
Pako Natek bf67c2348d refactor proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 12:05:47 +01:00
Jorge Penadés 3d25b599ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:49:21 +01:00
Jorge Penadés f11aa2605b feat: refs #6776 back & procedure modified
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:48:30 +01:00
Guillermo Bonet 3950f287c9 Merge branch 'dev' into 6721-método-de-pago-al-volver-a-activar-trabajadores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 12:24:26 +00:00
Guillermo Bonet 4b568bc41e Merge branch 'dev' into 6775-itemProposalAdd
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 13:19:58 +01:00
Guillermo Bonet 256aa76e23 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 09:18:13 +00:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 10:14:19 +01:00
Alex Moreno 6685a20114 build: refs #6859 myt pull db
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 10:04:15 +01:00
Guillermo Bonet 46a1ad35b5 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 06:50:03 +00:00
Guillermo Bonet 8ee8fe1851 Merge branch '6778-changeViewDependencesVn2008' of https://gitea.verdnatura.es/verdnatura/salix into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 12:12:41 +01:00
Guillermo Bonet 35fc8930ce fix: refs #6778 Fix and tested 2024-02-14 12:12:40 +01:00
Guillermo Bonet 2c82a64029 Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 10:38:33 +00:00
Guillermo Bonet b64637254b refactor: refs #6501 Requested changes 2024-02-14 11:16:52 +01:00
Guillermo Bonet 874f776498 refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 11:05:16 +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 d83823ed0e Merge branch 'dev' into 6778-changeViewDependencesVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 07:07:00 +01:00
Guillermo Bonet 9dd5b725e1 Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:04:25 +00:00
Guillermo Bonet 142c1bf7bd Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 06:03:46 +00:00
Ivan Mas add5fedc4e Merge branch 'dev' into 6830-item_getLackOrigin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:12:02 +00:00
Pako Natek cf0d7e04a1 rounding stickers down 2024-02-13 13:43:31 +01:00
Josep Domingo 35df439f14 refs#6721 MetodoPagoActivarTrabajadores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:19:26 +01:00
Guillermo Bonet 92261ebe0d fix: refs #5586 Tests fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 13:09:12 +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 ed67b1168f refactor: refs #6501 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 11:14:35 +01:00
Guillermo Bonet b1fa834626 refactor: refs #6775 Deleted proc itemProposal_Add
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-13 10:12:08 +01:00
Guillermo Bonet c4528a9eac Merge branch 'dev' into 6501-procMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 06:16:13 +00:00