fix: solve conflicts from test to dev #780

Merged

alexm merged 34 commits from fixConflicts_testToDev into dev 2024-10-01 09:47:05 +00:00

Conversation 0 Commits 34 Files Changed 13 +53 -33

jsegarra commented 2024-10-01 06:57:19 +00:00

Member

Copy Link

No description provided.

jsegarra added 1 commit 2024-10-01 06:57:19 +00:00

778e6299ce fix: solve conflicts from test to dev

jsegarra requested review from alexm 2024-10-01 06:57:22 +00:00

jsegarra added 32 commits 2024-10-01 09:35:20 +00:00

b822c7722b feat: formatLocation when field is null

ddf42d9659 feat: update VnLocation instances

77ad96a58b fix: itemfixedPrice inputs

fb180f0198 fix: apply order

53d5d123c2 feat: i18n

a8c96278de Merge branch 'master' into hotfix_itemFixedPrice

0b47623011 Merge pull request 'HOTFIX: itemFixedPrice' (!755) from hotfix_itemFixedPrice into master ...

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

c5766aa1b3 chore: refs #7524 remove old filter

2057189b8e Merge pull request '#7524 remove old filter' (!764) from 7524-hotfix-removeOldFilter into master ...

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

f00db79d47 fix(VnTable): header background-color

bbf3b6d4b7 fix: #6943 show nickname salesPerson

353116a7a0 fix: split params

d5253149ed Merge pull request 'fix: split params' (!768) from warmfix-addSearchUrl into test ...

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

807827c97c Merge branch 'test' into warmfix_customerModule

6b0a0f71ce fix: fixed change state function

2be969339e Merge branch 'master' into Hotfix-ChangeTicketState

2990d32705 fix: grafana url

b541ce4e56 fix: split params

45c0d0ae3f Merge pull request 'Hotfix: fixed ticket state function' (!770) from Hotfix-ChangeTicketState into master ...

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

193670fdcf fix: refs #7404 revert commit prevent production access

336f2ba89e fix: refs #7404 remove from test

5097cc8b81 Merge pull request 'fix: #6943 show nickname salesPerson' (!766) from warmfix_customerModule into test ...

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

8356be1ec0 fix: onDataSaved VnTable ...

Habia un problema al usar this en entorno no local

f005674db6 Merge branch 'test' into 7404-remove-from-test

e5eb1d7663 Merge pull request 'fix: refs #7404 revert commit prevent production access' (!771) from 7404-remove-from-test into test ...

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

36838f930c Merge pull request 'fix: onDataSaved VnTable' (!772) from fix_vnTable_onDataSaved into master ...

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

2812e6f456 Merge branch 'master' into fix_8018

48b7b879f2 Merge pull request 'Imrpove VnLocation to show less fields' (!738) from fix_8018 into master ...

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

2302e22f11 fix: solve conflicts from master to test

35179695c3 Merge pull request 'fix: solve conflicts from master to test' (!777) from mergeConflicts into test ...

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

732bb0943c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

27b2d0232c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev

jsegarra added 1 commit 2024-10-01 09:41:09 +00:00

696c9ca9b3 fix: solve conflicts with stockBought

alexm approved these changes 2024-10-01 09:45:40 +00:00

alexm merged commit 7ae90908c4 into dev 2024-10-01 09:47:05 +00:00

alexm deleted branch fixConflicts_testToDev 2024-10-01 09:47:06 +00:00

alexm referenced this issue from a commit 2024-10-01 09:47:06 +00:00

Merge pull request 'fix: solve conflicts from test to dev' (!780) from fixConflicts_testToDev into dev

Sign in to join this conversation.

Reviewers

No reviewers

alexm

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

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-front#780

No description provided.