diff options
| author | Thomas Carlier <thc@odoo.com> | 2020-03-23 10:39:58 +0000 |
|---|---|---|
| committer | Thomas Carlier <thc@odoo.com> | 2020-03-30 14:08:07 +0000 |
| commit | 6dc283581488b2fd22a17bd4aaf3b1c228c7033d (patch) | |
| tree | 3723256573e4ef5e38892f2415e66c7b3100ae0d | |
| parent | c5ae9b38d1816f4fc3c29907fe8e370c78ed3d4b (diff) | |
[FIX] hr_expense: remove the expense_extract options from hr_expense
before this commit:
- the selection field with OCR options was in hr_expense module
after this commit:
- the selection field is now in expense_extract module
closes odoo/odoo#48617
X-original-commit: 9440139105825d4efa5fda23149c60179870f9f3
Related: odoo/enterprise#9553
Signed-off-by: Christophe Simonis <chs@odoo.com>
Signed-off-by: Thomas Carlier <Explicitapps@users.noreply.github.com>
| -rw-r--r-- | addons/hr_expense/models/__init__.py | 1 | ||||
| -rw-r--r-- | addons/hr_expense/models/res_company.py | 14 | ||||
| -rw-r--r-- | addons/hr_expense/models/res_config_settings.py | 2 | ||||
| -rw-r--r-- | addons/hr_expense/views/res_config_settings_views.xml | 5 |
4 files changed, 1 insertions, 21 deletions
diff --git a/addons/hr_expense/models/__init__.py b/addons/hr_expense/models/__init__.py index 4b256421e3b..af1e04d2dd2 100644 --- a/addons/hr_expense/models/__init__.py +++ b/addons/hr_expense/models/__init__.py @@ -7,4 +7,3 @@ from . import hr_expense from . import product_template from . import res_config_settings from . import account_journal_dashboard -from . import res_company diff --git a/addons/hr_expense/models/res_company.py b/addons/hr_expense/models/res_company.py deleted file mode 100644 index c7f91ae07e9..00000000000 --- a/addons/hr_expense/models/res_company.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import fields, models - - -class ResCompany(models.Model): - _inherit = 'res.company' - - expense_extract_show_ocr_option_selection = fields.Selection([ - ('no_send', 'Do not digitalize bills'), - ('manual_send', "Digitalize bills on demand only"), - ('auto_send', 'Digitalize all bills automatically')], string="Send mode on expense attachments", - required=False, default='auto_send') diff --git a/addons/hr_expense/models/res_config_settings.py b/addons/hr_expense/models/res_config_settings.py index 17d290531fb..b801eb11ecd 100644 --- a/addons/hr_expense/models/res_config_settings.py +++ b/addons/hr_expense/models/res_config_settings.py @@ -12,8 +12,6 @@ class ResConfigSettings(models.TransientModel): module_hr_payroll_expense = fields.Boolean(string='Reimburse Expenses in Payslip') module_hr_expense_extract = fields.Boolean(string='Send bills to OCR to generate expenses') - expense_extract_show_ocr_option_selection = fields.Selection(related='company_id.expense_extract_show_ocr_option_selection', - string='Expense processing option', readonly=False) @api.model diff --git a/addons/hr_expense/views/res_config_settings_views.xml b/addons/hr_expense/views/res_config_settings_views.xml index 0660bf8cdd7..ee47164eaad 100644 --- a/addons/hr_expense/views/res_config_settings_views.xml +++ b/addons/hr_expense/views/res_config_settings_views.xml @@ -52,15 +52,12 @@ <div class="o_setting_left_pane"> <field name="module_hr_expense_extract" widget="upgrade_boolean"/> </div> - <div class="o_setting_right_pane"> + <div class="o_setting_right_pane" id="expense_extract_settings"> <label string="Expense Digitalization (OCR)" for="module_hr_expense_extract"/> <span class="fa fa-lg fa-building-o" title="Values set here are company-specific."/> <div class="text-muted"> Digitalize your receipts with OCR and Artificial Intelligence </div> - <div class="mt16" attrs="{'invisible': [('module_hr_expense_extract', '=', False)]}"> - <field name="expense_extract_show_ocr_option_selection" class="o_light_label" widget="radio" required="True"/> - </div> </div> </div> </div> |