refs #5690 ticketproblems #1646

Merged

carlossa merged 7 commits from 5690-redondeo_ticketProblems into dev 2023-08-04 01:30:49 +00:00

Conversation 0 Commits 7 Files Changed 4 +16 -2

carlossa commented 2023-07-03 09:41:37 +00:00

Member

Copy Link

No description provided.

carlossa added 1 commit 2023-07-03 09:41:38 +00:00

d03df4c5cc refs #5690 ticketproblems

jgallego approved these changes 2023-07-19 07:16:16 +00:00

carlossa changed title from WIP: refs #5690 ticketproblems to refs #5690 ticketproblems 2023-07-19 10:38:58 +00:00

carlossa added 243 commits 2023-07-19 10:39:01 +00:00

0d6b248f76 feat(2fa): email 2fa ...

Refs #5475

902709d61b Added authCode table

641fdf39d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

2e0325e567 Validate code

b9e48f2102 Added translations & enable through departments

087e91e898 Updated unit tests

b0f1bae33e Added unit test

4807fcb394 Removed focus

b5f2cf3711 Added unit test & translation fixes

f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

9aaea7e8ed Changed to new SQL version

ef87dcc0f5 require authentication on every login

cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

c2af40edb5 changes

c3443ecc7c Updated e2e

b45b0ff826 refs #5066 copy project from the other

16fdfa00fd refs #5066 e2e solve

89a3ef5f8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

237c83c6f5 refs #5066 getVehicleSorted small mod

c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality

8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

7021e52705 correct folder

87e1caa4eb refs #5334 department seccion

598067f757 refs #5334 routes

071849065a refs #5334 fix main

443821b5c2 refs #5334 ?q

fd4d04756a refs #5334 routes index fix

612d0a2dfb refs #5334 fix index

3dcdbe0223 refs #5334 summary basic data

d09889b08a refs #5334 fix summary route

9f9963af56 refs #5334 descriptor

5c9ee21cfc refs #5334 department.card

f63dd0f9a3 refs #5334 datos

adafd7444b refs #5334 worker-department

10e085ca1b refs #5334 link department

027d45bc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

2b06c62876 refs #5334 left-menu

0789804352 refs #5334 fix basic-data

f74c370446 refs #5334 checks vertical

07e176ae4f refs #5334 fix checks basic-data

ceaaece007 refs #5334 label-value

3aa5ce6208 refs #5334 fix hasToSendMail

2a78a912eb refs #5334 worker.department

2e83d91006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

91edc09057 refs #5066 move sql

d8e7c2700a refs #5066 fix autocomplete

3423ce612c refs #5066 e2e fixs, change name sorted

f4e877dada refs #5334 refactor summary

2d6f0bb2ce refs #5334 front fix

9ee653dbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

8fff3989e7 Merge branch 'dev' into 5066-vehicleSorted

d9a64211de refs #5334 fix descriptor, basic-data, summary

107d8d1edd refs #5334 model y vista

2778858705 refs #5334 search-panel

cf632040e7 refs #5334 workFk, clientFk

e26eedb51c refs #5334 descriptor wprkerFk clientFk

e7d25a6cf3 refs #5334 filter

0661bf8fa9 refs #5066 remake sql without ROW_ORDER

eaffd61579 Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

813c4ede00 Merge branch 'dev' into 5066-vehicleSorted

45085cccc8 refs #5334 fix search-panel

8860c77147 refs #5334 fix descriptor

26187898e1 refs #5334 popover

1dcaba1fdc refs #5334 department workers list

0fd7f4183e refs #5334 fk

dfebb3b307 refs #5066 sorted without CONCAT, order=false

cfe0ba7a77 Merge branch '5066-vehicleSorted' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

d18137bce0 refs #5066 not dense

0774a94d8b refs #5334 params

e38bf4f1b3 refs #5334 button delete, btn popover

489012886b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d1a61b3e0d refs #5334 dinamic

eb6953a2b6 refs #5334 department

4c7c7f5c96 refs #5334 mod search-panel

f37c66304f refs #5334 change info

bb5247c49b refs #5334 tree

04780e211d refs #5334 test front & 1/2 back

5f72fabf8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

1095a59954 refs #5334 rest back, e2e summary, less e2e basic

5798b28c5e refs #5334 baicData e2e

9ef51f5600 remove fdescribe puppeter

c1cda1a3ff refs #5334 basicData e2e

d8f5978284 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

2545a40087 Merge branch 'dev' into 5334-editDepartment

8afd149954 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

d6cde764d7 refs #5334 changelog

738b04af4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

cc27d1fa97 refs #5066 fix vehicle res.data

051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

3a5e591cf0 refs #5475 feat(signin): use twoFactor and passExpired

b96f0f22b5 refs #5475 feat(account_changePassword)

