Commit Graph

1038 Commits

Author SHA1 Message Date
Javi Gallego 0c068ed126 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:03:24 +00:00
Jorge Penadés 44e92964f1 Merge pull request 'test to dev' (!2558) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-07 07:19:31 +00:00
Jorge Penadés 99e4808ae9 Merge branch 'test' into 6942-warmfix-setInsertAcl
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-07 07:11:07 +00:00
Guillermo Bonet aff0de23eb Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:29:28 +02:00
Guillermo Bonet b6fb7650cd Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:29:04 +02:00
Guillermo Bonet 70eddb6ce2 refactor: refs #7419 Added index ticketLog
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 08:18:07 +02:00
Robert Ferrús f7c2fd824f feat: refs #7496 changesRequested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 07:05:22 +02:00
Jorge Penadés 5a6e2a2b31 fix: refs #6942 create invoiceIn acl
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-06 15:45:39 +02:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Robert Ferrús e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-05 07:57:34 +00:00
Robert Ferrús a0e79a778d feat: refs #7496 deprecated ticket.isLabeled 2024-06-05 09:57:15 +02:00
Robert Ferrús fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 06:48:20 +00:00
Guillermo Bonet 3dab181bff Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2536
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 06:17:10 +00:00
Sergio De la torre f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 16:03:37 +02:00
Javi Gallego 8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 14:24:55 +02:00
Javi Gallego da1b4649bb feat: refs #4560 sin expeditionTruck 2024-06-04 11:58:39 +02:00
Javi Gallego 4230d46fe5 Merge branch 'dev' into 4560-GastosReparto 2024-06-04 09:47:58 +02:00
Robert Ferrús 3720f7acfe Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 06:57:29 +00:00
Sergio De la torre 94aef434a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 07:17:37 +02:00
Juan Ferrer 1ec55c8850 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 17:38:39 +02:00
Guillermo Bonet 5ab8e79dde Merge branch 'dev' into 6701-clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:11:56 +00:00
Guillermo Bonet 85d68890b8 refactor: refs #6701 New table clientRate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 12:11:26 +02:00
Carlos Satorres 7a92963886 fix acls
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:21:25 +02:00
Jorge Penadés ea7c2346d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:13:59 +02:00
Jorge Penadés 72630d613b fix: refs #6600 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:32:03 +02:00
Jorge Penadés 790a637d4d feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:25:48 +02:00
Jorge Penadés 084f31e441 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:34:10 +02:00
Robert Ferrús ecd34e080d feat: refs #7039 deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 07:59:57 +02:00
Sergio De la torre b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-03 07:56:43 +02:00
Guillermo Bonet b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 05:22:15 +00:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00
Jorge Penadés 4772509b67 fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 12:51:06 +02:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Pablo Natek 884b5f8475 feat: refs #6404 add cero filler to counter 2024-05-31 11:51:32 +02:00
Jorge Penadés 38bea60776 refactor: refs #6889 script sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 09:49:58 +02:00
Jorge Penadés eb15262fb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 08:37:28 +02:00
Robert Ferrús fd233a5e51 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 05:09:16 +00:00
Pablo Natek d901584c3f feat: refs #6404 add deadline field
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-05-30 18:39:06 +02:00
Jorge Penadés 002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 11:47:12 +02:00
Robert Ferrús 467383d7f4 feat: refs #6477 productionConfig add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:32:17 +02:00
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:04:34 +02:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Jorge Penadés d866ec6417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:59:19 +02:00
Pako Natek a2029f7934 Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 09:39:31 +00:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 09:16:25 +02:00
Jorge Penadés d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 07:00:17 +00:00
Pako Natek 03fa06a9fb Merge branch 'dev' into 6021-floranet_beta
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 06:37:44 +00:00
Pako Natek e0d8a46cd6 nuevo enfoque recipe y manejo de errores en order_confirm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 08:36:18 +02:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 17:23:58 +02:00
Pablo Natek 33e823675e feat: refs #6404 default weight
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 10:08:15 +02:00
Carlos Satorres eb2dd5ba5b refs #7406 acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 16:17:44 +02:00
Jorge Penadés 7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:36:18 +02:00
Carlos Satorres 578b8a2c71 refs #7406 changes sql, modelconfig model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:28:13 +02:00
Robert Ferrús b404c7d101 Merge pull request 'test' (!2514) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:11:12 +00:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Jorge Penadés 1af24e8473 fix : refs #6942 remove grafana update priv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 13:34:00 +02:00
Jorge Penadés 1671423d23 fix: refs #6942 add deleteById acl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:53:25 +02:00
Jorge Penadés c136f2783a refactor: refs #6942 toUnbook & drop buyer acls 2024-05-27 12:34:27 +02:00
Robert Ferrús 7559875aff feat: refs #7296 roadmapStopFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 12:08:14 +02:00
Sergio De la torre 74b71079f2 refs #6861 feat: obsrevation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 11:33:04 +02:00
Jorge Penadés dc90ad6595 fix: refs #6942 acls & back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 10:48:32 +02:00
Robert Ferrús 941438efd0 Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 09:41:30 +02:00
Robert Ferrús aaea0c95f7 feat: refs #7296 roadmapStopFk 2024-05-27 09:41:28 +02:00
Jorge Penadés f209718383 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 09:03:34 +02:00
Sergio De la torre 64f71e0f9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 07:46:21 +02:00
Javi Gallego 0e5a15dd4e con addressFk 2024-05-24 15:14:20 +02:00
Pako Natek ab3b58ec3c modificacion recipe y element
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 13:41:02 +02:00
Pako Natek 49a2e6fc84 tickets y email
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 11:44:58 +02:00
Pako Natek 257de96743 Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta 2024-05-24 07:44:12 +02:00
Jorge Penadés cddc034adf fix: refs #6942 revoke update isBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 17:53:08 +02:00
Carlos Satorres 1fa5a22bb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 09:17:19 +02:00
Sergio De la torre d1affb1191 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder 2024-05-23 07:49:11 +02:00
Carlos Satorres 4c5f46eb9b Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2480
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-22 13:55:53 +00:00
Carlos Satorres 4dee90ff57 refs #6820 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 14:56:46 +02:00
Sergio De la torre 49fed4e51e refs #6964 feat: hasItemOlder 2024-05-22 12:23:33 +02:00
Guillermo Bonet 35e892a90c refs #7422 Fix
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 10:07:51 +02:00
Guillermo Bonet 030106f06d refactor: refs #7422 Deprecated column
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:13:06 +02:00
Guillermo Bonet b33d4ce319 Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2471
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-21 06:11:24 +00:00
Guillermo Bonet ac2ed0956b refs #7422 Fixed all problems
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:04:28 +02:00
Guillermo Bonet cbf9a4c4e9 refs #7422 Fixed all problems 2024-05-21 07:58:51 +02:00
Guillermo Bonet 93314d67b6 refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:31:24 +02:00
Guillermo Bonet cc2b5764e9 refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:26:54 +02:00
Guillermo Bonet 82d985ff3a refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:19:04 +02:00
Guillermo Bonet 8563116091 Merge pull request 'refactor: refs #7422 Deleted tables' (!2478) from 7422-byeVn2008Tables into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2478
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-21 05:06:12 +00:00
Carlos Satorres 119102b0b3 refs #6820 acl
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 16:00:38 +02:00
Pablo Natek 38b1e48959 Merge pull request 'feat: refs #6021 add new column' (!2485) from 6021-createObservations into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2485
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-20 12:27:48 +00:00
Pablo Natek b203d94b27 feat: refs #6021 add new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 11:37:40 +02:00
Guillermo Bonet 7f0f1b9547 refactor: refs #7422 Deleted tables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 09:54:30 +02:00
Sergio De la torre df08f7a8de Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 15:10:26 +00:00
Pablo Natek 4790ae94d1 Merge branch 'dev' into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:33:57 +00:00
Guillermo Bonet 0b5f05cbed refactor: refs #7375 Refactor clientsDisable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:36:54 +02:00
Sergio De la torre 27110c2abe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 06:27:09 +02:00
Carlos Andrés 38c505fb7a refs #7400 feat: book ledger with counters
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 19:07:48 +02:00
Carlos Andrés 01d1a2391d refs #7400 feat: book ledger with counters 2024-05-16 18:48:59 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Ivan Mas 10d812ae3d Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 11:34:18 +00:00
Ivan Mas 993dd0d8bd refs #6965 Modify firstEditorFk NULL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 13:15:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Guillermo Bonet 115d1aaf85 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-05-16 08:10:53 +02:00
Sergio De la torre 75bb08a0c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 07:08:47 +02:00
Ivan Mas c15f9b13f2 Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:17:11 +00:00
Ivan Mas 9ed90412de refs #6965 Points to user instead of worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 13:15:27 +02:00
Sergio De la torre 9288f08b91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:30:05 +02:00
Robert Ferrús 1ee29036f4 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 08:22:00 +00:00
Guillermo Bonet 778f368300 Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2429
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-15 08:19:34 +00:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2456
2024-05-15 06:57:05 +00:00
Juan Ferrer b6f788a8db fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 14:21:16 +02:00
Pako Natek bb4f78961f element table 2024-05-14 14:01:13 +02:00
Carlos Andrés 4254fac6c2 Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-14 09:35:51 +00:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 06:32:45 +00:00
Alex Moreno 3798509206 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-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:49:39 +00:00
Robert Ferrús b0da193b4a feat: refs #7039 añadir colum virtual country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 07:48:03 +02:00
Sergio De la torre 8656c16165 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-14 07:11:18 +02:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 14:24:31 +02:00
Robert Ferrús 5e3fa1be8b Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:33:37 +00:00
Pablo Natek bde7fc9972 fix: refs #4988 no task id on table comment
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 12:30:17 +02:00
Pablo Natek c7eeaf238a fix: refs #4988 add schema
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 11:04:50 +02:00
Pablo Natek 48392879cb fix: refs #4988 insert into agencyWorkCenter
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-05-13 10:59:22 +02:00
Jorge Penadés 29e3f934af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 09:35:08 +02:00
Alex Moreno 6ac664a139 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-05-13 09:06:57 +02:00
Jorge Penadés 562aefecdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 08:56:54 +02:00
Pablo Natek 1e956bb0f8 fix: duplicate version
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 08:53:25 +02:00
Ivan Mas 473f261cf1 refs #7342 Modify decimal item plastic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 14:11:29 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés 1996a00af1 feat: refs #5919 drop version 2024-05-10 13:31:21 +02:00
Guillermo Bonet b324b0c0f3 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-10 11:20:33 +00:00
Carlos Andrés 349c3d71dd Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:14:23 +02:00
Carlos Andrés 56815e4b1a Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:10:54 +02:00
Jorge Penadés 8876a7ea8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 13:05:22 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Guillermo Bonet ba72408e84 refactor: refs #7345 Deprecated isFarmer__
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 12:45:53 +02:00
Guillermo Bonet 6b7a529b55 refactor: refs #7345 Renamed column of invoiceInConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:39:14 +02:00
Guillermo Bonet 1ea357a5dd feat: refs #7126 Refactor and added columns in bs.waste table & proc
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 10:01:46 +02:00
Robert Ferrús 35f69b8692 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 07:21:05 +00:00
Jorge Penadés 4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 08:28:06 +02:00
Robert Ferrús b03fe4e6d3 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:23:07 +00:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Guillermo Bonet f4229284fa Merge branch 'dev' into 7252-deliveryNoteFarmingFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:56:05 +00:00
Guillermo Bonet 9c5b46b3e2 Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2346
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 11:30:28 +00:00
Robert Ferrús 0498b425b3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 10:51:18 +00:00
Ivan Mas 9d7184ed7b refs #6965 Add Fk vehicleFk firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:35:26 +02:00
Jorge Penadés 2c826ed838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:14:43 +02:00
Guillermo Bonet faf2d51a43 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-09 11:36:15 +02:00
Guillermo Bonet 494b46e7ec fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry
gitea/salix/pipeline/head This commit looks good Details
2024-05-09 11:33:57 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Robert Ferrús e02dfc0456 Merge branch 'dev' into 182001-packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 05:18:08 +00:00
Sergio De la torre 094b15fe8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-09 07:08:31 +02:00
Carlos Andrés 710841ba4a Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 16:31:25 +02:00
Guillermo Bonet c4a66b42bb feat: refs #7247 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:56:51 +02:00
Guillermo Bonet 3a7d93759c Merge branch 'dev' into 7247-monacoVies
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:52:32 +00:00
Guillermo Bonet 1a375c0e88 refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:45:37 +02:00
Guillermo Bonet 7d92b514c5 refactor: refs #6230 Revoke item: `size`, longName, name 2024-05-08 13:59:37 +02:00
Guillermo Bonet 53b58104c7 refactor: refs #6230 Revoke item: `size`, longName, name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 13:52:52 +02:00
Robert Ferrús 50157c932e Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:42:54 +00:00
Jorge Penadés 26ff5e8fa9 feat; refs #5919 WIP acls 2024-05-08 11:03:18 +02:00
Sergio De la torre 5a0882c2ac refs #6861 feat:sectoCollection reserve
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 10:59:19 +02:00
Sergio De la torre a3e9c91bdb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 10:58:20 +02:00
Jorge Penadés d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-08 10:35:07 +02:00
Carlos Satorres c0b4a931a6 Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 07:55:26 +00:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Carlos Satorres 371df19194 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 14:59:25 +02:00
Carlos Satorres 3eba4a1f69 refs #6882 fix sql 2024-05-07 14:59:23 +02:00
Robert Ferrús 6c6ae412bd feat: refs #182001 packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:19:11 +02:00
Guillermo Bonet 0d7d4917a7 Merge branch 'master' into test 2024-05-07 13:18:28 +02:00
Jorge Penadés 0f5e2dcc54 fix: refs #6938 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 11:47:22 +02:00
Robert Ferrús 1eb75599d8 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 09:38:14 +00:00
Sergio De la torre e8a30c1df8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-06 10:30:19 +02:00
Robert Ferrús b57be129e3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:27:21 +00:00
Carlos Satorres bc5f78827c Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:09:21 +00:00
Javi Gallego 633a3c481c Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 07:42:38 +00:00
Javi Gallego fe025b510d Merge pull request 'feat: create isInformal' (!2405) from 7109-entry-isInformal into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2405
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-06 07:41:27 +00:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Robert Ferrús 87e85e4a4e Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:07 +00:00
Carlos Andrés 166f4da934 Merge pull request 'fix: descuentos en bs.ventas refs #6974' (!2331) from 6974-descuentos-bs.ventas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2331
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-03 17:08:07 +00:00
Carlos Andrés e979defd92 fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 15:03:05 +02:00
Javi Gallego 432b696305 feat: create isInformal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:57:09 +02:00
Pablo Natek 133b862dc0 fix: refs #7187 move column sim to deviceProductionUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:20:16 +02:00
Pablo Natek 95aba9e7b3 Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-03 11:52:22 +00:00
Carlos Satorres f77cf619db refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:27:19 +02:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Pako Natek b5402a3f2f defaultSector
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 10:44:57 +02:00
Robert Ferrús 523735e4fc Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 04:59:01 +00:00
Jorge Penadés 74b04d98f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 16:38:56 +02:00
Pablo Natek d45d53d665 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 10:26:46 +02:00
Jorge Penadés 63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-02 08:58:51 +02:00
Carlos Andrés a67f603990 Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 15:50:13 +02:00
Jon Elias 2b9bfb5d85 Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2364
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-30 10:19:29 +00:00
Robert Ferrús 5ea57ce728 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 10:04:40 +00:00
Robert Ferrús e7be1e2efe feat: refs #7296 expeditionTruck to roadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 11:48:18 +02:00
Guillermo Bonet f10ecf4f00 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:55 +02:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +02:00
Guillermo Bonet 80b44ccace Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2362
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 05:37:33 +00:00
Carlos Andrés e934b47e98 Hotfix feat: new function to kill connections
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 17:09:51 +02:00
Carlos Andrés 21a1e1eed3 Hotfix feat: new function to kill connections 2024-04-29 16:59:56 +02:00
Jorge Penadés 9802f0066c fix: refs #5919 unique key & unassigned locker 2024-04-29 16:05:36 +02:00
Jorge Penadés 0003779681 fix: refs 5919 apply version 2024-04-29 11:35:08 +02:00
Pako Natek 9aa6e3f80a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 13:09:15 +02:00
Pako Natek 3440bb1725 hotFix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-27 12:43:15 +02:00
Pako Natek 9e87b055b7 hotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-27 12:36:21 +02:00
Jorge Penadés b9d3684db2 feat: refs #6600 add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 15:48:30 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Javi Gallego 94e04c1c2f Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:45:43 +02:00
Carlos Andrés a4417dde6c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-25 19:23:48 +02:00
Carlos Andrés f25d3c14c6 Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-25 19:06:06 +02:00
Carlos Andrés 326c5c97bd Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-04-25 19:02:05 +02:00
Pablo Natek 5c45dd6c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 16:18:18 +02:00
Javi Gallego 2e2bc3d594 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:31:06 +00:00
Javi Gallego 4f20224acc Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 14:28:53 +02:00
Javi Gallego 7d3870e4a1 feat: refs#6382 test fixed 2024-04-25 14:28:47 +02:00
Javier Casado a9e4b2cd36 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 11:46:53 +00:00
Javi Gallego a4f1183df6 feat: refs #7108 pascalCase
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 13:11:57 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Pablo Natek 42591af5c7 fix: refs #4988 create table 2024-04-25 09:46:15 +02:00
Javi Gallego 1b34822fb7 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 07:13:57 +00:00
Pablo Natek f2d4283304 fix: refs #7187 number on de code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:29:57 +02:00
Pablo Natek e8a32d8e13 fix: refs #7187 db version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:09:42 +02:00
Pablo Natek 008b6f6f41 fix: refs #7187 unify versions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:08:26 +02:00
Pablo Natek 88ef12032b feat: refs #7187 serialNumber new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:05:18 +02:00
jcasado aeee012c2b refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:43:10 +02:00
Guillermo Bonet 6fb87531c4 refactor: #7258 Deprecated last tables vn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:27:16 +02:00
Pablo Natek a15970c95f fix: refs #7187 sql for pdaFreelancer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:08:57 +02:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Guillermo Bonet f7ebd071bf refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 09:53:31 +02:00
Robert Ferrús ffe56edc9c feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:24:42 +02:00
Robert Ferrús a27e06e8ff feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:08:19 +02:00
Robert Ferrús 7899cf230e feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:05:29 +02:00
Javi Gallego 73f7d09b0e feat: #7108 acl a invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 08:14:07 +02:00
Javi Gallego dcc46494bc Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 07:45:02 +02:00
Pablo Natek fbc1614132 fix: refs #7187 sql creation for deviceProductionUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 18:50:28 +02:00
Juanjo Breso 79172ef288 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 10:16:27 +00:00
Carlos Andrés 2d5daf55c2 Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2349
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-23 10:04:08 +00:00
Juanjo Breso d7e4dd4fc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 08:03:17 +02:00
Javi Gallego eaf2762922 feat: #6382 chekCodeFormat
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 07:57:37 +02:00
Juan Ferrer d58607f26e Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 19:43:48 +00:00
Carlos Andrés 8bb331f0ed feat: Varias líneas farming en albaranes refs #7020
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 19:57:17 +02:00
Pablo Natek adc3b413f5 feat: refs #4988 agency add module
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 17:17:17 +02:00
Robert Ferrús 44f2cd4efc feat: refs #7247 clientSupplier_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 14:04:07 +02:00
Ivan Mas f380e0d1ce Merge branch 'dev' into 7021-Delete_rfid_schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 11:17:54 +00:00
Guillermo Bonet eb9f81c81d feat #7181 Rollback creditInsurance_getRisk
gitea/salix/pipeline/head This commit looks good Details
2024-04-22 13:05:16 +02:00
Ivan Mas 1ef98ecd8c Merge branch 'dev' into 7021-Delete_rfid_schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:37:15 +00:00
Sergio De la torre 0f05fe5d93 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 10:32:03 +00:00
Javi Gallego 4416790ce1 Merge branch 'dev' into 7108-exchange-rate 2024-04-22 11:45:02 +02:00
Robert Ferrús 6a0a944319 Merge branch 'dev' into 7029-packagingVolumeRestriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 07:23:18 +00:00
Juan Ferrer bc45cafb40 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 08:54:14 +02:00
Carlos Andrés fd903f27c0 fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-21 16:01:32 +02:00
Ivan Mas ad317cb5e5 refs #7021 Delete rfid schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 14:11:35 +02:00
Carlos Andrés 27d59f4a8f fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 19:12:24 +02:00
Sergio De la torre 279c300fbf Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 11:08:15 +00:00
Guillermo Bonet 2b11f85b67 Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 11:06:47 +00:00
Sergio De la torre ad13ad856b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:13:48 +02:00
Pablo Natek 77f7348acb feat(workcenter): refs #4988 add workcenter config menu
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 09:02:01 +02:00
Sergio De la torre 76fb9bf7a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 07:12:43 +02:00
Sergio De la torre 32e2827287 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:55:07 +02:00
Sergio De la torre a3c8532661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:27:00 +02:00
Juan Ferrer 7cda14c424 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 13:24:32 +02:00
Juan Ferrer ae326e6e2e feat(binlog): refs #4409 Old recalc code removed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Queues: orderTotal, ticketTotal and travelEntries
2024-04-17 13:21:27 +02:00
Robert Ferrús 3e5b6a9ad1 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 09:01:39 +00:00
Guillermo Bonet cffc1964b6 feat: refs #6968 Transactioned and isTriggerDisabled
gitea/salix/pipeline/head This commit looks good Details
2024-04-17 10:26:21 +02:00
Sergio De la torre ae88a8a281 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 07:44:08 +02:00
Juanjo Breso 81b2e89fd8 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 05:30:39 +00:00
Carlos Andrés d53f19b47d feat: Turn problems into calculated columns
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 17:01:14 +02:00
Pablo Natek d0dfdc668b feat(agency): refs #4988 add new agency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 16:25:27 +02:00
Guillermo Bonet 7a557be09a feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 11:07:57 +02:00
Jorge Penadés 976b18203e feat: refs #7187 check if is freelancer on insert & update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 10:49:17 +02:00
Robert Ferrús ffd7b3cf50 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 08:39:08 +00:00
Javi Gallego 58baa45e09 Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 09:47:21 +02:00
Pablo Natek 0418540ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 07:39:13 +02:00
Pablo Natek 336c3274ea feat(agency): refs #4988 add summary 2024-04-16 07:38:48 +02:00
Guillermo Bonet 0f26fb46b6 feat: refs #6724 Grant changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 13:16:36 +02:00
Guillermo Bonet 78bd561122 Merge branch 'dev' into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 11:11:55 +00:00
Sergio De la torre 4cb79956a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery 2024-04-15 13:03:47 +02:00
Jorge Penadés 200cbd8d74 fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 11:03:57 +02:00
Jorge Penadés a68b8431c5 feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:21:59 +02:00
Robert Ferrús 36b3a92ca3 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 05:18:54 +00:00
Sergio De la torre 19ef199648 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 11:27:54 +02:00
Javi Gallego bb6ea31bf7 feat: funcional a falta de test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 10:26:32 +02:00
Pablo Natek 0d03cf76b4 fix(sql): refs #6005 fix fk formation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 10:17:04 +02:00
Sergio De la torre 13415b1ef0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 09:49:18 +02:00
Pablo Natek 3547299c70 Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2276
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-12 07:12:53 +00:00
Pablo Natek aaef10b8d8 feat(collection-label): refs #6602 add qr to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 08:48:29 +02:00
Robert Ferrús 800fa36d04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 08:40:50 +02:00
Guillermo Bonet b5f3b5ebee Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-04-12 08:19:57 +02:00
Guillermo Bonet c0cabc894b refactor: refs #7181 Added grant
gitea/salix/pipeline/head This commit looks good Details
2024-04-12 08:08:49 +02:00
Guillermo Bonet 69280c63b4 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-12 08:03:12 +02:00
Pablo Natek 726b1ddc07 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 05:14:29 +00:00
Jorge Penadés 841a5fcd5b feat: refs #6449 add summaryId column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 15:08:33 +02:00
Robert Ferrús 04c5a9a004 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 12:21:32 +00:00
Juanjo Breso aee638c3a9 Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 11:43:07 +00:00
Jorge Penadés 86ba8c9fcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 13:40:51 +02:00
Sergio De la torre d998b650da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890-itemShelving_asignado
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-11 07:06:40 +02:00
Juan Ferrer ce55058314 feat(pbx): refs #7198 country prefix, schedule
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 18:14:10 +02:00
Ivan Mas 83befbd120 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 15:21:42 +00:00
Robert Ferrús e2eff4df54 Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 12:04:40 +00:00
Ivan Mas 85301b84bc Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 11:18:31 +00:00