From a5d3f898f019fc20f32bf69e4051ec0dea4853b4 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Thu, 29 Oct 2020 11:20:02 -0700 Subject: [PATCH 1/4] [MOV] helpdesk_rma: from hibou-suite-enterprise:11.0 --- helpdesk_rma/__init__.py | 1 + helpdesk_rma/__manifest__.py | 21 +++++++++++++++++++++ helpdesk_rma/models/__init__.py | 1 + helpdesk_rma/models/helpdesk.py | 26 ++++++++++++++++++++++++++ helpdesk_rma/tests/__init__.py | 1 + helpdesk_rma/tests/test_helpdesk.py | 14 ++++++++++++++ helpdesk_rma/views/helpdesk_views.xml | 20 ++++++++++++++++++++ 7 files changed, 84 insertions(+) create mode 100644 helpdesk_rma/__init__.py create mode 100755 helpdesk_rma/__manifest__.py create mode 100644 helpdesk_rma/models/__init__.py create mode 100644 helpdesk_rma/models/helpdesk.py create mode 100644 helpdesk_rma/tests/__init__.py create mode 100644 helpdesk_rma/tests/test_helpdesk.py create mode 100644 helpdesk_rma/views/helpdesk_views.xml diff --git a/helpdesk_rma/__init__.py b/helpdesk_rma/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/helpdesk_rma/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/helpdesk_rma/__manifest__.py b/helpdesk_rma/__manifest__.py new file mode 100755 index 00000000..6a4386f0 --- /dev/null +++ b/helpdesk_rma/__manifest__.py @@ -0,0 +1,21 @@ +{ + 'name': 'Helpdesk RMA', + 'summary': 'Adds RMA functionality to the Helpdesk App', + 'version': '11.0.1.0.0', + 'author': "Hibou Corp.", + 'category': 'Helpdesk', + 'license': 'AGPL-3', + 'images': [], + 'website': "https://hibou.io", + 'description': "Adds functionality to the Helpdesk App", + 'depends': [ + 'helpdesk', + 'rma', + ], + 'demo': [], + 'data': [ + 'views/helpdesk_views.xml', + ], + 'auto_install': False, + 'installable': True, + } diff --git a/helpdesk_rma/models/__init__.py b/helpdesk_rma/models/__init__.py new file mode 100644 index 00000000..a3d4b803 --- /dev/null +++ b/helpdesk_rma/models/__init__.py @@ -0,0 +1 @@ +from . import helpdesk diff --git a/helpdesk_rma/models/helpdesk.py b/helpdesk_rma/models/helpdesk.py new file mode 100644 index 00000000..7b470e65 --- /dev/null +++ b/helpdesk_rma/models/helpdesk.py @@ -0,0 +1,26 @@ +from odoo import api, models, fields + +from logging import getLogger +_logger = getLogger(__name__) + + +class Ticket(models.Model): + _inherit = 'helpdesk.ticket' + + rma_count = fields.Integer(compute='_compute_rma_count') + + def _compute_rma_count(self): + for ticket in self: + if ticket.partner_id: + ticket.rma_count = self.env['rma.rma'].search_count([('partner_id', 'child_of', ticket.partner_id.id)]) + else: + ticket.rma_count = 0 + + def action_partner_rma(self): + self.ensure_one() + action = self.env.ref('rma.action_rma_rma').read()[0] + + action['context'] = { + 'search_default_partner_id': self.partner_id.id, + } + return action diff --git a/helpdesk_rma/tests/__init__.py b/helpdesk_rma/tests/__init__.py new file mode 100644 index 00000000..253df8c6 --- /dev/null +++ b/helpdesk_rma/tests/__init__.py @@ -0,0 +1 @@ +from . import test_helpdesk \ No newline at end of file diff --git a/helpdesk_rma/tests/test_helpdesk.py b/helpdesk_rma/tests/test_helpdesk.py new file mode 100644 index 00000000..e34e72eb --- /dev/null +++ b/helpdesk_rma/tests/test_helpdesk.py @@ -0,0 +1,14 @@ +from odoo.tests import common + + +class TestHelpdesk(common.TransactionCase): + + # We need to test Stage, Ticket, Server, and Filter Classes + # We created a couple fields per model and a couple methods + # for our functionality implementation + + def setUp(self): + pass + + def test_helpdesk_filter(self): + pass \ No newline at end of file diff --git a/helpdesk_rma/views/helpdesk_views.xml b/helpdesk_rma/views/helpdesk_views.xml new file mode 100644 index 00000000..412fce27 --- /dev/null +++ b/helpdesk_rma/views/helpdesk_views.xml @@ -0,0 +1,20 @@ + + + + + + helpdesk.ticket.form.inherit + helpdesk.ticket + + + + + + + + + From 71a2cd5c093dfe5db3bfb61346417669112f51a8 Mon Sep 17 00:00:00 2001 From: Connor Christian Date: Fri, 30 Oct 2020 14:37:14 -0400 Subject: [PATCH 2/4] [MIG] helpdesk_rma: for Odoo 12.0 Additionally hide button if there is no assigned customer --- helpdesk_rma/__manifest__.py | 2 +- helpdesk_rma/views/helpdesk_views.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/helpdesk_rma/__manifest__.py b/helpdesk_rma/__manifest__.py index 6a4386f0..03a4a9ce 100755 --- a/helpdesk_rma/__manifest__.py +++ b/helpdesk_rma/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Helpdesk RMA', 'summary': 'Adds RMA functionality to the Helpdesk App', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'author': "Hibou Corp.", 'category': 'Helpdesk', 'license': 'AGPL-3', diff --git a/helpdesk_rma/views/helpdesk_views.xml b/helpdesk_rma/views/helpdesk_views.xml index 412fce27..66d1639e 100644 --- a/helpdesk_rma/views/helpdesk_views.xml +++ b/helpdesk_rma/views/helpdesk_views.xml @@ -10,6 +10,7 @@ From f1215f621da8288c7c4dcc4327585f98abebd40b Mon Sep 17 00:00:00 2001 From: Connor Christian Date: Fri, 30 Oct 2020 17:11:49 -0400 Subject: [PATCH 3/4] [MIG] helpdesk_rma: for Odoo 13.0 --- helpdesk_rma/__manifest__.py | 2 +- helpdesk_rma/views/helpdesk_views.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helpdesk_rma/__manifest__.py b/helpdesk_rma/__manifest__.py index 03a4a9ce..084063a5 100755 --- a/helpdesk_rma/__manifest__.py +++ b/helpdesk_rma/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Helpdesk RMA', 'summary': 'Adds RMA functionality to the Helpdesk App', - 'version': '12.0.1.0.0', + 'version': '13.0.1.0.0', 'author': "Hibou Corp.", 'category': 'Helpdesk', 'license': 'AGPL-3', diff --git a/helpdesk_rma/views/helpdesk_views.xml b/helpdesk_rma/views/helpdesk_views.xml index 66d1639e..51e2a4fe 100644 --- a/helpdesk_rma/views/helpdesk_views.xml +++ b/helpdesk_rma/views/helpdesk_views.xml @@ -7,9 +7,9 @@ helpdesk.ticket - +