diff --git a/__manifest__.py b/__manifest__.py index c4d6410b2970461f267b248a4e242bd32e78f083..981d78893279424a888d42cb399aec5475f6ae56 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -16,6 +16,7 @@ "security/ir.model.access.csv", "security/security_rules.xml", "views/hr_expense.xml", + "views/hr_expense_sheet.xml", "views/hr_timesheet.xml", "views/product.xml", ], diff --git a/i18n/fr.po b/i18n/fr.po index 2a433212984cbdbcf58099b5a598be3c069e0969..620feca0e85045d9a573f12b29aeaaefc8821bcd 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -1,6 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * cgscop_expense +# * hr_expense # msgid "" msgstr "" @@ -17,7 +18,9 @@ msgstr "" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.hr_expense_actions_my_unsubmitted +#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_my_expenses_to_submit +#: model_terms:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter msgid "My Expenses" msgstr "Mes dépenses" @@ -27,3 +30,44 @@ msgstr "Mes dépenses" msgid "My Expense Reports" msgstr "Mes notes de frais" +#. module: hr_expense +#: model_terms:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter +msgid "To report" +msgstr "À soumettre" + +#. module: hr_expense +#: model:ir.actions.server,name:hr_expense.hr_expense_submit_action_server +msgid "Submit Report" +msgstr "Créer une note de frais" + +#. module: hr_expense +#: model_terms:ir.ui.view,arch_db:hr_expense.hr_expense_view_form +msgid "Create Report" +msgstr "Créer une note de frais" + +#. module: cgscop_expense +#: model:ir.model,name:cgscop_expense.model_account_analytic_line +msgid "Analytic Line" +msgstr "Ligne analytique" + +#. module: cgscop_expense +#: model:ir.model.fields,field_description:cgscop_expense.field_account_analytic_line__company_currency_id +msgid "Company Currency" +msgstr "Devise de la société" + +#. module: cgscop_expense +#: model:ir.model,name:cgscop_expense.model_hr_employee +msgid "Employee" +msgstr "Employé" + +#. module: cgscop_expense +#: model:ir.model,name:cgscop_expense.model_hr_expense +msgid "Expense" +msgstr "Dépense" + +#. module: cgscop_expense +#: model:ir.model,name:cgscop_expense.model_product_template +msgid "Product Template" +msgstr "Modèle d'article" + + diff --git a/views/hr_expense.xml b/views/hr_expense.xml index 5b212c5d80d4b4eb9fde139e499ba4e099a92eb0..467d8bbcb2766abd981b4692704db8882aa1856c 100644 --- a/views/hr_expense.xml +++ b/views/hr_expense.xml @@ -5,12 +5,15 @@ <odoo> <data> - <!-- Agenda Tree View --> + <!-- Frais Tree View --> <record id="view_hr_expense_cgscop_tree_inherited" model="ir.ui.view"> <field name="name">hr.expense.cgscop.tree</field> <field name="model">hr.expense</field> <field name="inherit_id" ref="hr_expense.view_expenses_tree"/> <field name="arch" type="xml"> + <xpath expr="//tree" position="attributes"> + <attribute name="import">False</attribute> + </xpath> <field name="analytic_account_id" position="attributes" options="{'no_open': True, 'no_create': True}"> <attribute name="string">Code activité UR</attribute> <attribute name="groups"></attribute> @@ -84,5 +87,17 @@ </field> </record> + <!-- Frais Kanban View --> + <record id="view_hr_expense_cgscop_kanban_inherited" model="ir.ui.view"> + <field name="name">hr.expense.cgscop.kanban</field> + <field name="model">hr.expense</field> + <field name="inherit_id" ref="hr_expense.hr_expense_kanban_view"/> + <field name="arch" type="xml"> + <xpath expr="//kanban" position="attributes"> + <attribute name="import">False</attribute> + </xpath> + </field> + </record> + </data> </odoo> diff --git a/views/hr_expense_sheet.xml b/views/hr_expense_sheet.xml new file mode 100644 index 0000000000000000000000000000000000000000..8bc1f1f8c06202532c6df6839bf31a67e6ae7186 --- /dev/null +++ b/views/hr_expense_sheet.xml @@ -0,0 +1,33 @@ +<?xml version="1.0"?> +<!-- Copyright 2019 Le Filament + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> + +<odoo> + <data> + + <!-- Note de Frais Tree View --> + <record id="view_hr_expense_sheet_cgscop_tree_inherited" model="ir.ui.view"> + <field name="name">hr.expense.sheet.cgscop.tree</field> + <field name="model">hr.expense.sheet</field> + <field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_tree"/> + <field name="arch" type="xml"> + <xpath expr="//tree" position="attributes"> + <attribute name="import">False</attribute> + </xpath> + </field> + </record> + + <!-- Note de Frais Kanban View --> + <record id="view_hr_expense_sheet_cgscop_kanban_inherited" model="ir.ui.view"> + <field name="name">hr.expense.sheet.cgscop.kanban</field> + <field name="model">hr.expense.sheet</field> + <field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_kanban"/> + <field name="arch" type="xml"> + <xpath expr="//kanban" position="attributes"> + <attribute name="import">False</attribute> + </xpath> + </field> + </record> + + </data> +</odoo>