-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '16.0' into 16.0-mig-repair_calendar_view
- Loading branch information
Showing
83 changed files
with
977 additions
and
401 deletions.
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
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,46 @@ | ||
name: pre-commit | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- "16.0*" | ||
push: | ||
branches: | ||
- "16.0" | ||
- "16.0-ocabot-*" | ||
|
||
jobs: | ||
pre-commit: | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- uses: actions/checkout@v3 | ||
- uses: actions/setup-python@v2 | ||
with: | ||
python-version: "3.11" | ||
- name: Get python version | ||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV | ||
- uses: actions/cache@v1 | ||
with: | ||
path: ~/.cache/pre-commit | ||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} | ||
- name: Install pre-commit | ||
run: pip install pre-commit | ||
- name: Run pre-commit | ||
run: pre-commit run --all-files --show-diff-on-failure --color=always | ||
env: | ||
# Consider valid a PR that changes README fragments but doesn't | ||
# change the README.rst file itself. It's not really a problem | ||
# because the bot will update it anyway after merge. This way, we | ||
# lower the barrier for functional contributors that want to fix the | ||
# readme fragments, while still letting developers get README | ||
# auto-generated (which also helps functionals when using runboat). | ||
# DOCS https://pre-commit.com/#temporarily-disabling-hooks | ||
SKIP: oca-gen-addon-readme | ||
- name: Check that all files generated by pre-commit are in git | ||
run: | | ||
newfiles="$(git ls-files --others --exclude-from=.gitignore)" | ||
if [ "$newfiles" != "" ] ; then | ||
echo "Please check-in the following files:" | ||
echo "$newfiles" | ||
exit 1 | ||
fi |
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
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
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
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
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 |
---|---|---|
@@ -1,27 +1,28 @@ | ||
# -*- coding: utf-8 -*- | ||
# (c) 2015 Alfredo de la Fuente - AvanzOSC | ||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
{ | ||
'name': 'MRP Repair Cancel Reason', | ||
"name": "MRP Repair Cancel Reason", | ||
"version": "16.0.1.0.0", | ||
"license": 'AGPL-3', | ||
"author": 'AvanzOSC', | ||
'website': "http://www.odoomrp.com", | ||
"license": "AGPL-3", | ||
"author": "AvanzOSC", | ||
"website": "https://github.com/avanzosc/mrp-repair-addons", | ||
"contributors": [ | ||
"Ana Juaristi <[email protected]>", | ||
"Alfredo de la Fuente <[email protected]>", | ||
], | ||
'category': 'Manufacturing', | ||
'depends': ['product', | ||
'stock', | ||
'mrp', | ||
'repair', | ||
], | ||
'data': ['security/ir.model.access.csv', | ||
'data/repair_order_cancel_reason.xml', | ||
'wizard/wiz_repair_order_cancel_reason_view.xml', | ||
'views/repair_order_view.xml', | ||
'views/repair_order_cancel_reason_view.xml', | ||
], | ||
'installable': True, | ||
], | ||
"category": "Manufacturing", | ||
"depends": [ | ||
"product", | ||
"stock", | ||
"mrp", | ||
"repair", | ||
], | ||
"data": [ | ||
"security/ir.model.access.csv", | ||
"data/repair_order_cancel_reason.xml", | ||
"wizard/wiz_repair_order_cancel_reason_view.xml", | ||
"views/repair_order_view.xml", | ||
"views/repair_order_cancel_reason_view.xml", | ||
], | ||
"installable": True, | ||
} |
14 changes: 6 additions & 8 deletions
14
mrp_repair_cancel_reason/data/repair_order_cancel_reason.xml
100755 → 100644
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 |
---|---|---|
@@ -1,8 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<openerp> | ||
<data noupdate="1"> | ||
<record id="mrp_cancel_reason_customer" model="repair.order.cancel.reason"> | ||
<field name="name">Canceled at customer request</field> | ||
</record> | ||
</data> | ||
</openerp> | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<odoo noupdate="1"> | ||
<record id="mrp_cancel_reason_customer" model="repair.order.cancel.reason"> | ||
<field name="name">Canceled at customer request</field> | ||
</record> | ||
</odoo> |
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 |
---|---|---|
@@ -1,4 +1,3 @@ | ||
# -*- coding: utf-8 -*- | ||
# (c) 2015 Alfredo de la Fuente - AvanzOSC | ||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
from . import repair_order |
18 changes: 10 additions & 8 deletions
18
mrp_repair_cancel_reason/models/repair_order.py
100755 → 100644
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 |
---|---|---|
@@ -1,19 +1,21 @@ | ||
# -*- coding: utf-8 -*- | ||
# (c) 2015 Alfredo de la Fuente - AvanzOSC | ||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
from odoo import models, fields | ||
from odoo import fields, models | ||
|
||
|
||
class MrpRepair(models.Model): | ||
_inherit = 'repair.order' | ||
_inherit = "repair.order" | ||
|
||
cancel_reason_id = fields.Many2one( | ||
'repair.order.cancel.reason', string='Reason for cancellation', | ||
readonly=True, ondelete='restrict') | ||
"repair.order.cancel.reason", | ||
string="Reason for cancellation", | ||
readonly=True, | ||
ondelete="restrict", | ||
) | ||
|
||
|
||
class MrpRepairCancelReason(models.Model): | ||
_name = 'repair.order.cancel.reason' | ||
_description = 'Repair Cancel Reason' | ||
_name = "repair.order.cancel.reason" | ||
_description = "Repair Cancel Reason" | ||
|
||
name = fields.Char('Reason', required=True, translate=True) | ||
name = fields.Char("Reason", required=True, translate=True) |
Empty file.
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 |
---|---|---|
@@ -1,4 +1,3 @@ | ||
# -*- coding: utf-8 -*- | ||
# (c) 2015 Alfredo de la Fuente - AvanzOSC | ||
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html | ||
from . import test_repair_order_cancel_reason |
Oops, something went wrong.