6745-2404_testToMaster #1950

Merged

alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00

Conversation 0 Commits 191 Files Changed 177 +1865 -994

alexm commented 2024-01-24 14:01:06 +00:00

Member

Copy Link

No description provided.

alexm added 190 commits 2024-01-24 14:01:08 +00:00

b51710fb31 refs #5525 mod yml y sql

26872c28e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

95602895df refs #5525 update changes

790de4f05f refs #5525 trad fr pt

7fd87c4b04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

de7b270d9e refs #5525 sql

72bae89224 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

b8f0b205db refs #5525 move sql

dce5394cb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

0a78dd344f refs #5525 sql

f3a40dfb23 refs #5525 comment

a54e9ca87f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

c453935ddd refs #5525 sql

5b5191a6a5 refs #5525 findOne sql

56bbdd66ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

cc6ffff018 refs #5525 nd debtor

22c7714abc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

b2702d8567 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

2f9979046d refs #5525 iban

344b5d984a refs #5525 add nif iban

3bc26b228e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

5664ec3a8f refs #5525 change supplier

2ff346ec25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

8678d2b1e0 refs #5525 new sql

b5d882ae5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

d26a73bdd9 refs #5525 sql correct

4b40c8b067 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

cdc91e76f5 refs #5525 supplier sql table i18n

f4ac6f68c0 refs #5525 trad en

5dbfe31a60 refs #5666 feat: define VnRole

cf3cc37d97 refs #5666 feat: create mixin

3c5af184bb refs #5666 feat: use mixin for this models

a102c3f3a9 refs #5666 perf: loggable to mixin

aab88dc7de refs #5666 perf: use use loggable as mixin

384b5eb7c7 refs #5666 remove old file

b57106af48 refs #6291 validateTin

0a5e8e1902 refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState

2a57f7e98a Merge branch 'dev' into 6366-unifyTicketChangeState

7c6798c564 refs #6291 dni vn-user

a7361a89bd refs #6489 remove auth

7911cc12df Merge branch 'dev' into 6489-authSupport

50a97693b9 refs 5666 feat: remove loggable.js file

f5f2896cbf refs 5666 feat: replace Role model by VnRole model

bb9723b65d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin

2a2998a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin

16001099b6 refs #5666 feat: update ACLs for role and vnRole

01e7135224 refs #5666 feat: replace Role by VnRole in front

2fe631f078 refs #5666 feat: change models permissions

57add7abf0 refs #5666 perf: replace Role by VnRole

b4f4714c0a refs #5666 feat: remove loggable.json

1d92bbf4a2 refs #5666 feat: replace base value and add mixins

6f32a588bb refs #5666 feat: add role relation to RoleMapping

7a63e527a5 refs #5666 perf: remove comments

035b31d878 refs #5666 test: fix e2e tests

a7c48b6ddc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin

102ea1ee65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

920b38c929 refs #5525 move sql

d1f0557923 refs #5666 perf: remove ruleAlias property

f817551a57 refs #5666 perf: remove ruleAlias property

074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin

556b403a5b refs #5525 letter debtor st

ea31d3bebb refs #5525 debtor-nd

6416891918 refs #6291 tinIsValid worker

26a05a4840 fix: refs #3979 si se abona un abono sin almacen no falla

3a37e6dfc8 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen

22a9ffc163 refs #6291 dni

18e87a05c4 refs #5525 st and nd

2185b4ddc0 Merge branch 'dev' into 6259-ticketSmsJoinClientSms

acb0ec508f refs #5499 feat: claimObservation

5c5be788c1 refs #5499 feat: trigger for all changes

adc7608b25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial

73d1c1698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI

6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin

c4ff4c1984 refs #6291 tin valid

27a369bef4 refactor(ticketSms): refs #6259 merge ticksms to clientsms

35750bc93f merge(dev): refs #6259 merge dev

8d08adca21 Merge branch 'dev' into 5666-loggable_to_mixin

4d2cf87f49 Merge branch 'dev' into 5666-loggable_to_mixin

5a1c4ddea0 refactor(ticketSms): refs #6259 ticketSmsToClientSms

323c7adcdd Merge branch 'dev' into 6259-ticketSmsJoinClientSms

c77715d865 refs #6291 validation original

df1c9e3d9f refs #5525 suppliercif

bfb31ad7c3 refs #5525 supplier

bbf1bb50e9 refs #5525 fix sql supplier for sepacore

f7ec64f3c1 merge(dev): refs #6366 merge dev

1b8461034e using hasAnyNegative: refs #6515

ccf5387e04 refactor(state): refs #6366 unifyTicketChangeState

