Merge branch '10.0'

2025-02-23 04:11:36 +02:00 · 2018-01-14 00:08:29 +08:00
parent 728d9c23ef b52eadda2a
commit d373a636ee
15 changed files with 125 additions and 54 deletions
--- a/app_odoo_customize/openerp.py
+++ b/app_odoo_customize/openerp.py
@@ -44,6 +44,8 @@ You can config odoo, make it look like your own platform.
 13. Change Powered by Odoo in login screen.(Please change '../views/app_odoo_customize_view.xml' #15)
 14. Quick delete test data in Apps: Sales/POS/Purchase/MRP/Inventory/Accounting/Message/Workflow etc.
 15. Reset All the Sequence to beginning of 1: SO/PO/MO/Invoice...
+16. Fix odoo reload module translation bug while enable english language
+17. Stop Odoo Auto Subscribe(Performance Improve)

 This module can help to white label the Odoo.
 Also helpful for training and support for your odoo end-user.
@@ -51,7 +53,7 @@ The user can get the help document just by one click.

    """,
    'images': ['static/description/banner.png'],
-    'depends': ['web'],
+    'depends': ['web','mail'],
    'data': [
        'views/app_odoo_customize_view.xml',
        'views/app_theme_config_settings_view.xml',
--- a/app_odoo_customize/data/ir_config_parameter.xml
+++ b/app_odoo_customize/data/ir_config_parameter.xml
@@ -42,6 +42,10 @@
            <field name="key">app_show_poweredby</field>
            <field name="value">False</field>
        </record>
+        <record id="app_stop_subscribe" model="ir.config_parameter">
+            <field name="key">app_stop_subscribe</field>
+            <field name="value">False</field>
+        </record>
        
        <record id="app_documentation_url" model="ir.config_parameter">
            <field name="key">app_documentation_url</field>
--- a/app_odoo_customize/i18n/zh_CN.po
+++ b/app_odoo_customize/i18n/zh_CN.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0+e-20171014\n"
+"Project-Id-Version: Odoo Server 10.0+e-20171107\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-19 20:57+0000\n"
-"PO-Revision-Date: 2017-12-19 20:57+0000\n"
+"POT-Creation-Date: 2018-01-10 11:41+0000\n"
+"PO-Revision-Date: 2018-01-10 11:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -54,10 +54,15 @@ msgstr "基础模型数据"
 msgid "Cancel"
 msgstr "取消"

+#. module: app_odoo_customize
+#: model:ir.model.fields,help:app_odoo_customize.field_app_theme_config_settings_app_stop_subscribe
+msgid "Check to stop Odoo Subscribe function"
+msgstr "Check to stop Odoo Subscribe function"
+
 #. module: app_odoo_customize
 #: model:ir.model.fields,field_description:app_odoo_customize.field_app_theme_config_settings_create_uid
 msgid "Created by"
-msgstr "创建者"
+msgstr "创建人"

 #. module: app_odoo_customize
 #: model:ir.model.fields,field_description:app_odoo_customize.field_app_theme_config_settings_create_date
@@ -151,7 +156,12 @@ msgstr "显示名称"
 #. module: app_odoo_customize
 #: model:ir.model.fields,field_description:app_odoo_customize.field_app_theme_config_settings_app_documentation_url
 msgid "Documentation Url"
-msgstr "文档链接"
+msgstr "用户手册链接"
+
+#. module: app_odoo_customize
+#: model:ir.model,name:app_odoo_customize.model_mail_thread
+msgid "Email Thread"
+msgstr "Email线程"

 #. module: app_odoo_customize
 #: model:ir.model.fields,field_description:app_odoo_customize.field_app_theme_config_settings_id
@@ -166,7 +176,7 @@ msgstr "安装语言"
 #. module: app_odoo_customize
 #: model:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings
 msgid "Inventory"
-msgstr "仓库"
+msgstr "库存"

 #. module: app_odoo_customize
 #: model:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings
@@ -283,6 +293,11 @@ msgstr "显示分享Odoo"
 msgid "Show Support"
 msgstr "显示支持"

+#. module: app_odoo_customize
+#: model:ir.model.fields,field_description:app_odoo_customize.field_app_theme_config_settings_app_stop_subscribe
+msgid "Stop Odoo Subscribe(Performance Improve)"
+msgstr "停用Odoo自动订阅(提高性能)"
+
 #. module: app_odoo_customize
 #: model:ir.model.fields,field_description:app_odoo_customize.field_app_theme_config_settings_app_support_url
 msgid "Support Url"
@@ -297,17 +312,17 @@ msgstr "系统名称"
 #. module: app_odoo_customize
 #: model:ir.model.fields,help:app_odoo_customize.field_app_theme_config_settings_app_show_enterprise
 msgid "Uncheck to hide the Enterprise tag"
-msgstr "不勾选则不显示企业版标签"
+msgstr "Uncheck to hide the Enterprise tag"

 #. module: app_odoo_customize
 #: model:ir.model.fields,help:app_odoo_customize.field_app_theme_config_settings_app_show_share
 msgid "Uncheck to hide the Odoo Share Dashboard"
-msgstr "不勾选则不显示odoo分享"
+msgstr "Uncheck to hide the Odoo Share Dashboard"

 #. module: app_odoo_customize
 #: model:ir.model.fields,help:app_odoo_customize.field_app_theme_config_settings_app_show_poweredby
 msgid "Uncheck to hide the Powered by text"
-msgstr "不勾选则不显示Powered by字样"
+msgstr "不勾选则不显示Odoo Powered by"

 #. module: app_odoo_customize
 #: model:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings
@@ -357,7 +372,7 @@ msgstr "启用后，会显示快速调试菜单"
 #. module: app_odoo_customize
 #: model:ir.ui.view,arch_db:app_odoo_customize.view_app_theme_config_settings
 msgid "White Label Setting"
-msgstr "个性化Odoo设置"
+msgstr "个性化odoo设置"

 #. module: app_odoo_customize
 #: model:ir.model,name:app_odoo_customize.model_ir_ui_view
@@ -367,8 +382,8 @@ msgstr "ir.ui.view"
 #. module: app_odoo_customize
 #: model:ir.actions.act_window,name:app_odoo_customize.action_app_theme_config
 #: model:ir.ui.menu,name:app_odoo_customize.menu_app_theme_config
-msgid "odoo Customize"
-msgstr "odoo 定制"
+msgid "odooApp Customize"
+msgstr "odooApp 定制"

 #. module: app_odoo_customize
 #: model:ir.ui.menu,name:app_odoo_customize.menu_app_group
--- a/app_odoo_customize/models/init.py
+++ b/app_odoo_customize/models/init.py
@@ -3,3 +3,4 @@
 import ir_ui_view
 import app_theme_config_settings
 import base_language_install
+import mail_thread
--- a/app_odoo_customize/models/app_theme_config_settings.py
+++ b/app_odoo_customize/models/app_theme_config_settings.py
@@ -24,6 +24,7 @@ class AppThemeConfigSettings(models.TransientModel):
    app_show_enterprise = fields.Boolean('Show Enterprise Tag', help=u"Uncheck to hide the Enterprise tag")
    app_show_share = fields.Boolean('Show Share Dashboard', help=u"Uncheck to hide the Odoo Share Dashboard")
    app_show_poweredby = fields.Boolean('Show Powered by Odoo', help=u"Uncheck to hide the Powered by text")
+    app_stop_subscribe = fields.Boolean('Stop Odoo Subscribe(Performance Improve)', help=u"Check to stop Odoo Subscribe function")

    app_documentation_url = fields.Char('Documentation Url')
    app_documentation_dev_url = fields.Char('Developer Documentation Url')
@@ -45,6 +46,7 @@ class AppThemeConfigSettings(models.TransientModel):
        app_show_enterprise = True if ir_config.get_param('app_show_enterprise') == "True" else False
        app_show_share = True if ir_config.get_param('app_show_share') == "True" else False
        app_show_poweredby = True if ir_config.get_param('app_show_poweredby') == "True" else False
+        app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe') == "True" else False

        app_documentation_url = ir_config.get_param('app_documentation_url',
                                                    default='http://www.sunpop.cn/documentation/user/10.0/en/index.html')
@@ -64,6 +66,8 @@ class AppThemeConfigSettings(models.TransientModel):
            app_show_enterprise=app_show_enterprise,
            app_show_share=app_show_share,
            app_show_poweredby=app_show_poweredby,
+            app_stop_subscribe=app_stop_subscribe,
+            
            app_documentation_url=app_documentation_url,
            app_documentation_dev_url=app_documentation_dev_url,
            app_support_url=app_support_url,
@@ -85,6 +89,7 @@ class AppThemeConfigSettings(models.TransientModel):
        ir_config.set_param("app_show_enterprise", self.app_show_enterprise or "False")
        ir_config.set_param("app_show_share", self.app_show_share or "False")
        ir_config.set_param("app_show_poweredby", self.app_show_poweredby or "False")
+        ir_config.set_param("app_stop_subscribe", self.app_stop_subscribe or "False")

        ir_config.set_param("app_documentation_url",
                            self.app_documentation_url or "http://www.sunpop.cn/documentation/user/10.0/en/index.html")
--- a/app_odoo_customize/models/mail_follower.py
+++ b/app_odoo_customize/models/mail_follower.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Jarvis (www.odoomod.com)
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
--- a/app_odoo_customize/models/mail_thread.py
+++ b/app_odoo_customize/models/mail_thread.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Jarvis (www.odoomod.com)
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+
+from odoo import api, fields, models, _
+
+
+class MailThread(models.AbstractModel):
+    _inherit = "mail.thread"
+
+    @api.multi
+    def message_subscribe(self, partner_ids=None, channel_ids=None, subtype_ids=None, force=True):
+        """ 停用订阅功能. """
+        ir_config = self.env['ir.config_parameter']
+        app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe') == "True" else False
+        if app_stop_subscribe:
+            return
+        else:
+            return super(MailThread, self).message_subscribe(partner_ids, channel_ids, subtype_ids, force)
+
+    @api.multi
+    def message_auto_subscribe(self, updated_fields, values=None):
+        """ 停用订阅功能. """
+        ir_config = self.env['ir.config_parameter']
+        app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe') == "True" else False
+        if app_stop_subscribe:
+            return
+        else:
+            return super(MailThread, self).message_auto_subscribe(updated_fields, values)
+
+    @api.multi
+    def _message_auto_subscribe_notify(self, partner_ids):
+        """ 停用订阅功能. """
+        ir_config = self.env['ir.config_parameter']
+        app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe') == "True" else False
+        if app_stop_subscribe:
+            return
+        else:
+            return super(MailThread, self)._message_auto_subscribe_notify(partner_ids)
--- a/app_odoo_customize/readme.md
+++ b/app_odoo_customize/readme.md
@@ -18,6 +18,7 @@ You can config odoo, make it look like your own platform.
 14. Quick delete test data in Apps: Sales/POS/Purchase/MRP/Inventory/Accounting/Message/Workflow etc.
 15. Reset All the Sequence to beginning of 1: SO/PO/MO/Invoice...
 16. Fix odoo reload module translation bug while enable english language
+17. Stop Odoo Auto Subscribe(Performance Improve)
 This module can help to white label the Odoo.
 Also helpful for training and support for your odoo end-user.
 The user can get the help document just by one click.
@@ -42,7 +43,8 @@ http://www.sunpop.cn
 13. 自定义登陆界面中的 Powered by Odoo
 14. 快速删除测试数据，支持模块包括：销售/POS门店/采购/生产/库存/会计/消息与工作流等.
 15. 将各类单据的序号重置，从1开始，包括：SO/PO/MO/Invoice 等
-16. 修复odoo启用英文后模块显示的Bug
+16. 修复odoo启用英文后模块不显示中文的Bug
+17. 可停用odoo自动订阅功能，避免“同样对象关注2次”bug，同时提升性能

 使用方法：将解压后的 app_odoo_customize 放到 odoo的 addons目录下，激活开发者模式，应用-->更新应用列表，
 找到 "App odoo Customize"模块，安装即可。
--- a/app_odoo_customize/static/description/index.html
+++ b/app_odoo_customize/static/description/index.html
@@ -7,23 +7,23 @@
                    Online Documentation Access,Quick Data Clear. </p>
                <br>
                <ul>
-                    <li>1.Deletes Odoo label in footer</li>
-                    <li>2.Replaces "Odoo" in Windows title</li>
-                    <li>3.Customize Documentation, Support, About links and title in usermenu</li>
-                    <li>4.Adds "Developer mode" link to the top right-hand User Menu.</li>
-                    <li>5.Adds Quick Language Switcher to the top right-hand User Menu.</li>
-                    <li>6.Adds Country flags to the top right-hand User Menu.</li>
-                    <li>7.Adds English and Chinese user documentation access to the top right-hand User Menu.</li>
-                    <li>8.Adds developer documentation access to the top right-hand User Menu.</li>
-                    <li>9.Customize "My odoo.com account" button</li>
-                    <li>10.Standalone setting panel, easy to setup.</li>
-                    <li>11.Provide 236 country flags.</li>
-                    <li>12.Multi-language Support.</li>
-                    <li>13.Change Powered by Odoo in login screen.(Please change '../views/app_odoo_customize_view.xml' #15)</li>
-                    <li>14.Quick delete test data in Apps: Sales/POS/Purchase/MRP/Inventory/Accounting/Base Models.</li>
-                    <li>15.Reset All the Sequence to beginning of 1: SO/PO/MO/Invoice...</li>
-                    <li>16.Fix odoo reload module translation bug while enable english language
-</li>
+                    <li>1. Deletes Odoo label in footer</li>
+                    <li>2. Replaces "Odoo" in Windows title</li>
+                    <li>3. Customize Documentation, Support, About links and title in usermenu</li>
+                    <li>4. Adds "Developer mode" link to the top right-hand User Menu.</li>
+                    <li>5. Adds Quick Language Switcher to the top right-hand User Menu.</li>
+                    <li>6. Adds Country flags to the top right-hand User Menu.</li>
+                    <li>7. Adds English and Chinese user documentation access to the top right-hand User Menu.</li>
+                    <li>8. Adds developer documentation access to the top right-hand User Menu.</li>
+                    <li>9. Customize "My odoo.com account" button</li>
+                    <li>10. Standalone setting panel, easy to setup.</li>
+                    <li>11. Provide 236 country flags.</li>
+                    <li>12. Multi-language Support.</li>
+                    <li>13. Change Powered by Odoo in login screen.(Please change '../views/app_odoo_customize_view.xml' #15)</li>
+                    <li>14. Quick delete test data in Apps: Sales/POS/Purchase/MRP/Inventory/Accounting/Base Models.</li>
+                    <li>15. Reset All the Sequence to beginning of 1: SO/PO/MO/Invoice...</li>
+                    <li>16. Fix odoo reload module translation bug while enable english language</li>
+                    <li>17. Stop Odoo Auto Subscribe(Performance Improve)</li>
                </ul>
                <p>
                This module can help to white label the Odoo.
--- a/app_odoo_customize/static/description/set1.png
+++ b/app_odoo_customize/static/description/set1.png
--- a/app_odoo_customize/static/description/set12.png
+++ b/app_odoo_customize/static/description/set12.png
--- a/app_odoo_customize/static/description/set3.png
+++ b/app_odoo_customize/static/description/set3.png
--- a/app_odoo_customize/views/app_theme_config_settings_view.xml
+++ b/app_odoo_customize/views/app_theme_config_settings_view.xml
@@ -60,6 +60,10 @@
                                <field name="app_show_poweredby"/>
                                <label for="app_show_poweredby"/>
                            </div>
+                            <div>
+                                <field name="app_stop_subscribe"/>
+                                <label for="app_stop_subscribe"/>
+                            </div>
                        </div>
                    </group>
                    <group string="User Menu Content">
@@ -137,7 +141,7 @@
        </record>

        <record id="action_app_theme_config" model="ir.actions.act_window">
-            <field name="name">odoo Customize</field>
+            <field name="name">odooApp Customize</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">app.theme.config.settings</field>
            <field name="view_mode">form</field>
--- a/app_product_type_sequence/产品自动唯一编码模块支持多规格.txt
+++ b/app_product_type_sequence/产品自动唯一编码模块支持多规格.txt
@@ -1,22 +0,0 @@
-App Product Auto Sequence, Auto Code(Variants Supported)
-
-1.<2E>Զ<EFBFBD><D4B6><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD>롣
-2.<2E>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD>룬<EFBFBD><EBA3AC>ʽΪ <20><><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>-001<30><31>
-3.<2E><>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>ǿ<EFBFBD><C7BF>Ҫ<EFBFBD><D2AA>Ψһ<CEA8><D2BB>
-4.<2E><><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD>ͬ<EFBFBD><CDAC>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>ʹ<EFBFBD>ò<EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-5.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۡ<EFBFBD><DBA1><EFBFBD><EFBFBD>桢ϵͳ<CFB5>˵<EFBFBD><CBB5>п<EFBFBD><D0BF>ٶ<EFBFBD><D9B6>塣
-6.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD>֡<EFBFBD>
-    
-This module allows to associate a sequence to the product reference.<br/>
-The reference (default code) is unique (SQL constraint) and required.<br/>
-Support Product with or without Variants.
-1.Auto Sequence or code for every product.<2E>Զ<EFBFBD><D4B6><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD>롣
-2.Auto Sequence or for every product variants, like product20171130-001.<2E>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD>룬<EFBFBD><EBA3AC>ʽΪ <20><><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>-001<30><31>
-3.Product code must be Unique.<2E><>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>ǿ<EFBFBD><C7BF>Ҫ<EFBFBD><D2AA>Ψһ<CEA8><D2BB>
-4.Define different product type, each product type use own rule of sequence.<2E><><EFBFBD>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD>ͣ<EFBFBD><CDA3><EFBFBD>ͬ<EFBFBD><CDAC>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>ʹ<EFBFBD>ò<EFBFBD>ͬ<EFBFBD><CDAC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-5.Quick access in sale , inventory, system menu.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۡ<EFBFBD><DBA1><EFBFBD><EFBFBD>桢ϵͳ<CFB5>˵<EFBFBD><CBB5>п<EFBFBD><D0BF>ٶ<EFBFBD><D9B6>塣
-6.Multi language support.<br/><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD>֡<EFBFBD>
-
-
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD>棬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-http://www.sunpop.cn/product/app-product-auto-sequence-auto-codevariants-supported/
--- a/app_product_type_sequence/产品自动生成唯一编码自动输入关键属性-支持多规格.txt
+++ b/app_product_type_sequence/产品自动生成唯一编码自动输入关键属性-支持多规格.txt
@@ -0,0 +1,18 @@
+App Product Auto Sequence, Auto Code(Variants Supported)
+
+
+        App Product Auto Sequence, Auto Code(Variants Supported), Auto Attributes
+
+        This module allows to associate a sequence to the product reference.<br/>
+        The reference (default code) is unique (SQL constraint) and required.<br/>
+        Support Product with or without Variants.
+        1.Auto Sequence or code for every product.自动产品编码。
+        2.Auto Sequence or for every product variants, like product20171130-001.自动多规格产品编码，形式为 主产品编码-001。
+        3.Product code must be Unique.产品编码强制要求唯一。
+        4.Define different product type, each product type use own rule of sequence.可自定义产品类型，不同产品类型使用不同编码规则。
+        5.Quick access in sale , inventory, system menu.可以在销售、库存、系统菜单中快速定义。
+        6.Multi language support.<br/>多语种支持。
+        7.Setup default Auto Sequence for each product category，自动设置每个产品目录使用的产品编码规则
+        8.Auto setup product attribute lik Sale/Purchase, Stockable/Consumable/Service, Stock Routes. 自动设置产品的销售/采购，可库存产品/服务/消耗品，购买/制造/按订单生成等库存路线
+
+http://www.sunpop.cn/product/app-product-auto-sequence-auto-codevariants-supported/