8231_testToMaster_2448 #3241

Merged

alexm merged 281 commits from 8231_testToMaster_2448 into master 2024-11-26 06:04:22 +00:00

Conversation 0 Commits 281 Files Changed 253 +4456 -3247

alexm commented 2024-11-25 13:17:23 +00:00

Member

Copy Link

No description provided.

alexm added 280 commits 2024-11-25 13:17:23 +00:00

33f1ed360b refactor: refs #7457 Added from param if not exists

155597bf85 fix: refs #7283 remove

5085921c21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

26b28eeb0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

392012ef60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

727c18d6ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

2af4d86c28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

1927a914e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

f786996e2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

7c3d02817e fix: refs #7283 remove tests

06296e7bd5 feat: refs #8071 travel_weeklyClone

78a9b788bf feat: refs #7006 itemTypeLog created

6c62172633 feat: refs #7006 itemTypeLog created

67714f2dff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

de0fe37ffe feat: refs #8083 add prop

3ce8d21ed3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter

a35c10adab fix: refs #7457 error on empty from param and add translate

78ee7e141d fix: refs #7457 remove translate and use param definition for restriction

7e0f19b368 feat: refs #8127 entry_getCommission

34deba406b feat: refs #7266 First commit

28db5f221b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8083-changeState

15a8a70201 Merge branch 'dev' into 8083-changeState

2b05e8c48e feat: refs #7943 quitar lectura en metodos comunes

bf2d7541a5 feat: refs #7266 Item label QR

0af58b20be feat: refs #7266 Item label QR finished

c3f8da52c6 feat: refs #7266 Item label barcode

e772776028 Merge branch 'dev' into 8083-changeState

13a30783d9 Merge pull request 'feat: refs #8083 add prop' (!3115) from 8083-changeState into dev ...

Reviewed-on: #3115
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

b4e1b015de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

30c1a57b68 Merge branch 'test' into dev

62f9f31279 feat: refs #7943 usa back con permisos

72662b3112 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

2f5f4ecc7c Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev ...

Reviewed-on: #3136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

b1a295dca4 feat: refs #7266 Print corrections

f552a3b7e1 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

3da08e3a23 feat: refs #8020 machineWorkerDeprecated

db4b540958 Merge branch 'test' into dev

5a8f43d0ea Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev ...

Reviewed-on: #3141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

838dd9e1b4 Merge branch 'dev' into 7457-orderFilter

4c9682e107 Merge branch 'dev' into 7266-itemLabels

4c529da620 feat: refs #7266 Requested changes and query optimization

4d96b1df68 Merge branch '7266-itemLabels' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemLabels

7ae99fe6a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

f97f1c2b9a Merge branch 'dev' into 7266-itemLabels

f6d818f58e Merge pull request 'feat: refs #7266 First commit' (!3129) from 7266-itemLabels into dev ...

Reviewed-on: #3129
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

8569bec34a feat: refs #7266 Minor change

1bf900f81b feat: refs #8087 Traspasar redadas a travels

e498cbd060 Merge branch 'dev' into 7283-itemsMigration3

4d3bc2c837 feat: refs #8087 Traspasar redadas a travels

11e13fdb20 feat: refs #7922 refs #792 scanOrder

8f10260795 feat: refs #7943 return just the required content

ab145be1aa Merge pull request 'feat: refs #7943 return only the required content' (!3148) from 7943-fixWorker into dev ...

Reviewed-on: #3148
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

956e89475e Merge branch 'dev' into 7006-itemTypeLog

e775e56120 feat: refs #7921 refs#7921 sendLostExpedition

80764b6495 feat: refs #7006 itemTypeLog

14d6eb722e feat: refs #7006 Requested changes

76a9db29c2 Merge pull request 'feat: refs #7006 itemTypeLog created' (!3093) from 7006-itemTypeLog into dev ...

Reviewed-on: #3093
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

fb0764bc1f feat: refs #8087 Traspasar redadas a travels

d8e241740f feat: refs #7524 restrict fields

8c4d3bac0d Merge branch 'test' into dev

869c7ab598 fix: refs #6644 email and translations

c8101375a2 Merge branch 'dev' into 6644-modEmail

2bd3f4514b Merge pull request 'fix: refs #6644 email and translations' (!3152) from 6644-modEmail into dev ...

Reviewed-on: #3152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

6efc2c340c feat: refs #7921 refs#7921 sendLostExpedition

b20ca1d8d7 Merge branch 'dev' into 7524-fixE2e

