Pako Natek
|
fc1ea280fa
|
fix: refs #8069 new conception
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 14:03:57 +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
|
a49d6aaf12
|
Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-02 11:32:23 +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
|
c4c08934a7
|
Merge branch 'dev' into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-02 09:27:57 +00: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 |
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 |
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
|
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 |
Pako Natek
|
9d84c39fce
|
feat: refs #8069 orderRow_updateOverstocking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 08:52:20 +02: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
|
4ad070ab66
|
feat: refs #8012 cubos
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-02 08:26:38 +02:00 |
Pako Natek
|
16d1dc3c11
|
Merge branch 'master' into 8030-master-HotFix-PriceDelta
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-02 06:02:44 +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
|
0dd9be96dd
|
feat: refs #8012 restore
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-02 07:54:57 +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 |
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
|
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 |
Robert Ferrús
|
0a0b2f9ba0
|
Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-02 05:03:02 +00: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
|
03ea7580d8
|
feat: refs #8069 new proc
|
2024-10-01 15:02:24 +02:00 |
Pako Natek
|
fd262e32c1
|
feat: refs #8069 new trigger hedera.orderRow_afterInsert
|
2024-10-01 14:25:10 +02:00 |
Pako Natek
|
304992e7cf
|
feat: refs #8069 starting branch
|
2024-10-01 13:40:33 +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 |
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 |
Alex Moreno
|
f54a9a1348
|
fix(fixtures): revert bad merge master to test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-01 12:27:16 +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 |
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
|
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 |
Robert Ferrús
|
982c1dd67b
|
feat: refs #8064 itemTagState
gitea/salix/pipeline/pr-master Build queued...
Details
|
2024-10-01 07:42:06 +02: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
|
1e64028b02
|
Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-30 08:25:27 +00: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 |
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 |
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 |
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 |
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 |
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 |
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 |
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
|
0cd20503d2
|
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 12:52:16 +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 |
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 |
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 |
Jorge Penadés
|
eb0f8ec23c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 08:59:22 +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
|
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 |
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 |
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
|
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 |
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
|
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 |
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
|
bfd52b8773
|
Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 05:31:34 +00: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 |
Jorge Penadés
|
6ff76fd74b
|
feat: refs #7207 show queue in worker summary
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 14:40:38 +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 |
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 |
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 |
Javier Segarra
|
8523ec1b8a
|
Merge branch 'master' into hotfix-postCodeACLS
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 12:38:35 +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 |
Javier Segarra
|
6f78a7470c
|
Merge branch 'master' into hotfix-postCodeACLS
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 11:51:11 +00: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 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 |
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 |
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
|
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 |
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 |
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 |
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 |
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 |
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 |
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
|
d9f39967ea
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-18 13:43:03 +02:00 |
Guillermo Bonet
|
e3c92c3644
|
fix: refs #6421 worker_getHierarchy infinite loop
|
2024-09-18 13:43:00 +02:00 |
Jorge Penadés
|
d08e2d39fc
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fixResolver
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-18 12:20:32 +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 |
Guillermo Bonet
|
4dd70ccc69
|
build: dump 2438
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-18 12:01:25 +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 |
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 |
Javier Segarra
|
3783bddd2c
|
Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 07:05:18 +00: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 |
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 |
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 |
Javier Segarra
|
96159224a4
|
Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 16:48:09 +02: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 |
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 |
Javi Gallego
|
06d06d7b1a
|
Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2970
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-09-17 13:09:18 +00:00 |
Javier Segarra
|
7f6bd55eaa
|
Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-17 13:07:25 +00: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 |
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
|
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 |
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 |
Javier Segarra
|
2e32dfddc4
|
perf(salix): refs #7677 #7677 restore files
|
2024-09-17 11:43:28 +02:00 |
Javier Segarra
|
3e5442c40b
|
Merge branch 'dev' into 7677_vnLocation_perf
|
2024-09-17 11:42:04 +02: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 |
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 |
Pablo Natek
|
81eb875132
|
Merge pull request 'fix: refs #7760 remove throw on ticket split' (!2980) from 7760-fixTicketSplit into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2980
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-09-17 06:58:02 +00: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 |
Guillermo Bonet
|
1cbba0b52f
|
Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-09-17 08:42:02 +02:00 |
Guillermo Bonet
|
2980b2da51
|
fix: refs #7759 Added more grants for vn user
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-17 08:41:52 +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 |
Javi Gallego
|
06efa8be94
|
Merge branch 'dev' into 3505-closureTests
|
2024-09-17 07:12:01 +02: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 |
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 |
Javi Gallego
|
e4a74ba0e9
|
feat: refs #3505 testBack closure
|
2024-09-16 13:24:33 +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 |
Robert Ferrús
|
e361b789f4
|
Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 11:03:08 +00: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 |
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 |
Robert Ferrús
|
bdef639f78
|
Merge branch 'dev' into 7964-entry_getCommission
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:29:26 +00: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 |
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
|
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 |
Pablo Natek
|
cc1cd0563f
|
feat: refs #7404 fixtures and translates
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 09:00:46 +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 |
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
|
4ba8565006
|
Merge branch 'dev' into Hotfix-WagonSQL
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-13 09:31:09 +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 |
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 |
Javier Segarra
|
0d47d58b71
|
Merge branch '7677_vnLocation_perf' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-13 09:45:09 +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
|
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 |
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
|
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
Alex Moreno
|
e74da7cbab
|
feat: refs #7953 pullinfo
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-10 08:17:47 +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
|
9759715609
|
fix: refs #6346 created test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-10 07:52:09 +02:00 |
Jon Elias
|
0593ea9a30
|
Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-10 07:50:42 +02:00 |
Jon Elias
|
125c0c9b3b
|
refactor: refs #6346 requested changes
|
2024-09-10 07:50:40 +02:00 |
Javier Segarra
|
c407dde7a0
|
feat(salix): refs #6156 #6156 remove redundant condition
|
2024-09-09 15:14:01 +02:00 |
Jorge Penadés
|
579ac481f3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-09 15:13:52 +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 |
Javier Segarra
|
f70f475223
|
feat(salix): refs #6156 #6156 change user definer
|
2024-09-09 15:12:44 +02:00 |
Javier Segarra
|
773933ca3c
|
feat(salix): refs #6156 #6156 change config sql
|
2024-09-09 15:11:55 +02:00 |
Javier Segarra
|
a5f6fe95ea
|
feat(salix): refs #5938 #5938 add futureAlertLevel
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-09 14:58:02 +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 |
Guillermo Bonet
|
946806c98e
|
Merge branch 'test' into dev
|
2024-09-09 14:25:51 +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 |
Carlos Andrés
|
88a8b4975b
|
fix: ticket 218504 ticket_close
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-09 12:37:49 +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 |
Javier Segarra
|
378ee1119f
|
Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField
|
2024-09-09 10:18:10 +02:00 |
Jon Elias
|
c93275b62d
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 08:06:04 +00:00 |
Jorge Penadés
|
18ec76d156
|
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 10:03:22 +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 |
Guillermo Bonet
|
c4527cc5c5
|
feat: refs #4515 New throw buy_checkItem
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 08:28:27 +02:00 |
Pablo Natek
|
25ff498a0b
|
Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master Build queued...
Details
|
2024-09-09 05:54:07 +00: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 |
Guillermo Bonet
|
5a82ce4aae
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 13:51:13 +02:00 |
Carlos Andrés
|
d10db686e5
|
fix: refs #7346 ticket_close serial
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 12:52:24 +02:00 |
Ivan Mas
|
762975ed14
|
Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 09:54:34 +00:00 |
Ivan Mas
|
d9c860c44a
|
Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 09:48:58 +00: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
|
af929c1ee9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 10:45:35 +02:00 |
Jorge Penadés
|
2df9bb9bdb
|
Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 08:42:53 +00: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 |
Jorge Penadés
|
0a7a9e2cc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 10:29:44 +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 |
Juan Ferrer
|
93330db88f
|
Merge branch 'test' into 7931-availableFix
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-06 07:14:08 +00:00 |
Jorge Penadés
|
78a851336f
|
chore: refs #7323 worker changes wip
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 09:11:20 +02:00 |
Juan Ferrer
|
640b45ed99
|
fix: refs #7931 Apply PR change requests
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-06 09:06:00 +02:00 |
Ivan Mas
|
26db88b344
|
Merge branch 'dev' into 7898-New_column_floor_parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 07:00:19 +00:00 |
Ivan Mas
|
0626b83370
|
Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 06:56:15 +00:00 |
Ivan Mas
|
747e6a562a
|
feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 08:51:41 +02:00 |
Guillermo Bonet
|
1b8583a19d
|
feat: refs #7759 Revoke routine grants vn
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 08:50:50 +02: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 |
Guillermo Bonet
|
7486c4a3c6
|
feat: refs #7562 refs #7532 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 07:48:53 +02:00 |
Robert Ferrús
|
75146f930a
|
Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-06 04:28:11 +00:00 |
Guillermo Bonet
|
72024fb854
|
fix: refs #7759 Added user 'vn'@'localhost' & grants
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 06:12:48 +02: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 |
Jorge Penadés
|
cff5bef54b
|
fix: refs #7524 add fixture orm config
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-05 15:47:45 +02:00 |
Juan Ferrer
|
a7bc58a5bc
|
fix: refs #7931 Immediately discount order lines from available
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-05 14:45:17 +02:00 |
Robert Ferrús
|
5e456a32fb
|
Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-05 14:38:58 +02:00 |
Robert Ferrús
|
3e4caa8edf
|
feat: refs #7929 autoincrement 1
|
2024-09-05 14:38:55 +02:00 |
Robert Ferrús
|
fa34c4328e
|
Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-05 12:27:41 +00:00 |
Robert Ferrús
|
684658bb96
|
feat: refs #7929 quitar codigo
|
2024-09-05 14:25:50 +02:00 |
Jorge Penadés
|
4869322476
|
Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-05 09:57:26 +00: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 |
Javier Segarra
|
bb401af086
|
Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 09:00:14 +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 |
Jorge Penadés
|
e98313a1a5
|
Merge branch 'dev' into 7524-addFixture
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 07:37:56 +00:00 |
Guillermo Bonet
|
d0eab064b7
|
Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 07:26:27 +00:00 |
Guillermo Bonet
|
6df817ea5d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-05 09:25:00 +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 |
Jorge Penadés
|
03d711b694
|
chore: refs #7524 add select limit
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 09:12:52 +02:00 |
Robert Ferrús
|
777eba8c53
|
Merge branch 'master' into ticket216260-buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-05 05:22:02 +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 |
Robert Ferrús
|
75be124e1f
|
feat: refs #7929 create table material
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 14:14:12 +02:00 |
Guillermo Bonet
|
2bb73af47d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 14:12:50 +02:00 |
Guillermo Bonet
|
80839100c7
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 14:10:33 +02:00 |
Guillermo Bonet
|
212e8d1a03
|
fix: refs #7346 invoiceSerial
|
2024-09-04 14:09:31 +02:00 |
Pako Natek
|
e574f0060a
|
hotfix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 13:37:13 +02:00 |
Guillermo Bonet
|
afcb590a9e
|
fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 12:45:33 +02:00 |
Guillermo Bonet
|
297eb30395
|
fix: ticket #216260 buy_recalcPrices
|
2024-09-04 12:41:44 +02:00 |
Guillermo Bonet
|
74a5d1f217
|
fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 12:23:01 +02:00 |
Jorge Penadés
|
544ddb0f15
|
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-04 10:39:46 +02:00 |
Guillermo Bonet
|
fbfbcf9bd4
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 09:02:57 +02:00 |
Guillermo Bonet
|
a8cc3f496f
|
build: refs #7897 dump 24.36
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-04 09:02:38 +02:00 |
Guillermo Bonet
|
c5521ea021
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 07:06:22 +02:00 |
Jorge Penadés
|
a07582faa4
|
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-03 16:22:04 +02:00 |
Javier Segarra
|
d54361a0bc
|
Merge branch 'dev' into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 13:38:03 +00:00 |