cf01c8d46e refs #5475 feat(account_changePassword)

dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

ee1b901dea refs #5475 feat(account_changePassword): accessScope

d4cc9cf82a change log remove

98125f8974 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

3701acd26e refs #5334 error getLeaves solve

168e7f1929 changelog

092471f74e refs #5475 feat(account_changePassword): accessScope and backTest

7f20973650 refs #5334 merge

4537344790 merge

a155f846c2 refs #5334 fix ctx

c63df30e5c refs #5334 fix back

f0f8b112cd Merge branch 'dev' into 5334-editDepartment

fa10070675 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

a8fafacb82 refs #5475 send email force

e741904250 refs #5347

d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

2ddf8e5de6 Merge branch 'dev' into 5334-editDepartment

168d05a830 refs #5334 fix errors

6ab431f8ef refs #5475 tests

7f9d8da7a7 refs #5836 defaulter

4931745cde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

27946c0062 Refs #5347

137e01e60c refs #5334 fix acl, filter

beb173f6ce refs #5334 quit e2e no necesario

f6cc59eafb refs #5347

f0fec2cdd6 refs #5347

203e80afa8 refs #5347

16af0c5d6c Merge branch 'dev' into 5347-clientCreate-→-client_create

abfe012a78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted

dcbe8c5f7a refs #5066 quit if

eff46c1cec refs #5066 e2e fix, vnConfig

798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

24ea18aeb0 refs #5836 isworker back

e43e52b561 refs #5753 db export and fix fixtures

5216f12001 refs #5836 check fix

f0b238b62a refs #5836 fix e2e

07712f58e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

4b8b7a9d82 refs #5475 fix accessScope

06437c9e80 refs #5334 remove other

162faf0d01 Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

31d637c8a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

89c25c07b6 refs #5475 fix e2e and back test

f02019d64d refs #5334 fix words

6e52b3b968 refs #5347

54e75dc850 Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create

8723cf2958 refs #5753 fix legacy bugs

bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create

c9c20711b9 refs #5347

89b63f47fc Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create

9dc52b6011 refs #5334 fix labels trad

bb4951bbc8 Merge branch 'dev' into 5334-editDepartment

be1c145d9a refs #5347

af91630852 refs #5836 e2e fix

c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

b062cec747 refs #5475 fix setPassword options/cb

0441bc29b7 refs #5475 correct SQL folder

ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump

6fcbf69f60 refs #5753 isNotEditableCredit to zeroCreditEditor

6b4501146d refs #5334 fix errors

83b096c206 refs #5334 fix errors

3d93043b98 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

e6ed834bf0 refs #5836 remove case

dc36c6fd9d refs #5334 basicData solve e2e

dc10c20fe3 refs #5334 email validate

d1fb2859be Merge branch 'dev' into 5753_232401_db_dump

5e68363312 refs #5334 onsearch postlink

7fe8698b6f refs #5753 fix ticketToInvoice

c3ef642017 refs #5836 fix fk

4d03ef8f09 Merge branch 'dev' into 5836-clientDefaulterisWorker

3b346d673b Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev ...

Reviewed-on: #1643
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

2d1420e3f8 Merge branch 'dev' into 5836-clientDefaulterisWorker

5612c56aed Merge pull request '5836-clientDefaulterisWorker' (!1639) from 5836-clientDefaulterisWorker into dev ...

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

461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev

8ef6f0dd17 Merge branch 'dev' into 5347-clientCreateRefactor

ff6d9e427b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

983d028d06 refs #5334 popover y basic data

9fe7024d17 refs #5347

4d0ed75090 Merge branch '5347-clientCreateRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreateRefactor

6b557d5d8a refs #5347

2ccf8d5197 refs #5347

f1502139ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

5000e05e05 refs #5334 merge + e2e solve

e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'

4369d275f8 refs #4770 feat: add test

089f1e48ac Merge pull request '5347-clientCreateRefactor' (!1644) from 5347-clientCreateRefactor into dev ...

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

59ad603de6 refs #5816 set version

040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight

6530e87508 refs #4614 feat(ticket): prevent invoice without weight

3d9f0e1497 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment

83467c3b6c refs #5334 quit es

9c9b53917a refs #5334 fix error

a7ad947168 Merge pull request '5334-editDepartment' (!1521) from 5334-editDepartment into dev ...

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

63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa

48951cc5a1 Merge pull request '5475 - Autenticación de doble factor por email' (!1429) from 5475-email_2fa into dev ...

Reviewed-on: #1429
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

ea71e980cc refs #5970 add changelog

a665b6c060 refs #5970 fix sql

d9d4441d59 refs #5970 deploy: 233001 init

be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight

8fe9b387ce refs #4614 test: front and correct folder

7030be3efa fix

