Merge remote-tracking branch 'upstream/8.0' into 9.0-merge-91b95cd

8 years ago · 39979ef5c7
45 changed files with 137 additions and 76 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,34 @@
+language: python
+
+python:
+  - "2.7"
+  
+sudo: false
+cache: pip
+
+addons:
+  apt:
+    packages:
+      - expect-dev  # provides unbuffer utility
+      - python-lxml  # because pip installation is slow
+
+env:
+  - VERSION="9.0" LINT_CHECK="1"
+  - VERSION="9.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0"
+  - VERSION="9.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
+  - VERSION="9.0" UNIT_TEST="1" LINT_CHECK="0"
+
+virtualenv:
+  system_site_packages: true
+
+install:
+  - pip install anybox.testing.openerp
+  - git clone https://github.com/it-projects-llc/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
+  - travis_install_nightly
+
+script:
+  - travis_run_tests
+
+after_success:
+  coveralls
--- a/mail_all/README.rst
+++ b/mail_all/README.rst
@ -9,8 +9,8 @@ Further information

 HTML Description: https://apps.odoo.com/apps/modules/9.0/mail_all/

-Usage instructions: `<doc/index.rst>`_
+Usage instructions: `<doc/index.rst>`__

-Changelog: `<doc/changelog.rst>`_
+Changelog: `<doc/changelog.rst>`__

 Tested on Odoo 9.0 d3dd4161ad0598ebaa659fbd083457c77aa9448d
--- a/mail_all/views/templates.xml
+++ b/mail_all/views/templates.xml
@ -9,4 +9,4 @@
            </xpath>
        </template>
    </data>
-</openerp>
+</openerp>
--- a/mail_check_immediately/init.py
+++ b/mail_check_immediately/init.py
@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-import models
+from . import models
--- a/mail_check_immediately/openerp.py
+++ b/mail_check_immediately/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Check mail immediately',
    'version': '1.0.1',
--- a/mail_check_immediately/models.py
+++ b/mail_check_immediately/models.py
@ -60,7 +60,6 @@ class FetchMailImmediately(models.AbstractModel):
    def run_fetchmail_manually(self):

        fetchmail_task = self.env.ref('fetchmail.ir_cron_mail_gateway_action')
-        fetchmail_task_id = fetchmail_task.id
        fetchmail_model = self.env['fetchmail.server'].sudo()

        fetchmail_task._try_lock()