78edda56c7 Merge pull request 'feat: refs #7524 restrict fields' (!3151) from 7524-fixE2e into dev ...

Reviewed-on: #3151
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

93feb74949 Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost

eb5f57285a feat: refs #7193 added scope in parking model

3f04f3f24b Merge pull request 'feat: refs #7921 refs#7921 sendLostExpedition' (!3149) from 7921-sendExpeditionLost into dev ...

Reviewed-on: #3149
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

b27aa1bd94 Merge branch 'dev' into 7193-ParkingCreateScope

c43bdb5021 feat: refs #7266 Added details and improvements in item label reports

b899a7967f Merge branch 'dev' into 7266-itemQrBarcodeLabel

21ddd3fcd0 Merge pull request '#7193 Added scope in parking model' (!3153) from 7193-ParkingCreateScope into dev ...

Reviewed-on: #3153
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

0180998683 fix: refs #7283 item filters

385279b39d fix: refs #7283 tback

b41e703a1b Merge pull request 'fix: refs #7283 item filters' (!3156) from 7283-fixItemFilters into dev ...

Reviewed-on: #3156
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

61026d2d34 feat: refs #8087 Traspasar redadas a travels

511c848342 feat: refs #8087 Traspasar redadas a travels

bffb13f94a feat: refs #8087 Traspasar redadas a travels

994b562823 Merge branch 'dev' into 8071-travelWeeklyClone

f05b6a46b0 feat: refs #8071 quitar esquema

a37b7b71a8 feat: refs #7266 Requested changes and improvements

c8662a5051 Merge branch '7266-itemQrBarcodeLabel' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemQrBarcodeLabel

bfc446ab79 feat: refs #7266 Requested changes and improvements

66a5708efb Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev ...

Reviewed-on: #3147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

6afb8fbeb5 Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev ...

Reviewed-on: #3154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2f0fa56040 feat: refs #7266 Version

8ab6bc39cc Merge branch 'dev' into 8071-travelWeeklyClone

a8cc417fb4 Merge branch 'dev' into 7922-scanOrder

6bf186ca66 Merge pull request 'feat: refs #7922 refs #792 scanOrder' (!3157) from 7922-scanOrder into dev ...

Reviewed-on: #3157
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f699f64caa Merge branch 'dev' into 8071-travelWeeklyClone

5a9d254396 Merge pull request 'feat: refs #8071 travel_weeklyClone' (!3058) from 8071-travelWeeklyClone into dev ...

Reviewed-on: #3058
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

17412c5b84 feat: refs #7266 Version

6c40934f74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

4c0dec19d4 feat: refs #7266 buyFkForPrint

37548e5e64 feat: refs #7266 buyFkForPrint

85ded59cb3 refactor: refs #6920 add correct role

c899727bfc Merge pull request 'refactor: refs #6920 add correct role' (!3160) from 6920-dms_invoiceIn into dev ...

Reviewed-on: #3160
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

c113d83797 feat: refs #6845 userInterface

3b87cf0c69 Merge pull request 'feat: refs #7266 buyFkForPrint' (!3159) from 7266-ItemShelvingBuy into dev ...

Reviewed-on: #3159
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

cab2b7c93c Merge pull request 'feat: refs #6845 userInterface' (!3161) from 6845-UserInterface into dev ...

Reviewed-on: #3161
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

dd7c967624 Merge branch 'test' into dev

fd36f7ecc3 feat: refs #8150 movExpeditions

6927f4b28d feat: refs #6818 saysimple integration

9b28cf9130 feat: refs #6818 add records

6ef1f950d1 feat: refs #6818 add config table

fc61f7e4ab fix: refs #7457 remove group by calc time reduce bellow 1s

39f7391abf Merge branch '7457-orderFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter

0c20aea45f Merge branch 'dev' of https: refs #7457//gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter

a254cb19cd feat: refs #4948 Added ticket_selfConsumptionPackaging

d6349f113c feat: refs #7743 add simple spec for sendMail

50a73c98a2 feat: refs #7743 add try catch stmt to the test

c4fc51f4b8 Merge branch 'dev' into 7743-simpleTestForSendMail

5c054fe0d3 feat: refs #6869 add back

f7a29cd9c7 feat(Supplier): refs #6828 add companySize

0dc77851c0 fix: refs #4948 Tests

e0ffc2840b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails

a41fc36f90 feat: refs #6869 define model

9f763ebae7 Merge branch 'dev' into 6828-supplier_companySize

a79905f7c2 Merge pull request 'feat(Supplier): refs #6828 add companySize' (!3174) from 6828-supplier_companySize into dev ...

