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 |
Alex Moreno
|
9695fea48f
|
feat(Docuware): refs #8066 add username and password
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-08 12:05:19 +02:00 |
Carlos Satorres
|
b4dc5276dd
|
fix: refs #7986 create fk
|
2024-10-08 08:36:17 +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
|
33a4061058
|
feat: refs #8069 8069-overStocking
|
2024-10-07 14:24:55 +02: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 |
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 |
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 |
Robert Ferrús
|
a7c858dbba
|
Merge branch 'dev' into 7981-showAgencyName
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-27 08:13:35 +00:00 |
Jorge Penadés
|
20e894257d
|
fix: refs #7874 rollback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 16:07:14 +02:00 |
Jorge Penadés
|
f62d11dab2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 09:17:14 +02:00 |
Jorge Penadés
|
d1529c808e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 09:09:07 +02:00 |
Jorge Penadés
|
7c23acde64
|
feat: refs #7874 add observationTypeFk col
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 09:08:42 +02:00 |
Javi Gallego
|
6ce4ff1311
|
Merge branch 'dev' into 6722-thermograph
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 13:31:12 +02:00 |
Javi Gallego
|
9ef44d8d8d
|
feat: refs #6722 refactor createThermograph
|
2024-09-25 13:23:31 +02:00 |
Jorge Penadés
|
3e270befa5
|
chore: refs #7874 refactor table
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 12:19:12 +02:00 |
Jorge Penadés
|
ddebd31648
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 10:57:53 +02:00 |
Sergio De la torre
|
eb85181ea0
|
feat: refs #7855 delete isChecked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 08:43:38 +02:00 |
Sergio De la torre
|
b776788714
|
feat: refs #7855 delete isChecked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 08:35:15 +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
|
8c18bcd776
|
feat(components): refs #8030 new component bonus
With table vn.priceDelta, buyers set a range of items to be affected for a price increasing
Refs: #8030
|
2024-09-25 07:36:48 +02:00 |
Robert Ferrús
|
3f81d624cb
|
feat: refs #7981 deprecated showAgencyName
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 18:52:55 +02:00 |
Pako Natek
|
64376b7503
|
fix: refs #8030 new table version
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 14:04:29 +02:00 |
Pako Natek
|
785778e58a
|
fix: refs #8030 database selected for grant
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 13:56:41 +02:00 |
Pako Natek
|
e33429f474
|
fix: refs #8030 grant actions to buyer
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-24 13:53:24 +02:00 |
Pako Natek
|
7a343d60e6
|
feat: refs #8030 new fields for vn.priceDelta
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 13:04:03 +02: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 |
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 |
Jorge Penadés
|
11b54666d0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 10:34:16 +02:00 |
Jorge Penadés
|
78b500e452
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-24 10:15:25 +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 |
Pako Natek
|
9a0b487d20
|
feat: refs #8030 new table
|
2024-09-23 13:12:53 +02:00 |
Javier Segarra
|
4689681618
|
fix(salix): add administrative ACLs
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 12:07:06 +02:00 |
Jorge Penadés
|
8ff0dc06fe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 09:29:51 +02: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 |
Ivan Mas
|
06f8f8e95e
|
refactor: refs #7725 deprecate worker.isF11Allowed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-22 08:39:19 +02:00 |
Ivan Mas
|
0bf2935c23
|
Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-22 05:29:26 +00:00 |
Ivan Mas
|
753f6d7866
|
feat: refs #7994 add schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-22 07:27:43 +02:00 |
Ivan Mas
|
1ec8d8d5a0
|
feat: refs #7994 update sale.originalQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-22 07:24:21 +02:00 |
Carlos Satorres
|
346893455f
|
fix: remove comment
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 13:38:53 +02:00 |
Carlos Satorres
|
564d23653c
|
fix: acls
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 13:24:00 +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 |
Robert Ferrús
|
a65700abed
|
feat: refs #8000 modificar comentario
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 10:37:36 +02: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
|
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 |
Robert Ferrús
|
1b4a324c3c
|
feat: refs #8000 modificar comentarios
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 07:58:15 +02:00 |
Robert Ferrús
|
f50b8326ba
|
Merge branch '8000-catalog_calculate' of https://gitea.verdnatura.es/verdnatura/salix into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 07:33:08 +02:00 |
Robert Ferrús
|
0c35e1fa9c
|
feat: refs #8000 modificar comentario
|
2024-09-20 07:33:05 +02:00 |
Robert Ferrús
|
e75ac1bb8d
|
Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 04:58:51 +00: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 |
Robert Ferrús
|
5456490dcd
|
feat: refs #8000 poner comentario
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-19 12:09:47 +02:00 |
Jorge Penadés
|
22af34c0cb
|
feat: refs #7323 use scopes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-19 09:27:05 +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 |
Jorge Penadés
|
a6168e61f1
|
refactor: refs #7323 improve role resolver
gitea/salix/pipeline/pr-master Build queued...
Details
|
2024-09-18 12:19:49 +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 |
Jorge Penadés
|
c0c8548216
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 09:41:40 +02:00 |
Guillermo Bonet
|
7f9cd1e0d9
|
Merge pull request 'feat: refs #7893 Created waste_addSalesLauncher' (!2972) from 7893-waste_addSales into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2972
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-18 05:40:17 +00:00 |
Guillermo Bonet
|
91ee956fbd
|
Merge pull request 'feat: refs #7882 Added model and method' (!2879) from 7882-quadMinds into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2879
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-18 05:16:45 +00:00 |
Guillermo Bonet
|
871d5457d0
|
refactor: refs #7882 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-18 07:14:52 +02:00 |
Jorge Penadés
|
75b7e603c9
|
fix: refs #7323 drop acl
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 16:08:51 +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 |
Pablo Natek
|
ad6fcc0d36
|
Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 11:57:54 +00:00 |
Guillermo Bonet
|
a3022a7379
|
Merge branch 'dev' into 7893-waste_addSales
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 10:35:27 +00:00 |
Guillermo Bonet
|
fa5ace677c
|
refactor: refs #7893 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-17 12:35:08 +02: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 |
Pako Natek
|
019d855fbf
|
fix: refs #7969 new plantTray restriction
|
2024-09-17 11:22:07 +02:00 |
Jon Elias
|
eb083d6d2b
|
Merge branch 'dev' into 6346-WagonToCard
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 09:07:26 +00:00 |
Jon Elias
|
c8315714d4
|
Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 09:05:17 +00: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 |
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 |
Guillermo Bonet
|
51da7ae063
|
feat: refs #7893 Created waste_addSalesLauncher
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 13:33:53 +02:00 |
Jon Elias
|
3aebe88593
|
Merge branch 'dev' into 6346-WagonToCard
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 11:04:27 +00:00 |
Jon Elias
|
9aff118b6e
|
feat: refs #6346 added script for wagons
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 13:00:11 +02:00 |
Guillermo Bonet
|
0d7953a869
|
Merge branch 'dev' into 7912-wasteChanges
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:33:23 +00:00 |
Guillermo Bonet
|
5c7a537275
|
feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 12:32:52 +02:00 |
Jorge Penadés
|
0a0701f7c2
|
Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:24:36 +00: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
|
51cabd06a4
|
refactor: refs #7562 Deleted deprecated objects
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-16 10:44:04 +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 |
Jon Elias
|
8b7beb7247
|
Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 06:20:16 +00: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 |
Guillermo Bonet
|
63dde3dd78
|
fix: refs #7819 Version
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-13 14:13:14 +02:00 |
Ivan Mas
|
dc5691fce7
|
Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 11:49:28 +00:00 |
Jon Elias
|
8d050a8e08
|
Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 11:07:55 +00:00 |
Jorge Penadés
|
b083b267b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 11:59:51 +02:00 |
Jorge Penadés
|
cfbc3692e9
|
feat: refs #7874 clientObservationType
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-13 11:59:28 +02:00 |
Sergio De la torre
|
11193bebe6
|
Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2598
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-13 09:43:31 +00:00 |
Jon Elias
|
f1f0f5920c
|
fix: refs #6346 fixed SQL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 11:29:05 +02:00 |
Jorge Penadés
|
2dc55a706c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 09:20:57 +02:00 |
Alex Moreno
|
bbb3889154
|
fix: sql wagonTypeTray
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-13 08:54:03 +02:00 |
Alex Moreno
|
ebbc143152
|
fix: sql wagonTypeTray
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-09-13 08:29:41 +02:00 |
Jon Elias
|
99bd20bc05
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 06:13:26 +00:00 |
Sergio De la torre
|
05b6c75a19
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin
|
2024-09-13 07:02:15 +02:00 |
Guillermo Bonet
|
3d598a4ec4
|
fix: refs #7952 Version
gitea/salix/pipeline/head Build queued...
Details
|
2024-09-12 14:57: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 |
Jorge Penadés
|
36d8e88ac3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-12 13:10:56 +02: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 |
Jorge Penadés
|
74fafdf330
|
fix: refs #7828 filter mail access
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 10:27:18 +02: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 |
Guillermo Bonet
|
bb97ccb6bb
|
Merge pull request 'feat: refs #7562 Created deleteDeprecatedObjects' (!2627) from 7562-deleteDeprecatedObjects into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-09-12 08:08:16 +00:00 |
Jorge Penadés
|
6f81ca08db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 09:55:03 +02:00 |
Jorge Penadés
|
f1f10d1367
|
refactor: refs #7828 wip
|
2024-09-12 09:15:07 +02:00 |
Guillermo Bonet
|
6075ec6518
|
feat: refs #7562 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 09:06:03 +02:00 |
Jon Elias
|
d36ce6bf99
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 05:43:17 +00:00 |
Jon Elias
|
a73bdfe18f
|
Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
|
2024-09-12 07:36:55 +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 |
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 |
Guillermo Bonet
|
479fc02245
|
Merge pull request 'feat: refs #6727 Added util logClean' (!2602) from 6727-logClean into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2602
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-09-11 10:48:02 +00:00 |
Guillermo Bonet
|
2a41fc6fc4
|
Merge branch 'dev' into 6727-logClean
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 09:25:52 +00: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 |
Jorge Penadés
|
558ab6eba2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
|
2024-09-11 09:30:18 +02:00 |
Sergio De la torre
|
b492a1e6a8
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:05:26 +02:00 |
Jorge Penadés
|
85c50db19e
|
Merge branch 'dev' into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-10 11:45:09 +00:00 |
Guillermo Bonet
|
01d591af53
|
fix: refs #7564 Deleted query
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-10 12:58:16 +02:00 |
Jorge Penadés
|
e2ef3472b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-10 09:41:46 +02:00 |
Guillermo Bonet
|
9d9e0996f6
|
Merge branch 'dev' into 7882-quadMinds
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-10 08:12:15 +02:00 |
Jon Elias
|
125c0c9b3b
|
refactor: refs #6346 requested changes
|
2024-09-10 07:50:40 +02:00 |
Javier Segarra
|
773933ca3c
|
feat(salix): refs #6156 #6156 change config sql
|
2024-09-09 15:11:55 +02:00 |
Guillermo Bonet
|
bf1a43a23e
|
refactor: refs #7900 Deleted sectorProdPriority column
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 14:43:16 +02:00 |
Javier Segarra
|
38ee76f7c9
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-09 12:20:02 +00:00 |
Jorge Penadés
|
6e511f00c0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 13:58:46 +02:00 |
Javier Segarra
|
2fef104954
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-09 10:48:20 +00:00 |
Alex Moreno
|
0949112b13
|
Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 12:42:13 +02:00 |
Javier Segarra
|
31b04cba75
|
feat(salix): refs #6156 #6156 Move to myt version
|
2024-09-09 12:08:12 +02:00 |
Guillermo Bonet
|
daf3dfd2ee
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-09 11:35:28 +02:00 |
Guillermo Bonet
|
261bebbc3b
|
feat: refs #6727 Deleted duplicated indexes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 09:41:40 +02:00 |
Guillermo Bonet
|
56eb3e093d
|
feat: refs #6727 Added indexes in creationDate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-09 09:39:10 +02:00 |
Guillermo Bonet
|
7053f2786a
|
Merge branch 'dev' into 6727-logClean
|
2024-09-09 09:38:40 +02:00 |
Jon Elias
|
b3aa263cea
|
Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 07:32:11 +02:00 |
Juan Ferrer
|
37fabc38bd
|
fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-06 14:56:14 +02:00 |
Jorge Penadés
|
c43c61991d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 14:22:57 +02:00 |
Jorge Penadés
|
901cdc7117
|
feat: refs #4074 modify acls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 14:18:15 +02:00 |
Jorge Penadés
|
b277ae2d92
|
Merge branch 'dev' into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 12:01:18 +00:00 |
Guillermo Bonet
|
a718b6e81f
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 13:52:10 +02:00 |
Jorge Penadés
|
26d47b3f38
|
Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 11:29:53 +02:00 |
Jorge Penadés
|
18d93d93a6
|
chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 10:40:16 +02:00 |
Ivan Mas
|
900e840eec
|
Merge branch 'dev' into 7819-Delete_obsolete_objects
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 07:43:06 +00:00 |
Ivan Mas
|
f193938264
|
Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-06 06:02:01 +00:00 |
Guillermo Bonet
|
925002256a
|
Merge branch 'dev' into 7562-deleteDeprecatedObjects
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 05:49:20 +00:00 |
Ivan Mas
|
ac8b101455
|
feat: refs #7898 Modify default
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-05 17:05:48 +02:00 |
Robert Ferrús
|
3e4caa8edf
|
feat: refs #7929 autoincrement 1
|
2024-09-05 14:38:55 +02:00 |
Robert Ferrús
|
684658bb96
|
feat: refs #7929 quitar codigo
|
2024-09-05 14:25:50 +02:00 |
Guillermo Bonet
|
620ce5d45e
|
Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2900
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-05 09:44:38 +00:00 |
Guillermo Bonet
|
5a51d5c07b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued...
Details
|
2024-09-05 11:19:02 +02:00 |
Guillermo Bonet
|
ac01da5eed
|
feat: refs #7759 Deleted version 11163-maroonEucalyptus
|
2024-09-05 11:19:00 +02:00 |
Javi Gallego
|
40a1b24403
|
Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-05 09:07:24 +00:00 |
Guillermo Bonet
|
8ca491b8de
|
Merge branch 'dev' into 7759-newDefiner
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 09:40:42 +02:00 |
Guillermo Bonet
|
2b465d0d23
|
Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 07:18:37 +00:00 |
Carlos Satorres
|
b66386fdb1
|
Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2603
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-04 13:07:50 +00:00 |