Skip to content

Commit

Permalink
Merge PR #3 into 14.0
Browse files Browse the repository at this point in the history
Signed-off-by mikevhe18
  • Loading branch information
ssi-bot committed Sep 5, 2024
2 parents 3667f32 + e61b58f commit 9872daf
Show file tree
Hide file tree
Showing 11 changed files with 109 additions and 15 deletions.
15 changes: 5 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

exclude: |
(?x)
# NOT INSTALLABLE ADDONS
Expand Down Expand Up @@ -97,7 +96,7 @@ repos:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.11.5
hooks:
- id: isort
name: isort except __init__.py
Expand Down Expand Up @@ -125,19 +124,15 @@ repos:
args: ["--extend-ignore=F401"] # ignore unused imports in __init__.py
files: /__init__\.py$
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3
- repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19
hooks:
- id: pylint
- id: pylint_odoo
name: pylint with optional checks
args:
- --rcfile=.pylintrc
- --exit-zero
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- id: pylint
name: pylint with mandatory checks
- id: pylint_odoo
args:
- --rcfile=.pylintrc-mandatory
additional_dependencies: *pylint_deps
4 changes: 2 additions & 2 deletions ssi_meeting_outsource_work/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Copyright 2023 OpenSynergy Indonesia
# Copyright 2023 PT. Simetri Sinergi Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

# pylint: disable=C8101
{
"name": "Meeting + Outsource Work Integration",
"version": "14.0.1.0.1",
"version": "14.0.2.0.0",
"website": "https://simetri-sinergi.id",
"author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia",
"license": "AGPL-3",
Expand Down
4 changes: 3 additions & 1 deletion ssi_meeting_outsource_work/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
# Copyright 2023 PT. Simetri Sinergi Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import employee_expense_account
from . import (
calendar_event,
)
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
from odoo import models


class EmployeeExpenseAccount(models.Model):
class CalendarEvent(models.Model):
_name = "calendar.event"
_inherit = ["calendar.event", "mixin.outsource_work_object"]
_inherit = [
"calendar.event",
"mixin.outsource_work_object",
]
_outsource_work_create_page = True
46 changes: 46 additions & 0 deletions ssi_meeting_quality_control/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3

=====================================
Meeting + Quality Control Integration
=====================================


Installation
============

To install this module, you need to:

1. Clone the branch 14.0 of the repository https://github.com/open-synergy/ssi-meeting
2. Add the path to this repository in your configuration (addons-path)
3. Update the module list (Must be on developer mode)
4. Go to menu *Apps -> Apps -> Main Apps*
5. Search For *Meeting + Quality Control Integration*
6. Install the module

Bug Tracker
===========

Bugs are tracked on `GitHub Issues
<https://github.com/open-synergy/ssi-meeting/issues>`_. In case of trouble, please
check there if your issue has already been reported. If you spotted it first,
help us smash it by providing detailed and welcomed feedback.


Credits
=======

Contributors
------------

* Michael Viriyananda <[email protected]>

Maintainer
----------

.. image:: https://simetri-sinergi.id/logo.png
:alt: PT. Simetri Sinergi Indonesia
:target: https://simetri-sinergi.id

This module is maintained by the PT. Simetri Sinergi Indonesia.
7 changes: 7 additions & 0 deletions ssi_meeting_quality_control/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Copyright 2024 OpenSynergy Indonesia
# Copyright 2024 PT. Simetri Sinergi Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import (
models,
)
19 changes: 19 additions & 0 deletions ssi_meeting_quality_control/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright 2024 OpenSynergy Indonesia
# Copyright 2024 PT. Simetri Sinergi Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# pylint: disable=C8101
{
"name": "Meeting + Quality Control Integration",
"version": "14.0.1.0.0",
"website": "https://simetri-sinergi.id",
"author": "OpenSynergy Indonesia, PT. Simetri Sinergi Indonesia",
"license": "AGPL-3",
"installable": True,
"depends": [
"ssi_quality_control",
"calendar",
],
"data": [],
"demo": [],
"images": [],
}
6 changes: 6 additions & 0 deletions ssi_meeting_quality_control/models/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright 2024 OpenSynergy Indonesia
# Copyright 2024 PT. Simetri Sinergi Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl-3.0-standalone.html).
from . import (
calendar_event,
)
14 changes: 14 additions & 0 deletions ssi_meeting_quality_control/models/calendar_event.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright 2024 OpenSynergy Indonesia
# Copyright 2024 PT. Simetri Sinergi Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl-3.0-standalone.html).

from odoo import models


class CalendarEvent(models.Model):
_name = "calendar.event"
_inherit = [
"calendar.event",
"mixin.qc_worksheet",
]
_qc_worksheet_create_page = True
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
odoo14-addon-ssi-outsource-work
odoo14-addon-ssi-quality-control

0 comments on commit 9872daf

Please sign in to comment.