refs #5866 addBackTransferClient #1682

Merged

jorgep merged 4 commits from 5866-addTicketTransfer into dev 2023-07-20 13:28:04 +00:00

Conversation 0 Commits 4 Files Changed 6 +105 -23

jorgep commented 2023-07-20 08:22:52 +00:00

Member

Copy Link

No description provided.

jorgep added 1 commit 2023-07-20 08:22:54 +00:00

9db8ae237f refs #5866 addBackTransferClient

jorgep added 69 commits 2023-07-20 08:23:24 +00:00

510b78c703 refs #6006 mod dias anteriores

551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir

78108b2ca5 Merge branch 'master' into hotfix-travel

aea5133f39 refs #5877 fix: aply changes

c0d329edca a

ef6a2ae578 refs #5887 fix: delete requires

7aaaf5492c refs #5887 refacotr: move code to hook

12685e045c tedst

b228b693cc Merge pull request 'refs #6006 mod dias anteriores' (!1662) from hotfix-travel into master ...

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

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

69c3a49cce warnFix: smtp prevents the sending of emails depending on the condition

978224c21c Merge branch 'master' into hotfix_mailAlias

3a61bc6052 refs #5887 move changes sql

337ce56a60 refs #5887 test exlcuido

988ff96016 Merge pull request 'hotfix_mailAlias' (!1664) from hotfix_mailAlias into master ...

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

ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix

660612cb84 refs #5999 url

6fbadf7e4e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

2627cafc22 refs #5999 defaulter country autocomplete

4632ed298d Merge branch 'master' into 5999-defaultCountry

173ed251c3 refs #5964 fix supply

29a4c51518 Merge branch 'master' into 5964-supplyFixValidation

575d7710a6 Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master ...

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

190db79019 Merge branch 'master' into 5999-defaultCountry

5ffa8b8910 Merge pull request '5999-defaultCountry' (!1665) from 5999-defaultCountry into master ...

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

6d8b3e346d refs #5837 fix filter existingClient France

765c22df96 refs #5837 new table

4a7cfe9122 fix: workCenter

4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5

5716acaa3c fix: test

93387cae62 refs #5837 if isSocialNameUnique

6980392ba1 fix: tabulacion

06690ca71e Merge pull request 'hotfix_workCenter2' (!1669) from hotfix_workCenter2 into master ...

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

f24aa2c801 pop vehicle error

10e726c486 move vehicleInvoice

a5d1c68511 change err and traduction

52f58a92c8 refs err.sqlMessage

47e8fab8d9 refs remove

93da129239 refs #5983 feat(itemShelving): add getInventory

b3a7a170f0 refs #5934 feat: añadido clientSms log

3e8775149a refs #5934 feat: change icon

9076553070 refs #5983 test(itemShelving): add getInventory

bd723bb7ba refs #5824 mod ng

49c656928e refs #5983 feat(itemShelving): add visible

2f6c988005 Merge branch 'dev' into 5983_inventory_parking

25ce685116 Merge branch 'dev' into 5824-fixUpsertFixedPrice

85c017431c refs #5983 fix(itemShelving): fixtures

e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking

3d83b7b46d Merge pull request 'pop vehicle error' (!1672) from hotfix-vehicleError into master ...

Reviewed-on: #1672
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

4150bdc6c8 Merge pull request 'refs #5824 mod ng' (!1678) from 5824-fixUpsertFixedPrice into dev ...

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

b17de86fb1 refs #6043 add ACL

dbebd80a68 Merge branch 'dev' into 6043-fixe2eError

579d6d53d8 Merge branch 'dev' into 5837-quitRestrictionFrance

1f7f903ec6 Merge pull request 'refs #6043 add ACL' (!1680) from 6043-fixe2eError into dev ...

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

7cff014988 refs #5983 fix(itemShelving): vn

6344c11d1e Merge branch 'dev' into 5983_inventory_parking

b23dfaeeb1 Merge pull request '5983_inventory_parking' (!1677) from 5983_inventory_parking into dev ...

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

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

ab95ef74a9 refs #5934 refactor: nombres variables

6df1ef9d4c Merge branch 'dev' into 5934-clientSms

60e75d7825 refs #5837 fix client condition

aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance

c1e578a456 Merge pull request 'refs #5837 fix filter existingClient France' (!1668) from 5837-quitRestrictionFrance into dev ...

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

5771ccb488 Merge branch 'dev' into 5934-clientSms

484bcd3fde Merge pull request '5934-clientSms' (!1675) from 5934-clientSms into dev ...

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

0585080303 refs #6011 deploy 2330 version

071a891d30 refs #6011 add changelog

75ea594272 refs #6011 deploy(2332): init version

2fa1c4b6ca Merge branch 'dev' into 5866-addTicketTransfer

jorgep changed title from WIP: refs #5866 addBackTransferClient to refs #5866 addBackTransferClient 2023-07-20 12:34:21 +00:00

jorgep added 8 commits 2023-07-20 12:34:25 +00:00

7bd378e9dd refs #

4c7f42acb5 a

d3165fcdc7 refs #5849 fix: tback

b13618529a refs #5849 delete: traducción erronea

4755c50cd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved

1215b8cd57 Merge branch 'dev' into 5849-makeInvoice_solved

c3a897b8c3 Merge pull request '5849-makeInvoice_solved' (!1676) from 5849-makeInvoice_solved into dev ...

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

8281dbacd1 Merge branch 'dev' into 5866-addTicketTransfer

jorgep added 1 commit 2023-07-20 13:16:19 +00:00

618989052a refs #5866 fix transferClient and test added

jorgep requested review from alexm 2023-07-20 13:19:08 +00:00

alexm approved these changes 2023-07-20 13:20:16 +00:00

jorgep merged commit cd377c4790 into dev 2023-07-20 13:28:04 +00:00

jorgep deleted branch 5866-addTicketTransfer 2023-07-20 13:28:04 +00:00

jorgep referenced this issue from a commit 2023-07-20 13:28:05 +00:00

Merge pull request 'refs #5866 addBackTransferClient' (!1682) from 5866-addTicketTransfer into dev

Sign in to join this conversation.

Reviewers

No reviewers

alexm

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

No description provided.