81634e6684 Merge branch 'dev' into 6259-ticketSmsJoinClientSms

4510f0a037 Merge branch 'dev' into 5666-loggable_to_mixin

31c282ac0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase

c116bc56c3 refactor(clientSms): refs #6259 redirect to lilium

bc1edf8f04 Merge branch '6259-ticketSmsJoinClientSms' of https://gitea.verdnatura.es/verdnatura/salix into 6259-ticketSmsJoinClientSms

23854cb103 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase

3fbead7473 refs #6291 fix tinIsValid

4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin

ab341b9b5e test: refs #3979 test de clone

2fb60aeed3 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen

b42aed13c4 Merge branch 'dev' into 6366-unifyTicketChangeState

847623f9c6 Merge branch 'dev' into 6259-ticketSmsJoinClientSms

2a65ad6b31 refs #6635 build: new version

4cb82524cb test: refs #3979 quito clone parametro group porque no se usa

f7d83b15bd Merge branch 'dev' into 5666-loggable_to_mixin

8019180ee8 Merge pull request '#5666 - Loggable to mixin' (!1826) from 5666-loggable_to_mixin into dev ...

Reviewed-on: #1826
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

932b993723 Merge branch 'dev' into 6515-hasAnyNegativeBase

cdab389f22 Merge pull request 'using hasAnyNegative: refs #6515' (!1905) from 6515-hasAnyNegativeBase into dev ...

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

767c6a6ac8 test: refs #3979 fixtures arregladas para que los abonos sean negativos

71937a4df3 refs #5499 feat: send RocketMessage when change state

2e5ae062cf Merge branch 'dev' into 6259-ticketSmsJoinClientSms

8ee6cfb015 refs #5499 feat: send RocketMessage when change state

e9773b3885 refactor(state): refs #6366 simplify if condition

f48500f4b3 Merge branch 'dev' into 6366-unifyTicketChangeState

406cf7335b Merge branch 'dev' into 3979-abonarTicketsSinAlmacen

cdea3abcdf Merge pull request 'refs #6259 TicketSms to ClientSms' (!1900) from 6259-ticketSmsJoinClientSms into dev ...

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

c72311860b refs #647 remove e2e

9af27783ed Merge branch 'dev' into 6366-unifyTicketChangeState

f4062ab47b remove(traduction): refs #6366 remove unused traduction

77d88df27d Merge branch '6366-unifyTicketChangeState' of https://gitea.verdnatura.es/verdnatura/salix into 6366-unifyTicketChangeState

782772bffc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI

280f9080fa Merge pull request 'refs #647 remove e2e' (!1915) from 6647-skipE2E into dev ...

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

0e29db3b1e Merge branch 'dev' into 6366-unifyTicketChangeState

dffb212722 Merge pull request 'refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState' (!1838) from 6366-unifyTicketChangeState into dev ...

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

a22de3ab25 Merge branch 'dev' into 6291-comprobarDNI

d5ca47ea2a refactor: refs #6410 Deleted dmsType.path

ea5483e847 refs #6222 refactor: sale_calculateComponent

676d95563b refs #6322 importe

bf44f82f4f refs #6322 fix code

81ffc122fc Merge branch 'test' into dev

08aaf660e2 Merge branch 'dev' into 6410-dmsTypePath

16d7a20798 Merge branch 'dev' into 6291-comprobarDNI

510a395ef2 Merge pull request 'refactor: refs #6410 Deleted dmsType.path' (!1919) from 6410-dmsTypePath into dev ...

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

55f9519ebd Merge branch 'dev' into 6291-comprobarDNI

6647649f5e Merge pull request 'refs #6291 validateTin' (!1836) from 6291-comprobarDNI into dev ...

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

1bd6751d56 refs #5499 revert

7cc454751e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial

21566fd7ba refs #5499 code: remove unused translations

877dc718a7 refs #6353 remove rating

980ca81bfc refs #6353 fixtures catalog rating

de4ddf9392 remove bad comment

edde5819e3 refs #6660 feat: update mariadb version 10.7.7→10.11.6

b76e269e73 refs #5499 perf: rename variable

93f80718d8 Merge pull request 'Send message to comercial by RocketChat' (!1897) from 5499_claim_rocketMessage_comercial into dev ...

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

ce5e8c278f Merge branch 'dev' into 6660-mariadbV10.11.6

46fe878f45 Merge pull request 'refs #6660 feat: update mariadb version 10.7.7→10.11.6' (!1926) from 6660-mariadbV10.11.6 into dev ...

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

