8524-devToTest #3415

Merged

alexm merged 343 commits from 8524-devToTest into test 2025-02-04 13:42:16 +00:00

Conversation 0 Commits 343 Files Changed 127 +2327 -1758

alexm commented 2025-02-04 12:06:01 +00:00

Member

Copy Link

No description provided.

alexm added 343 commits 2025-02-04 12:06:02 +00:00

9585af8e77 feat: refs #6822 create entryTransfer

bac07fe265 feat: refs #6822

3e1b296b29 refs #6553 changes models

a5ffdddb53 refs #6553 fix back

11d1cd8eb3 Merge branch 'dev' into 6553-workerBusiness

5d73af5392 refs #6553 fix back

06fe0f5cef refs #6553 fix acls

41fabecc9b refs #6553 fix acls

e8d0ebe91d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

a9ad3df592 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

4f7b625a4f fix(business): sql role

0486c40454 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

be0de3511b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

cc8af9d14a refs #6553 fix back

3362d7562f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

36b4c7fb74 typo

b5f8ad77f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

eb17d66986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

04f6059d6f feat: refs #6822

22c83b6b56 Merge branch 'dev' into 6822-entryTransfer

a34376f4d2 feat: refs #6822

c286dd780f Merge branch 'dev' into 6822-entryTransfer

1ffe41c23e Merge branch 'dev' into 6822-entryTransfer

5a7d5787f7 feat: refs #6822 clonar travel con warehouseInFk

d60a1a3424 feat: refs #6822 entry_clone

1332aef213 Merge branch 'dev' into 6822-entryTransfer

109770b0a3 feat: refs #6822 return newEntry

2cb8d07aef feat: refs #6822

5a742ada5c Merge branch 'dev' into 6822-entryTransfer

8b106a0cbc Merge branch 'dev' into 6822-entryTransfer

24e64fe607 Merge branch 'dev' into 6822-entryTransfer

bb36667616 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

5f63017853 feat: refs #6822 changes transaction

070613de64 feat: refs #7686 Added new alertLevel APPROVED and changes in vn.state.alertLevel

28c94b5f32 feat: refs #7686 Changes in procs

cf651dc2e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

5e5a8078ca fix: refs #6553 json worker

a27e3ed60f Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

ff328c9f0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

07c4fa4b1d Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

400226f955 Merge branch 'dev' into 6822-entryTransfer

e999201969 feat: refs #6822 entry_clone

18a055f28a Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

c3c60b1fa7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

2aa0e2af2a Merge branch 'dev' into 6553-workerBusiness

4b9a39e6ba Merge branch 'dev' into 6553-workerBusiness

601909e853 Merge branch 'dev' into 6553-workerBusiness

d2a4a84728 Merge branch 'dev' into 6822-entryTransfer

9a01ae5ccc feat: refs #6822 tabulaciones

d86eaf5471 Merge branch 'dev' into 6822-entryTransfer

4e71fb97c3 Merge branch 'dev' into 6822-entryTransfer

d9575190ee Merge branch 'dev' into 6822-entryTransfer

62243e164a feat: refs #7134 refs #6427 #7134 add new supplier/receipts method

50b35c3474 Merge branch 'dev' into 7134-supplierBalance

771e06743e feat: refs #7134 add supplier payment

f46a46359e feat: refs #7134 #7134 modify balanceStartingDate

aab595e9dd feat: refs #7134 #7134 use VN_CURDATE

aa2f9985cd feat: refs #7134 change index

01537d410c feat: refs #6629 refs # 6629 updateAddress

229a241bff Merge branch 'dev' into 6629-addressObservationBack2

7b8d4c6a2c Merge branch 'dev' into 6822-entryTransfer

4b474834cf feat: refs #6822 change request

be394cec28 feat: refs #6822 change request

3f4aa60cd2 feat: refs #6822 poner esquemas en el with

22dc1e22f4 Merge branch 'dev' of https: refs #7134//gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance

c518352bf7 feat: refs #6822 changes required

b97b61c7dd feat: refs #6822 fix

