修改相关错误

suningwz · Jan 27, 2022 · d1958ff · d1958ff
1 parent b8e674f
commit d1958ff
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 51 deletions.
diff --git a/wecom_hrm/i18n/zh_CN.po b/wecom_hrm/i18n/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 06:37+0000\n"
-"PO-Revision-Date: 2021-12-24 14:43+0800\n"
+"POT-Creation-Date: 2022-01-27 04:54+0000\n"
+"PO-Revision-Date: 2022-01-27 12:55+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -17,6 +17,17 @@ msgstr ""
 "Plural-Forms: \n"
 "X-Generator: Poedit 3.0.1\n"
 
+#. module: wecom_hrm
+#: model_terms:ir.ui.view,arch_db:wecom_hrm.hr_kanban_view_employees
+msgid ""
+"<span class=\"fa fa-weixin text-info\" role=\"img\" aria-label=\"Enterprise "
+"wechat Employee\" title=\"Enterprise wechat Employee\">\n"
+"                        </span>"
+msgstr ""
+"<span class=\"fa fa-weixin text-info\" role=\"img\" aria-label=\"企业微信员"
+"工\" title=\"企业微信员工\">\n"
+"                        </span>"
+
 #. module: wecom_hrm
 #: model:ir.ui.menu,name:wecom_hrm.menu_wecom_config_plan
 msgid "Activity Planning"
@@ -60,8 +71,8 @@ msgid "Create WeCom Tags"
 msgstr "创建企微标签"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Create contacts tags: %s to WeCom"
 msgstr "创建通讯录标签：%s 到企业微信"
@@ -87,15 +98,15 @@ msgid "Delete WeCom Tags"
 msgstr "删除企微标签"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Delete contacts tag [%s] member to WeCom"
 msgstr "删除企微的通讯录标签 [%s] 的成员"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Delete contacts tags: %s to WeCom"
 msgstr "删除通讯录标签：%s 到企业微信"
@@ -164,33 +175,12 @@ msgid "Enterprise wechat user"
 msgstr "企微用户"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wecom_hrm/models/wecom_contacts_block.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/wecom_contacts_block.py:0
 #, python-format
 msgid "Failed"
 msgstr "失败"
 
-#. module: wecom_hrm
-#: code:addons/wecom_hrm/models/wecom_contacts_block.py:0
-#: code:addons/wxwork/wecom_hrm/models/wecom_contacts_block.py:0
-#, python-format
-msgid "Failed to read WeCom members! Error details: %s ."
-msgstr "无法读取企业微信成员！错误详细信息：%s。"
-
-#. module: wecom_hrm
-#: model_terms:ir.ui.view,arch_db:wecom_hrm.view_wecom_contacts_block_form
-msgid "Get user name"
-msgstr "获取用户名"
-
-#. module: wecom_hrm
-#: code:addons/wecom_hrm/models/wecom_contacts_block.py:0
-#: code:addons/wxwork/wecom_hrm/models/wecom_contacts_block.py:0
-#, python-format
-msgid "Get user name successfully"
-msgstr "成功获取用户名"
-
 #. module: wecom_hrm
 #: model:ir.ui.menu,name:wecom_hrm.menu_wecom_config_hide_hr_menu
 msgid "Hide Hr Menu"
@@ -213,9 +203,7 @@ msgstr "人力资源配置"
 #: model:ir.model.fields,field_description:wecom_hrm.field_res_company__id
 #: model:ir.model.fields,field_description:wecom_hrm.field_wecom_contacts_block__id
 msgid "ID"
-msgstr "ID"
-
-
+msgstr ""
 
 #. module: wecom_hrm
 #: model:ir.ui.menu,name:wecom_hrm.menu_wecom_view_hr_job
@@ -317,17 +305,15 @@ msgid "Settings"
 msgstr "设置"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wecom_hrm/models/wecom_contacts_block.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/wecom_contacts_block.py:0
 #, python-format
 msgid "Success"
 msgstr "成功"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Successfully updated tag."
 msgstr "已成功更新标签。"
@@ -348,22 +334,22 @@ msgstr ""
 "最大的id自增。"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Tag successfully created."
 msgstr "标签已成功创建。"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Tag: %s deleted successfully."
 msgstr "标签：%s已成功删除。"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Tag: %s deletion failed."
 msgstr "标签：%s 删除失败。"
