!7105 !7104 添加功能

Merge pull request !7105 from 李鹏宇/dev

soong_workflow/models/soong_workflow_record.py

@@ -229,19 +229,18 @@ class SoongWorkflowRecord(models.Model):
     @api.model
     def get_view(self, view_id=None, view_type='form', **options):
         """在视图加载时检查当前用户是否在经办人列表中，并更新状态"""
-        if options.get('action_id') == 3236 or options.get('action_id') == 3996:
-            current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
-            if current_employee:
-                all_records = self.search([])
-                # 更新当前用户经办的记录为"待办"
-                user_records = all_records.search([
-                    ('employee_ids', 'in', current_employee.id),
-                ])
-                user_records.write({'soong_state': 'to_do'})
+        current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
+        if current_employee:
+            all_records = self.search([])
+            # 更新当前用户经办的记录为"待办"
+            user_records = all_records.search([
+                ('employee_ids', 'in', current_employee.id),
+            ])
+            user_records.write({'soong_state': 'to_do'})
 
-                # 更新其他记录为"已办"
-                other_records = all_records - user_records
-                other_records.write({'soong_state': 'done'})
+            # 更新其他记录为"已办"
+            other_records = all_records - user_records
+            other_records.write({'soong_state': 'done'})
 
         return super(SoongWorkflowRecord, self).get_view(view_id, view_type, **options)
 

soong_workflow/views/soong_workflow_record.xml

@@ -188,17 +188,17 @@
                 </tree>
             </field>
         </record>
-        <record id="soong_workflow_record_my_action" model="ir.actions.act_window">
-            <field name="name">我的流程</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">soong.workflow.record</field>
-            <field name="view_mode">tree,kanban,search</field>
-<!--            <field name="context">{'check_employee': 1, 'search_default_is_start':1, 'search_default_is_to_do':1}</field>-->
-            <field name="context">{'header_search_default_approve_state': 1, 'header_search_default_to_do':1, 'check_employee': 1}</field>
-            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False)]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search"/>
-            <field name="view_id" ref="soong_workflow_record_my_tree"/>
-        </record>
+<!--        <record id="soong_workflow_record_my_action" model="ir.actions.act_window">-->
+<!--            <field name="name">我的流程</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">soong.workflow.record</field>-->
+<!--            <field name="view_mode">tree,kanban,search</field>-->
+<!--&lt;!&ndash;            <field name="context">{'check_employee': 1, 'search_default_is_start':1, 'search_default_is_to_do':1}</field>&ndash;&gt;-->
+<!--            <field name="context">{'header_search_default_approve_state': 1, 'header_search_default_to_do':1, 'check_employee': 1}</field>-->
+<!--            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False)]</field>-->
+<!--            <field name="search_view_id" ref="soong_workflow_record_search"/>-->
+<!--            <field name="view_id" ref="soong_workflow_record_my_tree"/>-->
+<!--        </record>-->
         <record id="soong_workflow_record_todo_action" model="ir.actions.act_window">
             <field name="name">待办</field>
             <field name="type">ir.actions.act_window</field>

yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py

@@ -43,7 +43,7 @@ class YuthonReassignmentApproval(models.Model):
     #异动信息
     change_kind = fields.Selection([('promoted', '晋升'), ('demoted', '降职'), ('leveling', '平级调整'), ('seconded', '借调')], default="promoted", string="异动类型")
     change_reason = fields.Text(string="异动原因")
-    change_company_id = fields.Many2one('res.company', string="异动公司", default=lambda self: self.env.user.company_id)
+    change_company_id = fields.Many2one('res.company', string="异动公司")
     change_date = fields.Date(string="调动日期", default=lambda self: fields.Date.today())
     handover_date = fields.Date(string="移交日期", default=lambda self: fields.Date.today())
     handover_person_id = fields.Many2one("hr.employee", string="工作交接人")

yuthon_purchase/data/process_code_data.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+     <record id="purchase_workflow_approval_code" model="ir.sequence">
+        <field name="name">采购订单-编号</field>
+        <field name="code">purchase_workflow_approval_code</field>
+        <field name="prefix">CGOU%(y)s%(month)s%(day)s</field>
+        <field name="padding">3</field>
+        <field name="company_id" eval="False"/>
+    </record>
+</odoo>

yuthon_purchase/models/purchase_workflow.py

@@ -7,7 +7,7 @@ class PurchaseWorkflow(models.Model):
     _description = '采购审批单'
     _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
 
-    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_order_sequence_code'))
+    code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_workflow_approval_code'))
     name = fields.Char(string="标题")
     name_title = fields.Char(string="默认标题", default=lambda self: self._description, readonly=True)
     user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user, required=True)

yuthon_work_brand/views/hr_menus.xml

@@ -671,21 +671,21 @@
               parent="holiday_manage_menu_root_board"
               action="soong_workflow.action_kklw_workflow_approval_request"
               sequence="1"/>
-    <menuitem id="menu_workflow_approval_request_my_start"
-              name="我的流程"
-              parent="holiday_manage_menu_root_board"
-              action="soong_workflow.soong_workflow_record_my_action"
-              sequence="2"/>
+<!--    <menuitem id="menu_workflow_approval_request_my_start"-->
+<!--              name="我的流程"-->
+<!--              parent="holiday_manage_menu_root_board"-->
+<!--              action="soong_workflow.soong_workflow_record_my_action"-->
+<!--              sequence="2"/>-->
     <menuitem id="menu_soong_workflow_todo_record"
               name="待办"
               parent="holiday_manage_menu_root_board"
               action="soong_workflow.soong_workflow_record_todo_action"
-              sequence="5"/>
+              sequence="4"/>
     <menuitem id="menu_soong_workflow_done_record"
               name="已办"
               parent="holiday_manage_menu_root_board"
               action="soong_workflow.soong_workflow_record_done_action"
-              sequence="7"/>
+              sequence="4"/>
 
     <menuitem id="yuthon_notice_menu1_board"
               parent="holiday_manage_menu_root_board"