Merge branch 'master' into dev_zhou

Merge pull request !4 from 李鹏宇/pengyuthon-dev

hr_payroll/models/hr_contract.py

@@ -23,6 +23,15 @@ class HrContract(models.Model):
         ('weekly', 'Weekly'),
         ('daily', 'Daily')],
         compute='_compute_schedule_pay', store=True, readonly=False)
+
+    state = fields.Selection([
+        ('draft', 'New'),
+        ('open', 'Running'),
+        ('close', 'Expired'),
+        ('cancel', '中止')
+    ], string='Status', group_expand='_expand_states', copy=False,
+        tracking=True, help='Status of the contract', default='draft')
+
     resource_calendar_id = fields.Many2one(required=True, default=lambda self: self.env.company.resource_calendar_id,
         help="Employee's working schedule.")
     hours_per_week = fields.Float(related='resource_calendar_id.hours_per_week')

planning/views/planning_views.xml

@@ -6,7 +6,7 @@
         <field name="model">planning.slot</field>
         <field name="arch" type="xml">
             <tree string="Shift List" multi_edit="1" sample="1" editable="bottom" js_class="planning_tree" open_form_view="True">
-                <header>
+                    <header>
                     <button name="action_planning_publish_and_send" class="btn btn-secondary mx-1"
                         string="Publish &amp; Send" type="object" groups="planning.group_planning_manager" invisible="context.get('search_default_my_shifts')"/>
                 </header>