Merge branch 'master' into dev-pengyuthon

# Conflicts:
#	yuthon_approval/views/inherit_approval_category_views.xml

yuthon_approval/models/inherit_approval_category.py

@@ -13,7 +13,7 @@ class ApprovalCategory(models.Model):
     category_start_date = fields.Date(string="开始日期", default=fields.Date.today())
     category_end_date = fields.Date(string="结束日期")
 
-    approval_type = fields.Selection(
+    new_approval_type = fields.Selection(
         string='审批分类',
         selection=[('business', '业务单据'),
                    ('oa', 'OA审批'),
@@ -22,7 +22,7 @@ class ApprovalCategory(models.Model):
 
     def unlink(self):
         for res in self:
-            if res.biote_approval_type == 'business' or res.biote_approval_type == 'branch':
+            if res.new_approval_type == 'business' or res.new_approval_type == 'branch':
                 raise UserError('不允许删除业务/分支审批！')
         return super(ApprovalCategory, self).unlink()
 

yuthon_approval/views/inherit_approval_category_views.xml

@@ -19,6 +19,7 @@
         <field name="inherit_id" ref="approvals.approval_category_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='description']" position="after">
+                <field name="new_approval_type" />
                 <field name="approval_department_ids" widget="many2many_tags"/>
             </xpath>
             <xpath expr="//field[@name='approver_ids']" position="after">
@@ -28,7 +29,7 @@
     </record>
 
     <record id="approvals.approval_category_action_new_request" model="ir.actions.act_window">
-        <field name="domain">[('approval_type', '=', 'oa')]</field>
+        <field name="domain">[('new_approval_type', '=', 'oa')]</field>
     </record>
 
 </odoo>