47cb1ff722 Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

6ac30dcb0c feat: refs #6822 fix conflict

0a4f4c5926 feat: refs #7134 rename supplier.createReceipt by createPayment

f86bd1233b feat: refs #7134 tiller

b681585ad5 Merge branch 'dev' into 6822-entryTransfer

43bbdfd421 feat: refs #6822

4f370dbaea Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

ab1eed66df feat: refs #6822 changes required

781a8a4d10 refactor: refs #8205 Added geoFk Fk

d1aa164aea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

4bc475d132 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

c1b9032534 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

e2a4c5339a fix: refs #6553 fix back

afb01ed021 fix: refs #7917 fix route filter freeLancer

419815ff87 fix: refs #7917 fix back

a30cad1da1 fix: refs #7917 fix tback

16bbcf8185 fix: refs #7917 fix summary test

6f16974320 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

85163a13fa fix: refs #7917 fix fixtures

ca90d6ecd7 Merge branch 'dev' into 7134-supplierBalance

3691daded4 feat: refs #7134 add bank name

a69a767c8a feat: refs #7134 use filter to order by

81d3bce12a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

78a8f80321 fix: refs #7917 fix tback

02d77324b1 feat: refs #6822 crear test

31aa7f9915 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

e8faaa42aa Merge branch 'dev' into 6822-entryTransfer

cbf72be299 Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

ddecfee24b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

04734ac55c feat: refs #6822 test transfer

b7658f5814 feat: refs #6822 fix test

aee747abd3 Merge branch 'dev' into 6822-entryTransfer

ebf234dd4f feat: refs #6822 delete fixtures to test

1b90317b67 Merge branch 'dev' into 6822-entryTransfer

a139c9849c fix: refs #6553 fix model

65aa931738 Merge branch 'dev' into 6822-entryTransfer

c4c9b5640e feat: refs #6822 modify transaction

823be8e0ea Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer

bd1cee6d8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

5d337c4def Merge branch 'dev' into 6822-entryTransfer

115756aaf3 feat: refs #6822 fix transfer test

209bd21548 Merge branch 'dev' of https: refs #6553//gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

c8d57a1efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

6d661dba85 Merge branch 'dev' into 7917-freelancerRoute2

886383b82d Merge branch 'dev' into 7686-onPrevious

95e7757574 Merge branch 'dev' of https: refs #6629//gitea.verdnatura.es/verdnatura/salix into 6629-addressObservationBack2

d547456d22 Merge branch 'dev' into 7917-freelancerRoute2

978914aa71 Merge branch 'dev' into 6553-workerBusiness

f207222b47 Merge branch 'dev' into 7134-supplierBalance

358f93c454 fix: refs #6553 fix worker back

a4f9d62504 Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

420bb2a57e perf: refs #7134 remove unnecessary code

f6c3893d00 feat: refs #7134 minor changes

60f0b169d4 fix: refs #6553 fix advanced

050c338ffb feat: refs #8387 crudModel

6fd8c5ded6 feat: refs #8387 fix

da3b8ac8d0 Merge branch 'dev' into 8387-itemTagCrudModel

f0e9cce228 fix: refs #7134 remove unnused method

9bfc2a01c5 perf: refs #7134 sql style

96649f5d8a feat: refs #7134 remove default value

86dde8dfb3 fix: refs #7917 fix pr

60c1daa47c Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

3bdb8f6228 Merge branch 'dev' into 7917-freelancerRoute2

07b07611be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

24f501f47a Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

277cd80f50 Merge branch 'dev' into 6822-entryTransfer

849bcd1ff5 feat: refs #6629 test back updateObservations

d39c063786 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

807ddf07ad feat: refs #6629 test back

6ef0d2625d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

93c9ef6f4c feat: refs #8387 changes

024ab8602d fix: refs #6553 fix back advanced summary

6ab0515f8e feat: refs #8398 sendCheckingPresence

516147b8bb fix: refs #7917 fix acls

53eb1f427b Merge branch 'dev' into 7917-freelancerRoute2

