[MERGE] forward port branch 9.0 up to d2605bcc

addons/anonymization/models/anonymization.py

@@ -68,6 +68,8 @@ class IrModelFieldsAnonymization(models.Model):
 
     @api.model
     def create(self, vals):
+        raise UserError("""The Odoo Migration Platform no longer accepts anonymized databases.\n
+            If you wish for your data to remain private during migration, please contact us at upgrade@odoo.com""")
         # check field state: all should be clear before we can add a new field to anonymize:
         self._check_write()
         if vals.get('field_name') and vals.get('model_name'):

addons/anonymization/wizard/anonymize_wizard.py

@@ -126,6 +126,8 @@ class IrModelFieldsAnonymizeWizard(models.TransientModel):
     @api.multi
     def anonymize_database(self):
         """Sets the 'anonymized' state to defined fields"""
+        raise UserError("""The Odoo Migration Platform no longer accepts anonymized databases.\n
+            If you wish for your data to remain private during migration, please contact us at upgrade@odoo.com""")
         self.ensure_one()
 
         # create a new history record:

requirements.txt

@@ -6,7 +6,7 @@ feedparser==5.2.1
 gevent==1.1.2
 greenlet==0.4.10
 jcconv==0.2.3
-Jinja2==2.8
+Jinja2==2.8.1
 lxml==3.5.0
 Mako==1.0.4
 MarkupSafe==0.23