Permalink
Browse files

fix conflict

  • Loading branch information...
Musvol committed Jan 10, 2019
1 parent e7ebb92 commit 99e736496056adc75cde13cc16edc052cc2463ef
Showing with 0 additions and 5 deletions.
  1. +0 −5 addons/hr_payroll/views/hr_payslip_views.xml
@@ -77,13 +77,8 @@
<field name="employee_id"/>
<field name="date_from"/>
<field name="date_to"/>
<<<<<<< HEAD
<field name="basic_wage" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<field name="net_wage" widget="monetary" options="{'currency_field': 'currency_id'}"/>
=======
<field name="basic_wage"/>
<field name="net_wage"/>
>>>>>>> 538358a... [IMP] hr_payroll: reorganize menus layouts
<field name="state"/>
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
</tree>

0 comments on commit 99e7364

Please sign in to comment.