Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入

sf_wxwork_approval/__manifest__.py

@@ -12,7 +12,7 @@
     'category': 'bfm',
     'author': 'jikimo',
     'website': 'https://bfm.r.jikimo.com',
-    'depends': ['web'],
+    'depends': ['web', 'mail', 'sf_sale'],
     'data': [
         # 定义权限组放在最上面
         # 权限组
@@ -22,6 +22,7 @@
         'views/wxwork_config_view.xml',
         'views/views.xml',
         'views/wxwork_settings_view.xml',
+        'views/wxwork_approval.xml',
         'views/wxwork_approval_template_view.xml',
         'views/wxwork_approval_approval_line.xml',
 

sf_wxwork_approval/models/__init__.py

@@ -7,4 +7,5 @@ from . import wxwork_approval_template_summary
 from . import we_approval_record
 from . import wx_work_api
 
+from . import wxwork_approval
 # from . import res_config_setting

sf_wxwork_approval/models/wxwork_approval.py

@@ -0,0 +1,24 @@
+import logging
+from odoo import api, fields, models
+from odoo.exceptions import UserError
+
+_logger = logging.getLogger(__name__)
+
+
+class WxworkApproval(models.Model):
+    _name = 'wxwork.approval'
+    _description = "审批"
+    inherit = ['mail.thread', 'mail.activity.mixin']
+    _order = 'id desc'
+
+    template_id = fields.Many2one('wxwork.approval.template', string='审批模板')
+    business_model = fields.Many2many('sale.order', 'sale_approval_rel', 'sale_id', 'approval_id', string='业务类型')
+    approve_history_ids = fields.One2many('wxwork.approval.history', 'approve_id', string='审批流程')
+    state = fields.Char(string='状态')
+
+
+class WxworkApprovalHistory(models.Model):
+    _name = 'wxwork.approval.history'
+    _description = "审批历史记录"
+
+    approve_id = fields.Many2one('wxwork.approval', string='审批')

sf_wxwork_approval/security/ir.model.access.csv

@@ -18,6 +18,7 @@ access_wxwork_approval_contact_config,wxwork.approval.contact.config,model_wxwor
 access_wxwork_approval_table_config,wxwork.approval.table.config,model_wxwork_approval_table_config,base.group_user,1,1,1,1
 access_wxwork_approval_attendance_config,wxwork.approval.attendance.config,model_wxwork_approval_attendance_config,base.group_user,1,1,1,1
 access_wxwork_approval_file_config,wxwork.approval.file.config,model_wxwork_approval_file_config,base.group_user,1,1,1,1
+access_wxwork_approval,wxwork.approval,model_wxwork_approval,base.group_user,1,1,1,1
 
 
 

sf_wxwork_approval/views/views.xml

@@ -34,7 +34,7 @@
 		</field>
 	</record>
 
-	<record id="action_wxwork_approval" model="ir.actions.act_window">
+	<record id="action_wxwork_approval_template" model="ir.actions.act_window">
         <field name="name">审批记录</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">wxwork.approval.record</field>
@@ -49,10 +49,11 @@
     </record>
 
     <menuitem
-        id="menu_wxwork_approval"
+        id="menu_wxwork_approval_template"
         name="审批"
-        sequence="1"
+        sequence="2"
-        action="action_wxwork_approval"
+        action="action_wxwork_approval_template"
     />
 
+
 </odoo>

sf_wxwork_approval/views/wxwork_approval.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="wxwork_approval_tree_view" model="ir.ui.view">
+        <field name="name">审批</field>
+        <field name="model">wxwork.approval</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="id"/>
+                <field name="business_model"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="wxwork_approval_form" model="ir.ui.view">
+        <field name="name">审批</field>
+        <field name="model">wxwork.approval</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="id"/>
+                        <field name="template_id"/>
+                        <field name="business_model" widget="many2many_tags"/>
+                    </group>
+                </sheet>
+<!--                <div class="oe_chatter">-->
+<!--                    <field name="message_follower_ids"/>-->
+<!--                    <field name="activity_ids"/>-->
+<!--                    <field name="message_ids" options="{'post_refresh': 'recipients'}"/>-->
+<!--                </div>-->
+            </form>
+        </field>
+    </record>
+
+    <record id="action_wxwork_approval" model="ir.actions.act_window">
+        <field name="name">审批</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">wxwork.approval</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                [审批记录] 还没有哦！点左上角的[创建]按钮，沙发归你了!
+            </p>
+            <p>
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+            id="menu_wxwork_approval"
+            name="审批"
+            sequence="1"
+            action="action_wxwork_approval"
+    />
+
+</odoo>