verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

WIP: refs #1877 feat(ticket_basicData) update directly #1655

Draft
alexm wants to merge 2 commits from 1877-ticket_basic-data_update into dev
pull from: 1877-ticket_basic-data_update
merge into: verdnatura:dev
Conversation 0 Commits 2 Files Changed 6 +111 -12
alexm commented 2023-07-10 11:12:59 +00:00
Member
Copy Link
No description provided.
alexm added 1 commit 2023-07-10 11:13:01 +00:00
gitea/salix/pipeline/head This commit looks good Details
b591d7b46f refs #1877 feat(ticket_basicData) update directly
alexm added 161 commits 2023-07-25 06:49:19 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
b45b0ff826 refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
16fdfa00fd refs #5066 e2e solve
gitea/salix/pipeline/head This commit looks good Details
237c83c6f5 refs #5066 getVehicleSorted small mod
gitea/salix/pipeline/head This commit looks good Details
91edc09057 refs #5066 move sql
gitea/salix/pipeline/head This commit looks good Details
d8e7c2700a refs #5066 fix autocomplete
gitea/salix/pipeline/head This commit looks good Details
3423ce612c refs #5066 e2e fixs, change name sorted
gitea/salix/pipeline/head This commit looks good Details
b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
8fff3989e7 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
813c4ede00 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
c23d8282eb refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head This commit looks good Details
d18137bce0 refs #5066 not dense
gitea/salix/pipeline/head There was a failure building this commit Details
f0024346a8 refs #5712 openDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
9ebac5a3f8 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
cc27d1fa97 refs #5066 fix vehicle res.data
gitea/salix/pipeline/head There was a failure building this commit Details
e5ababb0a9 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head This commit looks good Details
dcbe8c5f7a refs #5066 quit if
gitea/salix/pipeline/head This commit looks good Details
eff46c1cec refs #5066 e2e fix, vnConfig
gitea/salix/pipeline/head There was a failure building this commit Details
4f616397a2 refs #5712 use dmsType readRole
gitea/salix/pipeline/head This commit looks good Details
e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head There was a failure building this commit Details
4369d275f8 refs #4770 feat: add test
gitea/salix/pipeline/head There was a failure building this commit Details
1a18ba66a9 refs #5712 fix(workerDms): filter
gitea/salix/pipeline/head This commit looks good Details
444b08c566 refs #5712 test(docuware)
gitea/salix/pipeline/head Build queued... Details
5d933da28a refs #5712 fix empty data
gitea/salix/pipeline/head This commit looks good Details
7030be3efa fix
gitea/salix/pipeline/head This commit looks good Details
6fa6c21cb1 remove fixtures
gitea/salix/pipeline/head This commit looks good Details
0afddb546b Merge pull request 'refs #5978 hotfix_workCenter' (!1650) from hotfix_workCenter into test 
Reviewed-on: #1650
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
9f2ef5c2c0 change ref master
gitea/salix/pipeline/head This commit looks good Details
ce8927a714 Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master 
Reviewed-on: #1653
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
d1c8f0ff11 refs #5949 itemRecycle
gitea/salix/pipeline/head This commit looks good Details
1bcd3039cd refs #5475 redesign 2FA email
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
ba109dccc5 refs #5949 trad
gitea/salix/pipeline/head This commit looks good Details
6978339fd3 refs #5475 fix email translations
gitea/salix/pipeline/head This commit looks good Details
7291b793ae refs #5949 fix traduct
gitea/salix/pipeline/head This commit looks good Details
56247b5012 add acl
gitea/salix/pipeline/head This commit looks good Details
da13f0811c refs 5887 cambiado drop y create por create or replace
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head There was a failure building this commit Details
e1f12bea02 a
gitea/salix/pipeline/head This commit looks good Details
5a5a1ed20b refs #5887 feat: addback test
gitea/salix/pipeline/head There was a failure building this commit Details
a215797390 tranalstion
gitea/salix/pipeline/head Build queued... Details
6655807d80 refs #4770 refactor: change acl
gitea/salix/pipeline/head There was a failure building this commit Details
a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head This commit looks good Details
808a9976ab refs #5887 fix: back etst
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head There was a failure building this commit Details
d7ac20dc6a hotFix(supplier): fix accessToken in before save
gitea/salix/pipeline/head This commit looks good Details
510b78c703 refs #6006 mod dias anteriores
gitea/salix/pipeline/head There was a failure building this commit Details
219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
78108b2ca5 Merge branch 'master' into hotfix-travel
gitea/salix/pipeline/head There was a failure building this commit Details
c0d329edca a
gitea/salix/pipeline/head There was a failure building this commit Details
ef6a2ae578 refs #5887 fix: delete requires
gitea/salix/pipeline/head There was a failure building this commit Details
7aaaf5492c refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head This commit looks good Details
12685e045c tedst
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head There was a failure building this commit Details
978224c21c Merge branch 'master' into hotfix_mailAlias
gitea/salix/pipeline/head There was a failure building this commit Details
3a61bc6052 refs #5887 move changes sql
gitea/salix/pipeline/head This commit looks good Details
337ce56a60 refs #5887 test exlcuido
gitea/salix/pipeline/head This commit looks good Details
988ff96016 Merge pull request 'hotfix_mailAlias' (!1664) from hotfix_mailAlias into master 
Reviewed-on: #1664
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
392dc5060a refs #4770 delete test
gitea/salix/pipeline/head This commit looks good Details
c91db1b429 a
gitea/salix/pipeline/head This commit looks good Details
660612cb84 refs #5999 url
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
2627cafc22 refs #5999 defaulter country autocomplete
gitea/salix/pipeline/head This commit looks good Details
4632ed298d Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head There was a failure building this commit Details
173ed251c3 refs #5964 fix supply
gitea/salix/pipeline/head This commit looks good Details
0d308ec8ad Merge pull request 'refs #5949 itemRecycle' (!1656) from 5949-recycledPlasticItem into dev 
Reviewed-on: #1656
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
765a84e2eb refs #5819 Added param to call zone_getLeaves
gitea/salix/pipeline/head This commit looks good Details
29a4c51518 Merge branch 'master' into 5964-supplyFixValidation
gitea/salix/pipeline/head This commit looks good Details
575d7710a6 Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master 
Reviewed-on: #1666
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
190db79019 Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head There was a failure building this commit Details
5ffa8b8910 Merge pull request '5999-defaultCountry' (!1665) from 5999-defaultCountry into master 
Reviewed-on: #1665
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
6d8b3e346d refs #5837 fix filter existingClient France
gitea/salix/pipeline/head This commit looks good Details
765c22df96 refs #5837 new table
gitea/salix/pipeline/head There was a failure building this commit Details
4a7cfe9122 fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head This commit looks good Details
5716acaa3c fix: test
gitea/salix/pipeline/head There was a failure building this commit Details
93387cae62 refs #5837 if isSocialNameUnique
gitea/salix/pipeline/head This commit looks good Details
6980392ba1 fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
06690ca71e Merge pull request 'hotfix_workCenter2' (!1669) from hotfix_workCenter2 into master 
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
f24aa2c801 pop vehicle error
gitea/salix/pipeline/head This commit looks good Details
10e726c486 move vehicleInvoice
gitea/salix/pipeline/head This commit looks good Details
a5d1c68511 change err and traduction
gitea/salix/pipeline/head This commit looks good Details
52f58a92c8 refs err.sqlMessage
gitea/salix/pipeline/head This commit looks good Details
47e8fab8d9 refs remove
gitea/salix/pipeline/head This commit looks good Details
3c013110d3 refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
93da129239 refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head There was a failure building this commit Details
b3a7a170f0 refs #5934 feat: añadido clientSms log
gitea/salix/pipeline/head This commit looks good Details
3e8775149a refs #5934 feat: change icon
gitea/salix/pipeline/head This commit looks good Details
9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head There was a failure building this commit Details
7bd378e9dd refs #
gitea/salix/pipeline/head Build queued... Details
4c7f42acb5 a
gitea/salix/pipeline/head This commit looks good Details
d3165fcdc7 refs #5849 fix: tback
gitea/salix/pipeline/head There was a failure building this commit Details
bd723bb7ba refs #5824 mod ng
gitea/salix/pipeline/head This commit looks good Details
49c656928e refs #5983 feat(itemShelving): add visible
gitea/salix/pipeline/head This commit looks good Details
2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
36db2ee883 Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
25ce685116 Merge branch 'dev' into 5824-fixUpsertFixedPrice
gitea/salix/pipeline/head This commit looks good Details
85c017431c refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good Details
e2f50d63f6 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
4150bdc6c8 Merge pull request 'refs #5824 mod ng' (!1678) from 5824-fixUpsertFixedPrice into dev 
Reviewed-on: #1678
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
b17de86fb1 refs #6043 add ACL
gitea/salix/pipeline/head This commit looks good Details
dbebd80a68 Merge branch 'dev' into 6043-fixe2eError
gitea/salix/pipeline/head This commit looks good Details
579d6d53d8 Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
7cff014988 refs #5983 fix(itemShelving): vn
gitea/salix/pipeline/head This commit looks good Details
6344c11d1e Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head Build queued... Details
ab95ef74a9 refs #5934 refactor: nombres variables
gitea/salix/pipeline/head Build queued... Details
6df1ef9d4c Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head Build started... Details
b13618529a refs #5849 delete: traducción erronea
gitea/salix/pipeline/head This commit looks good Details
60e75d7825 refs #5837 fix client condition
gitea/salix/pipeline/head This commit looks good Details
aefcb8c49a Merge branch 'dev' into 5837-quitRestrictionFrance
gitea/salix/pipeline/head This commit looks good Details
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>
gitea/salix/pipeline/head This commit looks good Details
5771ccb488 Merge branch 'dev' into 5934-clientSms
gitea/salix/pipeline/head This commit looks good Details
484bcd3fde Merge pull request '5934-clientSms' (!1675) from 5934-clientSms into dev 
Reviewed-on: #1675
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
0585080303 refs #6011 deploy 2330 version
gitea/salix/pipeline/head This commit looks good Details
071a891d30 refs #6011 add changelog
gitea/salix/pipeline/head This commit looks good Details
75ea594272 refs #6011 deploy(2332): init version
gitea/salix/pipeline/head This commit looks good Details
1215b8cd57 Merge branch 'dev' into 5849-makeInvoice_solved
gitea/salix/pipeline/head This commit looks good Details
9db8ae237f refs #5866 addBackTransferClient
gitea/salix/pipeline/head This commit looks good Details
2fa1c4b6ca Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
c3a897b8c3 Merge pull request '5849-makeInvoice_solved' (!1676) from 5849-makeInvoice_solved into dev 
Reviewed-on: #1676
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
8281dbacd1 Merge branch 'dev' into 5866-addTicketTransfer
gitea/salix/pipeline/head This commit looks good Details
618989052a refs #5866 fix transferClient and test added
gitea/salix/pipeline/head This commit looks good Details
cd377c4790 Merge pull request 'refs #5866 addBackTransferClient' (!1682) from 5866-addTicketTransfer into dev 
Reviewed-on: #1682
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
eb963ff993 refs #5866 fix(transferClient): correct variable name
gitea/salix/pipeline/head This commit looks good Details
203f6a5659 refs #5712 correct sql folder
gitea/salix/pipeline/head This commit looks good Details
26ea39cacc Merge pull request '5712-workerDms_integrateDocuware' (!1577) from 5712-workerDms_integrateDocuware into dev 
Reviewed-on: #1577
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
694ff746df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1877-ticket_basic-data_update
Some checks failed
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Required
Details
This pull request has changes conflicting with the target branch.
  • modules/ticket/back/models/ticket-methods.js
Sign in to join this conversation.
Reviewers
No reviewers
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
1 Participants
Notifications
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#1655
No description provided.
Delete Branch "1877-ticket_basic-data_update"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?