Added project_merge and helpdesk_merge modules and fix for user story (…

…#192)
onesteinbv · Jul 17, 2024 · 910f572 · 910f572
2 parents d9e28a2 + a7bb661
commit 910f572
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/package.txt b/package.txt
@@ -212,6 +212,7 @@ oca/fs_attachment
 oca/fs_storage
 oca/fs_storage_backup
 oca/helpdesk_mgmt
+oca/helpdesk_mgmt_merge
 oca/helpdesk_mgmt_project
 oca/helpdesk_mgmt_timesheet
 oca/hr_employee_firstname
@@ -247,6 +248,7 @@ oca/product_analytic
 oca/product_category_product_link
 oca/product_category_tax
 oca/project_list
+oca/project_merge
 oca/project_parent
 oca/project_role
 oca/project_sequence

diff --git a/repos.yaml b/repos.yaml
@@ -25,7 +25,7 @@
         onestein: git@github.com:onesteinbv/addons-oca.git
     merges:
         - remote: onestein
-          ref: a67a7b1fb62590e8acc3fc525d487fbe192dd307
+          ref: 0aa883092242dd6b150657a83b079932dceb15eb
 
 # third-party
 ./addons-third-party:
@@ -53,4 +53,4 @@
     remotes:
         onestein: git@github.com:onesteinbv/ProjectManagement.git
     merges:
-        - onestein fb34e537c714204a56d233451553c2aabd0ad500
+        - onestein 484c38bb7932061bc87165b07f7214633e103e00