--- a/mail_check_immediately/static/src/js/main.js
+++ b/mail_check_immediately/static/src/js/main.js
@ -10,7 +10,7 @@ openerp.mail_check_immediately = function(instance, local) {
            this.imm_model = new instance.web.Model('fetch_mail.imm');
            this.events['click a.oe_fetch_new_mails'] = function(){
                _this.run_fetchmail_manually();
-            }
+            };
        },

        start: function() {
@ -22,7 +22,7 @@ openerp.mail_check_immediately = function(instance, local) {
            this.get_last_fetched_time();

            this.get_time_loop = setInterval(function(){
-                _this.get_last_fetched_time()
+                _this.get_last_fetched_time();
            }, 30000);

        },
@ -31,8 +31,8 @@ openerp.mail_check_immediately = function(instance, local) {
            var _this = this;

            this.imm_model.call('run_fetchmail_manually', {context: new instance.web.CompoundContext()}).then(function(){
-                _this.get_last_fetched_time()
-            })
+                _this.get_last_fetched_time();
+            });
        },

        get_last_fetched_time: function(){
@ -43,7 +43,7 @@ openerp.mail_check_immediately = function(instance, local) {
                    value = $.timeago(res);
                value = value || 'undefined';
                _this.$el.find('span.oe_view_manager_fetch_mail_imm_field').html(value);
-            })
+            });
        },

        destroy: function(){
--- a/mail_delete_odoo_footer/openerp.py
+++ b/mail_delete_odoo_footer/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Delete Odoo footer in email (TODO)',
    'version': '1.0.0',
--- a/mail_fix_553/init.py
+++ b/mail_fix_553/init.py
@ -1 +1,2 @@
-import mail_fix_553
+# -*- coding: utf-8 -*-
+from . import mail_fix_553
--- a/mail_fix_553/openerp.py
+++ b/mail_fix_553/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    "name": "Fix mail error 553",
    "version": "0.3",
--- a/mail_fix_553/mail_fix_553.py
+++ b/mail_fix_553/mail_fix_553.py
@ -2,19 +2,18 @@

 import base64
 import logging
+import re
 from email.utils import formataddr
-from urlparse import urljoin

-from openerp import api, tools
+from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
-from openerp.osv import fields, osv
+from openerp.osv import osv
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _

 _logger = logging.getLogger(__name__)

-import re


 class mail_mail(osv.Model):
--- a/mail_fix_empty_body/init.py
+++ b/mail_fix_empty_body/init.py
@ -1 +1,2 @@
-import models
+# -*- coding: utf-8 -*-
+from . import models
--- a/mail_fix_empty_body/openerp.py
+++ b/mail_fix_empty_body/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Fix "False" in empty email body',
    'version': '1.0.0',
--- a/mail_fix_empty_body/models.py
+++ b/mail_fix_empty_body/models.py
@ -1,4 +1,6 @@
-from openerp import api, models, fields, SUPERUSER_ID
+# -*- coding: utf-8 -*-
+from openerp import models
+


 class mail_compose_message(models.TransientModel):
--- a/mail_fix_header_from/init.py
+++ b/mail_fix_header_from/init.py
@ -1 +1,2 @@
-import models
+# -*- coding: utf-8 -*-
+from . import models
--- a/mail_fix_header_from/openerp.py
+++ b/mail_fix_header_from/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    "name": "Fix non-ascii header 'from' (OBSOLETE)",
    "version": "0.3",
--- a/mail_fix_header_from/models.py
+++ b/mail_fix_header_from/models.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import re
 from openerp.addons.base.ir import ir_mail_server

--- a/mail_move_message/init.py
+++ b/mail_move_message/init.py
@ -1,2 +1,3 @@
-import controllers
-import mail_move_message_models
+# -*- coding: utf-8 -*-
+from . import controllers
+from . import mail_move_message_models
--- a/mail_move_message/openerp.py
+++ b/mail_move_message/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Mail relocation',
    'version': '1.0.4',
--- a/mail_move_message/controllers/init.py
+++ b/mail_move_message/controllers/init.py
@ -1 +1,2 @@
-import main
+# -*- coding: utf-8 -*-
+from . import main
--- a/mail_move_message/controllers/main.py
+++ b/mail_move_message/controllers/main.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from openerp.addons.web.controllers.main import DataSet
 from openerp.tools.translate import _
 from openerp import http
@ -18,6 +19,7 @@ class MailChatController(openerp.addons.bus.controllers.main.BusController):
        return super(MailChatController, self)._poll(dbname, channels, last, options)


+
 class DataSetCustom(DataSet):

    def _extend_name(self, model, records):
--- a/mail_move_message/mail_move_message_models.py
+++ b/mail_move_message/mail_move_message_models.py
@ -1,4 +1,4 @@
-from lxml import etree
+# -*- coding: utf-8 -*-
 from openerp import api, models, fields, SUPERUSER_ID
 from openerp.tools import email_split
 from openerp.tools.translate import _
--- a/mail_move_message/static/src/js/mail_move_message.js
+++ b/mail_move_message/static/src/js/mail_move_message.js
@ -96,7 +96,7 @@ odoo.define('mail_move_message.relocate', function (require) {
        on_click: function(){
            if(this.node.attrs.special == 'quick_create'){
                var self = this;
-                var related_field = this.field_manager.fields[this.node.attrs['field']];
+                var related_field = this.field_manager.fields[this.node.attrs.field];
                var context_built = $.Deferred();
                if(this.node.attrs.use_for_mail_move_message) {
                    var model = new Model(this.view.dataset.model);
@ -116,7 +116,7 @@ odoo.define('mail_move_message.relocate', function (require) {
                }
                $.when(context_built).pipe(function (context) {
                    if(self.node.attrs.use_for_mail_move_message) {
-                        self.field_manager.fields['partner_id'].set_value(context['partner_id']);
+                        self.field_manager.fields.partner_id.set_value(context.partner_id);
                    }
                    var dialog = new form_common.FormViewDialog(self, {
                        res_model: related_field.field.relation,
@ -130,8 +130,8 @@ odoo.define('mail_move_message.relocate', function (require) {
                    });
                    dialog.on('create_completed', self, function(id) {
                        related_field.set_value(id);
-                        if(self.field_manager.fields['filter_by_partner']) {
-                            self.field_manager.fields['filter_by_partner'].set_value(true);
+                        if(self.field_manager.fields.filter_by_partner) {
+                            self.field_manager.fields.filter_by_partner.set_value(true);
                        }
                    });
                });
--- a/mail_outgoing/init.py
+++ b/mail_outgoing/init.py
@ -1 +1,2 @@
-import mail_outgoing_models
+# -*- coding: utf-8 -*-
+from . import mail_outgoing_models
--- a/mail_outgoing/openerp.py
+++ b/mail_outgoing/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Outgoing mails menu',
    'version': '1.0.0',
--- a/mail_outgoing/mail_outgoing_models.py
+++ b/mail_outgoing/mail_outgoing_models.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from openerp.osv import osv


--- a/mail_outgoing/mail_outgoing_views.xml
+++ b/mail_outgoing/mail_outgoing_views.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
    <data>
-		
+        
        <record id="action_mail_outgoing" model="ir.actions.act_window">
            <field name="name">Outgoing</field>
            <field name="res_model">mail.mail</field>
@ -10,8 +10,8 @@
            <field name="context">{}</field>
            <field name="search_view_id" ref="mail.view_mail_search"/>
            <field name="help" type="html">
-				<p>
-					Failed or delayed emails will be shown here. You will be able to retry failed emails and send delayed emails manually.
+                <p>
+                    Failed or delayed emails will be shown here. You will be able to retry failed emails and send delayed emails manually.
                </p>
            </field>
        </record>
@ -30,5 +30,5 @@
        </record>


-	</data>
+    </data>
 </openerp>
--- a/mail_outgoing/security/mail_outgoing.xml
+++ b/mail_outgoing/security/mail_outgoing.xml
@ -3,10 +3,10 @@
    <data>
        <record model="res.groups" id="group_all_emails">
            <field name="name">all_emails</field>
-			<field name="comment">Gets access to all emails. For example to check outgoing emails.</field>
-		</record>
+            <field name="comment">Gets access to all emails. For example to check outgoing emails.</field>
+        </record>

-		<record model="ir.rule" id="rule_mail_mail_user">
+        <record model="ir.rule" id="rule_mail_mail_user">
            <field name="name">mail.mail: user</field>
            <field name="model_id" ref="mail.model_mail_mail"/>
            <field name="domain_force">[('author_id', '=', user.partner_id.id)]</field>
@ -16,9 +16,9 @@
            <field name="perm_create" eval="True"/>
            <field name="perm_unlink" eval="False"/>
            <field name="global" eval="False"/>
-		</record>
+        </record>

-		<record model="ir.rule" id="rule_mail_mail_system">
+        <record model="ir.rule" id="rule_mail_mail_system">
            <field name="name">mail.mail: system</field>
            <field name="model_id" ref="mail.model_mail_mail"/>
            <field name="domain_force">[(1, '=', 1)]</field>
@ -28,6 +28,6 @@
            <field name="perm_create" eval="True"/>
            <field name="perm_unlink" eval="True"/>
            <field name="global" eval="False"/>
-		</record>
-	</data>
+        </record>
+    </data>
 </openerp>
--- a/mail_partner_lang/init.py
+++ b/mail_partner_lang/init.py
@ -1 +1,2 @@
-import models
+# -*- coding: utf-8 -*-
+from . import models
--- a/mail_partner_lang/openerp.py
+++ b/mail_partner_lang/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Use partner language in mail',
    'version': '1.0.0',
--- a/mail_partner_lang/models.py
+++ b/mail_partner_lang/models.py
@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from openerp.osv import osv, fields
-from openerp import SUPERUSER_ID
+from openerp.osv import osv
+


 class mail_thread(osv.Model):
--- a/mail_recovery/README.rst
+++ b/mail_recovery/README.rst
@ -18,7 +18,7 @@ Contributors

 Sponsors
 --------
-* `IT-Projects LLC <https://it-projects.info>`_
+* `IT-Projects LLC <https://it-projects.info>`__

 Further information
 ===================
@ -27,8 +27,8 @@ Demo: http://runbot.it-projects.info/demo/mail-addons/9.0

 HTML Description: https://apps.odoo.com/apps/modules/9.0/mail_recovery/

-Usage instructions: `<doc/index.rst>`_
+Usage instructions: `<doc/index.rst>`__

-Changelog: `<doc/changelog.rst>`_
+Changelog: `<doc/changelog.rst>`__

 Tested on Odoo 9.0 fd9eb2e4819031c6758c021f4c335b591367632d
--- a/mail_recovery/static/src/js/mail_recovery.js
+++ b/mail_recovery/static/src/js/mail_recovery.js
@ -10,14 +10,14 @@ odoo.define('mail_recovery', function (require) {
        on_focus_textarea: function(event) {
            var $input = $(event.target);
            if (!$input.val()) {
-                $input.val(window.localStorage['message_storage']);
+                $input.val(window.localStorage.message_storage);
            }
        },
        on_keyup_textarea: function(event) {
-            window.localStorage['message_storage'] = $(event.target).val();
+            window.localStorage.message_storage = $(event.target).val();
        },
        send_message: function (event) {
-            window.localStorage['message_storage'] = '';
+            window.localStorage.message_storage = '';
            return this._super(event);
        },
    });
--- a/mail_sent/init.py
+++ b/mail_sent/init.py
@ -1,3 +1,2 @@
 # -*- coding: utf-8 -*-
-
-import models
+from . import models
--- a/mail_todo_custom/static/src/js/mail_todo_custom.js
+++ b/mail_todo_custom/static/src/js/mail_todo_custom.js
@ -41,4 +41,4 @@ openerp.mail_todo_custom = function(session) {
        },

    });
-}
+};
--- a/mass_mailing_extra/init.py
+++ b/mass_mailing_extra/init.py
@ -1 +1,2 @@
-import models
+# -*- coding: utf-8 -*-
+from . import models
--- a/mass_mailing_extra/openerp.py
+++ b/mass_mailing_extra/openerp.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 {
    'name': 'Improvements for mass mailing',
    'version': '1.0.0',
--- a/mass_mailing_extra/models.py
+++ b/mass_mailing_extra/models.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from openerp import api, models, fields


--- a/mass_mailing_extra/views.xml
+++ b/mass_mailing_extra/views.xml
@ -5,34 +5,34 @@
        <record model="ir.ui.view" id="view_mail_mail_statistics_form">
            <field name="name">mail.mail.statistics.form</field>
            <field name="model">mail.mail.statistics</field>
-			<field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_form"/>
+            <field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_form"/>
            <field name="arch" type="xml">
-				<xpath expr="//form" position="inside">
-					<notebook>
-						<page string="Partners">
-							<group>
-								<label for="partners" string="Partners (summary)"/>
-								<field name="partners" readonly="1" nolabel="1"/>
-								<field name="partner_id" readonly="1"/>
-							</group>
-							<label for="partner_ids"/>
-							<field name="partner_ids" readonly="1"/>
-						</page>
-					</notebook>
-				</xpath>
-			</field>
-		</record>
+                <xpath expr="//form" position="inside">
+                    <notebook>
+                        <page string="Partners">
+                            <group>
+                                <label for="partners" string="Partners (summary)"/>
+                                <field name="partners" readonly="1" nolabel="1"/>
+                                <field name="partner_id" readonly="1"/>
+                            </group>
+                            <label for="partner_ids"/>
+                            <field name="partner_ids" readonly="1"/>
+                        </page>
+                    </notebook>
+                </xpath>
+            </field>
+        </record>

        <record model="ir.ui.view" id="view_mail_mail_statistics_tree">
            <field name="name">mail.mail.statistics.tree</field>
            <field name="model">mail.mail.statistics</field>
-			<field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_tree"/>
+            <field name="inherit_id" ref="mass_mailing.view_mail_mail_statistics_tree"/>
            <field name="arch" type="xml">
-				<xpath expr="//field[@name='mail_mail_id_int']" position="before">
-					<field name="partners"/>
-				</xpath>
+                <xpath expr="//field[@name='mail_mail_id_int']" position="before">
+                    <field name="partners"/>
+                </xpath>
            </field>
        </record>

-	</data>
+    </data>
 </openerp>
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@ -0,0 +1,4 @@
+OCA_web https://github.com/OCA/web
+access-addons https://github.com/it-projects-llc/access-addons.git
+misc-addons https://github.com/it-projects-llc/misc-addons
+website-addons https://github.com/it-projects-llc/website-addons
--- a/res_partner_mails_count/init.py
+++ b/res_partner_mails_count/init.py
@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-import models
+from . import models
--- a/res_partner_mails_count/tests/test_mail.py
+++ b/res_partner_mails_count/tests/test_mail.py
@ -3,7 +3,7 @@
 from openerp.tests.common import TransactionCase


-class test_message_count(TransactionCase):
+class TestMessageCount(TransactionCase):
    post_install = True

    def test_count(self):
--- a/res_partner_mails_count/tests/test_phantom.py
+++ b/res_partner_mails_count/tests/test_phantom.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import openerp.tests


--- a/res_partner_strip_email/init.py
+++ b/res_partner_strip_email/init.py
@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-import models
+from . import models
--- a/res_partner_strip_email/models.py
+++ b/res_partner_strip_email/models.py
@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-

-from openerp import models, fields, api
+from openerp import api
+from openerp import models


 class res_partner_strip_email(models.Model):