Reviewed-on: #3174
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

eaad989b3a fix: clean deletes also zoneEvent range records

180b0b5b3f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

7c016da8f9 refactor: refs #7641 entry report style

e38adf4296 fix: refs #7641 align columns

186312702d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration

82bcb48101 Merge pull request 'test' (!3179) from test into dev ...

Reviewed-on: #3179
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

5bbcf5005f Merge branch 'test' into dev

90e7ab1ec1 refactor: refs #7950 Created cmr model

76d072e00f fix: more data for fixture.before

eb3d0e837f Merge branch 'dev' into fixturesLocal

d442593823 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

0f5ca107f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration

a921e51023 refactor: refs #7715 Deleted hasNewLabelMrwMethod column

f989b72fab feat: refs #8080 Added column comment

aec4d0b1a4 Merge branch 'test' into dev

dd3a854ec5 Merge pull request 'feat: refs #8080 Added column comment' (!3185) from 8080-duaComment into dev ...

Reviewed-on: #3185
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

b532691043 Merge pull request 'feat: refs #8150 movExpeditions' (!3167) from 8150-moveExpeditionsApp into dev ...

Reviewed-on: #3167
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

a9def89e01 Merge branch 'dev' into fixturesLocal

2d70e95996 Merge pull request 'fix: more data for fixture.before' (!3181) from fixturesLocal into dev ...

Reviewed-on: #3181
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

d52f537f0c refactor: refs #8153 Optimized order_getTax

f45460b0e1 Merge branch 'dev' into 8153-order_getTaxOptimize

a67ea6b15f Merge pull request 'refactor: refs #7715 Deleted hasNewLabelMrwMethod column' (!3184) from 7715-byeMrwOld into dev ...

Reviewed-on: #3184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2ece748138 refactor: refs #7242 Deleted select column

4891e98109 Merge pull request 'refactor: refs #7242 Deleted select column' (!3189) from 7242-unlocated into dev ...

Reviewed-on: #3189
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

6427a90c44 Merge branch 'dev' into 7950-cmrModelUnify

127c6fced0 refactor: refs #8153 Optimized order_getTax

3c8ef7cdba refactor: refs #7950 Requested changes

9b971fc284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport

a426e9c7c6 Merge pull request 'refactor: refs #8153 Optimized order_getTax' (!3188) from 8153-order_getTaxOptimize into dev ...

Reviewed-on: #3188
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

628b67e1e5 fix: refs #8153 Version

ab2e35b64c fix: refs #8153 Version

c2381f0feb refactor: refs #7920 Main change

779a75cd78 refactor: refs #7920 Major changes

f52041eeff Merge branch 'dev' into 6818-saySimpleIntegration

968e308ab6 Merge pull request 'feat: refs #6818 saysimple integration' (!3168) from 6818-saySimpleIntegration into dev ...

Reviewed-on: #3168
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

a91f952778 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport

5d908fd5f9 feat: refs #7641 improve style

172b4d8e05 Merge branch 'test' into dev

0a92fbbdbc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport

2273dc636e refactor: refs #7920 Major changes

b3bf0024e3 refactor: refs #7920 Major changes

9d5ef3eeb0 Merge branch 'dev' into 7920-itemShelving

755312b981 refactor: refs #7920 Fix tests

5a134668da refactor: refs #7920 itemShelvingLog

782563f67d Merge branch 'test' into dev

72e067ff81 fix: refs #7244 Added collection ACL

344427da45 feat: refs #8151 moveExpeditions

018393fa93 feat: refs #8151 Added test

d4a60f63c9 feat: refs #8151 Added test

e1b0fc298c feat: refs #8143 deprecate recoverPass and sync from account.user

9c0af7f7c6 refactor: refs #7950 Requested changes

97e53b2ef8 Merge branch 'dev' into 7950-cmrModelUnify

b7655b4f92 feat: refs #8057 Added geoFk columns

d4b0da50d0 feat: refs #8057 Added data updates

155616e622 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

b0812139cb Merge branch '7283-itemsMigration3' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3

cba1abad68 feat: refs #8057 Added data updates

bde192966e feat: refs #8057 Added data updates

b9397c527d feat: refs #8057 Added data updates

cd7ed6987a Merge pull request 'fix: refs #7283 remove' (!2907) from 7283-itemsMigration3 into dev ...

Reviewed-on: #2907
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

5f50d84213 feat: refs #7244 Requested changes

8449a6c6d3 feat: refs #7244 Requested changes

