solveConflicts_test_to_dev #957

Merged

alexm merged 58 commits from solveConflicts_test_to_dev into dev 2024-11-18 10:21:51 +00:00

Conversation 0 Commits 58 Files Changed 35 +207 -187

jsegarra commented 2024-11-18 09:58:09 +00:00

Member

Copy Link

No description provided.

jsegarra added 58 commits 2024-11-18 09:58:10 +00:00

94c7ee3ae3 fix: arrayData store shared

139861f6cf test: fix limit

55b4c07e80 fix(ZoneCard): fix ZoneLocations searchbar

218d041000 fix(ZoneCard): fix ZoneLocations redirections

faf307bc16 fix: #8192 find by thermographFk instead id

259f0e30af Merge branch 'master' into hotfix_termograph_filter

925ff859cc fix(ZoneCard): fix ZoneLocations redirections

aa5eb005fd feat: #8192 remove expr-builder proposal

84414df487 Merge branch 'hotfix_termograph_filter' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_termograph_filter

c4cad9b7bb Merge branch 'master' into hotfix_termograph_filter

a929dec2ab fix(ZoneCard): fix ZoneLocations redirections

045a828bf9 fix(ZoneCard): fix ZoneLocations redirections

e6ba0c7c30 Merge branch 'master' into hotfix_termograph_filter

cb1c050343 fix: customerFilter sales person input

64c884693d Merge pull request 'HOTFIX #8192 Filter termopragh' (!934) from hotfix_termograph_filter into master ...

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

ca0d70933e Merge branch 'master' into hotfix_customer_salesPerson_Filter

0a239e8c43 Merge pull request 'HOTFIX: customerFilter sales person input' (!939) from hotfix_customer_salesPerson_Filter into master ...

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

354f2ce055 fix: deleted duplicate VnUsesMana

141cb32cae Merge branch 'master' into Hotfix-SalesMana

f2b132db79 fix(VnPaginate): not start without data

e19d11baa8 Merge branch 'master' into hotFix_arrayData_store_data

d52a0fdc7f fix: customer Risk icon color

d3f538e37c perf: previous commit

c57ff7b3c9 Merge pull request 'HOTFIX: Customer Risk color' (!942) from hotFix_customerRisk_icon into master ...

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

2891e1363a feat: #6943 CustomerDescriptor actions

8e52bd0688 perf: #6943 improve OrderList

87ba74bcfc perf: #6943 Create ticket from client

c465c9b2c7 Merge branch 'master' into hotfix-customerDescriptor_actions

bdd36f6ba1 Merge branch 'master' into hotfix-customerDescriptor_actions

4d8432feb5 revert: #6943 address star feature

e64ea2db19 feat: #6943 CustomerList salesPerson

eb287696fa fix: fixed state column in ticket list

1fc2ae0689 Merge branch 'master' into Hotfix-TicketList

d0427c17be Merge pull request 'HOTFIX: #6943 CustomerDescriptor actions' (!943) from hotfix-customerDescriptor_actions into master ...

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

89661397fb Merge branch 'master' into Hotfix-TicketList

f03e5dc412 Merge pull request 'Hotfix: fixed state column in TicketList and translation' (!944) from Hotfix-TicketList into master ...

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

064dbfc432 fix: #6943 Update AddressObservations

54a34e8034 fix: Redirect to catalog when create new order

acaf7f2930 Merge pull request 'fix: Redirect to catalog when create new order' (!946) from hotfix_OrderNew_redirectTo_catalog into master ...

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

5916923521 fix: Redirect to catalog when create new order

94873f7771 Merge pull request 'fix: Redirect to catalog when create new order' (!947) from hotfix_OrderNew_redirectTo into master ...

Reviewed-on: #947
Reviewed-by: Jon Elias <jon@verdnatura.es>

2e2a118627 Merge branch 'master' into hotFix_AddressObservation_crud

b8293d91e8 Merge pull request 'HOTFIX: #6943 hotFix_AddressObservation_crud' (!945) from hotFix_AddressObservation_crud into master ...

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

1dc2f54f61 Merge branch 'master' into Hotfix-SalesMana

6de5864dd6 Merge pull request 'Hotix: deleted duplicate VnUsesMana' (!940) from Hotfix-SalesMana into master ...

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

5e5d2f3c42 fix: #7671 apply sort-by itemFk and name

34ccbccf20 Merge pull request 'Down changes from master to test' (!950) from master into test ...

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

e230cc61a0 fix(TicketBasicData): getShipped, getLanded & bad try catch

48513868b1 Merge branch 'master' into hotFix_arrayData_store_data

ff9d793378 Merge pull request 'HOTFIX: #7671 apply sort-by itemFk and name' (!949) from hotfix_itemFixedPrice_sortBy into master ...

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

a50b22bb2a Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped

149f92bc93 Merge branch 'master' into hotFix_arrayData_store_data

27a1d7460d Merge pull request 'hotFix_arrayData_store_data' (!929) from hotFix_arrayData_store_data into master ...

Reviewed-on: #929
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

b74c1d1823 Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped

03490b7f3a Merge pull request 'hotFix(TicketBasicData): getShipped, getLanded & bad try catch' (!953) from hotFix_ticketBasicData_getLanded_getShipped into master ...

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

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

0c36d385ec Merge branch 'test' into solveConflicts_test_to_dev

f52095a2fc Merge branch 'test' into solveConflicts_test_to_dev

jsegarra requested review from alexm 2024-11-18 09:59:53 +00:00

alexm approved these changes 2024-11-18 10:00:12 +00:00

alexm merged commit 09be2d4d41 into dev 2024-11-18 10:21:51 +00:00

alexm deleted branch solveConflicts_test_to_dev 2024-11-18 10:21:51 +00:00

alexm referenced this issue from a commit 2024-11-18 10:21:51 +00:00

Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev 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#957

No description provided.