ec14281a82 feat: refs #7322 add optional addressFk parameter to transferClient method

b78603275f fix: refs #7322 reorder parameters in transferClient method for consistency

4853e45051 feat: refs #8398 change merge.spec

df3f4c3d2e Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack

81ab9fe0ba Merge branch 'dev' into 6822-entryTransfer

0bfd0895d7 feat: refs #8077 sumDefaulter

9cd8dfaf9d feat: refs #8077 fix spec

8b3f2572a1 Merge branch 'dev' into 8077-sumDefaulterBackFix

4f68a7d262 feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model

6c2071742c Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack

de2f12bdb5 Merge branch 'dev' into 6629-addressObservationBack2

ce96b0a819 Merge branch 'dev' into 6822-entryTransfer

52f9e71062 feat: refs #6822 refs#6822 fix branche

a98967bac1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

ffeb710933 Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

477646ba31 feat: refs #8227 Roadmap changes

8e21ca5293 Merge branch 'dev' into 8381-thermographTravel

a46ec1bc8d feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records

7292ac48b2 Merge branch 'dev' into 6822-entryTransfer

da8609afd6 Merge branch 'dev' into 8381-thermographTravel

c727586855 feat: refs #8387 add column validationRegex

9d289fa11e build: init version

3d5bfb81da feat: refs #8387 regular expression all tags

b4ac80615b feat: refs #8387 fix traductions

a40e9a547b feat: refs #8387

5ff27de72c feat: refs #8387

dfcfd34202 Merge branch 'dev' into 7134-supplierBalance

d66b8f4963 fix: refs #7917 acls

482fe77159 feat: refs #8227 Roadmap changes

3c89ea0df8 fix: refs #8387 local/es.json

2e247c3ea5 Merge branch 'dev' into 8387-itemTagCrudModel

294c2f832e Merge branch 'dev' into 7134-supplierBalance

630d867787 fix: refs #7134 use vn_curdate

5a12a01565 Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulterBackFix

4a2508716d Merge branch 'dev' into 6822-entryTransfer

99b5433e62 fix: refs #7917 fix acls

b47f175b67 Merge branch 'dev' into 7917-freelancerRoute2

052630d268 feat: refs #8227 Roadmap changes

43528a0a53 feat: refs #8342 deprecate sorter and splitLine tables

e92e1d3a46 feat: refs #6822 refs #688 change request

0f531d4b74 feat: refs #6822 change request

0eff155daf refactor: refs #7184 created myteam filter and modified filters where it is used

6d5a329b49 fix: refs #7184 fixed filter and test

602e822599 refactor: refs #7184 deleted .value

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

64c697da6c Merge pull request '#7184: Created myTeam filter' (!3378) from 7184-MyTeamFilter into dev ...

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

0177353b30 Merge branch 'dev' into 8227-roadmap

14e69c1c64 Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack

1816ff6cf4 Merge branch 'dev' into 6822-entryTransfer

2124a50dc2 Merge branch 'dev' into 6629-addressObservationBack2

10a6626a65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

89de87c280 Merge pull request 'feat: refs #8398 sendCheckingPresence' (!3362) from 8398-mergeSendCheckingPresenceBack into dev ...

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

d98a867e12 Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables

13821b86ea Merge pull request 'feat: refs #8342 deprecate sorter and splitLine tables' (!3377) from 8342-deprecateSorterAndSplitLineTables into dev ...

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

d8847d3d09 feat: refs #6822 change request

0038fabcc6 Merge branch 'dev' into 6822-entryTransfer

f165d17869 feat: refs #7322 add addressFk parameter to transferClient method and update tests

95329b7ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer

162cd4d69e feat: refs #8227 Roadmap major changes

ce8b707400 Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap

a6908aa8c0 Merge branch 'dev' into 8227-roadmap

306eb6a059 feat: refs #8227 Roadmap fix version

603e3e32c4 fix: shipped field

f3cb2bd200 Merge pull request 'Fix[priceDifference]: Fixed shipped field' (!3380) from Fix-priceDifferenceError into dev ...

