diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-09-10 17:06:18 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-09-10 17:06:18 +0200 |
| commit | 86ff929ad6718d2bfb691dd272aa3f353406ff4f (patch) | |
| tree | a62b50cc471452ff2dc3c034a38d6cade79c03ed /addons/lunch | |
| parent | 4ad896bd3d6bbc851a59adead1a653abc31fc882 (diff) | |
| parent | 1199451606cab7342e34fc9c41a2085b8beb1243 (diff) | |
[MERGE] forward port branch saas-11.4 up to 1199451606c
Diffstat (limited to 'addons/lunch')
| -rw-r--r-- | addons/lunch/__manifest__.py | 1 | ||||
| -rw-r--r-- | addons/lunch/models/__init__.py | 1 | ||||
| -rw-r--r-- | addons/lunch/models/res_users.py | 13 | ||||
| -rw-r--r-- | addons/lunch/views/res_users_views.xml | 14 |
4 files changed, 0 insertions, 29 deletions
diff --git a/addons/lunch/__manifest__.py b/addons/lunch/__manifest__.py index 828f2f29f45..ef5bc49a52f 100644 --- a/addons/lunch/__manifest__.py +++ b/addons/lunch/__manifest__.py @@ -29,7 +29,6 @@ If you want to save your employees' time and avoid them to always have coins in 'views/lunch_templates.xml', 'wizard/lucky_order_view.xml', 'views/lunch_views.xml', - 'views/res_users_views.xml', 'data/lunch_data.xml', ], 'demo': ['data/lunch_demo.xml'], diff --git a/addons/lunch/models/__init__.py b/addons/lunch/models/__init__.py index e16f6c755b9..9824b4ad3b0 100644 --- a/addons/lunch/models/__init__.py +++ b/addons/lunch/models/__init__.py @@ -1,4 +1,3 @@ # -*- coding: utf-8 -*- from . import lunch -from . import res_users diff --git a/addons/lunch/models/res_users.py b/addons/lunch/models/res_users.py deleted file mode 100644 index 9d3a39d8974..00000000000 --- a/addons/lunch/models/res_users.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import fields, models - - -class ResUsers(models.Model): - _inherit = 'res.users' - - group_lunch_user = fields.Selection( - selection=lambda self: self._get_group_selection('lunch.module_lunch_category'), - string='Lunch', compute='_compute_groups_id', inverse='_inverse_groups_id', - category_xml_id='lunch.module_lunch_category') diff --git a/addons/lunch/views/res_users_views.xml b/addons/lunch/views/res_users_views.xml deleted file mode 100644 index c414ba40d57..00000000000 --- a/addons/lunch/views/res_users_views.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0"?> -<odoo> - <record id="res_users_view_form" model="ir.ui.view"> - <field name="name">res.users.form.lunch.inherit</field> - <field name="model">res.users</field> - <field name="inherit_id" ref="base.view_users_form"/> - <field name="priority">90</field> - <field name="arch" type="xml"> - <group name="applications" position="inside"> - <field name='group_lunch_user'/> - </group> - </field> - </record> -</odoo> |