!6759 添加功能

Merge pull request !6759 from 李鹏宇/dev_zhou

yuthon_account_report/models/financial_sheet_collection.py

@@ -7,9 +7,9 @@ class FinancialSheetCollection(models.Model):
     _description = '财务数据表收集'
 
     employee_id = fields.Many2one('hr.employee', string='人员')
-    company_id = fields.Many2one('res.company', string='公司')
-    department_id = fields.Many2one('hr.department', string="部门")
-    user_role_id = fields.Many2one('soong.user.role', string="角色")
+    company_id = fields.Many2one(related='employee_id.company_id', string='公司')
+    department_id = fields.Many2one(related='employee_id.department_id', string="部门")
+    user_role_id = fields.Many2one(related='employee_id.user_role_id', string="角色")
     create_date = fields.Datetime(string='创建日期', default=fields.Datetime.now)
     account_type = fields.Selection([('to', '待确认',), ('ok', '已确认')], string='状态', default='to')
     sheet_line_ids = fields.One2many('financial.sheet.line', 'sheet_id', string='财务数据表行')

yuthon_account_report/models/information_summary_table.py

@@ -8,11 +8,12 @@ class InformationSummaryTable(models.Model):
     _description = '信息汇总表收集'
 
     employee_id = fields.Many2one('hr.employee', string='人员')
-    company_id = fields.Many2one('res.company', string='公司')
-    department_id = fields.Many2one('hr.department', string="部门")
-    user_role_id = fields.Many2one('soong.user.role', string="角色")
+    company_id = fields.Many2one(related='employee_id.company_id', string='公司')
+    department_id = fields.Many2one(related='employee_id.department_id', string="部门")
+    user_role_id = fields.Many2one(related='employee_id.user_role_id', string="角色")
     account_type = fields.Selection([('to', '待确认', ), ('ok', '已确认')], string='状态', default='to')
     summary_line = fields.One2many('information.summary.line', 'summary_id', string='汇总表')
+    create_date = fields.Datetime(string='创建日期', default=fields.Datetime.now)
 
     def open_record(self):
         return {

yuthon_account_report/views/financial_sheet_collection_views.xml

@@ -4,16 +4,16 @@
         <field name="name">financial.sheet.collection.tree</field>
         <field name="model">financial.sheet.collection</field>
         <field name="arch" type="xml">
-            <tree string="财务数据表收集" editable="bottom">
-                <field name="employee_id"/>
+            <tree string="财务数据表收集" editable="bottom" create="False" delete="False"
+                        decoration-danger="account_type == 'to'"
+                       decoration-success="account_type == 'ok'"
+            >
+                <field name="employee_id" required="1"/>
                 <field name="company_id"/>
                 <field name="department_id"/>
                 <field name="user_role_id"/>
-                <field name="create_date"/>
-                <field name="account_type"
-                       decoration-danger="account_type == 'to'"
-                       decoration-success="account_type == 'ok'"
-                />
+                <field name="account_type"/>
+                <field name="create_date" readonly="1"/>
                 <button name="button_put" string="发送" type="object" class="oe_highlight"
                         invisible="account_type == 'ok'"/>
                 <button name="open_record" type="object" string="详情" class="btn-primary"/>
@@ -34,7 +34,7 @@
                         </group>
                         <group>
                             <field name="user_role_id"/>
-                            <field name="create_date"/>
+                             <field name="create_date" readonly="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -42,8 +42,8 @@
                             <field name="sheet_line_ids" mode="kanban,tree"
                                    context="{'kanban_view_ref':'yuthon_account_report.financial_sheet_line_kanban'}">
                                 <tree editable="bottom">
-                                    <field name="sheet_id" column_invisible="1"/>
-                                    <field name="collection_id"/>
+                                    <field name="sheet_id" column_invisible="1" />
+                                    <field name="collection_id" required="1"/>
                                     <field name="this_issue_number"/>
                                     <field name="same_last_year"/>
                                     <field name="remake"/>

yuthon_account_report/views/information_summary_table_views.xml

@@ -4,15 +4,16 @@
         <field name="name">information.summary.table.tree</field>
         <field name="model">information.summary.table</field>
         <field name="arch" type="xml">
-            <tree string="信息汇总表" editable="bottom">
-                <field name="employee_id"/>
+            <tree string="信息汇总表" editable="bottom"  create="False" delete="False"
+                   decoration-danger="account_type == 'to'"
+                   decoration-success="account_type == 'ok'"
+            >
+                <field name="employee_id" required="1"/>
                 <field name="company_id"/>
                 <field name="department_id"/>
                 <field name="user_role_id"/>
-                <field name="account_type"
-                       decoration-danger="account_type == 'to'"
-                       decoration-success="account_type == 'ok'"
-                />
+                <field name="account_type"/>
+                <field name="create_date"/>
                 <button name="button_put" string="发送" type="object" class="oe_highlight"
                         invisible="account_type == 'ok'"/>
                 <button name="open_record" type="object" string="详情" class="btn-primary"/>
@@ -33,6 +34,7 @@
                         <group>
                             <field name="department_id"/>
                             <field name="user_role_id"/>
+                            <field name="create_date" readonly="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -41,7 +43,7 @@
                                 <tree editable="bottom"
                                       context="{'kanban_view_ref':'yuthon_account_report.information_summary_line_kanban'}">
                                     <field name="summary_id" column_invisible="1"/>
-                                    <field name="table_id"/>
+                                    <field name="table_id" required="1"/>
                                     <field name="this_year"/>
                                     <field name="remake"/>
                                 </tree>