Reviewed-on: #3380
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

e9f1e28ac0 feat: refs #8227 Added roadmap_cloneDay

57ed161d27 Merge branch 'dev' into 8205-geoFk

b09e3398ff Merge branch 'dev' into 8077-sumDefaulterBackFix

ad05641520 Merge pull request 'feat: refs #8077 sumDefaulter' (!3367) from 8077-sumDefaulterBackFix into dev ...

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

75b0589561 feat: refs #8227 Undo vehicle_checkNumberPlate change and triggers checks

e54b148088 Merge pull request 'refactor: refs #8205 Added geoFk Fk' (!3304) from 8205-geoFk into dev ...

Reviewed-on: #3304
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

2ee5ba908a feat: refs #6822 change request

163302c770 feat: refs #6822 fix test

034df6e8ea feat: added nickname in address

b9206c44bb Merge branch 'dev' into 8387-itemTagCrudModel

ad87631092 Merge branch 'dev' into 6629-addressObservationBack2

705dec2dbc Merge pull request 'feat: refs #6629 refs # 6629 updateAddress' (!3255) from 6629-addressObservationBack2 into dev ...

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

4fd58e24c5 Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer

46a22733e2 Merge branch 'dev' into 8387-itemTagCrudModel

29af7cfcbc test: refs #7322 added test error for case when expected error is not thrown

be3bcefa46 Merge pull request '7322-addSelectAddressOnTicketTransfer' (!3363) from 7322-addSelectAddressOnTicketTransfer into dev ...

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

1f6779d86b feat: refs #8387 change request

609df98614 feat: refs #8227 Added grants

d10670cb37 Merge branch 'dev' into 8387-itemTagCrudModel

62f26ec8c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

6f8cbc1017 Merge branch 'dev' into 6822-entryTransfer

14c087e17f Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

c4a7fbf6e8 fix: refs #7917 fix tests

75168eef91 feat: refs #8227 Roadmap changes

edb26a3750 Merge pull request '6822-entryTransfer' (!3376) from 6822-entryTransfer into dev ...

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

06cd177d31 Merge branch 'dev' into 7917-freelancerRoute2

a948442e13 Merge branch 'test' into dev

5a449c66ce Merge branch 'dev' into 8387-itemTagCrudModel

d659e05ce8 fix: refs #7917 remove update

d9d80a0e43 Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

56982ee1ba Merge pull request 'feat: refs #8387 crudModel' (!3355) from 8387-itemTagCrudModel into dev ...

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

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

ba2333f180 refactor: refs #7686 remove unused stored procedures for item shelving and ticket delay

857874c4c6 refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic

1261722943 Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev ...

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

8cbe64eedd fix: remove orphaned agencyIncoming records with null agencyModeFk

b8f9dc7ad7 fix: correct SQL syntax for deleting orphaned agencyIncoming records

59d3bd9d44 Merge branch 'dev' into Fix-TicketSummaryAddress

e85b68650d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress

167368b9ae Merge branch 'Fix-TicketSummaryAddress' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress

c73af0a44b fix: specify database context in agencyIncoming foreign key deletion SQL

dac30dcac5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress

eb29a66a80 Merge pull request 'Fix_TicketSummary[Address]: Added nickname in address relation' (!3383) from Fix-TicketSummaryAddress into dev ...

Reviewed-on: #3383
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

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

0def25ad15 Merge branch 'dev' into 7686-onPrevious

9419eada64 Merge branch 'dev' into 7134-supplierBalance

08d2414363 refactor: refs #7686 update editableStates tests to check for 'OK' and 'Bloqueado' states

8482743baf feat: refs #6822 ACL

b14beb83f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness

3c16914135 Merge branch 'dev' into 7917-freelancerRoute2

a01c419b44 fix: refs #7917 fix tback

bb08ad7d1a Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2

b383725f9f fix: refs #7917 fix user tests

a6a875cb2c feat: refs #8077 redirection lilium

801629c8db fix: refs #8492 Sage invoiceInTax Check VAT

