From c4beaa77f5f9b11091feedc3d4eaf96dc1dbcf36 Mon Sep 17 00:00:00 2001 From: George Daramouskas Date: Wed, 29 Aug 2018 14:12:04 +0200 Subject: [PATCH] [PORT] Backport privacy, privacy_partner_report to 8.0 --- README.md | 11 +++ oca_dependencies.txt | 1 + privacy/__openerp__.py | 2 +- privacy/readme/CONTRIBUTORS.rst | 1 + privacy_partner_report/README.rst | 1 + privacy_partner_report/__openerp__.py | 2 +- .../views/privacy_menu_view.xml | 20 +++-- .../views/privacy_report.xml | 26 +++--- .../wizard/privacy_report_partner.py | 7 +- .../wizard/privacy_report_partner_wizard.xml | 88 ++++++++++--------- 10 files changed, 92 insertions(+), 67 deletions(-) create mode 100644 oca_dependencies.txt diff --git a/README.md b/README.md index 8a9b8f7..633cdb8 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,17 @@ Odoo modules for data protection (like GDPR). +[//]: # (addons) + +Available addons +---------------- +addon | version | summary +--- | --- | --- +[privacy](privacy/) | 8.0.1.0.0 | Provides data privacy and protection features to comply to regulations, such as GDPR. +[privacy_partner_report](privacy_partner_report/) | 8.0.1.0.0 | Show the transactions that a specific partner is involved in. + +[//]: # (end addons) + ---- OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit organization whose diff --git a/oca_dependencies.txt b/oca_dependencies.txt new file mode 100644 index 0000000..6da85e0 --- /dev/null +++ b/oca_dependencies.txt @@ -0,0 +1 @@ +reporting-engine diff --git a/privacy/__openerp__.py b/privacy/__openerp__.py index d4268c6..dfa8c0b 100644 --- a/privacy/__openerp__.py +++ b/privacy/__openerp__.py @@ -3,7 +3,7 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { 'name': 'Data Privacy and Protection', - 'version': '9.0.1.0.0', + 'version': '8.0.1.0.0', 'category': 'Data Protection', 'summary': 'Provides data privacy and protection features ' 'to comply to regulations, such as GDPR.', diff --git a/privacy/readme/CONTRIBUTORS.rst b/privacy/readme/CONTRIBUTORS.rst index 4c0548e..fa802d6 100644 --- a/privacy/readme/CONTRIBUTORS.rst +++ b/privacy/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Miquel Raïch * Daniel Reis +* George Daramouskas diff --git a/privacy_partner_report/README.rst b/privacy_partner_report/README.rst index ff70cea..f34d393 100644 --- a/privacy_partner_report/README.rst +++ b/privacy_partner_report/README.rst @@ -48,6 +48,7 @@ Contributors ------------ * Miquel Raïch +* George Daramouskas Do not contact contributors directly about support or help with technical issues. diff --git a/privacy_partner_report/__openerp__.py b/privacy_partner_report/__openerp__.py index 6c0ed62..5b9abd9 100644 --- a/privacy_partner_report/__openerp__.py +++ b/privacy_partner_report/__openerp__.py @@ -3,7 +3,7 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { 'name': 'Privacy Partner Report', - 'version': '9.0.1.0.0', + 'version': '8.0.1.0.0', 'category': 'GDPR', 'summary': 'Show the transactions that a specific partner is involved in.', 'author': "Eficent, " diff --git a/privacy_partner_report/views/privacy_menu_view.xml b/privacy_partner_report/views/privacy_menu_view.xml index a1cad2d..6f2a150 100644 --- a/privacy_partner_report/views/privacy_menu_view.xml +++ b/privacy_partner_report/views/privacy_menu_view.xml @@ -1,14 +1,16 @@ - + - + + + - + diff --git a/privacy_partner_report/views/privacy_report.xml b/privacy_partner_report/views/privacy_report.xml index ae11dbc..359bf67 100644 --- a/privacy_partner_report/views/privacy_report.xml +++ b/privacy_partner_report/views/privacy_report.xml @@ -1,11 +1,17 @@ - - - Privacy Partner Data - privacy.partner.report - ir.actions.report.xml - privacy.report_partner_xlsx - xlsx - - - + + + + + Privacy Partner Data + privacy.partner.report + ir.actions.report.xml + privacy.report_partner_xlsx + xlsx + + + + + diff --git a/privacy_partner_report/wizard/privacy_report_partner.py b/privacy_partner_report/wizard/privacy_report_partner.py index c348580..d9df4f7 100644 --- a/privacy_partner_report/wizard/privacy_report_partner.py +++ b/privacy_partner_report/wizard/privacy_report_partner.py @@ -3,7 +3,7 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from openerp import api, fields, models, _ from openerp.osv import fields as old_fields -from openerp.exceptions import UserError +from openerp.exceptions import MissingError class PrivacyPartnerReport(models.TransientModel): @@ -23,6 +23,7 @@ class PrivacyPartnerReport(models.TransientModel): ) table_ids = fields.Many2many( comodel_name='privacy.partner.data', + relation='privacy_parter_report_data_rel', string='Models with related partner data', ) @@ -107,11 +108,11 @@ class PrivacyPartnerReport(models.TransientModel): @api.multi def compute_data_for_report(self, data): if not data.get('form'): - raise UserError( + raise MissingError( _("Form content is missing, this report cannot be printed.")) partner = data['form'].get('partner_id', False) if not partner: - raise UserError( + raise MissingError( _("No provided partner.")) partner = self.env['res.partner'].sudo().browse(partner[0]) tables = data['form'].get('table_ids', False) diff --git a/privacy_partner_report/wizard/privacy_report_partner_wizard.xml b/privacy_partner_report/wizard/privacy_report_partner_wizard.xml index bc75960..03f2acf 100644 --- a/privacy_partner_report/wizard/privacy_report_partner_wizard.xml +++ b/privacy_partner_report/wizard/privacy_report_partner_wizard.xml @@ -1,51 +1,53 @@ - - - - Partner Report - privacy.partner.report - -
- - - Select a company
- + + + + + Partner Report + privacy.partner.report + + + + + Select a company
+ + - - - Select a partner
- + + Select a partner
+ + + + + + + + + + - - - - - - - - - -
-
- -
- +
+
+ + + - - Partner Report - privacy.partner.report - ir.actions.act_window - form - form - - {} - new - + + Partner Report + privacy.partner.report + ir.actions.act_window + form + form + + {} + new + - + +