From 9f35ae0602951d8ecde141ca19dd27932cb0f991 Mon Sep 17 00:00:00 2001
From: jem-odoo <jem@openerp.com>
Date: Tue, 14 Nov 2017 15:13:40 +0100
Subject: [PATCH] [MOV] hr_expense: move files to fit guidelines

---
 addons/hr_expense/__manifest__.py             |   7 +-
 addons/hr_expense/data/hr_expense_data.xml    |   8 ++
 ...xpense_sheet.xml => hr_expense_report.xml} |   0
 .../views/{hr_expense.xml => assets.xml}      |   6 -
 ..._dashboard.xml => hr_department_views.xml} |   0
 addons/hr_expense/views/report_expense.xml    | 119 ------------------
 6 files changed, 11 insertions(+), 129 deletions(-)
 rename addons/hr_expense/report/{report_expense_sheet.xml => hr_expense_report.xml} (100%)
 rename addons/hr_expense/views/{hr_expense.xml => assets.xml} (54%)
 rename addons/hr_expense/views/{hr_dashboard.xml => hr_department_views.xml} (100%)
 delete mode 100644 addons/hr_expense/views/report_expense.xml

diff --git a/addons/hr_expense/__manifest__.py b/addons/hr_expense/__manifest__.py
index d67cc4ee6a2..d1f3ab98f1d 100644
--- a/addons/hr_expense/__manifest__.py
+++ b/addons/hr_expense/__manifest__.py
@@ -36,10 +36,9 @@ This module also uses analytic accounting and is compatible with the invoice on
         'wizard/hr_expense_sheet_register_payment.xml',
         'views/hr_expense_views.xml',
         'security/ir_rule.xml',
-        'report/report_expense_sheet.xml',
-        'views/hr_dashboard.xml',
-        'views/account_journal_dashboard.xml',
-        'views/hr_expense.xml',
+        'report/hr_expense_report.xml',
+        'views/hr_department_views.xml',
+        'views/assets.xml',
         'views/res_config_settings_views.xml',
     ],
     'demo': ['data/hr_expense_demo.xml'],
diff --git a/addons/hr_expense/data/hr_expense_data.xml b/addons/hr_expense/data/hr_expense_data.xml
index 100282658a8..45dcc2738f9 100644
--- a/addons/hr_expense/data/hr_expense_data.xml
+++ b/addons/hr_expense/data/hr_expense_data.xml
@@ -62,5 +62,13 @@
             <field name="sequence" eval="10"/>
         </record>
 
+        <!-- Email Templates -->
+        <template id="hr_expense_template_refuse_reason">
+            <p>Your Expense <t t-if="is_sheet">Report </t><t t-esc="name"/> has been refused</p>
+            <ul class="o_timeline_tracking_value_list">
+                <li>Reason : <t t-esc="reason"/></li>
+            </ul>
+        </template>
+
     </data>
 </odoo>
diff --git a/addons/hr_expense/report/report_expense_sheet.xml b/addons/hr_expense/report/hr_expense_report.xml
similarity index 100%
rename from addons/hr_expense/report/report_expense_sheet.xml
rename to addons/hr_expense/report/hr_expense_report.xml
diff --git a/addons/hr_expense/views/hr_expense.xml b/addons/hr_expense/views/assets.xml
similarity index 54%
rename from addons/hr_expense/views/hr_expense.xml
rename to addons/hr_expense/views/assets.xml
index 48517345dcd..01ca1efbc01 100644
--- a/addons/hr_expense/views/hr_expense.xml
+++ b/addons/hr_expense/views/assets.xml
@@ -6,11 +6,5 @@
                 <script type="text/javascript" src="/hr_expense/static/src/js/tour.js"></script>
             </xpath>
         </template>
-        <template id="hr_expense_template_refuse_reason">
-            <p>Your Expense <t t-if="is_sheet">Report </t><t t-esc="name"/> has been refused</p>
-            <ul class="o_timeline_tracking_value_list">
-                <li>Reason : <t t-esc="reason"/></li>
-            </ul>
-        </template>
     </data>
 </odoo>
