From 90f58ef5a114f73a241c55ebe0d2dc919afdbfcf Mon Sep 17 00:00:00 2001
From: Ivan x390 <guohuadeng@hotmail.com>
Date: Sat, 5 Oct 2019 21:29:39 +0800
Subject: [PATCH] fix  odoo_customize

---
 app_odoo_customize/__manifest__.py            |  5 +++--
 .../static/src/xml/dashboard.xml              | 22 -------------------
 .../static/src/xml/res_config_edition.xml     | 10 +++++++++
 .../views/res_config_settings_views.xml       | 15 +++++++++++++
 app_web_enterprise/__manifest__.py            |  2 +-
 .../static/src/xml/dashboard.xml              | 16 --------------
 .../static/src/xml/res_config_edition.xml     | 13 +++++++++++
 7 files changed, 42 insertions(+), 41 deletions(-)
 delete mode 100644 app_odoo_customize/static/src/xml/dashboard.xml
 create mode 100644 app_odoo_customize/static/src/xml/res_config_edition.xml
 create mode 100644 app_odoo_customize/views/res_config_settings_views.xml
 delete mode 100644 app_web_enterprise/static/src/xml/dashboard.xml
 create mode 100644 app_web_enterprise/static/src/xml/res_config_edition.xml

diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py
index 2041d3e3..4f264ac4 100644
--- a/app_odoo_customize/__manifest__.py
+++ b/app_odoo_customize/__manifest__.py
@@ -23,7 +23,7 @@
 
 {
     'name': 'Odoo Customize(Debranding, My Odoo)',
-    'version': '13.19.09.29',
+    'version': '13.19.10.05',
     'author': 'Sunpop.cn',
     'category': 'Productivity',
     'website': 'https://www.sunpop.cn',
@@ -74,7 +74,7 @@
     """,
     'images': ['static/description/banner.gif'],
     'depends': [
-        'base',
+        'base_setup',
         'web',
         'mail',
         'iap',
@@ -85,6 +85,7 @@
     'data': [
         'views/app_odoo_customize_views.xml',
         'views/app_theme_config_settings_views.xml',
+        'views/res_config_settings_views.xml',
         'views/ir_model_views.xml',
         'views/ir_views.xml',
         # data
diff --git a/app_odoo_customize/static/src/xml/dashboard.xml b/app_odoo_customize/static/src/xml/dashboard.xml
deleted file mode 100644
index bdc7d346..00000000
--- a/app_odoo_customize/static/src/xml/dashboard.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-    <t t-extend="DashboardApps">
-        <t t-jquery=".o_web_settings_dashboard_pills" t-operation="replace">
-            <a href="https://www.sunpop.cn" target="_blank" class="flex-grow-1 w-25"><i class="fa fa-lg fa-rocket text-muted"/> App store</a>
-            <a href="https://www.sunpop.cn" target="_blank" class="flex-grow-1 w-25"><i class="fa fa-lg fa-picture-o text-muted"/> Theme store</a>
-        </t>
-    </t>
-<!--    when enterprise-->
-<!--    <t t-extend="DashboardMain">-->
-<!--        <t t-jquery="a[href='https://play.google.com/store/apps/details?id=com.odoo.mobile']" t-operation="replace">-->
-<!--            <a class="d-block mx-auto" href="https://www.sunpop.cn" target="_blank">-->
-<!--                <img class="d-block mx-auto img img-fluid" src="/web_mobile/static/src/img/google_play.png" alt="On Google Play"/>-->
-<!--            </a>-->
-<!--        </t>-->
-<!--        <t t-jquery="a[href='https://itunes.apple.com/us/app/odoo/id1272543640']" t-operation="replace">-->
-<!--            <a class="d-block mx-auto" href="https://www.sunpop.cn" target="_blank">-->
-<!--                <img class="d-block mx-auto img img-fluid" src="/web_mobile/static/src/img/app_store.png" alt="On Apple Store"/>-->
-<!--            </a>-->
-<!--        </t>-->
-<!--    </t>-->
-</templates>
diff --git a/app_odoo_customize/static/src/xml/res_config_edition.xml b/app_odoo_customize/static/src/xml/res_config_edition.xml
new file mode 100644
index 00000000..d5e6f5e9
--- /dev/null
+++ b/app_odoo_customize/static/src/xml/res_config_edition.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-extend="res_config_edition">
+        <t t-jquery=".user-heading h3" t-operation="replace">
+            <h3>
+                odooApp <t t-esc="widget.server_version"/> (Sunpop.cn Enterprise Edition)
+            </h3>
+        </t>
+    </t>
+</templates>
diff --git a/app_odoo_customize/views/res_config_settings_views.xml b/app_odoo_customize/views/res_config_settings_views.xml
new file mode 100644
index 00000000..586d16b4
--- /dev/null
+++ b/app_odoo_customize/views/res_config_settings_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="app_res_config_settings_view_form" model="ir.ui.view">
+            <field name="name">app.res.config.settings.view.form</field>
+            <field name="model">res.config.settings</field>
+            <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
+            <field name="arch" type="xml">
+                <div id="appstore" position="attributes">
+                    <attribute name="class">o_hidden</attribute>
+                </div>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py
index 882a5513..89d8ab97 100644
--- a/app_web_enterprise/__manifest__.py
+++ b/app_web_enterprise/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': "App web enterprise enhance,企业版界面增强",
-    'version': '13.19.08.24',
+    'version': '13.19.10.05',
     'author': 'Sunpop.cn',
     'category': 'Base',
     'website': 'https://www.sunpop.cn',
diff --git a/app_web_enterprise/static/src/xml/dashboard.xml b/app_web_enterprise/static/src/xml/dashboard.xml
deleted file mode 100644
index 48601ec9..00000000
--- a/app_web_enterprise/static/src/xml/dashboard.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates xml:space="preserve">
-<!--    when enterprise-->
-    <t t-extend="DashboardMain">
-        <t t-jquery="a[href='https://play.google.com/store/apps/details?id=com.odoo.mobile']" t-operation="replace">
-            <a class="d-block mx-auto" href="https://www.sunpop.cn" target="_blank">
-                <img class="d-block mx-auto img img-fluid" src="/web_mobile/static/src/img/google_play.png" alt="On Google Play"/>
-            </a>
-        </t>
-        <t t-jquery="a[href='https://itunes.apple.com/us/app/odoo/id1272543640']" t-operation="replace">
-            <a class="d-block mx-auto" href="https://www.sunpop.cn" target="_blank">
-                <img class="d-block mx-auto img img-fluid" src="/web_mobile/static/src/img/app_store.png" alt="On Apple Store"/>
-            </a>
-        </t>
-    </t>
-</templates>
diff --git a/app_web_enterprise/static/src/xml/res_config_edition.xml b/app_web_enterprise/static/src/xml/res_config_edition.xml
new file mode 100644
index 00000000..e7c02f5c
--- /dev/null
+++ b/app_web_enterprise/static/src/xml/res_config_edition.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-extend="res_config_edition">
+        <t t-jquery=".user-heading h3" t-operation="replace">
+            <h3>
+                odooApp <t t-esc="widget.server_version"/> (Sunpop.cn Edition)
+            </h3>
+        </t>
+        <t t-jquery=".user-o_web_settings_compact_subtitle small" t-operation="replace">
+            <small><a target="_blank" href="http://www.gnu.org/licenses/lgpl.html" style="text-decoration: underline;">GNU LGPL Licensed</a></small>
+        </t>
+    </t>
+</templates>