2f7de633bd Merge branch 'dev' into 7244-collectionAcl

d387486ea8 refactor: refs #7920 Requested changes

534b50f51a feat: refs #8151 Requested changes

b7cb420c72 Merge branch 'dev' into 8151-moveExpeditions

b3dcaf4cf5 feat: refs #8151 Requested changes

54da1a713a Merge branch '8151-moveExpeditions' of https://gitea.verdnatura.es/verdnatura/salix into 8151-moveExpeditions

96a13af02c Merge branch 'dev' into 8143-deprecateColumnsFromUser

c8ab5d4344 fix: refs #6818 add defaultChannel

0a11997250 Merge pull request 'feat: refs #8143 deprecate recoverPass and sync from account.user' (!3203) from 8143-deprecateColumnsFromUser into dev ...

Reviewed-on: #3203
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

25b05637a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel

a37332f7be fix: refs #6818 add defaultChannel

a8cb0b9eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

47ae1b59c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport

c4375b2505 feat: refs #7641 fine tunning

ab2e88806e fix: refs #7641 drop boilerplate code

eff251fbb5 feat: refs #7874 add default type

9ac54f463a fix: refs #7457 add with on select to reduce

4766d25dda feat: refs #7874 use name

e242320eed Merge pull request '#7874 setDefaultTypeNote' (!3209) from 7874-setDefaultTypeNote into dev ...

Reviewed-on: #3209
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

1ca737fd13 Merge branch 'dev' into 7641-refactorEntryReport

f3e640e4a0 Merge pull request 'refactor: refs #7641 entry report style' (!3178) from 7641-refactorEntryReport into dev ...

Reviewed-on: #3178
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

86c95e185c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel

f96b914649 fix: refs #6818 use right col type

4b659c0b48 fix: refs #6818 use right col type

7e2194df41 Merge pull request 'fix: refs #6818 add defaultChannel' (!3205) from 6818-addDefaultChannel into dev ...

Reviewed-on: #3205
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

3b48cf3d5d Merge pull request 'feat: refs #8151 moveExpeditions' (!3200) from 8151-moveExpeditions into dev ...

Reviewed-on: #3200
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

0fbef4c88a Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev ...

Reviewed-on: #3198
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

d1c528c8fd Merge branch 'dev' into 7950-cmrModelUnify

96b85701d8 Merge pull request 'refactor: refs #7950 Created cmr model' (!3180) from 7950-cmrModelUnify into dev ...

Reviewed-on: #3180
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

d8e728e823 Merge branch 'dev' into 7457-orderFilter

48ffb80094 Merge branch 'dev' into 7920-itemShelving

216b81adda Merge pull request 'refactor: refs #7920 Main change' (!3194) from 7920-itemShelving into dev ...

Reviewed-on: #3194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

e344ae3bf2 refactor: refs #7920 Fix version

e49285ace8 refactor: refs #7920 Fix version

b5463e5560 refactor: refs #7920 Fix version

7a4455d6d0 feat: refs #6869 refs#6869 itemShelving_get

e1a091535e refactor: refs #7920 Fix version

07318656b7 feat: refs #8135 refs#8135 updateTicketACL

86e4e3e981 Merge branch 'dev' into 7743-simpleTestForSendMail

f7a5fc7e31 Merge branch 'dev' into 8127-entry_updateComission

c5f1b05671 feat: refs #8127 quitar esquemas

a3945070f2 refactor: refs #7920 No changes in itemShelvingLog table

923296e85e Merge branch 'dev' into 8127-entry_updateComission

b529ccfe29 feat: refs #7920 Added ItemShelving in shelvingLog

55daa2d02b Merge pull request '7743-simpleTestForSendMail' (!3170) from 7743-simpleTestForSendMail into dev ...

Reviewed-on: #3170
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

60f989b566 Merge branch 'dev' into 7457-orderFilter

6c00efae89 feat: refs #7289 #7289 apply option 1

353ca659cd feat: refs #8057 Requested changes

e81727f3f8 Merge branch 'dev' into 8057-geoFk

7d5928bc3d Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev ...

Reviewed-on: #3210
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2b97c18412 Merge branch 'dev' into 6869-createGetDetails

329488d700 Merge branch 'dev' into 8127-entry_updateComission

5e21e4e368 Merge pull request 'feat: refs #8127 entry_getCommission' (!3128) from 8127-entry_updateComission into dev ...

Reviewed-on: #3128
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

9558d030ff feat: refs #7289 #7289 remove bad translation

f471f7e76c Merge branch 'dev' into 7289_sales_already_moved

