diff --git a/autovacuum_mail_message/README.rst b/autovacuum_message_attachment/README.rst
similarity index 100%
rename from autovacuum_mail_message/README.rst
rename to autovacuum_message_attachment/README.rst
diff --git a/autovacuum_mail_message/__init__.py b/autovacuum_message_attachment/__init__.py
similarity index 100%
rename from autovacuum_mail_message/__init__.py
rename to autovacuum_message_attachment/__init__.py
diff --git a/autovacuum_mail_message/__openerp__.py b/autovacuum_message_attachment/__manifest__.py
similarity index 77%
rename from autovacuum_mail_message/__openerp__.py
rename to autovacuum_message_attachment/__manifest__.py
index ed5d4a032..dd39b8fda 100644
--- a/autovacuum_mail_message/__openerp__.py
+++ b/autovacuum_message_attachment/__manifest__.py
@@ -1,17 +1,15 @@
-# -*- coding: utf-8 -*-
# Copyright (C) 2018 Akretion
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
{
"name": "AutoVacuum Mail Message",
- "version": "9.0.1.1.0",
+ "version": "12.0.1.0.0",
"category": "Tools",
"website": "https://github.com/OCA/server-tools",
"author": "Akretion, Odoo Community Association (OCA)",
"license": "LGPL-3",
"installable": True,
- "application": False,
- "summary": "Automatic Delete old mail message to clean database",
+ "summary": "Automatically delete old mail messages to clean database",
"depends": [
"mail",
],
diff --git a/autovacuum_mail_message/data/data.xml b/autovacuum_message_attachment/data/data.xml
similarity index 74%
rename from autovacuum_mail_message/data/data.xml
rename to autovacuum_message_attachment/data/data.xml
index 2d07bb6d2..3b0eae78b 100644
--- a/autovacuum_mail_message/data/data.xml
+++ b/autovacuum_message_attachment/data/data.xml
@@ -9,10 +9,10 @@
1
days
-1
+ code
+ model.autovacuum_mail_message()
-
-
-
+
diff --git a/autovacuum_mail_message/i18n/autovacuum_mail_message.pot b/autovacuum_message_attachment/i18n/autovacuum_mail_message.pot
similarity index 100%
rename from autovacuum_mail_message/i18n/autovacuum_mail_message.pot
rename to autovacuum_message_attachment/i18n/autovacuum_mail_message.pot
diff --git a/autovacuum_mail_message/i18n/fr.po b/autovacuum_message_attachment/i18n/fr.po
similarity index 100%
rename from autovacuum_mail_message/i18n/fr.po
rename to autovacuum_message_attachment/i18n/fr.po
diff --git a/autovacuum_mail_message/models/__init__.py b/autovacuum_message_attachment/models/__init__.py
similarity index 100%
rename from autovacuum_mail_message/models/__init__.py
rename to autovacuum_message_attachment/models/__init__.py
diff --git a/autovacuum_mail_message/models/mail_message.py b/autovacuum_message_attachment/models/mail_message.py
similarity index 93%
rename from autovacuum_mail_message/models/mail_message.py
rename to autovacuum_message_attachment/models/mail_message.py
index 93406d5ed..6501b81f8 100644
--- a/autovacuum_mail_message/models/mail_message.py
+++ b/autovacuum_message_attachment/models/mail_message.py
@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
# Copyright (C) 2018 Akretion
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
import logging
-import openerp
-from openerp import api, models
+import odoo
+from odoo import api, models
_logger = logging.getLogger(__name__)
@@ -16,7 +15,7 @@ class MailMessage(models.Model):
@api.multi
def batch_unlink(self):
with api.Environment.manage():
- with openerp.registry(
+ with odoo.registry(
self.env.cr.dbname).cursor() as new_cr:
new_env = api.Environment(new_cr, self.env.uid,
self.env.context)
diff --git a/autovacuum_mail_message/models/message_vacuum_rule.py b/autovacuum_message_attachment/models/message_vacuum_rule.py
similarity index 95%
rename from autovacuum_mail_message/models/message_vacuum_rule.py
rename to autovacuum_message_attachment/models/message_vacuum_rule.py
index 411148bbd..0b798d05f 100644
--- a/autovacuum_mail_message/models/message_vacuum_rule.py
+++ b/autovacuum_message_attachment/models/message_vacuum_rule.py
@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
# Copyright (C) 2018 Akretion
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
from datetime import date, timedelta
-from openerp import _, api, exceptions, fields, models
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
-from openerp.tools.safe_eval import safe_eval
+from odoo import _, api, exceptions, fields, models
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
+from odoo.tools.safe_eval import safe_eval
import datetime
@@ -56,7 +55,7 @@ class MessageVacuumRule(models.Model):
help="Number of days the messages concerned by this rule will be "
"keeped in the database after creation. Once the delay is "
"passed, they will be automatically deleted.")
- active = fields.Boolean()
+ active = fields.Boolean(default=True)
description = fields.Text()
@api.multi
diff --git a/autovacuum_message_attachment/readme/CONFIGURE.rst b/autovacuum_message_attachment/readme/CONFIGURE.rst
new file mode 100644
index 000000000..a5af99737
--- /dev/null
+++ b/autovacuum_message_attachment/readme/CONFIGURE.rst
@@ -0,0 +1,6 @@
+* Go to the menu configuration => Technical => Email => Message Vacuum Rules
+* Add the adequates rules for your company. On each rule, you can indicate the models, type and subtypes for which you want to delete the messages, along with a retention time (in days).
+* Activate the cron AutoVacuum Mails and Messages
+
+It is recommanded to run it frequently and when the system is not very loaded.
+(For instance : once a day, during the night.)
diff --git a/autovacuum_message_attachment/readme/CONTRIBUTORS.rst b/autovacuum_message_attachment/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..0bddb053a
--- /dev/null
+++ b/autovacuum_message_attachment/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Florian da Costa
diff --git a/autovacuum_message_attachment/readme/DESCRIPTION.rst b/autovacuum_message_attachment/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..04463783e
--- /dev/null
+++ b/autovacuum_message_attachment/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+Odoo create a lot of message and/or mails. With time it can slow the system or take a lot of disk space.
+The goal of this module is to clean these message once they are obsolete.
+You can choose various criterias manage which messages you want to delete automatically.
diff --git a/autovacuum_mail_message/security/ir.model.access.csv b/autovacuum_message_attachment/security/ir.model.access.csv
similarity index 100%
rename from autovacuum_mail_message/security/ir.model.access.csv
rename to autovacuum_message_attachment/security/ir.model.access.csv
diff --git a/autovacuum_mail_message/static/description/icon.png b/autovacuum_message_attachment/static/description/icon.png
similarity index 100%
rename from autovacuum_mail_message/static/description/icon.png
rename to autovacuum_message_attachment/static/description/icon.png
diff --git a/autovacuum_mail_message/tests/__init__.py b/autovacuum_message_attachment/tests/__init__.py
similarity index 85%
rename from autovacuum_mail_message/tests/__init__.py
rename to autovacuum_message_attachment/tests/__init__.py
index c71d6ee82..6d036f0b6 100644
--- a/autovacuum_mail_message/tests/__init__.py
+++ b/autovacuum_message_attachment/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# © 2018 Akretion (Florian da Costa)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
diff --git a/autovacuum_mail_message/tests/test_message_vacuum_rule.py b/autovacuum_message_attachment/tests/test_message_vacuum_rule.py
similarity index 92%
rename from autovacuum_mail_message/tests/test_message_vacuum_rule.py
rename to autovacuum_message_attachment/tests/test_message_vacuum_rule.py
index d0d8343c4..8a1fece8d 100644
--- a/autovacuum_mail_message/tests/test_message_vacuum_rule.py
+++ b/autovacuum_message_attachment/tests/test_message_vacuum_rule.py
@@ -1,12 +1,10 @@
-# -*- coding: utf-8 -*-
# © 2018 Akretion (Florian da Costa)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from datetime import date, timedelta
-from openerp import api, exceptions
-from openerp.tests import common
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
+from odoo import api, exceptions
+from odoo.tests import common
class TestMessageVacuumRule(common.TransactionCase):
@@ -29,16 +27,14 @@ class TestMessageVacuumRule(common.TransactionCase):
def setUp(self):
super(TestMessageVacuumRule, self).setUp()
- self.registry.enter_test_mode()
+ self.registry.enter_test_mode(self.env.cr)
self.env = api.Environment(self.registry.test_cr, self.env.uid,
self.env.context)
self.subtype = self.env.ref('mail.mt_comment')
self.message_obj = self.env['mail.message']
self.channel_model = self.env.ref('mail.model_mail_channel')
today = date.today()
- before_400_days = today - timedelta(days=400)
- self.before_400_days = before_400_days.strftime(
- DEFAULT_SERVER_DATE_FORMAT)
+ self.before_400_days = today - timedelta(days=400)
def test_mail_vacuum_rules(self):
rule_vals = {
diff --git a/autovacuum_mail_message/views/message_rule_vacuum.xml b/autovacuum_message_attachment/views/message_rule_vacuum.xml
similarity index 97%
rename from autovacuum_mail_message/views/message_rule_vacuum.xml
rename to autovacuum_message_attachment/views/message_rule_vacuum.xml
index 987a16ae1..35e8d4739 100644
--- a/autovacuum_mail_message/views/message_rule_vacuum.xml
+++ b/autovacuum_message_attachment/views/message_rule_vacuum.xml
@@ -46,7 +46,7 @@
- Message Vacuum Rule
+ Message Vacuum Rules
message.vacuum.rule
form
tree,form