!2245 添加功能

Merge pull request !2245 from 李鹏宇/dev_zhou

yuthon_salary/models/yuthon_payroll_project.py

@@ -20,6 +20,7 @@ class YuthonPayrollCommon(models.Model):
     end_date = fields.Date(string="失效日期")
     before_tax = fields.Boolean(string="税前")
     is_enable = fields.Boolean(string="启用", default=True)
+    attributes = fields.Selection([('increment', '增'), ('deduction', '减')], string="工资项属性", default='increment')
 
     @api.onchange('payroll_type_ids')
     def _onchange_payroll_type_ids(self):
@@ -97,6 +98,7 @@ class YuthonPayrollTemporary(models.Model):
     yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储')],
                                       string='公司')
     department_id = fields.Many2one('hr.department', string="部门")
+    attributes = fields.Selection([('increment', '增'), ('deduction', '减')], string="工资项属性", default='increment')
     is_before_tax = fields.Boolean(string="税前")
     start_date = fields.Date(string="生效日期", default=fields.Date.today())
     end_date = fields.Date(string="失效日期")

yuthon_salary/views/yuthon_payroll_project_views.xml

@@ -8,6 +8,7 @@
                 <field name="sequence"/>
                 <field name="name"/>
                 <field name="before_tax"/>
+                <field name="attributes"/>
                 <field name="yuthon_company"/>
                 <field name="department_id"/>
                 <field name="conditional_formulas"/>
@@ -37,6 +38,7 @@
         <field name="arch" type="xml">
             <tree string="临时工资项" editable="bottom">
                 <field name="name"/>
+                <field name="attributes"/>
                 <field name="yuthon_company"/>
                 <field name="department_id"/>
                 <field name="is_before_tax"/>