Commit Graph

4286 Commits

Author SHA1 Message Date
Javier Segarra 486b51bcfa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia 2024-03-12 12:46:46 +01:00
Robert Ferrús 9624cdce60 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 11:25:56 +00:00
Sergio De la torre 9d94259d67 refs #6078 feat: workerActivity
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-12 12:21:46 +01:00
Javier Segarra e7f6e61ea1 refs #5858: change notification owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 10:20:43 +01:00
Sergio De la torre 375b690063 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:12:45 +00:00
Javier Segarra c1d0ea7e27 refs #5858: breaklines
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 09:40:42 +01:00
Javier Segarra 63a22a50f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-12 09:37:41 +01:00
Jorge Penadés 5531639027 feat: refs #6951 create procedure
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:34:12 +01:00
Guillermo Bonet 1d398a0acf refactor: refs #7018 Added comment and minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:40:11 +01:00
Guillermo Bonet e2eddbaef7 refactor: refs #7018 Added comment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:35:13 +01:00
Guillermo Bonet 1bcb61a224 refactor: refs #7018 Mirated procs to vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:25:58 +01:00
Guillermo Bonet 819bc7a56d Merge pull request 'refactor: refs #6495 Migrated procs to vn' (!2108) from 6495-procRefactor4 into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2108
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-12 06:04:19 +00:00
Guillermo Bonet 516b4b364f Merge branch 'dev' into 6499-procRefactor6
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:36:34 +00:00
Pablo Natek 35dab518c8 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:41:07 +00:00
Pablo Natek 421ca8654d fix(changes): refs #6005 remove changes files
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:39:03 +01:00
Guillermo Bonet adafab5847 refactor: refs #6874 item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:27:18 +01:00
Guillermo Bonet 552a1a33c2 hotfix: itemProposal
gitea/salix/pipeline/head This commit looks good Details
2024-03-11 12:38:52 +01:00
Guillermo Bonet a34be6ca02 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-11 12:21:54 +01:00
Robert Ferrús 9910ae5c64 fix: refs #6610 quitar variable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-11 12:12:02 +01:00
Pablo Natek 8529bed895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-03-11 12:01:13 +01:00
Carlos Satorres 35c5e127d4 Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-11 09:48:36 +01:00
Carlos Satorres b051b0512f refs #6842 fix fixtures 2024-03-11 09:48:29 +01:00
Jorge Penadés e5387b0b65 fix: refs #5186 use date function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 09:14:05 +01:00
Jorge Penadés 4e8e7d3f4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 08:59:26 +01:00
Alex Moreno dcdad9c469 Merge branch 'dev' into 6925-invoice-transaction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 06:05:50 +00:00
Javier Segarra 18773f34de 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-09 11:27:57 +01:00
Javier Segarra 4994a836c7 refs #5858 feat: alter table util.notification 2024-03-09 11:27:29 +01:00
Robert Ferrús b6af349d89 Merge branch '6610-hotFixDeleteTicketsWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 6610-hotFixDeleteTicketsWeekly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 12:32:25 +01:00
Robert Ferrús b1e90fabb2 refs #6610 2024-03-08 12:32:22 +01:00
Guillermo Bonet 1027ef6479 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 11:31:54 +00:00
Robert Ferrús 05b60150a0 Merge branch 'master' into 6610-hotFixDeleteTicketsWeekly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 11:20:07 +00:00
Robert Ferrús cdb9f372cf feat: refs #6610 fixDeleteTickets
gitea/salix/pipeline/pr-master Build queued... Details
2024-03-08 12:19:57 +01:00
Jorge Penadés 76c5595a58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 11:01:25 +01:00
Guillermo Bonet 74c199384c fix: refs #6372 vn2008.clean
gitea/salix/pipeline/head This commit looks good Details
2024-03-08 10:42:07 +01:00
Guillermo Bonet 37e8518242 feat: refs #6372 Added saleLabel to vn.clean
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 10:38:35 +01:00
Pablo Natek 2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 08:23:08 +01:00
Alex Moreno 89c55d23a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-08 08:11:30 +01:00
David Domenech 60c50337ff refs #6372
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 07:43:13 +01:00
David Domenech 014914e1d9 refs #6372 2024-03-08 07:36:14 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 15:56:02 +01:00
Carlos Satorres 557f1ec2d9 Merge branch 'dev' into 6842-sageMod
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 13:40:37 +00:00
Pako Natek b588b9807c fixtures local
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 13:45:53 +01:00
Alex Moreno 2f2aba1cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-07 11:42:35 +01:00
Alex Moreno ed39ede6cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:35:14 +01:00
Alex Moreno f29212cb65 deploy: refs #6995 production dump
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:34:24 +01:00
Alex Moreno fbdebad12c fix: refs #6995 desdeprecar unary_scan, unary_scan_line, unary_scan_line_buy, unary_scan_line_expedition
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:29:31 +01:00
Alex Moreno 00355aba3a fix: refs #6995 desdeprecar unary y unary_scan
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:24:18 +01:00
Alex Moreno 3bfaa97ddd fix: refs #6995remove preparation_exception
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 10:18:30 +01:00
Alex Moreno 99c9ad77d2 fix: refs #6995 restore vn.exchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 10:07:42 +01:00
Alex Moreno 572a09f704 fix: refs #6995 restore vn.exchangeInsuranceInPrevious
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:55:29 +01:00
Alex Moreno b8f09f363f fix: refs #6995 restore vn2008.jerarquia
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 09:33:32 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Robert Ferrús bf9842d5fd Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-07 07:16:11 +00:00
Alex Moreno a8c2779ee7 Merge branch 'master' into 6995-testToMaster_2410
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 06:22:04 +00:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Guillermo Bonet ee08502f33 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 06:07:54 +00:00
Guillermo Bonet cd40bd47e5 refactor: refs #6495 Deleted procs
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:08:40 +01:00
Robert Ferrús 29926db45f Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 06:01:37 +00:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Carlos Andrés f1654609df Merge pull request 'test' (!2142) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2142
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-03-06 16:16:16 +00:00
Carlos Andrés fc3c9332b3 Merge pull request 'master' (!2141) from master into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2141
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-06 16:10:42 +00:00
Sergio De la torre dc6cfafd05 Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 16:03:24 +00:00
Carlos Andrés c81749da78 feat: add column department.pbxQueue refs #6387
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-06 16:38:34 +01:00
Ivan Mas 6b2533cfb1 refs #6498 correccion errores 2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 15:16:55 +01:00
Carlos Satorres a14ab90d5a refs #6755 fix restore add fixtures 2024-03-06 14:41:58 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +01:00
Carlos Satorres 58a239708d refs #6842 remove sage
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:11:41 +01:00
Carlos Satorres 6a13a33f84 min c
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:09:41 +01:00
Carlos Satorres a24445439a remove v
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:09:03 +01:00
Carlos Satorres 59a0cb3f4a refs #6842 deprecated and move
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:08:20 +01:00
Ivan Mas 492c6f4dd6 refs #6969 test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-06 12:50:44 +01:00
Ivan Mas 7947d6644e refs #6498 Correcion errores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 12:44:59 +01:00
Sergio De la torre 49800a5cab Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:36:05 +00:00
Sergio De la torre 010f585ed4 Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:33:34 +00:00
Javier Segarra 7999a9bf93 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-06 11:42:09 +01:00
Javier Segarra eb5fdd1940 refs 5858 feat: replace with code 2024-03-06 11:41:48 +01:00
Javier Segarra 2f0c8d96d2 refs 5858 fix: resolve breaklines 2024-03-06 11:41:25 +01:00
Jorge Penadés 50a1d5b5ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:31:02 +01:00
Guillermo Bonet 094c00aabd Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 10:17:45 +00:00
Ivan Mas 3cb45dd57b Merge branch 'test' into 6969-Error_packaging-buyUltimateFromInterval
gitea/salix/pipeline/pr-test Build queued... Details
2024-03-06 10:08:50 +00:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Sergio De la torre 5e6c4b21ba Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:44:07 +00:00
Sergio De la torre 922d106bbd Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:43:39 +00:00
David Domenech 57c7f4d391 Merge branch 'dev' into 6874-item_getSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:30:28 +00:00
Alex Moreno 31dc2db838 Merge branch 'dev' into 6336-claimState_removeSome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 08:08:25 +00:00
Ivan Mas 354ecfaa16 refs #6498 Arreglar grant y tabs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:00:21 +01:00
Guillermo Bonet 4e28c315f7 Merge branch 'dev' into 6874-item_getSimilar
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 06:14:13 +00:00
Carlos Andrés 66b7a3e8f5 feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-03-05 17:30:29 +01:00
Sergio De la torre 34572112ec Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 15:21:16 +00:00
Sergio De la torre 2d5aae3b40 Merge branch 'dev' into 6607_checking_boxes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 15:11:14 +00:00
Sergio De la torre d397980efb refs #6607 feat:[checking boxes]
gitea/salix/pipeline/pr-dev Build queued... Details
2024-03-05 16:10:56 +01:00
Guillermo Bonet f601c12468 refactor: refs #6948 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 15:02:09 +01:00
Robert Ferrús b353924034 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 13:49:57 +00:00
Ivan Mas f215ce5f05 refs #6498 Delete procedures vn2008 and grant vn procs
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 14:33:16 +01:00
Robert Ferrús 5f16a9827c feat: refs #6738 move file version
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 14:17:58 +01:00
Ivan Mas 68846d3018 refs #6499 Refactor historico_multiple
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 13:43:03 +01:00
Robert Ferrús 9992a8b4ff Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 12:23:38 +00:00
Robert Ferrús 1580914567 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 12:23:23 +00:00
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 cf181521d6 refs #6078 feat:add workeractivity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 11:53:57 +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 55ba315858 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:30:25 +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
Jorge Penadés 0aa4add71b 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-03-05 10:11:41 +01:00
Robert Ferrús d668ae9904 refs #6738
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 09:34:30 +01:00
Robert Ferrús dc343a7e3b feat: refs #6738 delete vn2008.dock
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 09:33:48 +01:00
Guillermo Bonet ab4d1a0437 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 07:54:40 +00:00
Guillermo Bonet 619ac4e053 refactor: refs #6495 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 08:55:40 +01:00
Robert Ferrús 0c9e11c0b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 08:40:34 +01:00
Robert Ferrús 9a0b4ef674 feat: refs #6738 change table vn2008 to vn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 08:36:19 +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
Robert Ferrús c9b6cbf67b fix: vDatedFrom y vDatedTo
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 07:15:38 +01: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
Alex Moreno 5e794a7791 Merge branch 'dev' into 6336-claimState_removeSome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 13:15:50 +00:00
Alex Moreno b761c258a1 refs #6336 feat(claimState): delete without using 2024-03-04 14:12:56 +01: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
Javier Segarra 78c92af02f refs #5858 feat: fix vn file 2024-03-04 11:57:10 +01:00
Robert Ferrús 5175c91b2d fix: quitar delete
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-04 11:51:55 +01:00
Jorge Penadés 9cff06ae3d feat: refs #6276 acl itemBarcode delete
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 09:30:07 +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
Robert Ferrús 31bd88e856 Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-04 06:56:58 +00: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 216f6f1db3 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 06:07:30 +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
Carlos Andrés 292b77d57e feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 14:36:49 +01:00
Carlos Andrés b9e774cea0 feat: restricciones AWB para travel y entry refs #6960
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-01 14:26:36 +01:00
Jorge Penadés 026c3c80a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 13:48:00 +01:00
Robert Ferrús 5e2f9dd3d0 fix: poner nombres correcto
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 12:58:48 +01:00
Robert Ferrús 19f8d1bb81 fix: poner nombres en camelCase
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 12:57:34 +01:00
Robert Ferrús 87799fbc64 fix: rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 12:30:37 +01:00
Jorge Penadés 7d8d31022b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:29:55 +01:00
Jorge Penadés 3caed386e9 feat: refs #5186 add fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:23:06 +01:00
Jorge Penadés 657430d28b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:15:49 +01:00
Robert Ferrús 8365d9b843 Merge branch 'dev' into 6959-sale_checkWithoutComponents
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 10:32:16 +00:00
Guillermo Bonet 941e7da767 Merge branch 'dev' into 6494-procRefactor3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 10:23:08 +00: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
Pablo Natek 6aa68afd8f Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2100
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-01 07:39:06 +00:00
Guillermo Bonet 3dd4d48557 refactor: refs #6495 Deleted residual procs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 07:47:15 +01:00
Guillermo Bonet f4aa5cea91 refactor: refs #6499 Grants
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-01 07:32:45 +01:00
Jorge Penadés 7b0bed209e feat: refs #5186 add acl & model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 16:27:42 +01:00
Jorge Penadés 1927878184 fix: refs #5186 drop SaleGroup from ticketLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 16:04:16 +01:00
Jorge Penadés c54c9ce913 fix: refs #5186 create parkingLog & add sector relation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 14:43:37 +01:00
Javier Segarra 95fa776e41 refs 5858 feat: sql files
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 12:49:50 +00:00
Guillermo Bonet 625d19e88c hotfix: Autoincrement warehouse
gitea/salix/pipeline/head This commit looks good Details
2024-02-29 13:44:58 +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
Pako Natek 2f275d8f32 itemType add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 13:06:26 +01:00
Javier Segarra 8e976d2e4f refs #5858 feat: remove Schedule system
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 09:28:27 +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 01fb865a76 Merge branch 'dev' into 6495-procRefactor4
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 06:36:43 +00:00
Guillermo Bonet b4ae5a0a3b Merge branch 'dev' into 6499-procRefactor7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 06:36:33 +00: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 a2dc65cb31 Merge branch 'dev' into 6496-cleanVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 06:32:05 +00: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
Carlos Satorres de9787642d Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 14:05:45 +01:00
Carlos Satorres c7f527133e refs #6053 fixture 2024-02-28 14:05:43 +01:00
Ivan Mas 10a89cb790 refs #6827 Check usernames special characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-28 13:32:17 +01:00
Guillermo Bonet f5f2179ac6 refactor: refs #6495 Migrated procs to vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-28 12:32:28 +01:00
Javier Segarra 1d1d950e4b refs 6930 feat: ACL
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 11:57:00 +01:00
Robert Ferrús 8ce71a06d1 Merge branch 'master' into 6501-entry_getTransferFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-28 10:53:25 +00:00
Javier Segarra 9cad2de9fb Merge branch '6930_scopedToken_Multimedia' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 10:55:39 +01:00
Javier Segarra a06a593412 refs 6930 feat: ACL 2024-02-28 10:55:36 +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
Jorge Penadés cbb7bd0028 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 15:50:47 +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
Robert Ferrús 12fbae83c3 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-27 12:55:55 +00:00
Robert Ferrús 2fe0d5f5dd fix: refs #6371 restore tables dock y Tramos
gitea/salix/pipeline/pr-master Build queued... Details
2024-02-27 13:02:15 +01:00
Robert Ferrús 9c6c514056 feat: refs #6738
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-27 11:48:49 +01:00
Jorge Penadés 2795c39442 Merge branch 'dev' into 6513-deleteWrongRecords
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:07:20 +00:00
Carlos Andrés 7795c949b1 Merge pull request '6937-Agrupar-los-DUA-en-funcion-del-transitario-y-pais' (!2097) from 6937-Agrupar-los-DUA-en-funcion-del-transitario-y-pais into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2097
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-27 09:03:12 +00:00
Robert Ferrús 415b6109b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2 2024-02-27 09:54:21 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Carlos Satorres c5e66f1862 Merge branch 'dev' into 5640-fixtures_clientSocialNameUPPER
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 08:31:43 +00:00
Jorge Penadés 5f20a66ad7 fix: refs #6513 use vn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 08:50:23 +01:00
Pablo Natek afaa5fee7d fix(spec): refs #6349 fix fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 19:00:45 +01:00
Pablo Natek 8263b203a7 remove(claimRma): refs #6349 remove
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 18:38:50 +01:00
Carlos Andrés 7ffc11e45a Merge pull request 'feat: comprobaciones facturas contabilizadas refs #6932' (!2091) from 6932-cambios-en-ENT-con-facturas-contabilzadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2091
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-26 16:22:26 +00:00
Carlos Andrés dcb09cd9f9 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 15:54:13 +01:00
Carlos Andrés 9cbcd70d4d feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 15:44:34 +01:00
Carlos Andrés f1329a4624 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 15:43:17 +01:00
Jorge Penadés eba7ef31a2 fix: refs #6513 delete wrong records
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 15:11:02 +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
Carlos Andrés 2932e53389 feat:Agrupar DUA en función del transitario y país #6937
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 14:00:27 +01:00
Carlos Andrés fa53dcbf9d feat:Agrupar DUA en función del transitario y país #6937 2024-02-26 13:57:56 +01:00
Carlos Andrés 27beefe1ef feat:Agrupar DUA en función del transitario y país #6937 2024-02-26 13:43:32 +01:00
Jorge Penadés 085e231142 Merge branch 'dev' into 6513-createSupplierDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:29:44 +00:00
Jorge Penadés 41c44e6f59 Merge branch 'dev' into 6878-fixTimeEntry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:05:31 +00:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Carlos Andrés bfd86c8972 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:18:57 +01:00
Carlos Andrés a19ce04a40 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 12:18:02 +01: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 910cc41beb fix: refs #6513 trigger & alter table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 09:35:06 +01:00
Jorge Penadés 9df91a33b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6513-createSupplierDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 08:26:17 +01:00
Alex Moreno d37802fda8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-26 07:21:47 +01:00
Alex Moreno 24d925ac8c Merge branch 'dev' into 5640-fixtures_clientSocialNameUPPER
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 06:03:42 +00:00
Juan Ferrer e6d789ea13 Merge pull request 'refs #6915 test into dev' (!2093) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2093
2024-02-23 18:05:45 +00:00
Juan Ferrer 3f0d301870 Merge pull request 'refs #6915 master into test' (!2092) from master into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2092
2024-02-23 18:02:07 +00:00
Juan Ferrer 13aca51f2d build: refs #6915 dump & rocket shows Jenkins URL
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build queued... Details
2024-02-23 18:57:32 +01:00
Carlos Andrés 4cc950011e feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 18:15:07 +01:00
Carlos Andrés 55bc6418f5 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 18:13:01 +01:00
Carlos Andrés 5fe4f794cc feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 18:10:23 +01:00
Carlos Andrés bed4faceb7 feat: comprobaciones facturas contabilizadas refs #6932
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 18:04:43 +01:00
Jorge Penadés 3c038a060c feat: refs #6513 WIP triggers & logger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 16:27:49 +01:00
Carlos Andrés c18b42a717 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 16:01:55 +01:00
Carlos Andrés 29a96ede56 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-23 15:58:00 +01:00
Carlos Andrés b9a2cad1f1 feat: validar caracteres invocieIn.supplierref #6931 2024-02-23 15:46:30 +01:00
Carlos Andrés 6f599cbe4a Merge branch 'dev' into 6931-Líneas-en-referencias-de-invoiceIn.supplierRef 2024-02-23 15:45:37 +01:00
Carlos Andrés e0cee8f559 feat: validar caracteres invocieIn.supplierref #6931
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:41:30 +01:00
Jorge Penadés 1a1e7742d3 feat: refs #6513 create table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:32:21 +01:00
Guillermo Bonet 34b5312266 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 15:04:59 +01:00
Alex Moreno 771545fa63 refs #5640 fix(fixutures): client social name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 15:01:57 +01:00
Guillermo Bonet e971070f2f fix: refs #6372 Version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 14:21:40 +01:00
David Domenech d62c7ef0f5 refs #6372
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-23 13:45:48 +01:00
David Domenech 8076707109 refs #6372
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-23 13:29:36 +01:00
Jorge Penadés 70c400c5f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:51:22 +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
Pablo Natek 18da27179d merge(dev): refs #6005 traduction conflict
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 09:40: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 0ad3abcea3 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-23 08:39:54 +01: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 08b109140d Merge branch 'dev' into 6193_inventory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:02:53 +00:00
Alex Moreno 489432b4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:51:26 +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
Alex Moreno 607b908814 Merge branch 'dev' into 6414-fix_backTest_newWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:41:36 +00:00
Alex Moreno 4a2032b9cd refs #5509 fix(EntryDms): sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:39:56 +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
Alex Moreno 1f48245223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-23 07:13:54 +01:00
Alex Moreno 2b19004783 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-23 07:13:05 +01:00
Alex Moreno c7dd81e53d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-02-23 07:12:24 +01:00
David Domenech f2b1418419 Merge branch 'dev' into 6372-ExpenseManual-Error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:03:14 +00:00
Juan Ferrer 20e5eda4d1 fix: refs #6915 broken view vn.doc removed 2024-02-22 16:16:32 +01:00
Carlos Satorres fac7071bae refs #6414 fix(newWorker): back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:38:26 +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
Carlos Andrés ae58c2219b Merge branch 'dev' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 10:16:09 +00:00
David Domenech 13249fae08 refs #6372 2024-02-22 10:47:27 +01:00
Guillermo Bonet 0344a81785 fix: refs #6780 Rollback vn2008.versiones
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-22 09:08:37 +01:00
Alex Moreno 033b176e72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-22 09:06:03 +01:00
Pablo Natek f4f6eeb6fe fix(version): refs #6372 add semicolon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 08:36:14 +01:00
David Domenech d48fd77f48 refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 08:25:38 +01:00
David Domenech 5110d6e71d fix error refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 07:09:35 +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
David Domenech e4d60d20c5 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 05:59:00 +00:00
Robert Ferrús 0a16335eaa fix: refs #6371 restore tables
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-21 18:48:39 +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
Javier Segarra 838effadc0 refs #5858 feat: move change to vnx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 15:18:10 +01:00
Alex Moreno 60dfe8ec05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-21 15:12:48 +01:00
Javier Segarra cc90b13668 refs #5858 feat: remove unnecesary update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 15:05:38 +01:00
Alex Moreno 92f2282632 Revert "Merge pull request 'Revert "Merge branch 'dev' into test"' (!2064) from test_revert into test"
gitea/salix/pipeline/pr-dev This commit looks good Details
This reverts commit cbe23d8df5, reversing
changes made to c4a64b93cc.
2024-02-21 14:52:28 +01: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
David Domenech 658c351860 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 13:36:42 +00:00
Ivan Mas 48310d24c7 refs #6732 change name supplier.isSerious to supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 14:36:12 +01:00
Alex Moreno c4a64b93cc Merge branch 'dev' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-02-21 13:32:54 +00: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 88a88640e5 refs #5858 feat: sql comments 2024-02-21 14:22:06 +01:00
David Domenech 29accbb23e Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-21 13:10:20 +00:00
David Domenech 5bef3989cd refs #6372
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 14:07:52 +01: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
Robert Ferrús fba353f8e4 feat: refs #6371 restore Proveedores_cargueras
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-21 13:43:33 +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
Pablo Natek 5e97f820a2 feat(spec): refs #6005 add spec
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:59:42 +01:00
Ivan Mas 65cb2d45fd refs #6784 Eliminate row in fixtures.before.sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 12:30:25 +01:00
Ivan Mas f0daf2dd9a refs #6784 Modify fixtures.before.sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:22:27 +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
Robert Ferrús 7d39813fd0 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 11:09:02 +00:00
Ivan Mas f592045925 refs #6784 Delete clientType.id and modify relationships in json and js 2024-02-21 11:49:27 +01:00
Alex Moreno 946006c7e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-21 07:48:05 +01:00
David Domenech 1cf17a3d8d refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 07:35:57 +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 be0e835a37 refs #5878 feat: remove vn_event_getCollisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 14:40:38 +01:00
Pablo Natek 59336b8588 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 14:33:45 +01:00
Javier Segarra 791687f271 refs #5878 feat: comments
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 14:27:22 +01:00
Pablo Natek 913e7aa1d8 fix(run): refs #6372 change version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 14:22:07 +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
Pablo Natek 1c40e01fcb refactor: refs #6005 move the logic to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:49:42 +01:00
David Domenech 1fb0545817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:21:38 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00
Robert Ferrús 1563fe2cea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 12:30:25 +01:00
Jorge Penadés 9ce162da71 fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 10:59:13 +01:00
Pablo Natek ab7eb88913 merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 09:34:08 +01:00
Jorge Penadés 9b5823384a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-20 08:26:02 +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
David Domenech 8f80b6ab7b Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 06:05:34 +00:00
Robert Ferrús 4f6ae220e1 feat: refs #6738 crear las Fk de la tabla flight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-19 15:10:34 +01:00
Javi Gallego a7c48e9132 feat: #6392 quito de fixtures para que no falle la fk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 15:05:11 +01:00
Jorge Penadés e9f7fbed86 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:56 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Javi Gallego c53ff1243f feat: #6392 no es necesario agencyTermConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:37:36 +01:00
Javi Gallego 2c1172bd88 feat: #6392 sin gastos
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-19 13:56:16 +01:00
Javi Gallego 8642ddcd7f Merge branch 'dev' into 6392-balance-produccion-propia 2024-02-19 13:34:27 +01:00
Carlos Satorres 9e3b4e8451 refs #6842 sql mod sage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 13:30:03 +01: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
Pako Natek f0d59f12e6 Merge branch 'dev' into 6358-boxPicking-BluePinguin
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:55:11 +00:00
Alex Moreno e8a945ba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-19 11:49:20 +01:00
David Domenech c12fdc2ed4 Merge branch 'dev' into 6372-Delete-views-from-vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 10:29:47 +00:00
David Domenech 3d47c9e5e8 refs #6372
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-19 11:27:37 +01:00
Sergio De la torre 7a0320270a Merge pull request 'test' (!2048) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2048
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-19 10:25:33 +00:00
Jorge Penadés 8d1dea8a00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:19:59 +01: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
David Domenech 12f3af68bf refs #6372
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:04:07 +01:00
David Domenech cc600542ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-19 10:58:36 +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
Sergio De la torre 5b541aa804 refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-19 09:13:03 +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 15de4f0b73 refs #6531 feat:showLastTickets
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-16 15:56:40 +01:00
Pablo Natek c10cb7c051 feat(spec): refs #6403 mrwIntegration
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-16 14:15:13 +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
Jorge Penadés 030f42d03f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:11:02 +01:00
Jorge Penadés f8ceca3575 Merge branch 'dev' into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 11:58:39 +00: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 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
Pablo Natek 85b1391006 fix(sql): refs #6403 merge master
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-16 08:31:41 +01:00
Pablo Natek 94fe0220e5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6403-mrwIntegration 2024-02-16 08:30:06 +01:00
Jorge Penadés 556a67ecfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 08:26:32 +01:00
David Domenech ae0ce91127 refs #6685
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-16 06:10:09 +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