Commit Graph

1766 Commits

Author SHA1 Message Date
Guillermo Bonet 4a17d9ec0e fix: refs #7760 collection_assing
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-06 09:07:48 +02:00
Jorge Penadés e0d0b66963 feat: refs #7207 add transaction
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-04 16:48:38 +02:00
Carlos Andrés 5d7d9f8d9e fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 13:07:54 +02:00
Sergio De la torre 324875ec1f fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 10:42:33 +02:00
Jorge Penadés 70a2189e30 Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-04 07:46:18 +00:00
Guillermo Bonet 0b1756ff3a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-04 09:13:53 +02:00
Guillermo Bonet 7aa8200fca fix: refs #7956 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 09:02:59 +02:00
Pablo Natek c203d5d5e7 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 05:52:45 +00:00
Pablo Natek 72bab95be1 fix: refs #7781 leave early before any updates on the proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 07:52:13 +02:00
Carlos Andrés c683925403 Actualizar db/routines/vn/procedures/item_getSimilar.sql
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 15:19:57 +00:00
Carlos Andrés 197517dfcc fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head There was a failure building this commit Details
2024-10-03 17:02:40 +02:00
Jorge Penadés 3638e9abb6 refactor: refs #7207 simplify code
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 16:50:31 +02:00
Jorge Penadés 23d2d2b1ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 15:39:37 +02:00
Guillermo Bonet 9499819eec Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 12:43:21 +02:00
Guillermo Bonet f1bc959a49 fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 12:40:52 +02:00
Sergio De la torre 32415d3616 fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master Build started... Details
2024-10-03 11:56:36 +02:00
Sergio De la torre 82f8e84288 fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 11:42:21 +02:00
Guillermo Bonet 0c4637030c Merge pull request 'refactor: refs #7886 Deleted proc buy_getVolumeByAgency' (!2965) from 7886-buy_getVolumeByAgency into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2965
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-03 07:51:06 +00:00
Guillermo Bonet a994f0c1c1 Merge pull request 'refactor: refs #7980 Deleted table buyMark' (!3052) from 7980-byeBuyMark into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3052
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-03 07:49:07 +00:00
Javi Gallego 91d9a6e417 Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3060
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-03 05:45:09 +00:00
Javi Gallego 5f695f63b3 Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2882
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-03 05:34:44 +00:00
Javi Gallego ee52c8b45f fix: refs #7346 findByid con fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 15:34:53 +02:00
Javi Gallego 43df98598c feat: refs #7346 manual invoice with address 2024-10-02 15:27:09 +02:00
Robert Ferrús 06296e7bd5 feat: refs #8071 travel_weeklyClone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 13:39:10 +02:00
Guillermo Bonet 2655e20ef6 refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale 2024-10-02 11:32:20 +02:00
Guillermo Bonet 62bd2ae03b refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-02 11:27:09 +02:00
Sergio De la torre bbcf71619c fix: refs #6861 duplicatedTicketsInReserve
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-02 09:56:36 +02:00
Guillermo Bonet 724ddd5fe8 refactor: refs #7980 Deleted table buyMark
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 09:26:23 +02:00
Guillermo Bonet 26a9e8ca50 Merge branch '7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado' of https://gitea.verdnatura.es/verdnatura/salix into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 09:09:05 +02:00
Guillermo Bonet b556903d6d feat: refs #7902 Changed definer and throw msg 2024-10-02 09:09:04 +02:00
Guillermo Bonet 2baf433d1a Merge branch 'dev' into 7902-Trigger-ticketRefund-para-no-añadir-ticket-eliminado
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 07:07:48 +00:00
Guillermo Bonet 9ba017d352 feat: refs #7902 Changed definer and throw msg
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 09:06:21 +02:00
Pako Natek d87f940fff Merge branch 'test' into 8030-testPriceDelta
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-02 05:40:48 +00:00
Guillermo Bonet dc0a4f35f3 Merge branch 'dev' into 7886-buy_getVolumeByAgency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 05:36:02 +00:00
Pako Natek a48843a5cf feat: refs #8030 new field vn.priceDelta.zoneGeoFk 2024-10-02 07:30:49 +02:00
Pablo Natek c6a823e6aa Merge branch 'dev' into 7404-deprecateStockBuyedAndRelatedProcs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 13:05:54 +00:00
Pablo Natek 435fec03da refactor: refs #7404 deprecated stockBuyed
gitea/salix/pipeline/pr-dev Build queued... Details
2024-10-01 15:05:02 +02:00
Javi Gallego 4c9a199418 Merge branch 'dev' into 9722-travelThermographTrigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 12:29:55 +02:00
Javi Gallego d31340ff25 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:22:36 +02:00
Javi Gallego fe741fa7e1 fix: getSimilar daysInForward 2024-10-01 12:22:33 +02:00
Javi Gallego 863c9ec068 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:19:53 +02:00
Javi Gallego 6685ade299 fix: getSimilar daysInforward 2024-10-01 12:19:51 +02:00
Alex Moreno c2e89002cd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 11:31:47 +02:00
Alex Moreno f916509b86 fix(StockBought): revert bad merge master to test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 11:30:34 +02:00
Guillermo Bonet f94ace05cc Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 06:59:43 +00:00
Guillermo Bonet 45e87a5d94 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 08:53:10 +02:00
Guillermo Bonet 2b4504c954 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 08:52:41 +02:00
Guillermo Bonet 452324191c fix: refs #7759 Changed definer
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 08:51:03 +02:00
Guillermo Bonet 94636e1c19 Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 05:56:48 +00:00
Sergio De la torre b4a2be660d fix: refs #6868 handleUser addIsOnReservationMode
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-01 07:08:11 +02:00
Alex Moreno 61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 14:40:35 +02:00
Alex Moreno 75d0c298a1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-30 14:38:17 +02:00
Carlos Andrés 41af809917 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 14:33:58 +02:00
Pako Natek 54d9125c21 feat(collection_new): refs #8058 urgent state
gitea/salix/pipeline/pr-dev This commit looks good Details
Urgent tickets will be priorized as asigned ones

