Commit Graph

1766 Commits

Author SHA1 Message Date
Guillermo Bonet b4d2c69b37 Merge branch 'master' into 8119-itemCampaignQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-22 06:42:02 +00:00
Guillermo Bonet 5162c2037b feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-22 08:41:46 +02:00
Jorge Penadés 1efe258ea0 fix: refs #7524 filter by department
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-21 14:30:45 +02:00
Guillermo Bonet 5d55fb287d Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued... Details
2024-10-21 09:25:39 +02:00
Guillermo Bonet dead904c19 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-21 09:25:29 +02:00
Guillermo Bonet bbc17d1ff8 fix: refs #230926 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-21 08:33:16 +02:00
Javi Gallego be9f711cc1 Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3110
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-21 06:31:17 +00:00
Guillermo Bonet 939f083671 Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3122
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-10-18 08:27:08 +00:00
Robert Ferrús 7e0f19b368 feat: refs #8127 entry_getCommission
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-18 08:21:09 +02:00
Guillermo Bonet 7e604f1a19 feat: refs #8119 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-18 07:44:28 +02:00
Guillermo Bonet 865da7bba2 refactor: refs #8106 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-18 07:15:26 +02:00
Alex Moreno 08e22db950 Merge pull request 'master' (!3125) 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: #3125
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-18 05:09:32 +00:00
Sergio De la torre 8df09bc64a Merge branch 'master' into 6861-ReserveSaleTracking
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-17 15:23:05 +00:00
Sergio De la torre 3463036086 fix: refs #6861 saleTrackingAdd
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-17 17:20:21 +02:00
Sergio De la torre 63c0ec308f fix: refs #6861 saleTrackingAdd
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-17 17:01:44 +02:00
Guillermo Bonet 28e957fecd refactor: refs #8106 refs #1406 Optimized ticket_getTax
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-17 14:46:19 +02:00
Sergio De la torre cb53962405 fix: refs #6861 saleTrackingAdd
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-17 13:58:21 +02:00
Sergio De la torre 989b68c33a fix: refs #6861 setQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-17 12:44:05 +02:00
Guillermo Bonet 8ca69d3574 feat: refs #8119 Minor change
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-17 10:21:39 +02:00
Guillermo Bonet 41d078aaf1 feat: refs #8119 itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-17 10:16:26 +02:00
Guillermo Bonet 3628abd5bf feat: refs #8119 itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-17 10:15:45 +02:00
Guillermo Bonet ec13c41be3 feat: refs #8119 itemCampaignQuantity 2024-10-17 10:09:57 +02:00
Guillermo Bonet 999cb2dbb4 feat: refs #8119 itemCampaignQuantity
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-17 10:08:27 +02:00
Javi Gallego c6e764b478 feat: refs #7348 hasDailyInvoice from client
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-16 08:32:10 +02:00
Sergio De la torre a989bef78c Merge pull request 'master' (!3108) 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: #3108
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-10-16 06:16:36 +00:00
Sergio De la torre 12abca0a2d fix: refs #6861 getTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-15 18:12:07 +02:00
Sergio De la torre 2adc424ccb fix: refs #6861 getTickets
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-15 17:07:35 +02:00
Sergio De la torre b592ccc162 fix: refs #6861 getTickets
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-15 17:01:09 +02:00
Alex Moreno 5b938a6f78 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-15 08:00:39 +02:00
Sergio De la torre 13c7b34c98 Merge branch 'master' into 6861-ItemShelvingSaleReserve
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-14 14:15:51 +00:00
Guillermo Bonet 78a9b788bf feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-14 08:42:54 +02:00
Jorge Penadés f5a43962fd Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 07:18:06 +00:00
Pako Natek 679773b33e feat: refs #8075 itemShelvingMoving 2024-10-09 07:26:22 +02:00
Alex Moreno 5cdb0b7eb6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-10-08 12:19:10 +02:00
Sergio De la torre 4894cb140e Merge pull request 'fix: refs #6861 duplicatedTicketsInReserve' (!3053) from 6861-itemShelvingSaleDelete into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3053
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-10-08 05:41:54 +00:00
Jorge Penadés 330c1f3de6 chore: refs #7207 drop transaction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 17:50:36 +02:00
Jorge Penadés 3755c5a15b Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-07 14:27:09 +00:00
Sergio De la torre d164cccee5 fix: refs #6861 assignCollection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 16:14:16 +02:00
Pako Natek e105fba227 feat: refs #8075 itemShelving
new field movingState
2024-10-07 13:46:56 +02:00
Pako Natek de769efc0f feat: refs #8075 autoupdating
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 09:05:03 +02:00
Jorge Penadés 53f590af61 Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-07 06:31:14 +00:00
Guillermo Bonet 701b8d3c14 Merge pull request 'refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale' (!3057) from 6824-itemShelvingSaleNoDelete into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3057
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-07 05:50:48 +00:00
Guillermo Bonet d6e2200227 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-07 07:48:23 +02:00
Guillermo Bonet eb5da0f9cc Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-07 07:39:23 +02:00
Guillermo Bonet 4da63900a2 fix: refs #7760 collection_assing added global handler sqlexception
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 07:36:50 +02:00
Guillermo Bonet 7b4d15cb23 refactor: refs #6824 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 07:30:36 +02:00
Guillermo Bonet 6b7f161d9a fix: refs #7844 sale_problems llena
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-07 06:39:41 +02:00
Guillermo Bonet 9a327a1c39 Merge branch 'dev' into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-06 08:21:07 +00:00
Guillermo Bonet ba9d0743b5 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-06 10:20:34 +02:00
Guillermo Bonet 12bf7f07c5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-06 09:13:07 +02:00
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