c98baf21bf Merge branch 'dev' into 3979-abonarTicketsSinAlmacen

887f686767 Merge pull request '3979-abonarTicketsSinAlmacen' (!1910) from 3979-abonarTicketsSinAlmacen into dev ...

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

d0df880c32 Merge branch 'dev' into 6322-futureTicketImporte

b7a523074f Merge pull request 'refs #6322 importe' (!1921) from 6322-futureTicketImporte into dev ...

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

14fff571b5 Merge branch 'dev' into 6353-ratingCatalog

1ca49d064e Merge pull request 'refs #6353 remove rating' (!1923) from 6353-ratingCatalog into dev ...

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

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

be1a94c283 feat: refs #6634 Modified collection-label

1cd9b85ddf Merge branch 'dev' into 6634-collectionLabelPrevia

a900e0fff6 feat: refs #6634 Minor change

4ead2345c4 Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia

107e35001a fix: refs #6582 Solved log error

f3e7162bfe Merge pull request 'feat: refs #6634 Modified collection-label' (!1932) from 6634-collectionLabelPrevia into dev ...

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

3ba5bc8fa1 refs #3979 fix e2e

7d7c6d7071 remove fdescribre

74a4e486aa refs #6661 Propagate changes from vn-database

3cdf8b2011 Merge branch 'dev' into 6489-authSupport

f8939fb5cf Merge branch 'dev' into fixe2e

f324ff5070 Merge pull request 'refs #6489 remove auth' (!1864) from 6489-authSupport into dev ...

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

492c15eb73 Merge branch 'dev' into fixe2e

371cc1e0a9 Merge pull request 'fixe2e' (!1934) from fixe2e into dev ...

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

3ebeebc159 refs #6230 remove basic-data columns

037a178717 refs #6230 fix test back

ce2bfc7cf1 refs #5525 insert

84134d671f refs #5525 remove as

7b9480f006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE

8095b02835 refs #5525 move version

49e915f5d1 Merge pull request 'refs #5525 mod yml y sql' (!1491) from 5525-ibanSEPA-CORE into dev ...

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

9452aacb49 Merge branch 'dev' into 6230-basicItem

9283173898 refs #6222 fix: correct sql folder

aac3e17d3c Merge branch 'test' into 6222-test-saleCcomponentUpdate

858912021b Delete db/changes/240201/00-saleComponent.sql

f75362a6d7 Merge pull request 'refs #6230 remove basic-data columns' (!1937) from 6230-basicItem into dev ...

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

2f67056dbf Merge branch 'test' into dev

3c778216a4 Merge branch 'test' into 6222-test-saleCcomponentUpdate

41aa5ff2f7 refs #6222

0f6718850f Merge branch '6222-test-saleCcomponentUpdate' of https://gitea.verdnatura.es/verdnatura/salix into 6222-test-saleCcomponentUpdate

82526d56f5 Merge pull request 'refs #6222 refactor: sale_calculateComponent' (!1920) from 6222-test-saleCcomponentUpdate into test ...

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

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

dfee2b0ce4 refs #6718 fix: loggable and sql

2415e22258 refs #6222 fix: apply sql

3be194356f fix expense

05f5b44f88 Merge pull request 'fix expense' (!1944) from test-fixExpense into test ...

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

2ee48a53e2 refs #6222 fix(ticket): step-two

c61105e356 Merge pull request 'refs #6222 fix(ticket): step-two' (!1948) from 6222-test-ticketStepTwo into test ...

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

1c0f8acb87 refs #5871 fix: awb

ece0c926dd refs #6745 fix: duplicate fixtures

alexm requested review from jgallego 2024-01-24 14:01:23 +00:00

alexm changed title from 6745-2404_testToMaster to WIP: 6745-2404_testToMaster 2024-01-24 14:01:31 +00:00

alexm added 1 commit 2024-01-25 06:23:34 +00:00

dec625d2df Merge branch 'master' into 6745-2404_testToMaster

jgallego approved these changes 2024-01-25 06:33:58 +00:00

alexm changed title from WIP: 6745-2404_testToMaster to 6745-2404_testToMaster 2024-01-25 06:39:08 +00:00

alexm merged commit bfbe8302b6 into master 2024-01-25 07:39:13 +00:00

alexm deleted branch 6745-2404_testToMaster 2024-01-25 07:39:14 +00:00

alexm referenced this issue from a commit 2024-01-25 07:39:16 +00:00

Merge pull request '6745-2404_testToMaster' (!1950) from 6745-2404_testToMaster into master

Sign in to join this conversation.

Reviewers

No reviewers

jgallego

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

No description provided.