6fa6c21cb1 remove fixtures

0afddb546b Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test ...

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

d9a5868ce4 refs #5930 fix(claim_updateClaim) options

8922d27f20 refs #4614 fix e2e

9f2ef5c2c0 change ref master

d941e2e18f Merge branch 'master' into hotfix-extraCommunityEntryRef

5e6d941f36 Merge branch 'dev' into 4614-ticket_weight

ce8927a714 Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master ...

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

60f70ac2b4 Merge pull request 'refs #4614 fear(ticket): add 'set weight' funcionality' (!1487) from 4614-ticket_weight into dev ...

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

d1c8f0ff11 refs #5949 itemRecycle

1bcd3039cd refs #5475 redesign 2FA email

43bf7ce707 Merge pull request 'refs #5475 redesign 2FA email' (!1657) from 5475_redesign_2FA_email into test ...

Reviewed-on: #1657
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

ba109dccc5 refs #5949 trad

6978339fd3 refs #5475 fix email translations

7291b793ae refs #5949 fix traduct

93e70e699a refs #5874 feat: refactorizado proceso facturación

56247b5012 add acl

da13f0811c refs 5887 cambiado drop y create por create or replace

810021e23a Merge pull request 'refs #5874 feat: refactorizado proceso facturación' (!1658) from hotfix_makeInvoice-refactor into master ...

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

d4a4e04f25 refs #5887 feat: cambiados permisos para añadir/quitar alias de correo

e1f12bea02 a

5a5a1ed20b refs #5887 feat: addback test

d4217ff8d3 refs #5887 correct translations

a215797390 tranalstion

6655807d80 refs #4770 refactor: change acl

a831a1534b Merge branch 'dev' into 4770-routes_roadmap2

808a9976ab refs #5887 fix: back etst

83698522ca Merge pull request '5887-mailAlias_refactor' (!1659) from 5887-mailAlias_refactor into master ...

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

d7ac20dc6a hotFix(supplier): fix accessToken in before save

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

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

7da1824e89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem

01dc26f64e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2

392dc5060a refs #4770 delete test

c91db1b429 a

c88a753865 Merge pull request '4770-routes_roadmap2' (!1647) from 4770-routes_roadmap2 into dev ...

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

191f478523 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5949-recycledPlasticItem

0d308ec8ad Merge pull request 'refs #5949 itemRecycle' (!1656) from 5949-recycledPlasticItem into dev ...

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

765a84e2eb refs #5819 Added param to call zone_getLeaves

b2b335326e Merge branch 'dev' into 5066-vehicleSorted

3c013110d3 refs #5819 Changed structure sql

b285c3e37a Merge pull request 'refs #5819 Added param to call zone_getLeaves' (!1667) from 5819-zone_getLeaves into dev ...

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

bd723bb7ba refs #5824 mod ng

36db2ee883 Merge branch 'dev' into 5066-vehicleSorted

9c746dd6c2 Merge pull request '5066-vehicleSorted' (!1467) from 5066-vehicleSorted into dev ...

Reviewed-on: #1467
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

25ce685116 Merge branch 'dev' into 5824-fixUpsertFixedPrice

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

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

aaba4e74b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5690-redondeo_ticketProblems

36c31af455 refs #5690 rounding translate

carlossa requested review from jgallego 2023-07-19 10:41:55 +00:00

carlossa added 4 commits 2023-07-19 11:43:08 +00:00

b17de86fb1 refs #6043 add ACL

dbebd80a68 Merge branch 'dev' into 6043-fixe2eError

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>

138b8e1912 Merge branch 'dev' into 5690-redondeo_ticketProblems

jgallego approved these changes 2023-07-19 14:27:43 +00:00

carlossa added 10 commits 2023-07-20 04:06:39 +00:00

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

9076553070 refs #5983 test(itemShelving): add getInventory

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

2f6c988005 Merge branch 'dev' into 5983_inventory_parking

85c017431c refs #5983 fix(itemShelving): fixtures

e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking

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>

6efda27f0c Merge branch 'dev' into 5690-redondeo_ticketProblems

carlossa added 1 commit 2023-08-01 11:40:37 +00:00

2bde94a667 Merge branch 'dev' into 5690-redondeo_ticketProblems

carlossa added 1 commit 2023-08-04 01:21:59 +00:00

1308efb98d Merge branch 'dev' into 5690-redondeo_ticketProblems

carlossa merged commit 44fe6940e5 into dev 2023-08-04 01:30:49 +00:00

carlossa deleted branch 5690-redondeo_ticketProblems 2023-08-04 01:30:49 +00:00

carlossa referenced this issue from a commit 2023-08-04 01:30:50 +00:00

Merge pull request 'refs #5690 ticketproblems' (!1646) from 5690-redondeo_ticketProblems into dev

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

No description provided.