Refs: #8058
2024-09-30 13:49:06 +02:00
Pako Natek 2962bd13c7 fix: refs #8030 buyer prefers to add multiple zoneGeoFk
gitea/salix/pipeline/pr-dev This commit looks good Details
Instead of choosing the deepest zoneGeo, buyer wants all to be merged

Refs: #8030
2024-09-30 11:59:22 +02:00
Sergio De la torre a0a8a22ab0 fix: refs #5320 withoutHaving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-30 11:13:12 +02:00
Pako Natek 25680994dd feat(previaDelta): refs #8030 new algorithym for coincident records
gitea/salix/pipeline/pr-dev Build queued... Details
when many records target the same zoneGeoFk, the deepest must be chosen

Refs: #8030
2024-09-30 10:24:45 +02:00
Sergio De la torre a9b083a044 fix: refs #5320 withoutHaving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-30 09:39:35 +02:00
Sergio De la torre 1f5c0d3e94 fix: refs #5320 withoutHaving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-30 08:25:40 +02:00
Pablo Natek f7e13e8ac9 Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 06:21:51 +00:00
Pako Natek 95601b139b feat(priceDelta): refs #8030 new field zoneGeoFk
gitea/salix/pipeline/pr-dev This commit looks good Details
Buyers need zone restriction field for the new component bonus