diff --git a/addons/hr_expense/views/hr_dashboard.xml b/addons/hr_expense/views/hr_department_views.xml
similarity index 100%
rename from addons/hr_expense/views/hr_dashboard.xml
rename to addons/hr_expense/views/hr_department_views.xml
diff --git a/addons/hr_expense/views/report_expense.xml b/addons/hr_expense/views/report_expense.xml
deleted file mode 100644
index e179edbcb9e..00000000000
--- a/addons/hr_expense/views/report_expense.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<template id="report_expense">
-    <t t-call="web.html_container">
-        <t t-foreach="get_expenses()" t-as="o">
-            <t t-call="web.external_layout">
-                <div class="page">
-                    <h2>HR Expenses</h2>
-
-                    <div class="row mt32 mb32">
-                        <div class="col-xs-3">
-                            <strong>Employee:</strong>
-                            <p t-esc="o['employee_name']"/>
-                        </div>
-                        <div class="col-xs-3">
-                            <strong>Manager:</strong>
-                            <p t-esc="o['validator_name']"/>
-                        </div>
-                        <div class="col-xs-3">
-                            <strong>Status:</strong>
-                            <p t-esc="o['state']"/>
-                        </div>
-                        <div class="col-xs-3">
-                            <strong>Currency:</strong>
-                            <p t-field="o['currency'].name"/>
-                        </div>
-                    </div>
-
-                    <table class="table table-condensed">
-                        <thead>
-                            <tr>
-                                <th>Date</th>
-                                <th>Name</th>
-                                <th>Unit Price</th>
-                                <th class="text-center">Qty</th>
-                                <th groups="product.group_uom">UoM</th>
-                                <th>Taxe(s)</th>
-                                <th class="text-right">Price</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <t t-foreach="o['lines']" t-as="line">
-                                <tr>
-                                    <td>
-                                        <span t-field='line.date'/>
-                                        <t t-if="line.description">
-                                            <sup><span t-esc="o['notes_index'][line.id]"/></sup>
-                                        </t>
-                                    </td>
-                                    <td>
-                                        <span t-field="line.name"/> 
-                                        <t t-if="line.analytic_account_id.name">
-                                            (<span t-field="line.analytic_account_id.name"/>)
-                                        </t>
-                                    </td>
-                                    <td>
-                                        <span t-field="line.unit_amount" 
-                                            t-options='{"widget": "monetary", "display_currency": line.currency_id}'/>
-                                    </td>
-                                    <td class="text-center">
-                                        <span t-field="line.quantity"/>
-                                    </td>
-                                    <td groups="product.group_uom">
-                                        <span t-field="line.product_uom_id"/>
-                                    </td>
-                                    <td>
-                                        <t t-foreach="line.tax_ids" t-as="tax">
-                                          <t t-if="tax.description">
-                                            <span t-field="tax.description"/>
-                                          </t>
-                                          <t t-if="not tax.description">
-                                            <span t-field="tax.name"/>
-                                          </t>
-                                        </t>
-                                    </td>
-                                    <td class="text-right">
-                                        <span t-field="line.total_amount"
-                                            t-options='{"widget": "monetary", "display_currency": line.currency_id}'/>
-                                    </td>
-                                </tr>
-                            </t>
-                        </tbody>
-                    </table>
-
-                    <div class="row">
-                        <div class="col-xs-4 pull-right">
-                            <table class="table table-condensed">
-                                <tr class="border-black">
-                                    <td><strong>Total</strong></td>
-                                    <td class="text-right">
-                                        <span t-esc="formatLang(o['total_amount'], currency_obj=o['currency'])"/>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                    </div>
-                    <t t-foreach="o['notes']" t-as="note">
-                        <span t-esc="note['index']"/>. <span t-esc="note['description']"/>
-                        <br/>
-                    </t>
-                    <br/>
-                    <br/>
-                    <p>Certified honest and conform,<br/>(Date and signature).<br/><br/></p>
-                    <p>This document must be dated and signed for reimbursement.</p>
-                </div>
-            </t>
-        </t>
-    </t>
-</template>
-
-<report
-    id="action_report_hr_expense"
-    string="HR Expense"
-    model="hr.expense"
-    report_type="qweb-pdf"
-    name="hr_expense.report_expense"
-    file="hr_expense.report_expense"
-/>
-</odoo>