diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py index 82c35eb5e..179662de8 100644 --- a/soong_workflow/models/soong_workflow_record.py +++ b/soong_workflow/models/soong_workflow_record.py @@ -103,7 +103,6 @@ class SoongWorkflowRecord(models.Model): def copy(self, default=None): default = default or {} default['code'] = False - default['name'] = False return super(SoongWorkflowRecord, self).copy(default=default) @api.depends('node_update_time', 'write_date2') diff --git a/yuthon_property_approval/models/property_fee_spending.py b/yuthon_property_approval/models/property_fee_spending.py index 781532dd9..0a3918489 100644 --- a/yuthon_property_approval/models/property_fee_spending.py +++ b/yuthon_property_approval/models/property_fee_spending.py @@ -30,6 +30,7 @@ class PropertyFeeSpending(models.Model): spending_fee = fields.Float(string="支付金额") pay_date = fields.Date(string="支付日期") expenses_type = fields.Many2one('yuthon.expenses.type', string="支出类型") + creart_datetime = fields.Date(string="创建日期", default=fields.Datetime.now) remake = fields.Text(string="备注") def _get_default_name_title(self): diff --git a/yuthon_property_approval/views/property_fee_spending_view.xml b/yuthon_property_approval/views/property_fee_spending_view.xml index c4cb20f42..427f66f3b 100644 --- a/yuthon_property_approval/views/property_fee_spending_view.xml +++ b/yuthon_property_approval/views/property_fee_spending_view.xml @@ -9,17 +9,18 @@ + - property.fee.spending.form - property.fee.spending - -
+ property.fee.spending.form + property.fee.spending + + + invisible="urgency_level != 'normal'"/> - -
+ +
+
+ + 费用支出搜索 + property.fee.spending + + + + + + + + + 费用支出 + property.fee.spending + tree,form - yuthon.expenses.type.tree - yuthon.expenses.type - - - - - + yuthon.expenses.type.tree + yuthon.expenses.type + + + + + \ No newline at end of file diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 0cb458894..9ff830707 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -926,6 +926,11 @@ name="对账(借)" parent="yuthon_financial_management_menu" action="yuthon_property.view_property_bank_statements_action_borrow"/> +