-
-
Notifications
You must be signed in to change notification settings - Fork 247
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[16.0][MIG] hr_expense_operating_unit: Migration to 16.0 #701
Open
hbrunn
wants to merge
39
commits into
OCA:16.0
Choose a base branch
from
hbrunn:16.0-mig-hr_expense_operating_unit
base: 16.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
b3d21cc
migrated hr-expense-operating-unit to 9.0
SerpentCS b010481
added OU to account move
SerpentCS 97c069c
added Readme file and minor fixes
SerpentCS c320e5a
Added Test Cases.
SerpentCS f577b76
Added Copyrights in xml files and made minor changes.
SerpentCS c4a71ea
PEP8 issues
AaronHForgeFlow 663ae8e
Add constraint
AaronHForgeFlow 6504416
travis
AaronHForgeFlow 2e86cc6
security
LoisRForgeFlow 286d8f0
[MIG] hr_expense_operating_unit v10
nikul-serpentcs bd4a3fc
[FIX] hr_expense_operating_unit test failing
bjeficent 7d01b6c
[MIG] hr_expense_operating_unit: Migration to version 12.0
bjeficent fba501f
[FIX]domain operating units on expenses
AaronHForgeFlow 4dab436
[UPD] Update hr_expense_operating_unit.pot
oca-travis b26a9fb
[UPD] README.rst
OCA-git-bot dbd2fdb
[FIX] Fixed unknown Fields
nikul-serpentcs 7dbe599
hr_expense_operating_unit 12.0.1.0.1
OCA-git-bot bd175a6
[IMP] hr_expense_operating_unit: black, isort
alan196 412af08
[MIG] hr_expense_operating_unit: Migration to V13
alan196 2edcd74
[UPD] Update hr_expense_operating_unit.pot
oca-travis 441d5db
[UPD] README.rst
OCA-git-bot f9e3f85
[FIX] hr_expense_operating_unit: adapt to v13 changes
hbrunn b414229
hr_expense_operating_unit 13.0.1.0.1
OCA-git-bot 44fdb81
[UPD] Eficent -> ForgeFlow
MiquelRForgeFlow 452129e
[UPD] README.rst
OCA-git-bot 43bbcd9
[14.0][MIG] hr_expense_operating_unit
kittiu a2f8926
[FIX] multi operating-unit can't create expense sheet
Saran440 891f582
[FIX] default ou on move
Saran440 8ca81f1
[UPD] Update hr_expense_operating_unit.pot
oca-travis 9e38a08
[UPD] README.rst
OCA-git-bot b7d4b0c
[MIG] Migrated hr_expense_operating_unit in v15
Rajan-SCS 94174f0
[FIX] hr_expense_operating_unit: reconcile move with expense
Saran440 b873ca2
[UPD] Update hr_expense_operating_unit.pot
668cdf8
[UPD] README.rst
OCA-git-bot 55a44ee
[UPD] README.rst
OCA-git-bot 7eb0e72
[IMP] hr_expense_operating_unit: pre-commit stuff
hbrunn dfe3663
[MIG] hr_expense_operating_unit: Migration to 16.0
hbrunn e6136cd
[ADD] hr_expense_operating_unit: test for onchange function
hbrunn b17ea7c
fixup! [MIG] hr_expense_operating_unit: Migration to 16.0
hbrunn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
========================= | ||
HR Expense Operating Unit | ||
========================= | ||
|
||
.. | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! This file is generated by oca-gen-addon-readme !! | ||
!! changes will be overwritten. !! | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
!! source digest: sha256:13f1a13af9ebc3b43564bf45cd6662d058459aee3a7a74028e0fc7b36078e0ea | ||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
||
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png | ||
:target: https://odoo-community.org/page/development-status | ||
:alt: Beta | ||
.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png | ||
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html | ||
:alt: License: LGPL-3 | ||
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Foperating--unit-lightgray.png?logo=github | ||
:target: https://github.com/OCA/operating-unit/tree/16.0/hr_expense_operating_unit | ||
:alt: OCA/operating-unit | ||
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png | ||
:target: https://translation.odoo-community.org/projects/operating-unit-16-0/operating-unit-16-0-hr_expense_operating_unit | ||
:alt: Translate me on Weblate | ||
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png | ||
:target: https://runboat.odoo-community.org/builds?repo=OCA/operating-unit&target_branch=16.0 | ||
:alt: Try me on Runboat | ||
|
||
|badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
||
This module introduces the following features: | ||
|
||
* Adds the Operating Unit (OU) to the Expense. | ||
|
||
* Security rules are defined to ensure that users can only see the Expense of that Operating Units in which they are allowed access to. | ||
|
||
* Adds Operating Unit (OU) to the account moves while generating accounting entries from the expense. | ||
|
||
**Table of contents** | ||
|
||
.. contents:: | ||
:local: | ||
|
||
Usage | ||
===== | ||
|
||
To use this module create the Operating Unit or use a created one: | ||
|
||
#. Once you have an OU, make sure you assign it to the desired User. | ||
#. Create the expense with the OU. | ||
#. The selectable OU are filtered by the users OU's. | ||
|
||
Bug Tracker | ||
=========== | ||
|
||
Bugs are tracked on `GitHub Issues <https://github.com/OCA/operating-unit/issues>`_. | ||
In case of trouble, please check there if your issue has already been reported. | ||
If you spotted it first, help us to smash it by providing a detailed and welcomed | ||
`feedback <https://github.com/OCA/operating-unit/issues/new?body=module:%20hr_expense_operating_unit%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
||
Do not contact contributors directly about support or help with technical issues. | ||
|
||
Credits | ||
======= | ||
|
||
Authors | ||
~~~~~~~ | ||
|
||
* ForgeFlow S.L. | ||
* Serpent Consulting Services Pvt. Ltd. | ||
|
||
Contributors | ||
~~~~~~~~~~~~ | ||
|
||
* Jordi Ballester Alomar <[email protected]> | ||
* Serpent Consulting Services Pvt. Ltd. <[email protected]> | ||
* Jarsa Sistemas <[email protected]> | ||
* Saran Lim. <[email protected]> | ||
|
||
Maintainers | ||
~~~~~~~~~~~ | ||
|
||
This module is maintained by the OCA. | ||
|
||
.. image:: https://odoo-community.org/logo.png | ||
:alt: Odoo Community Association | ||
:target: https://odoo-community.org | ||
|
||
OCA, or the Odoo Community Association, is a nonprofit organization whose | ||
mission is to support the collaborative development of Odoo features and | ||
promote its widespread use. | ||
|
||
This module is part of the `OCA/operating-unit <https://github.com/OCA/operating-unit/tree/16.0/hr_expense_operating_unit>`_ project on GitHub. | ||
|
||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). | ||
|
||
from . import models |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Copyright 2016-19 ForgeFlow S.L. | ||
# Copyright 2016-19 Serpent Consulting Services Pvt. Ltd. | ||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). | ||
|
||
{ | ||
"name": "HR Expense Operating Unit", | ||
"version": "16.0.1.0.0", | ||
"license": "LGPL-3", | ||
"author": "ForgeFlow S.L., " | ||
"Serpent Consulting Services Pvt. Ltd.," | ||
"Odoo Community Association (OCA)", | ||
"website": "https://github.com/OCA/operating-unit", | ||
"category": "Generic Modules/Human Resources", | ||
"depends": ["hr_expense", "account_operating_unit"], | ||
"data": ["views/hr_expense_view.xml", "security/hr_expense_security.xml"], | ||
"installable": True, | ||
} |
70 changes: 70 additions & 0 deletions
70
hr_expense_operating_unit/i18n/hr_expense_operating_unit.pot
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
# Translation of Odoo Server. | ||
# This file contains the translation of the following modules: | ||
# * hr_expense_operating_unit | ||
# | ||
msgid "" | ||
msgstr "" | ||
"Project-Id-Version: Odoo Server 15.0\n" | ||
"Report-Msgid-Bugs-To: \n" | ||
"Last-Translator: \n" | ||
"Language-Team: \n" | ||
"MIME-Version: 1.0\n" | ||
"Content-Type: text/plain; charset=UTF-8\n" | ||
"Content-Transfer-Encoding: \n" | ||
"Plural-Forms: \n" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: code:addons/hr_expense_operating_unit/models/hr_expense.py:0 | ||
#, python-format | ||
msgid "" | ||
"Configuration error. The Company in the Expense and in the Operating Unit " | ||
"must be the same." | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: code:addons/hr_expense_operating_unit/models/hr_expense.py:0 | ||
#: code:addons/hr_expense_operating_unit/models/hr_expense.py:0 | ||
#, python-format | ||
msgid "" | ||
"Configuration error. The Operating Unit in the Expense sheet and in the " | ||
"Expense must be the same." | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: code:addons/hr_expense_operating_unit/models/hr_expense.py:0 | ||
#, python-format | ||
msgid "" | ||
"Configuration error. The company in\n" | ||
" the Expense and in the Operating Unit must be the same" | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: model:ir.model,name:hr_expense_operating_unit.model_hr_expense | ||
msgid "Expense" | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: model:ir.model,name:hr_expense_operating_unit.model_hr_expense_sheet | ||
msgid "Expense Report" | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: model:ir.model.fields,field_description:hr_expense_operating_unit.field_hr_expense__operating_unit_id | ||
#: model:ir.model.fields,field_description:hr_expense_operating_unit.field_hr_expense_sheet__operating_unit_id | ||
#: model_terms:ir.ui.view,arch_db:hr_expense_operating_unit.hr_expense_sheet_view_search | ||
#: model_terms:ir.ui.view,arch_db:hr_expense_operating_unit.hr_expense_view_search | ||
msgid "Operating Unit" | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: model:ir.model,name:hr_expense_operating_unit.model_account_payment_register | ||
msgid "Register Payment" | ||
msgstr "" | ||
|
||
#. module: hr_expense_operating_unit | ||
#: code:addons/hr_expense_operating_unit/models/hr_expense.py:0 | ||
#, python-format | ||
msgid "" | ||
"You cannot submit the Expenses having different Operating Units or with no " | ||
"Operating Unit" | ||
msgstr "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). | ||
|
||
from . import hr_expense |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
# Copyright 2016-19 ForgeFlow S.L. | ||
# Copyright 2016-19 Serpent Consulting Services Pvt. Ltd. | ||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).). | ||
|
||
from odoo import _, api, fields, models | ||
from odoo.exceptions import UserError, ValidationError | ||
|
||
|
||
class HrExpenseExpense(models.Model): | ||
_inherit = "hr.expense" | ||
|
||
operating_unit_id = fields.Many2one( | ||
comodel_name="operating.unit", | ||
string="Operating Unit", | ||
default=lambda self: self.env["res.users"].operating_unit_default_get(), | ||
) | ||
|
||
def action_submit_expenses(self): | ||
ctx = self._context.copy() | ||
operating_unit_id = self.mapped("operating_unit_id") | ||
if operating_unit_id and len(operating_unit_id) > 1: | ||
raise UserError( | ||
_( | ||
"Configuration error. The Operating " | ||
"Unit in the Expense sheet and in the " | ||
"Expense must be the same." | ||
) | ||
) | ||
ctx.update({"default_operating_unit_id": operating_unit_id.id}) | ||
return super( | ||
HrExpenseExpense, self.with_context(**ctx) | ||
).action_submit_expenses() | ||
|
||
@api.constrains("operating_unit_id", "company_id") | ||
def _check_company_operating_unit(self): | ||
for rec in self: | ||
if ( | ||
rec.company_id | ||
and rec.operating_unit_id | ||
and rec.company_id != rec.operating_unit_id.company_id | ||
): | ||
raise ValidationError( | ||
_( | ||
"Configuration error. The Company in " | ||
"the Expense and in the Operating " | ||
"Unit must be the same." | ||
) | ||
) | ||
|
||
@api.constrains("operating_unit_id", "sheet_id") | ||
def _check_expense_operating_unit(self): | ||
for rec in self: | ||
if ( | ||
rec.sheet_id | ||
and rec.sheet_id.operating_unit_id | ||
and rec.operating_unit_id | ||
and rec.sheet_id.operating_unit_id != rec.operating_unit_id | ||
): | ||
raise ValidationError( | ||
_( | ||
"Configuration error. The Operating " | ||
"Unit in the Expense sheet and in the " | ||
"Expense must be the same." | ||
) | ||
) | ||
|
||
def _get_default_expense_sheet_values(self): | ||
sheet_values = super()._get_default_expense_sheet_values() | ||
ous = self.mapped("operating_unit_id") | ||
if len(ous) != 1 or any(not expense.operating_unit_id for expense in self): | ||
raise ValidationError( | ||
_( | ||
"You cannot submit the Expenses having " | ||
"different Operating Units or with " | ||
"no Operating Unit" | ||
) | ||
) | ||
for sheet in sheet_values: | ||
sheet.update({"operating_unit_id": ous.id}) | ||
return sheet_values | ||
|
||
def _prepare_move_vals(self): | ||
move_values = super()._prepare_move_vals() | ||
move_values["operating_unit_id"] = self.operating_unit_id.id | ||
return move_values | ||
|
||
def _prepare_move_line_vals(self): | ||
move_line_values = super()._prepare_move_line_vals() | ||
move_line_values["operating_unit_id"] = self.operating_unit_id.id | ||
return move_line_values | ||
|
||
|
||
class HrExpenseSheet(models.Model): | ||
_inherit = "hr.expense.sheet" | ||
|
||
operating_unit_id = fields.Many2one( | ||
comodel_name="operating.unit", | ||
string="Operating Unit", | ||
default=lambda self: self.env["res.users"].operating_unit_default_get(), | ||
) | ||
|
||
@api.onchange("operating_unit_id") | ||
def _onchange_operating_unit_id(self): | ||
if self.operating_unit_id: | ||
self.expense_line_ids.update( | ||
{"operating_unit_id": self.operating_unit_id.id} | ||
) | ||
|
||
@api.constrains("operating_unit_id", "company_id") | ||
def _check_company_operating_unit(self): | ||
for rec in self: | ||
if ( | ||
rec.company_id | ||
and rec.operating_unit_id | ||
and rec.company_id != rec.operating_unit_id.company_id | ||
): | ||
raise ValidationError( | ||
_( | ||
"""Configuration error. The company in | ||
the Expense and in the Operating Unit must be the same""" | ||
) | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
* Jordi Ballester Alomar <[email protected]> | ||
* Serpent Consulting Services Pvt. Ltd. <[email protected]> | ||
* Jarsa Sistemas <[email protected]> | ||
* Saran Lim. <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
This module introduces the following features: | ||
|
||
* Adds the Operating Unit (OU) to the Expense. | ||
|
||
* Security rules are defined to ensure that users can only see the Expense of that Operating Units in which they are allowed access to. | ||
|
||
* Adds Operating Unit (OU) to the account moves while generating accounting entries from the expense. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
To use this module create the Operating Unit or use a created one: | ||
|
||
#. Once you have an OU, make sure you assign it to the desired User. | ||
#. Create the expense with the OU. | ||
#. The selectable OU are filtered by the users OU's. |
30 changes: 30 additions & 0 deletions
30
hr_expense_operating_unit/security/hr_expense_security.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<!-- Copyright 2016-19 ForgeFlow S.L. | ||
Serpent Consulting Services Pvt. Ltd. | ||
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) --> | ||
<odoo> | ||
<record id="ir_rule_hr_expense_allowed_operating_units" model="ir.rule"> | ||
<field name="model_id" ref="hr_expense.model_hr_expense" /> | ||
<field | ||
name="domain_force" | ||
>['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])]</field> | ||
<field name="name">Expenses from allowed operating units</field> | ||
<field name="global" eval="True" /> | ||
<field eval="0" name="perm_unlink" /> | ||
<field eval="0" name="perm_write" /> | ||
<field eval="1" name="perm_read" /> | ||
<field eval="0" name="perm_create" /> | ||
</record> | ||
<record id="ir_rule_hr_expense_sheet_allowed_operating_units" model="ir.rule"> | ||
<field name="model_id" ref="hr_expense.model_hr_expense_sheet" /> | ||
<field | ||
name="domain_force" | ||
>['|',('operating_unit_id','=',False),('operating_unit_id','in',[g.id for g in user.operating_unit_ids])]</field> | ||
<field name="name">Expenses from allowed operating units</field> | ||
<field name="global" eval="True" /> | ||
<field eval="0" name="perm_unlink" /> | ||
<field eval="0" name="perm_write" /> | ||
<field eval="1" name="perm_read" /> | ||
<field eval="0" name="perm_create" /> | ||
</record> | ||
</odoo> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method is belong to hr.expense.sheet
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, indeed