@@ -398,15 +384,15 @@ msgid "Update WeCom Tags Name"
 msgstr "更新企微标签名称"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Update contacts tags: %s name to WeCom"
 msgstr "更新通讯录标签：%s 名称到企业微信"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Update contacts tags: %s to WeCom"
 msgstr "将通讯录标签 \"%s\" 更新到企业微信"
@@ -417,8 +403,8 @@ msgid "Use System Avatar"
 msgstr "使用系统头像"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #: model_terms:ir.ui.view,arch_db:wecom_hrm.view_department_form
 #, python-format
 msgid "WeCom"
@@ -502,8 +488,8 @@ msgid "WeCom user sort"
 msgstr "企业微信用户排序"
 
 #. module: wecom_hrm
+#: code:addons/wecom/wecom_hrm/models/hr_employee_category.py:0
 #: code:addons/wecom_hrm/models/hr_employee_category.py:0
-#: code:addons/wxwork/wecom_hrm/models/hr_employee_category.py:0
 #, python-format
 msgid "Wecom API error: %s, error name: %s, error message: %s"
 msgstr "企微API错误：%s，错误名称：%s，错误消息：%s"

diff --git a/wecom_hrm/views/hr_employee_view.xml b/wecom_hrm/views/hr_employee_view.xml
@@ -65,22 +65,23 @@
             </field>
         </record>
 
-        <!-- <record id="hr_kanban_view_employees" model="ir.ui.view">
+        <record id="hr_kanban_view_employees" model="ir.ui.view">
             <field name="name">hr.employee.kanban</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='hr_icon_display']" position="after">
-                    <field name="use_system_avatar"/>
+                <xpath expr="//templates" position="before">
+                    <field name="is_wecom_employee"/>
                 </xpath>
-                <xpath expr="//field[@name='image_128']" position="replace">
-                    <field name="image_128" widget="image" class="o_kanban_image_fill_left" options="{'zoom': true, 'zoom_delay': 1000, 'background': true, 'preventClicks': false}" attrs="{'invisible': [('use_system_avatar', '=', False)]}"/>
 
-                    <field name="avatar" widget="wecom_image_url" options="{'class':'mr16','size': [95, 95],'zoom': true, 'zoom_delay': 1000, 'background': true, 'preventClicks': false}" attrs="{'invisible': [('use_system_avatar', '=', True)]}"/>
+                <xpath expr="//strong[@class='o_kanban_record_title']/field[@name='name']" position="before">
+                    <div class="float-right" t-if="record.is_wecom_employee.raw_value" name="is_wecom_employee">
+                        <span class="fa fa-weixin text-info" role="img" aria-label="Enterprise wechat Employee" title="Enterprise wechat Employee">
+                        </span>
+                    </div>
                 </xpath>
-
             </field>
-        </record> -->
+        </record>
 
 
 

diff --git a/wecom_hrm_syncing/models/sync_tag.py b/wecom_hrm_syncing/models/sync_tag.py
@@ -226,8 +226,10 @@ def binding_tag(self, company, response):
                                 ]
                             )
                         )
-                        employees.append(employee.id)
+                        if employee:
+                            employees.append(employee.id)
                     if len(employees) > 0:
+                        print("employees------------", employees)
                         employee_category.write({"employee_ids": [(6, 0, employees)]})
 
                 partylist = tags["partylist"]  # 标签中包含的部门列表

diff --git a/wecom_hrm_syncing/views/hr_employee_view.xml b/wecom_hrm_syncing/views/hr_employee_view.xml
@@ -10,7 +10,7 @@
 
                 <xpath expr="//header//button[last()]" position="before">
 
-                    <button name="create_user_from_employee" string="Copy as system user" type="object" class="oe_highlight btn-info" attrs="{'invisible': ['&amp;',('is_wecom_employee', '!=', False),('user_id', '!=', False)]}" icon="fa-files-o" groups="hr.group_hr_manager"/>
+                    <button name="create_user_from_employee" string="Copy as system user" type="object" class="oe_highlight btn-info" attrs="{'invisible': ['|',('is_wecom_employee', '=', False),'&amp;',('is_wecom_employee', '!=', False),('user_id', '!=', False)]}" icon="fa-files-o" groups="hr.group_hr_manager"/>
                 </xpath>
 
             </field>