!7373 添加功能

Merge pull request !7373 from 李鹏宇/dev_zhou

yuthon_hr_employee_approval/models/contract_review_approval.py

@@ -16,6 +16,10 @@ class ContractReviewApproval(models.Model):
     department_id = fields.Many2one('hr.department', string='送审部门')
     amount = fields.Float(string='合同金额')
     remarks = fields.Text(string='情况说明')
+    purchase_type = fields.Selection(
+        [('fixed', '固定资产'), ('low', '低值易耗'), ('service', '服务'), ('day', '日常消耗品')],
+        string="采购类型", required=True, default='fixed')
+
     documents_ids = fields.Many2many('ir.attachment', string="附件")
     urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度',
                                      default='normal')

yuthon_hr_employee_approval/views/contract_review_approval_views.xml

@@ -51,6 +51,7 @@
                             <field name="contract_type"/>
                         </group>
                         <group>
+                            <field name="purchase_type"/>
                             <field name="amount"/>
                         </group>
                     </group>

yuthon_property/data/yuthon_new_property.xml

@@ -44,7 +44,7 @@
             <field name="name">定时任务:更新电表停用状态</field>
             <field name="model_id" ref="model_property_meter_archives"/>
             <field name="state">code</field>
-            <field name="code">model.update_ele_state</field>
+            <field name="code">model.update_ele_state()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
@@ -57,7 +57,7 @@
             <field name="name">定时任务:更新水表停用状态</field>
             <field name="model_id" ref="model_property_meter_water"/>
             <field name="state">code</field>
-            <field name="code">model.update_water_state</field>
+            <field name="code">model.update_water_state()</field>
             <field eval="True" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>

yuthon_trade/views/yuthon_business_approval_viwes.xml

@@ -46,13 +46,13 @@
                     <group string="审批事项">
                         <field name="is_back" invisible="1"/>
                         <field name="work_end" invisible="1"/>
-                        <field name="name"/>
+                        <field name="name" string="事项标题"/>
                         <field name="users_id"/>
+                        <field name="information_categories_ids" widget="many2many_tags" string="业务类型"/>
+                        <field name="reason" string="事项说明"/>
+                        <field name="document_ids" widget="preview_many2many" string="附件清单"/>
                         <field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
                         <field name="scope_chapter_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}" invisible="is_chapter == 'no' or not is_chapter"/>
-                        <field name="information_categories_ids" widget="many2many_tags"/>
-                        <field name="reason"/>
-                        <field name="document_ids" widget="preview_many2many"/>
                         <field name="department_id" invisible="1"/>
                     </group>
                 </sheet>