ec71cb8df6 Merge pull request 'fix: refs #8492 Sage invoiceInTax Check VAT' (!3390) from 8492-InvoiceInTax-Check-VAT into dev ...

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

821e2cbe4d feat: refs #8312 new column packaging.rejectCost

dfcc155ef9 Merge branch 'dev' into 8312-newPackagingColumn

a63ca1b3c5 Merge branch 'dev' into 7134-supplierBalance

b32c7f734f Merge branch 'dev' into 7134-supplierBalance

56b0baebaa feat: refs #8227 Roadmap changes

f2be71be6c fix: refs #7134 replace value by util.VN_CURDATE()

295c8493a8 Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance

17a27060c3 Merge branch 'dev' into 7917-freelancerRoute2

78842cd69c Merge pull request 'fix: refs #7917 fix route filter freeLancer' (!3327) from 7917-freelancerRoute2 into dev ...

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

1d53f2c490 fix: worker filter limit

17b4089b51 Merge pull request 'Fix[WorkerFilter]: Fixed filter' (!3394) from Fix-WorkerFilterLimit into dev ...

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

0de9c3c172 feat(available): refs #8408 available refreshing now includes time ...

Refs: #8408

4e2a6d275a fix(travel): refs #8408 trigger restriction for wrong availabled value ...

Refs: #8408

597615facb fix(agencyIncomingForeign): refs #8408 version changes rolled back ...

Refs: #8408

af5b4981df Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas

ad29b26553 refactor: refs #7414 update Spanish translation for 'total' to 'importe'

d536690197 feat: refs #6822 changes request

35e72c90d3 Merge branch 'dev' into 6822-entryTransferFix

f87fa37a79 Merge branch 'dev' into 8077-sumDefaulterRedirectionLilium

dd77326424 Merge pull request 'feat: refs #8077 redirection lilium' (!3389) from 8077-sumDefaulterRedirectionLilium into dev ...

Reviewed-on: #3389
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

73d1266bfc Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas

e87803874c Merge pull request 'feat(available): refs #8408 available refreshing now includes time' (!3395) from 8408-Disponible-por-zonas-y-horas into dev ...

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

a14d6227a1 feat: refs #8227 Roadmap changes

70d286df80 feat: refs #8487 deprecate travel.appointment

efe0aa708f Merge branch 'dev' into 7134-supplierBalance

1a8e962382 Merge pull request '#7134 SupplierBalance' (!3173) from 7134-supplierBalance into dev ...

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

2a7795d432 feat: refs #8477 add fee column to awb table

9c467e67e0 Merge branch 'dev' into 6822-entryTransferFix

7654a2e693 Merge pull request 'feat: refs #6822 ACL' (!3388) from 6822-entryTransferFix into dev ...

Reviewed-on: #3388
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

123f28055e feat: refs #8227 Roadmap changes

0a89a6a6fd fix: refs #7488 deleted nif validation

ef8e206520 Merge pull request '#7488: Deleted nif validation' (!3402) from 7488-DeleteNifValidation into dev ...

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

85c3dc54fa Merge branch 'dev' into 8487-deprecateAppointmentFromTravel

ecc92792da Merge pull request 'feat: refs #8487 deprecate travel.appointment' (!3399) from 8487-deprecateAppointmentFromTravel into dev ...

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

855600811e feat: refs #8227 Roadmap changes

3965441f7f Merge branch 'dev' into 7686-onPrevious

e0e72272a7 feat: refs #8312 change column name

9e95afa190 Merge branch 'dev' into 8312-newPackagingColumn

148072b39d feat: refs #8477 change column name and add comment

f68f62543d Merge branch 'dev' into 8477-AddFeeToAWB

4d210b34c7 Merge pull request 'feat: refs #8312 new column packaging.rejectCost' (!3391) from 8312-newPackagingColumn into dev ...

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

53ee0c1617 fix: fixed country field

e1125dc46d Merge branch 'dev' into 6553-workerBusiness

da5e395450 feat: refs #8312 add flippingCost column to Cubos view

