!2918 添加功能

Merge pull request !2918 from 李鹏宇/dev_zhou

soong_workflow/models/soong_workflow_record.py

@@ -17,7 +17,8 @@ class SoongWorkflowRecord(models.Model):
             '|',
             ('approve_state', '=', 'pending'),
             ('approve_state', '=', 'start'),
-            ('employee_ids', 'in', [self.env.user.employee_id.id])
+            ('employee_ids', 'in', [self.env.user.employee_id.id]),
+            ('reclaim_state', '=', False)
         ]
         return self.search_count(domain)
 

soong_workflow/views/soong_workflow_node_views.xml

@@ -13,7 +13,6 @@
                             <field name="name" placeholder="ex. 'Draft' or 'Direct Manager'" required="1"/>
                             <field name="node_name" placeholder="ex. 'draft' or 'direct_manager'" required="1"/>
                             <field name="department_id" widget="many2many_tags"/>
-                            <field name="is_concatenation"/>
                         </group>
                         <group>
                             <field name="sequence" required="1"/>
@@ -42,6 +41,9 @@
                             <field name="is_end"/>
                         </group>
                     </group>
+                    <group>
+                           <field name="is_concatenation"/>
+                    </group>
                     <notebook>
                         <page string="Buttons">
                              <button name="btn_role_sync"