Accept Merge Request #1330: (feature/org_info_synchronous -> develop)
Merge Request: 用户新增企业微信id Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1330
This commit is contained in:
@@ -7,10 +7,11 @@
|
|||||||
'sequence': 1,
|
'sequence': 1,
|
||||||
'category': 'sf',
|
'category': 'sf',
|
||||||
'website': 'https://www.sf.jikimo.com',
|
'website': 'https://www.sf.jikimo.com',
|
||||||
'depends': ['hr'],
|
'depends': ['base', 'hr'],
|
||||||
'data': [
|
'data': [
|
||||||
'views/hr_employee.xml',
|
'views/hr_employee.xml',
|
||||||
'views/res_config_settings_views.xml',
|
'views/res_config_settings_views.xml',
|
||||||
|
'views/res_users_view.xml',
|
||||||
'data/cron_data.xml',
|
'data/cron_data.xml',
|
||||||
],
|
],
|
||||||
'demo': [
|
'demo': [
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
|
|
||||||
from . import hr_employee
|
from . import hr_employee
|
||||||
from . import res_config_setting
|
from . import res_config_setting
|
||||||
|
from . import res_users
|
||||||
|
|||||||
@@ -20,7 +20,9 @@ class JkmPracticeEmployee(models.Model):
|
|||||||
if result['employee_list']:
|
if result['employee_list']:
|
||||||
for employee_info in result['employee_list']:
|
for employee_info in result['employee_list']:
|
||||||
if employee_info['work_email']:
|
if employee_info['work_email']:
|
||||||
self.sudo().search([('work_email', '=', employee_info['work_email'])]).write(
|
hr_employee = self.sudo().search([('work_email', '=', employee_info['work_email'])])
|
||||||
{'we_id': employee_info['we_id']})
|
hr_employee.write({'we_id': employee_info['we_id']})
|
||||||
|
if hr_employee.user_id:
|
||||||
|
hr_employee.user_id.write({'we_employee_id': employee_info['we_id']})
|
||||||
else:
|
else:
|
||||||
logging.info('_employee_info_sync error:%s' % result['message'])
|
logging.info('_employee_info_sync error:%s' % result['message'])
|
||||||
|
|||||||
12
sf_hr/models/res_users.py
Normal file
12
sf_hr/models/res_users.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from odoo import models, fields, api
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class ResUsers(models.Model):
|
||||||
|
_inherit = 'res.users'
|
||||||
|
|
||||||
|
we_employee_id = fields.Char(string=u'企业微信账号', default="")
|
||||||
20
sf_hr/views/res_users_view.xml
Normal file
20
sf_hr/views/res_users_view.xml
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
<data>
|
||||||
|
<record id="view_users_account_form" model="ir.ui.view">
|
||||||
|
<field name="name">res.users.account.form</field>
|
||||||
|
<field name="model">res.users</field>
|
||||||
|
<field name="inherit_id" ref="base.view_users_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<page name="preferences" position="after">
|
||||||
|
<page name="account" string="企业微信">
|
||||||
|
<group>
|
||||||
|
<field name="we_employee_id"/>
|
||||||
|
</group>
|
||||||
|
</page>
|
||||||
|
</page>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</data>
|
||||||
|
</odoo>
|
||||||
|
|
||||||
BIN
sf_plan/static/description/计划.png
Normal file
BIN
sf_plan/static/description/计划.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 673 B |
@@ -278,6 +278,7 @@
|
|||||||
sequence="150"
|
sequence="150"
|
||||||
action="sf_production_plan_action"
|
action="sf_production_plan_action"
|
||||||
groups="sf_base.group_plan_dispatch"
|
groups="sf_base.group_plan_dispatch"
|
||||||
|
web_icon="sf_plan,static/description/计划.png"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- <record model="ir.ui.menu" id="mrp_custom_menu" inherit_id="mrp.menu_mrp_manufacturing"> -->
|
<!-- <record model="ir.ui.menu" id="mrp_custom_menu" inherit_id="mrp.menu_mrp_manufacturing"> -->
|
||||||
|
|||||||
Reference in New Issue
Block a user