diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index dd0e6238a..4014b9198 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -850,9 +850,9 @@ class SoongWorkflowMixin(models.AbstractModel): field_attrs.group_ids or field_attrs.user_ids ): invisible_arr.append(node.node_name) - if self.env.user.has_group("soong_workflow.group_soong_workflow_manager"): - field_inst.set("readonly", "0") - else: + # if self.env.user.has_group("soong_workflow.group_soong_workflow_manager"): + # field_inst.set("readonly", "0") + # else: # Set Attributes # if self.state in readonly_arr : # field_inst.set("readonly", "1") diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index ba4cdf289..4f586e452 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -68,9 +68,9 @@ class PropertyLeaseContract(models.Model): active = fields.Boolean('Active', default=True, tracking=True) lease_term = fields.Float(string="租期") - lease_term_year = fields.Integer(string="租期(年)",default=lambda self: datetime.now().year) - lease_term_month = fields.Integer(string="租期(月)",default=lambda self: datetime.now().month) - lease_term_day = fields.Integer(string="租期(日)",default=lambda self: datetime.now().day) + lease_term_year = fields.Integer(string="租期(年)") + lease_term_month = fields.Integer(string="租期(月)") + lease_term_day = fields.Integer(string="租期(日)") term_start_time = fields.Date(string="合约开始时间", default=fields.Datetime.now) term_end_time = fields.Date(string="合约结束时间") actual_start_time = fields.Date(string="实际开始时间") @@ -447,6 +447,7 @@ class PropertyLeaseContract(models.Model): # todo 还没有计算递增递减 # todo 还没有计算首月优惠 # todo 还没有计算开始和结束不足月份和季度的计算比例 + for record in self: if record.term_start_time and record.term_end_time: record.write({'breakdown_ids': [(5, 0, 0)]})