3fede6d586 Merge pull request 'refs #6553 changes models' (!2522) from 6553-workerBusiness into dev ...

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

a2258a005a Merge branch 'dev' into 8312-addColumnCubosView

5c4f31e6af refactor: refs #7537 address display all digits in black in driver route report

923fef444c Merge pull request 'Fix[CustomerList]: fixed country field' (!3406) from CustomerListCountryField into dev ...

Reviewed-on: #3406
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

66a08f7641 Merge branch 'dev' into 8312-addColumnCubosView

b40f145613 feat: refs #8227 Roadmap changes

fa9b9cc5a3 feat: refs #8312 modify fixtures.before

45ccf8da28 Merge pull request 'feat: refs #8312 add flippingCost column to Cubos view' (!3407) from 8312-addColumnCubosView into dev ...

Reviewed-on: #3407
Reviewed-by: Robert Ferrús <robert@verdnatura.es>

3fa74a18de Merge branch 'dev' into 8477-AddFeeToAWB

83228d481d Merge pull request 'feat: refs #8477 add fee column to awb table' (!3400) from 8477-AddFeeToAWB into dev ...

Reviewed-on: #3400
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

2e4c5fe401 feat: refs #8477 add costPerKg to awb view

074fe5b0ac Merge pull request 'feat: refs #8477 add costPerKg to awb view' (!3409) from 8477-addColumnToAwbView into dev ...

Reviewed-on: #3409
Reviewed-by: Robert Ferrús <robert@verdnatura.es>

8dc803b5df feat: refs #8227 Roadmap changes

12604d0f67 Merge branch 'dev' into 8227-roadmap

9f8da1d64e Merge branch 'dev' into 7537-modifyDriverRoutePdf

ca5668f941 Merge branch 'dev' into 7414-ticketLogChanges

b2e5ba14c6 Merge pull request 'refactor: refs #7537 address display all digits in black in driver route report' (!3408) from 7537-modifyDriverRoutePdf into dev ...

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

ae2a68423a Merge pull request 'refactor: refs #7414 update Spanish translation for 'total' to 'importe'' (!3397) from 7414-ticketLogChanges into dev ...

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

adba4765ed refactor: refs #7686 update alert level conditions to only check for 'FREE'

55ec4aaba1 Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev ...

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

c1dd0eeb32 refactor: refs #8512 Add 'master' branch check in description condition

247bdc7295 Merge branch 'dev' into 8227-roadmap

6b9c8300fb feat: refs #7412 notificationMisAllocation

a408af2467 Merge branch 'dev' into 8227-roadmap

f0e50943d2 Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap

ef5fb111b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7412_misallocationNotification

9adb160f2d feat: refs #7412 refs#7569 sendEmailNotificationChangeText

8240dd655d Merge pull request 'feat: refs #7412 notificationMisAllocation' (!3412) from 7412_misallocationNotification into dev ...

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

9cecdab5a8 refactor: refs #8227 Fix tests

d6bd60f181 Merge branch 'dev' into 8227-roadmap

fb8973a358 fix: refs #8515 Fix test optimizePriority

49e5da5547 fix: refs #8515 Fix test optimizePriority

eb9d3a7b21 refactor: refs #8227 Requested changes

879d18dd73 Merge pull request 'feat: refs #8227 Roadmap changes' (!3372) from 8227-roadmap into dev ...

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

ee5a93ba81 Merge branch 'dev' into 8515-fixTestOptimizePriority

3bb0d52dde Merge pull request 'fix: refs #8515 Fix test optimizePriority' (!3414) from 8515-fixTestOptimizePriority into dev ...

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

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

guillermo approved these changes 2025-02-04 13:40:00 +00:00

alexm merged commit 4b903c5bad into test 2025-02-04 13:42:16 +00:00

alexm deleted branch 8524-devToTest 2025-02-04 13:42:16 +00:00

alexm referenced this issue from a commit 2025-02-04 13:42:17 +00:00

Merge pull request '8524-devToTest' (!3415) from 8524-devToTest into test

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#3415

No description provided.