-
-
Notifications
You must be signed in to change notification settings - Fork 403
[12.0][MIG] hr_timesheet_sheet #138
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
Merged
pedrobaeza
merged 23 commits into
OCA:12.0
from
brainbeanapps:12.0-mig-hr_timesheet_sheet
Nov 28, 2018
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
4ce7d98
[11.0][MIG] hr_timesheet_sheet (#125)
MiquelRForgeFlow 43ecca7
[UPD] Update hr_timesheet_sheet.pot
oca-travis ed98c8e
Translated using Weblate (Japanese)
yostashiro 996d091
Translated using Weblate (Português (Brasil))
534bcb7
Translated using Weblate (Portuguese (Brazil))
72ccf5f
[11.0][hr_timesheet_sheet]: allow to display more than 40 cells
JordiBForgeFlow b7c949d
hr_timesheet_sheet: add menu 'Timesheet Sheets to Approve'
JordiBForgeFlow 6110747
[UPD] Update hr_timesheet_sheet.pot
oca-travis 5da9162
hr_timesheet_sheet: pass selected project context to task creation
JordiBForgeFlow 70dcac7
[11.0][IMP] hr_timesheet_sheet: ease extensions (#131)
astirpe 6426160
[UPD] Update hr_timesheet_sheet.pot
oca-travis d52c084
Fix task domain and default project_id
astirpe 3a76f9d
Bump version
astirpe c089e57
[IMP] hr_timesheet_sheet ux
astirpe 442eaad
Code review
astirpe ee163ae
Update contributors list
astirpe 5768833
[UPD] Update hr_timesheet_sheet.pot
oca-travis c1a3447
[FIX] hr_timesheet_sheet: "Refuse" button name (#134)
astirpe 3aab6e6
[UPD] Update hr_timesheet_sheet.pot
oca-travis 10fa37d
[11.0][IMP] hr_timesheet_sheet: merge hr_timesheet_sheet_week_start_d…
LoisRForgeFlow dfb6c88
[UPD] Update hr_timesheet_sheet.pot
oca-travis 2394f53
restrict selection of projects to those that have 'allow_timsheets' set
JordiBForgeFlow ba1b8f6
[MIG] hr_timesheet_sheet: Migration to 12.0
alexey-pelykh 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 hidden or 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,109 @@ | ||
| ================== | ||
| HR Timesheet Sheet | ||
| ================== | ||
|
|
||
| .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
|
||
| .. |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-AGPL--3-blue.png | ||
| :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html | ||
| :alt: License: AGPL-3 | ||
| .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr--timesheet-lightgray.png?logo=github | ||
| :target: https://github.com/OCA/hr-timesheet/tree/12.0/hr_timesheet_sheet | ||
| :alt: OCA/hr-timesheet | ||
| .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png | ||
| :target: https://translation.odoo-community.org/projects/hr-timesheet-12-0/hr-timesheet-12-0-hr_timesheet_sheet | ||
| :alt: Translate me on Weblate | ||
| .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png | ||
| :target: https://runbot.odoo-community.org/runbot/117/12.0 | ||
| :alt: Try me on Runbot | ||
|
|
||
| |badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
|
||
| This module supplies a new screen enabling you to manage your work encoding (timesheet) by period. | ||
| Timesheet entries are made by employees each day. At the end of the defined period, | ||
| employees validate their sheet and the manager must then approve his team's entries. | ||
| Periods are defined in the company forms and you can set them to run monthly, weekly or daily. | ||
|
|
||
| Negative hours are not admitted. | ||
|
|
||
| **Table of contents** | ||
|
|
||
| .. contents:: | ||
| :local: | ||
|
|
||
| Installation | ||
| ============ | ||
|
|
||
| This module relies on: | ||
|
|
||
| * The OCA module '2D matrix for x2many fields', and can be downloaded from | ||
| Github: https://github.com/OCA/web/tree/11.0/web_widget_x2many_2d_matrix | ||
|
|
||
| Configuration | ||
| ============= | ||
|
|
||
| If you want other default ranges different from weekly, you need to go: | ||
|
|
||
| * In the menu `Configuration` -> `Settings` -> **Timesheet Options**, | ||
| and select in **Timesheet Sheet Range** the default range you want. | ||
| * When you have a weekly range you can also specify the **Week Start Day**. | ||
|
|
||
| Known issues / Roadmap | ||
| ====================== | ||
|
|
||
| * When you open the `Summary` or `Details` tab, a save should be performed | ||
| to ensure the data shown is correct. This perhaps could be achieved by including | ||
| a .js file that does that. | ||
| * The timesheet grid is limited to display a max. of 1M cells, due to a | ||
| limitation of the tree view limit parameter not being able to dynamically | ||
| set a limit. Since default value of odoo, 40 records is too small, we decided | ||
| to set 1M, which should be good enough in the majority of scenarios. | ||
|
|
||
| Bug Tracker | ||
| =========== | ||
|
|
||
| Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr-timesheet/issues>`_. | ||
| In case of trouble, please check there if your issue has already been reported. | ||
| If you spotted it first, help us smashing it by providing a detailed and welcomed | ||
| `feedback <https://github.com/OCA/hr-timesheet/issues/new?body=module:%20hr_timesheet_sheet%0Aversion:%2012.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 | ||
| ~~~~~~~ | ||
|
|
||
| * Eficent | ||
|
|
||
| Contributors | ||
| ~~~~~~~~~~~~ | ||
|
|
||
| * Miquel Raïch <miquel.raich@eficent.com> | ||
| * Andrea Stirpe <a.stirpe@onestein.nl> | ||
| * Lois Rilo <lois.rilo@eficent.com> | ||
| * Alexey Pelykh <alexey.pelykh@brainbeanapps.com> | ||
|
|
||
| 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/hr-timesheet <https://github.com/OCA/hr-timesheet/tree/12.0/hr_timesheet_sheet>`_ project on GitHub. | ||
|
|
||
| You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
This file contains hidden or 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 AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
|
||
| from . import models |
This file contains hidden or 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 @@ | ||
| # Copyright 2018 Eficent | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
|
|
||
| { | ||
| 'name': 'HR Timesheet Sheet', | ||
| 'version': '12.0.1.0.0', | ||
| 'category': 'Human Resources', | ||
| 'sequence': 80, | ||
| 'summary': 'Timesheet Sheets, Activities', | ||
| 'license': 'AGPL-3', | ||
| 'author': ( | ||
| 'Eficent, ' | ||
| 'Odoo Community Association (OCA)' | ||
| ), | ||
| 'website': 'https://github.com/OCA/hr-timesheet', | ||
| 'installable': True, | ||
| 'auto_install': False, | ||
| 'depends': [ | ||
| 'hr_timesheet', | ||
| 'web_widget_x2many_2d_matrix', | ||
| ], | ||
| 'data': [ | ||
| 'data/hr_timesheet_sheet_data.xml', | ||
| 'security/ir.model.access.csv', | ||
| 'security/hr_timesheet_sheet_security.xml', | ||
| 'views/hr_timesheet_sheet_views.xml', | ||
| 'views/hr_department_views.xml', | ||
| 'views/res_config_settings_views.xml', | ||
| ], | ||
| } | ||
This file contains hidden or 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,38 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <odoo noupdate="1"> | ||
| <!-- | ||
| License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). | ||
| --> | ||
|
|
||
| <!-- Timesheet sheet related subtypes for messaging / Chatter --> | ||
| <record id="mt_timesheet_confirmed" model="mail.message.subtype"> | ||
| <field name="name">Waiting Approval</field> | ||
| <field name="res_model">hr_timesheet.sheet</field> | ||
| <field name="default" eval="True"/> | ||
| <field name="description">waiting approval</field> | ||
| </record> | ||
| <record id="mt_timesheet_approved" model="mail.message.subtype"> | ||
| <field name="name">Approved</field> | ||
| <field name="res_model">hr_timesheet.sheet</field> | ||
| <field name="default" eval="True"/> | ||
| <field name="description">Timesheet approved</field> | ||
| </record> | ||
| <!-- Department (Parent) related subtypes for messaging / Chatter --> | ||
| <record id="mt_department_timesheet_confirmed" model="mail.message.subtype"> | ||
| <field name="name">Timesheets to Approve</field> | ||
| <field name="res_model">hr.department</field> | ||
| <field name="default" eval="False"/> | ||
| <field name="parent_id" eval="ref('mt_timesheet_confirmed')"/> | ||
| <field name="relation_field">department_id</field> | ||
| <field name="sequence" eval="5"/> | ||
| </record> | ||
| <record id="mt_department_timesheet_approved" model="mail.message.subtype"> | ||
| <field name="name">Timesheets Approved</field> | ||
| <field name="res_model">hr.department</field> | ||
| <field name="default" eval="False"/> | ||
| <field name="parent_id" eval="ref('mt_timesheet_approved')"/> | ||
| <field name="relation_field">department_id</field> | ||
| <field name="sequence" eval="5"/> | ||
| </record> | ||
|
|
||
| </odoo> |
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.
Uh oh!
There was an error while loading. Please reload this page.