Refs: #8030
2024-09-30 08:15:57 +02:00
Javier Segarra 35e4c0e76b Merge branch 'test' into 7404-revert-commit
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-27 11:01:40 +00:00
Pako Natek bc2ed26fc3 Merge branch 'master' into 8030-master-HotFix-PriceDelta
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-27 10:02:20 +00:00
Pablo Natek f858674c8a Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit f6c5f41d44, reversing
changes made to 5ee5da24e1.
2024-09-27 12:01:54 +02:00
Carlos Andrés 5270db2abe fix: refs #7779 refactor collection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-26 17:53:54 +02:00
Carlos Andrés 0ad1d838d9 fix: refs #7779 refactor collection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-26 17:44:29 +02:00
Javi Gallego c825191823 feat: refs #9722 fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-26 15:22:40 +02:00
Pako Natek 0edae3c144 Merge branch 'test' into 8030-testPriceDelta
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-26 12:57:29 +00:00
Carlos Andrés 0851c6fb97 fix: refs #7779 refactor collection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-26 12:48:18 +02:00
Sergio De la torre 08cb1241bf fix: refs #5890 recovery ItemShelving_afterInsert
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-26 11:53:33 +02:00
Carlos Andrés eb2a30f0d9 fix: refs #7779 refactor collection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-26 10:36:19 +02:00
Alex Moreno 4f97deb0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-25 12:08:16 +02:00
Alex Moreno 326c1755d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-25 12:07:57 +02:00
Pako Natek beb66cce1f feat(components): refs #8030 new component bonus
gitea/salix/pipeline/pr-master Build queued... Details
With table vn.priceDelta, buyers set a range of items to be affected for a price increasing

Refs: #8030
2024-09-25 07:43:29 +02:00
Pako Natek 2b6c604fcd feat(components): refs #8030 new component bonus
gitea/salix/pipeline/pr-test Build queued... Details
With table vn.priceDelta, buyers set a range of items to be affected for a price increasing

Refs: #8030
2024-09-25 07:37:52 +02:00
Sergio De la torre 98f33807dd fix: updateAvailable refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-24 16:48:48 +02:00
Jorge Penadés 16b059a14a refactor: refs #7207 tab
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 15:49:45 +02:00
Jorge Penadés 02e837ebb6 feat: refs #7207 add queue on department change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 15:43:33 +02:00
Jorge Penadés 0f8db9ee7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 14:38:58 +02:00
Pako Natek 403637dd8c Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 10:37:44 +00:00
Alex Moreno 63a4cb1847 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-24 12:25:41 +02:00
Pako Natek ed656836b1 Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 10:06:38 +00:00
Pako Natek f6e1880634 fix: refs #8030 test change
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-24 12:06:08 +02:00
Pako Natek 7e449c5716 fix: refs #8030 bugs 2024-09-24 11:54:12 +02:00
Pablo Natek d608b3b9c8 Merge pull request '7404-fixStockBought' (!3004) from 7404-fixStockBought into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3004
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-24 09:32:49 +00:00
Alex Moreno afbf084535 Merge branch 'test' into 8032-devToTest_2440
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-24 09:29:38 +00:00
Alex Moreno ae97c8a035 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-24 11:29:09 +02:00
Pako Natek 1be5fced3c fix: refs #8030 little bugs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-24 10:59:15 +02:00
Pako Natek 5c8f42a3ae fix: refs #8030 redmine revision updates
Changes recomended by the reviewer

Refs: #8030
2024-09-24 10:38:56 +02:00
Jorge Penadés c6a3004d12 feat: refs #7207 allocate new queue on dept change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-24 10:15:01 +02:00
Pako Natek fb7208d898 fix: refs #8030 warehouse filter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Warehouse is also needed to make the filter

Refs: #8030
2024-09-24 09:05:30 +02:00
Pako Natek acabd3e154 feat(catalog_componentCalculate): refs #8030 new component improved
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
The procedure has now the component "bonus", a special price increasing for a group of items