5e78317b5e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails

dd637b9333 fix: refs #6869 use id as primaryKey

a64f9b74ec feat: refs #8057 Requested changes

754c0cb9ab Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk

66009ee0dd Merge branch 'dev' into 8057-geoFk

d2b545aaae Merge branch 'dev' into 7457-orderFilter

433f883700 Merge pull request 'feat: refs #6869 define model' (!3172) from 6869-createGetDetails into dev ...

Reviewed-on: #3172
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

4b64b27ca7 Merge branch 'dev' into 7289_sales_already_moved

3f6a23fe35 Merge pull request '#7289 Sales already moved' (!3212) from 7289_sales_already_moved into dev ...

Reviewed-on: #3212
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

baadd621e1 Merge pull request 'feat: refs #8057 Added geoFk columns' (!3204) from 8057-geoFk into dev ...

Reviewed-on: #3204
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>

aed4bc89c7 feat: refs #8057 Fix version

2b770c0201 feat: refs #8057 Fix version

cdcc5051d2 feat: refs #8057 Fix version

8d4769d74d feat: refs #8057 More precision in getGeo

056b5adddc Merge branch 'dev' into 7457-orderFilter

b70b69557e fix: refs #7457 empty commit for gitea

7a9bcf11e2 Merge pull request 'refactor: refs #7457 Added from param if not exists' (!2502) from 7457-orderFilter into dev ...

Reviewed-on: #2502
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

7f39edf014 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

413e9e1e9f build: refs #8144 change package version

562d3b0f70 Merge pull request '8144-devToTest_2448' (!3216) from 8144-devToTest_2448 into test ...

Reviewed-on: #3216
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

d21b42a567 feat: refs #8099 refs#8099 addComplmentSalary

feb11c123e feat: refs #8099 refs#8099 addComplmentSalary

f89080d373 fix: refs #7323 add remaining fields

f192b92c6a Merge pull request 'feat: refs #8099 refs#8099 addComplmentSalary' (!3219) from 8099-addComplementSalary into test ...

Reviewed-on: #3219
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

c31fa7e9cf Merge branch 'test' into 7323-warfix-addRemainingFields

2335b57e05 Merge pull request '#7323 add remaining fields' (!3220) from 7323-warfix-addRemainingFields into test ...

Reviewed-on: #3220
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

033e269a5d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

3cce342d9d fix: refs #6818 add config

e4317a385c Merge pull request 'fix: refs #6818 add config' (!3223) from 6818-warmfixxInsertConfig into test ...

Reviewed-on: #3223
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

d302a9c3ba Merge branch 'master' into test

9fbffe8a6b fix: refs #7920 refs#7920 itemShelvingLog

a8dea64bc1 Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3227) from 7920-itemShelvingLog into test ...

Reviewed-on: #3227
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

512b4a54df fix: refs #7920 refs#7920 itemShelvingLog

07201f6448 Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLog' (!3231) from 7920-itemShelvingLogs into test ...

Reviewed-on: #3231
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

0870a1c3d6 refs#8087 Redadas en travel test

2563d1f0e4 Merge pull request 'refs#8087 Redadas en travel test' (!3232) from travelisRaidTest into test ...

Reviewed-on: #3232
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

7ad17d75d7 feat: refs #8124 Enrutadores nuevos requerimientos

52364bbe2d feat: refs #8124 Enrutadores nuevos requerimientos

0c592946e6 revert cd7ed6987a

a6d2f9c3f8 Merge branch 'test' into revert_7283_itemMigration3

f01051a266 Merge pull request 'Revert ItemMigration and enbale in Salix (cd7ed6987a)' (!3236) from revert_7283_itemMigration3 into test ...

Reviewed-on: #3236
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

a731bb3a45 Merge branch 'master' into test

7cf6acec19 Merge pull request '8124-enrutadoresNuevosRequerimientos' (!3235) from 8124-enrutadoresNuevosRequerimientos into test ...

Reviewed-on: #3235
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

alexm added 1 commit 2024-11-25 13:49:07 +00:00

ed39ae7e4b chore: refs #8231 add changelog

guillermo approved these changes 2024-11-26 06:03:33 +00:00

alexm merged commit 1a11832281 into master 2024-11-26 06:04:22 +00:00

alexm deleted branch 8231_testToMaster_2448 2024-11-26 06:04:22 +00:00

alexm referenced this issue from a commit 2024-11-26 06:04:24 +00:00

Merge pull request '8231_testToMaster_2448' (!3241) from 8231_testToMaster_2448 into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#3241

No description provided.