Merge branch 'dev' into dev_hong

# Conflicts:
#	yuthon_official/models/yuthon_official.py
#	yuthon_official/views/yuthon_official_views.xml

yuthon_official/models/official_category.py

@@ -34,5 +34,5 @@ class ApprovalRequest(models.Model):
     main_flats = fields.Char(string="主送")
     urgency = fields.Selection([('normal', '一般'), ('urgent', '紧急'), ('extra_urgent', '特急')], string="紧急程度")
     secret_level = fields.Selection([('normal', '一般'), ('urgent', '秘密'), ('secret', '机密'), ('so_secret', '绝密')], string="密级")
-    date = fields.Datetime(string="日期")
+    date = fields.Datetime(string="日期", default=fields.Datetime.now)
 

yuthon_wechat/models/hr_employee.py

@@ -25,11 +25,13 @@ class HrDepartment(models.Model):
                 wecom_department_id=record.wecom_id,
                 name=record.name,
                 name_en=record.wecom_name_en,
-                parentid=record.wecom_parent_id,
+                parentid=record.wecom_parent_id if record.wecom_parent_id else record.parent_id.wecom_id,
             )
             if not result_status:
                 sync_flag = False
                 sync_content = sync_content + record.name + "：" + result_content + ";\n"
+            else:
+                record.wecom_id = result_content.get("id", 0)
         if not sync_flag:
             raise UserError(str(sync_content))
 

yuthon_wechat/models/wecom_apps.py

@@ -129,5 +129,5 @@ class WeComApps(models.Model):
         else:
             result_data = self.sync_function_api("user_create", "DEPARTMENT_CREATE", data)
         if result_data.get("errcode", None) == 0:
-            return True, result_data.get("errmsg", "")
+            return True, result_data
         return False, result_data.get("errmsg", "")

yuthon_wechat/views/hr_employee_views.xml

@@ -41,11 +41,15 @@
         <field name="model">hr.department</field>
         <field name="inherit_id" ref="hr.view_department_form"/>
         <field name="arch" type="xml">
-             <xpath expr="//from" position="inside">
+             <xpath expr="//sheet" position="before">
                  <header>
-                    <button class="oe_stat_button" name="send_wecom_employee" string="同步企业微信员工" groups="hr.group_hr_manager" type="object" icon="fa-bars"/>
+                    <button class="oe_stat_button" name="send_wecom_employee" string="同步企业微信部门" groups="hr.group_hr_manager" type="object" icon="fa-bars"/>
                  </header>
             </xpath>
+            <xpath expr="//field[@name='color']" position="after">
+                 <field name="wecom_id" />
+                 <field name="wecom_parent_id" />
+            </xpath>
         </field>
     </record>
 
@@ -56,7 +60,7 @@
         <field name="arch" type="xml">
             <xpath expr="//tree" position="inside">
                  <header>
-                    <button class="oe_stat_button" name="send_wecom_employee" string="同步企业微信员工" groups="hr.group_hr_manager" type="object" icon="fa-bars"/>
+                    <button class="oe_stat_button" name="send_wecom_employee" string="同步企业微信部门" groups="hr.group_hr_manager" type="object" icon="fa-bars"/>
                  </header>
             </xpath>
         </field>