From 9bc974c2f8f0c75b97905947f1f46dceb52aac0b Mon Sep 17 00:00:00 2001
From: jbm-odoo <jbm@odoo.com>
Date: Fri, 26 Apr 2019 13:37:08 +0000
Subject: [PATCH] [IMP] hr_expense: Add setting to install hr_payroll_expense

Add a boolean field in res config settings to install hr_expense_payroll.
Add demo data to allow expense validation easily without having to create
a journal

closes odoo/odoo#32988

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
---
 addons/hr_expense/data/hr_expense_demo.xml    | 20 +++++++++++++++++++
 addons/hr_expense/models/hr_expense.py        |  5 +----
 .../hr_expense/models/res_config_settings.py  |  2 ++
 .../views/res_config_settings_views.xml       | 14 +++++++++++++
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml
index b3ea6145ab7..0a171e015a7 100644
--- a/addons/hr_expense/data/hr_expense_demo.xml
+++ b/addons/hr_expense/data/hr_expense_demo.xml
@@ -6,6 +6,14 @@
             <field name="address_home_id" ref="base.res_partner_address_3"/>
         </record>
 
+        <record id="hr_expense_account_journal" model="account.journal">
+            <field name="name">Expense</field>
+            <field name="code">EXP</field>
+            <field name="type">purchase</field>
+            <!-- avoid being selected as default journal -->
+            <field name="sequence">99</field>
+        </record>
+
         <record id="res_partner_address_fp" model="res.partner">
             <field name="name">Pieter Parter's Farm</field>
             <field name="parent_id" eval="ref('base.partner_root')"/>
@@ -21,6 +29,18 @@
             <field name="address_home_id" ref="res_partner_address_fp"/>
         </record>
 
+        <record id="hr.employee_qdp" model="hr.employee">
+            <field name="address_home_id" ref="res_partner_address_fp"/>
+        </record>
+
+        <record id="hr.employee_fme" model="hr.employee">
+            <field name="address_home_id" ref="res_partner_address_fp"/>
+        </record>
+
+        <record id="hr.employee_al" model="hr.employee">
+            <field name="address_home_id" ref="res_partner_address_fp"/>
+        </record>
+
         <record id="car_travel" model="product.product">
             <field name="list_price">0.50</field>
             <field name="standard_price">0.32</field>
diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index e3e643428b8..0cc16d9d070 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -614,10 +614,7 @@ class HrExpenseSheet(models.Model):
 
     @api.model
     def _default_journal_id(self):
-        journal = self.env.ref('hr_expense.hr_expense_account_journal', raise_if_not_found=False)
-        if not journal:
-            journal = self.env['account.journal'].search([('type', '=', 'purchase')], limit=1)
-        return journal.id
+        return self.env['account.journal'].search([('type', '=', 'purchase')], limit=1).id
 
     @api.model
     def _default_bank_journal_id(self):
diff --git a/addons/hr_expense/models/res_config_settings.py b/addons/hr_expense/models/res_config_settings.py
index 5edada30752..43c4de7ef09 100644
--- a/addons/hr_expense/models/res_config_settings.py
+++ b/addons/hr_expense/models/res_config_settings.py
@@ -10,6 +10,8 @@ class ResConfigSettings(models.TransientModel):
     use_mailgateway = fields.Boolean(string='Let your employees record expenses by email',
                                      config_parameter='hr_expense.use_mailgateway')
 
+    module_hr_payroll_expense = fields.Boolean(string='Reimburse Expenses in Payslip')
+
     @api.model
     def get_values(self):
         res = super(ResConfigSettings, self).get_values()
diff --git a/addons/hr_expense/views/res_config_settings_views.xml b/addons/hr_expense/views/res_config_settings_views.xml
index 26140494651..3f957c84e40 100644
--- a/addons/hr_expense/views/res_config_settings_views.xml
+++ b/addons/hr_expense/views/res_config_settings_views.xml
@@ -36,6 +36,20 @@
                                 </div>
                             </div>
                         </div>
+                        <h2>Reimbursement</h2>
+                        <div class="row mt16 o_settings_container" id="hr_payroll_accountant">
+                            <div class="col-lg-6 col-12 o_setting_box">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_hr_payroll_expense" widget="upgrade_boolean"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="module_hr_payroll_expense" string="Reimburse Expenses in Payslip"/>
+                                    <div class="text-muted">
+                                        Expenses can be reimbursed in payslips.
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </xpath>
             </field>