From b54183b644dee8de18425ceffdbe564adaa3589e Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Fri, 1 Feb 2019 12:36:29 +0800
Subject: [PATCH] fix scm qty

---
 app_base_chinese/__manifest__.py              |  5 +++--
 app_base_chinese/data/res_country_data.xml    |  2 +-
 app_base_chinese/models/__init__.py           |  1 +
 app_base_chinese/models/res_partner.py        | 19 +++++++++++++------
 .../models/res_partner_category.py            |  9 +++++++++
 .../views/res_partner_views.xml               |  4 ++--
 .../models/product_category.py                |  2 +-
 7 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 app_base_chinese/models/res_partner_category.py

diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index 6fcfa9b4..e5f7eed9 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -34,8 +34,9 @@
     odoo Chinese Enhance. 中国化增强-基础
     1. 中文默认值，如国家、时区、货币等。处理模块 base, product.
     2. 客户加简称，地址显示中文化，客户编码显示优先
-    3. 货币处理，增加排序显示
-    4. todo:中文演示数据(只有demo模式才加载)
+    3. 客户地址显示增加手机号与电话号码
+    4. 货币处理，增加排序显示
+    5. todo:中文演示数据(只有demo模式才加载)
     
     """,
     'pre_init_hook': 'pre_init_hook',
diff --git a/app_base_chinese/data/res_country_data.xml b/app_base_chinese/data/res_country_data.xml
index c9f79627..cef3b7f1 100644
--- a/app_base_chinese/data/res_country_data.xml
+++ b/app_base_chinese/data/res_country_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <!-- Country -->
         <record id="base.cn" model="res.country">
-            <field eval="'%(country_name)s，%(state_name)s%(city)s，%(zip)s\n%(street)s\n%(street2)s'" name="address_format" />
+            <field name="address_format"  eval="'%(country_name)s，%(state_name)s%(city)s，%(zip)s\n%(street)s\n%(street2)s'"/>
         </record>
     </data>
 </odoo>
diff --git a/app_base_chinese/models/__init__.py b/app_base_chinese/models/__init__.py
index 74b61f9f..f0ffb65f 100644
--- a/app_base_chinese/models/__init__.py
+++ b/app_base_chinese/models/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from . import res_partner
+from . import res_partner_category
 from . import res_currency
 
 
diff --git a/app_base_chinese/models/res_partner.py b/app_base_chinese/models/res_partner.py
index fe552ecb..0bb0e839 100644
--- a/app_base_chinese/models/res_partner.py
+++ b/app_base_chinese/models/res_partner.py
@@ -9,9 +9,16 @@ class ResPartner(models.Model):
 
     short_name = fields.Char('Short Name')  # 简称
 
-
-class PartnerCategory(models.Model):
-    _inherit = 'res.partner.category'
-    _order = 'sequence, name'
-
-    sequence = fields.Integer('Sequence', help="Used to order partner category")
+    # 增加地址显示中的手机号与电话号码
+    # 选项 show_address 开启则增加显示手机与电话号
+    def _get_name(self):
+        name = super(ResPartner, self)._get_name() or ''
+        partner = self
+        if self._context.get('show_address'):
+            if partner.mobile and partner.phone:
+                name = name + "\n" + partner.mobile + "," + partner.phone
+            elif partner.mobile:
+                name = name + "\n" + partner.mobile
+            elif partner.phone:
+                name = name + "\n" + partner.phone
+        return name
diff --git a/app_base_chinese/models/res_partner_category.py b/app_base_chinese/models/res_partner_category.py
new file mode 100644
index 00000000..44d2b0b3
--- /dev/null
+++ b/app_base_chinese/models/res_partner_category.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, fields, _
+
+class PartnerCategory(models.Model):
+    _inherit = 'res.partner.category'
+    _order = 'sequence, name'
+
+    sequence = fields.Integer('Sequence', help="Used to order partner category")
diff --git a/app_contacts_superbar/views/res_partner_views.xml b/app_contacts_superbar/views/res_partner_views.xml
index 27fa733f..6893b5fd 100644
--- a/app_contacts_superbar/views/res_partner_views.xml
+++ b/app_contacts_superbar/views/res_partner_views.xml
@@ -8,13 +8,13 @@
         <field name="arch" type="xml">
             <xpath expr="//search">
                 <superbar view_mode="kanban,tree">
-                    <field name="category_id"/>
-                    <field name="country_id"/>
                     <field name="commercial_partner_id"
                            widget="ztree_search"
                            model="res.partner"
                            domain="[('is_company', '=', 1)]"
                            level="0"/>
+                    <field name="category_id"/>
+                    <field name="country_id"/>
                 </superbar>
             </xpath>
         </field>
diff --git a/app_product_superbar/models/product_category.py b/app_product_superbar/models/product_category.py
index 0db2bc6e..eaf440d6 100644
--- a/app_product_superbar/models/product_category.py
+++ b/app_product_superbar/models/product_category.py
@@ -30,4 +30,4 @@ class ProductCategory(models.Model):
                 new_res.append((category.id, name))
             return new_res
         else:
-            return super(ProductCategory, self).name_get()
\ No newline at end of file
+            return super(ProductCategory, self).name_get()