!3220 1

Merge pull request !3220 from 李鹏宇/dev
2025-06-11 07:24:21 +00:00
parent 6ae457f219 d36be00228
commit 1f1cfbf57c
2 changed files with 1 additions and 3 deletions
@@ -380,8 +380,7 @@ class YuthonHrEmployee(models.Model):

            record.is_accum_salary = True
            if record.entry_date:
-                # if record.entry_date.year == fields.Date.today().year and record.entry_date.month == fields.Date.today().month:
-                if record.entry_date.year == 2025 and record.entry_date.month == 1:
+                if record.entry_date.year == fields.Date.today().year and record.entry_date.month == fields.Date.today().month:
                    record.is_accum_salary = False

    @api.depends('open_start_time', 'interrupt_work_month')
@@ -18,7 +18,6 @@
    ],
    'assets': {
        'web.assets_backend': [
-            # 'yuthon_will_task/static/scss/yuthon_will_task.scss',
            'yuthon_will_task/static/src/js/task_create_button.js',
            'yuthon_will_task/static/src/xml/task_create_button.xml',
        ],