From 59636caebae77a527b1e62f85b6a741d4ef029d9 Mon Sep 17 00:00:00 2001
From: Gert Pellin <gpe@odoo.com>
Date: Thu, 17 May 2018 13:19:44 +0200
Subject: [PATCH] [imp] sale_expense: Make expenses re-invoicing easier

Change the data of the product Expenses : https://drive.google.com/a/odoo.com/file/d/1N0jW9QDQ35-5EY13fAsDIwuW8HHUXi-3/view?usp=drivesdk
When creating a new expense product from the Expense app, the invoicing information should be Delivered and At cost by default  https://drive.google.com/a/odoo.com/file/d/1IoqYU8I5MBaeabQJOvQoO-NQl1RK2yPy/view?usp=drivesdk

project : RD for Dummies
task : [Expense] EXP product
---
 addons/sale_expense/__manifest__.py                  |  3 ++-
 addons/sale_expense/data/sale_expense_data.xml       | 10 ++++++++++
 addons/sale_expense/{ => data}/sale_expense_demo.xml |  0
 addons/sale_expense/views/product_view.xml           |  6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 addons/sale_expense/data/sale_expense_data.xml
 rename addons/sale_expense/{ => data}/sale_expense_demo.xml (100%)

diff --git a/addons/sale_expense/__manifest__.py b/addons/sale_expense/__manifest__.py
index 0700edc6772..8f1ccc7d6e8 100644
--- a/addons/sale_expense/__manifest__.py
+++ b/addons/sale_expense/__manifest__.py
@@ -18,11 +18,12 @@ This module allow to reinvoice employee expense, by setting the SO directly on t
     'data': [
         'security/ir.model.access.csv',
         'security/sale_expense_security.xml',
+        'data/sale_expense_data.xml',
         'views/product_view.xml',
         'views/hr_expense_views.xml',
         'views/sale_order_views.xml',
     ],
-    'demo': ['sale_expense_demo.xml'],
+    'demo': ['data/sale_expense_demo.xml'],
     'test': [],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_expense/data/sale_expense_data.xml b/addons/sale_expense/data/sale_expense_data.xml
new file mode 100644
index 00000000000..e8f85810f4b
--- /dev/null
+++ b/addons/sale_expense/data/sale_expense_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="hr_expense.product_product_fixed_cost" model="product.product">
+            <field name="invoice_policy">delivery</field>
+            <field name="expense_policy">cost</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/sale_expense/sale_expense_demo.xml b/addons/sale_expense/data/sale_expense_demo.xml
similarity index 100%
rename from addons/sale_expense/sale_expense_demo.xml
rename to addons/sale_expense/data/sale_expense_demo.xml
diff --git a/addons/sale_expense/views/product_view.xml b/addons/sale_expense/views/product_view.xml
index 71117e25137..10c91862ac8 100644
--- a/addons/sale_expense/views/product_view.xml
+++ b/addons/sale_expense/views/product_view.xml
@@ -14,4 +14,10 @@
             </xpath>
         </field>
     </record>
+
+    <record id="hr_expense.hr_expense_product" model="ir.actions.act_window">
+        <field name="context">{"default_can_be_expensed": 1, 'default_type': 'service',
+            'default_invoice_policy':'delivery', 'default_expense_policy' : 'cost'}</field>
+    </record>
+
 </odoo>