Refs: #8030
2024-09-24 08:50:34 +02:00
Pablo Natek 166ca42e32 Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-24 07:31:24 +02:00
Pablo Natek 3988eb0d97 fix: refs #7404 back and e2e 2024-09-24 07:31:22 +02:00
Robert Ferrús b34e8a7b7e Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 08:18:49 +00:00
Pablo Natek ab89c8f3ba Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 08:16:16 +00:00
Pablo Natek 80985fbd56 fix: refs #7404 round data and fix specs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 10:14:09 +02:00
Pablo Natek cd545c0001 Merge pull request 'fix(shelving_clean): less time por shelving removal' (!2988) from fixShelvingClean into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2988
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-23 08:05:09 +00:00
Robert Ferrús e0e3201f78 Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 05:37:43 +00:00
Carlos Andrés e25415f820 fix: refs#8011 previousSticker_get
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 13:54:22 +02:00
Carlos Andrés 190c964ec2 fix: refs#8011 previousSticker_get
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 13:50:08 +02:00
Carlos Andrés 7dce536f43 Merge pull request 'fix: refs #8011 Previas compo F' (!2995) from 8011-previas-campo-F into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2995
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-09-20 10:23:04 +00:00
Pablo Natek fb1e77f9c4 fix: refs #7404 fix back data source 2024-09-20 11:06:38 +02:00
Robert Ferrús 3bdd196fcc Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:38:12 +00:00
Pako Natek e9b93ff99b Merge branch 'dev' into 7999-longTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-20 08:13:52 +00:00
Pako Natek e8add6e614 feat(TPV): refs #7999 new frmLongTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
Parking table foreign key updated
Old proc removed

