Commit Graph

1308 Commits

Author SHA1 Message Date
Jorge Penadés 295c31a5f0 feat: refs #7874 add finance obs type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 11:01:25 +02:00
Jorge Penadés 2b17e6da4c Merge branch 'dev' into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-10 08:16:29 +00: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
Guillermo Bonet 023842ac33 feat: refs #7994 comment changes
gitea/salix/pipeline/head This commit looks good Details
2024-10-08 08:33:04 +02:00
Pako Natek ff43533b5a Merge branch 'dev' into 8075-itemShelvingMoving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-08 05:33:14 +00:00
Ivan Mas 0358157b2c Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 14:48:20 +00:00
Pako Natek 22719820fd feat: refs #8069 overStocking protocol
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-07 14:21:18 +02:00
Pako Natek e105fba227 feat: refs #8075 itemShelving
new field movingState
2024-10-07 13:46:56 +02:00
Pako Natek 3cc31b7779 Merge branch 'dev' into 8075-itemShelvingMoving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 06:41:45 +00:00
Pako Natek 542d0dcbd2 feat(itemShelving): refs #8075 new field
isMoving indicates the record must be transferred to another sector

Refs: #8075
2024-10-07 08:41:07 +02:00
Jorge Penadés 4fb0936399 Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-07 06:39:11 +00: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
Jorge Penadés c4faac7446 Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-04 07:47:38 +00:00
Jorge Penadés 3f1de126c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 15:13:49 +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
Jorge Penadés 1930bc450f Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 07:59:06 +00:00
Jorge Penadés 530617ce6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 09:57:53 +02: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
Robert Ferrús d1c08e68d3 Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 07:37:16 +00:00
Jorge Penadés 546bb85484 Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 09:27:51 +02:00
Jorge Penadés 0311069f00 Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 07:16:55 +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
Pako Natek abb39ec0e7 Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 12:32:45 +00:00
Robert Ferrús 47ed9a8f4e Merge pull request 'test' (!3056) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3056
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 09:22:26 +00:00
Robert Ferrús e51dd897c3 Merge pull request 'master' (!3055) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #3055
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 09:13:09 +00:00
Robert Ferrús 79adce30b6 Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 09:12:08 +00: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
Pako Natek b53f6d4008 Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 06:53:43 +00:00
Robert Ferrús c3c386046d Merge branch 'master' into 8012-packagingIsActive
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 06:34:14 +00:00
Robert Ferrús a3d79f3c56 feat: refs #8012 format
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 07:59:00 +02:00
Robert Ferrús 6e4244866c feat: refs #8012 create column 2024-10-02 07:53:53 +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
Pako Natek 02ef314ed9 feat: refs #8030 new field vn.priceDelta.zoneGeoFk
gitea/salix/pipeline/pr-master Build queued... Details
2024-10-02 07:40:26 +02:00
Pako Natek 7d3c2a4a1c fix: refs #8030 schema missing in zoneGeo table
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-02 07:36:04 +02:00
Pako Natek 3c89d1e5e0 fix: refs #8030 foreign key zoneGeo 2024-10-02 07:34:57 +02: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
Pako Natek fd262e32c1 feat: refs #8069 new trigger hedera.orderRow_afterInsert 2024-10-01 14:25:10 +02:00
Guillermo Bonet 0525081c52 Merge branch 'dev' into 7935-fixBool
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 10:46:48 +00: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
Guillermo Bonet 19dcedbce5 fix: refs #7935 Fix boolens
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 11:31:35 +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 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
Robert Ferrús 982c1dd67b feat: refs #8064 itemTagState
gitea/salix/pipeline/pr-master Build queued... Details
2024-10-01 07:42:06 +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
Robert Ferrús e6d950e33f Merge branch 'dev' into 7981-showAgencyName
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 06:31:27 +00: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