Revert "TA#60956 [CHG] Dependencies and cron option (#137)" (#141)

This reverts commit f49c7e6.
Numigi · Jul 2, 2024 · 6b6d9f8 · 6b6d9f8
1 parent dee8314
commit 6b6d9f8
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 335 deletions.
diff --git a/gitoo.yml b/gitoo.yml
@@ -19,9 +19,3 @@
   branch: "14.0"
   includes:
   - website_sale_invoice_address
-
-- url: https://github.com/OCA/queue
-  branch: "14.0"
-  includes:
-  - queue_job
-  - queue_job_cron
diff --git a/partner_duplicate_mgmt/__manifest__.py b/partner_duplicate_mgmt/__manifest__.py
@@ -3,41 +3,40 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 {
-    "name": "Partner Duplicate Management",
-    "version": "14.0.1.0.1",
-    "author": "Savoir-faire Linux",
-    "maintainer": "Numigi",
-    "website": "https://www.numigi.com",
-    "license": "LGPL-3",
-    "category": "Partner Management",
-    "summary": "Manage Partner Duplicates",
-    "depends": [
-        "account",
-        "base_view_inheritance_extension",
-        "contacts",
-        "crm",
-        "mail",
-        "queue_job_cron",
+    'name': 'Partner Duplicate Management',
+    'version': "14.0.1.0.0",
+    'author': 'Savoir-faire Linux',
+    'maintainer': 'Numigi',
+    'website': 'https://www.numigi.com',
+    'license': 'LGPL-3',
+    'category': 'Partner Management',
+    'summary': 'Manage Partner Duplicates',
+    'depends': [
+        'account',
+        'base_view_inheritance_extension',
+        'contacts',
+        'crm',
+        'mail',
     ],
-    "data": [
-        "data/ir_config_parameter.xml",
-        "data/ir_cron.xml",
-        "data/merger_reason.xml",
-        "data/res_partner.xml",
-        "data/res_partner_duplicate_field.xml",
-        "security/res_groups.xml",
-        "security/ir.model.access.csv",
-        "views/res_partner.xml",
-        "views/res_partner_duplicate.xml",
-        "views/res_partner_duplicate_field.xml",
-        "views/merger_reason.xml",
+    'data': [
+        'data/ir_config_parameter.xml',
+        'data/ir_cron.xml',
+        'data/merger_reason.xml',
+        'data/res_partner.xml',
+        'data/res_partner_duplicate_field.xml',
+        'security/res_groups.xml',
+        'security/ir.model.access.csv',
+        'views/res_partner.xml',
+        'views/res_partner_duplicate.xml',
+        'views/res_partner_duplicate_field.xml',
+        'views/merger_reason.xml',
     ],
-    "demo": [
-        "demo/res_users.xml",
+    'demo': [
+        'demo/res_users.xml',
     ],
-    "external_dependencies": {
-        "python": ["unidecode"],
+    'external_dependencies': {
+        'python': ['unidecode'],
     },
-    "post_init_hook": "update_partners_indexed_name",
-    "installable": True,
+    'post_init_hook': 'update_partners_indexed_name',
+    'installable': True,
 }
diff --git a/partner_duplicate_mgmt/data/ir_cron.xml b/partner_duplicate_mgmt/data/ir_cron.xml
@@ -2,21 +2,13 @@
 <odoo>
     <data noupdate="1">
 
-        <record model="queue.job.channel" id="channel_res_partner_duplicate_ir_cron">
-            <field name="name">res_partner_duplicate.ir_cron</field>
-            <field name="parent_id" ref="queue_job.channel_root" />
-        </record>
-
         <record id="ir_cron_create_duplicates" model="ir.cron">
             <field name="name">Find Partner Duplicates</field>
             <field name="model_id" ref="partner_duplicate_mgmt.model_res_partner_duplicate"/>
             <field name="state">code</field>
             <field name="code">model.create_duplicates()</field>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
-            <field name="run_as_queue_job" eval="True"/>
-            <field name="no_parallel_queue_job_run" eval="True"/>
-            <field name="channel_id" ref="channel_res_partner_duplicate_ir_cron"/>
             <field name="numbercall">-1</field>
             <field name="doall" eval="False"/>
         </record>