Refs: #7999
2024-09-20 10:12:24 +02:00
Carlos Andrés 633766e58b fix: recupero version anterior
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 10:06:10 +02:00
Carlos Andrés 1a44d23239 Merge branch 'master' into solve_merge_problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:59:58 +02:00
Carlos Andrés 4c0e05fdab fix: refs #8011 Previas compo F
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 18:03:59 +02:00
Alex Moreno ccb60eee87 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-09-19 12:42:12 +02:00
Alex Moreno b7e712b738 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-19 12:38:08 +02:00
Carlos Andrés e8a203efc7 fix: ticket_splitItemPackingType
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-19 12:09:36 +02:00
Robert Ferrús b48c221028 feat: refs #8000 refs #800 catalog_calculate itemMaxLength
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 08:33:33 +02:00
Pablo Natek 6f5cb6c70a Merge branch 'master' into hotFix-productionControl
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 15:47:15 +00:00
Pablo Natek 8aad80cbf1 fix(productionControl): refs #7969
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-18 17:45:58 +02:00
Guillermo Bonet e3c92c3644 fix: refs #6421 worker_getHierarchy infinite loop 2024-09-18 13:43:00 +02:00
Ivan Mas 51981eda06 Merge branch 'dev' into 7934-DeleteVn.MIDNIGHT
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-18 10:01:17 +00:00
Pablo Natek eb22a77e25 fix: timesstampadd to interval
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 11:48:50 +02:00
Pablo Natek 6c4b1cd522 fix(shelving_clean): less time por shelving removal
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 11:37:47 +02:00
Carlos Andrés 26a078504f fix: collection_new
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 11:27:57 +02:00
Carlos Andrés 4f9b6030e8 fix: collection_new
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 10:30:16 +02:00
Carlos Andrés d5f18b9187 fix: collection_new
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 10:25:21 +02:00
Carlos Andrés dcd7237d67 Merge branch 'master' into solve_merge_problems
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-18 10:17:57 +02:00
Carlos Andrés ba6b6572c3 fix: collection_new
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-18 09:45:12 +02:00
Robert Ferrús 168e2e3e25 Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-18 05:19:46 +00:00
Ivan Mas 7cd8e535f0 refactor: refs #7934 Delete vn.MIDNIGHT function
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 16:19:09 +02:00
Carlos Andrés 8f9a7802ab fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 15:50:51 +02:00
Sergio De la torre 974827443c fix: refs #6861 itemShelvingSale transaction
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 13:11:27 +02:00
Pako Natek 8b8c64ed65 Merge branch 'master' into 7969-plantTray
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 10:53:44 +00:00
Guillermo Bonet be30e5ae1f Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 10:30:29 +00:00
Guillermo Bonet acdaa96211 refactor: refs #7817 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-17 12:30:11 +02:00
Guillermo Bonet 4a102d315d fix: refs #7564 Ticket volume item cost 2024-09-17 12:10:47 +02:00
Pako Natek 829475b49b feat(collection_new): refs #7969 new restriction hasPlantTray for pickers
gitea/salix/pipeline/pr-master This commit looks good Details
Refs: #7969
2024-09-17 11:57:00 +02:00
Pako Natek 019d855fbf fix: refs #7969 new plantTray restriction 2024-09-17 11:22:07 +02:00
Pablo Natek d308f185bc Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 08:11:17 +00:00
Guillermo Bonet 55df919076 fix: refs #7760 collection_new
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:37:25 +02:00
Guillermo Bonet 267ce3167c fix: refs #7760 collection_new
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:30:40 +02:00
Guillermo Bonet 3fe1724e84 fix: refs #7760 ticket_splitItemPackingType
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 09:12:25 +02:00
Guillermo Bonet 88f434435b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-17 08:42:34 +02:00
Pablo Natek 9896ac2361 fix: refs #7760 remove throw on ticket split
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-17 08:21:29 +02:00
Javi Gallego 361d60a8a8 Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2945
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-17 05:28:48 +00:00
Carlos Andrés faf963ba52 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 15:11:51 +02:00
Carlos Andrés 1d42f58c39 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-16 15:09:34 +02:00
Carlos Andrés 2e03fe8193 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:41:29 +02:00
Alex Moreno cabc9660d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:27:08 +02:00
Alex Moreno 8803ae0534 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-16 14:25:27 +02:00
Carlos Andrés 33540063f4 fix: refs #7760 tmp.ticketIPT
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-16 14:17:51 +02:00
Carlos Andrés e7343b7e25 fix: refs #7760 tmp.ticketIPT 2024-09-16 14:16:48 +02:00
Robert Ferrús 10fcbffd37 feat: refs #7964 entry_beforeUpdate not
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 13:37:35 +02:00
Sergio De la torre c33740e36e fix: refs #6861 itemShelvingSale debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 13:00:20 +02:00
Robert Ferrús 7540526b9b feat: refs #7964 entry_beforeUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 12:26:29 +02:00
Pablo Natek 88962b051f Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:13:13 +00:00
Guillermo Bonet 738a390ef7 refactor: refs #7886 Deleted proc buy_getVolumeByAgency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:08:23 +02:00
Guillermo Bonet d7e7647b52 Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:17:20 +02:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Javi Gallego d7679fcb50 feat: refs #7977 muestra las facturas sin vencimientos tambien
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 09:01:47 +02:00
Pako Natek 6983a2fbd9 fix: refs #7969 no agency restriction removed
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 08:38:06 +02:00
Pako Natek 390b8271c2 fix: root instead of vn
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-16 08:20:17 +02:00
Pako Natek 6cbf25dee5 fix: refs #7969 fix on collectionNew
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-16 08:10:58 +02:00
Ivan Mas d7336b93df Merge branch 'dev' into 7923-DeleteLogifloraFunctions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 08:49:11 +00:00
Sergio De la torre 630e9cec1e Merge pull request 'test' (!2958) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2958
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-09-13 05:41:50 +00:00
Sergio De la torre 1ef9cc0458 Merge pull request 'master' (!2957) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2957
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-09-13 05:39:45 +00:00
Pako Natek a0bfc20595 revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:34:19 +02:00
Pako Natek b1027f454b locallyTested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 14:13:17 +02:00
Ivan Mas 8a1677f4e9 Merge branch 'dev' into 7923-DeleteLogifloraFunctions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 11:25:45 +00:00
Ivan Mas 4f9eb865d0 Merge branch 'dev' into 7952-DeprecateCreditInsurance.creditClassification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:27:27 +00:00
Ivan Mas 37900daf9e Merge branch 'dev' into 7923-DeleteLogifloraFunctions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:19:51 +00:00
Guillermo Bonet fcfef2a970 Merge pull request 'refactor: refs #7900 Deleted sectorProdPriority column' (!2941) from 7900-sectorProdPriority into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2941
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-12 08:21:32 +00:00
Pablo Natek 09031822a6 feat: refs #7781 only print when no expedition form other pallets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-12 08:24:33 +02:00
Javier Segarra 504e2f0ed2 Merge branch 'dev' into 7956-itemGetSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 17:42:05 +00:00
Ivan Mas 0feb44e404 refactor: refs #7923 Delete Logiflora functions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 15:07:37 +02:00
Guillermo Bonet 728c40916c refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 14:38:58 +02:00
Sergio De la torre 99761c97e8 Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2952
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-11 12:38:14 +00:00
Guillermo Bonet 956058c10c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:19:51 +02:00
Guillermo Bonet 8518351790 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:19:37 +02:00
Guillermo Bonet 889f3bdab4 fix: refs #7213 risk F11
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 14:12:07 +02:00
Sergio De la torre 7e06c2ab37 fix: available refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 13:57:03 +02:00
Ivan Mas d15be5100d refactor: refs #7952 Deprecate creditInsurance.creditClassification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 13:42:04 +02:00
Sergio De la torre db7d5c5e52 fix: available refs #6861
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-11 13:18:09 +02:00
Guillermo Bonet 6b5f59a09b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:27 +02:00
Guillermo Bonet 4c6aba96e5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-11 12:54:16 +02:00
Sergio De la torre 87182abf7e fix: available refs #6861
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-11 12:47:51 +02:00
Guillermo Bonet 07f7f87c28 Merge pull request 'fix: refs #7213 change rounding problems' (!2943) from 7213-changeRoundingProblem into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2943
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-11 10:32:59 +00:00
Guillermo Bonet 011c16180d fix: refs #7213 buyUltimate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 12:31:16 +02:00
Javi Gallego 10f7583587 feat: refs #7956 sin AS
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 11:22:22 +02:00
Pablo Natek 842c98edfc Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:22:24 +00:00
Pablo Natek 92f305b9fd fix: refs #6156 proc and version 2024-09-11 10:19:55 +02:00
Carlos Andrés ad8f27ea81 fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 10:15:37 +02:00
Javi Gallego ed8cf628a5 feat: refs #7956 tabulaciones
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:15:32 +02:00
Javi Gallego 6ae15a8e64 feat: refs #7956 definer 2024-09-11 08:13:28 +02:00
Javi Gallego 56e6a7e6aa feat: refs #7956 parametro daysInForward 2024-09-11 08:10:21 +02:00
Pablo Natek 8607a60ca7 feat: refs #7404 format date before select
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-11 07:56:08 +02:00
Sergio De la torre bebd49f08a fix: debugAdd refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-11 07:08:36 +02:00
Javier Segarra f487aed336 Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 14:16:56 +00:00
Carlos Andrés 8fd7c1a8dd fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 13:16:15 +02:00
Carlos Andrés 0bbf10ca4f fix: refs #7213 change rounding problems
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-10 12:59:07 +02:00
Pablo Natek fd1370f2e0 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 06:35:06 +00:00
Javier Segarra c407dde7a0 feat(salix): refs #6156 #6156 remove redundant condition 2024-09-09 15:14:01 +02:00
Javier Segarra 615f57b2e6 feat(salix): refs #6156 #6156 simplify CONCAT_WS 2024-09-09 15:13:32 +02:00
Javier Segarra f9a25617f0 feat(salix): refs #6156 #6156 add missing values 2024-09-09 15:13:08 +02:00