[PORT] Backport privacy, privacy_partner_report to 8.0

6 years ago · c4beaa77f5
10 changed files with 92 additions and 67 deletions
--- 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
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@ -0,0 +1 @@
+reporting-engine
--- 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.',
--- a/privacy/readme/CONTRIBUTORS.rst
+++ b/privacy/readme/CONTRIBUTORS.rst
@ -1,2 +1,3 @@
 * Miquel Raïch <miquel.raich@eficent.com>
 * Daniel Reis <dreis.pt@hotmail.com>
+* George Daramouskas <gdaramouskas@therp.nl>
--- a/privacy_partner_report/README.rst
+++ b/privacy_partner_report/README.rst
@ -48,6 +48,7 @@ Contributors
 ------------

 * Miquel Raïch <miquel.raich@eficent.com>
+* George Daramouskas <gdaramouskas@therp.nl>

 Do not contact contributors directly about support or help with technical issues.

--- 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, "
--- a/privacy_partner_report/views/privacy_menu_view.xml
+++ b/privacy_partner_report/views/privacy_menu_view.xml
@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
-<odoo>
+<openerp>

-    <menuitem id="menu_privacy_report_privacy_report"
-              name="Partner Report"
-              parent="privacy.menu_data_protection_report"
-              groups="privacy.group_data_protection_user"
-              sequence="10"
-              action="privacy_partner_report.action_privacy_partner_menu"
-    />
+    <data>
+        <menuitem id="menu_privacy_report_privacy_report"
+            name="Partner Report"
+            parent="privacy.menu_data_protection_report"
+            groups="privacy.group_data_protection_user"
+            sequence="10"
+            action="privacy_partner_report.action_privacy_partner_menu"
+        />
+    </data>

-</odoo>
+</openerp>
--- a/privacy_partner_report/views/privacy_report.xml
+++ b/privacy_partner_report/views/privacy_report.xml
@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="action_report_partner_data_xlsx" model="ir.actions.report.xml">
-      <field name="name">Privacy Partner Data</field>
-      <field name="model">privacy.partner.report</field>
-      <field name="type">ir.actions.report.xml</field>
-      <field name="report_name">privacy.report_partner_xlsx</field>
-      <field name="report_type">xlsx</field>
-      <field name="auto" eval="False"/>
-    </record>
-</odoo>
+<openerp>
+    <data>
+
+        <record
+            id="action_report_partner_data_xlsx"
+            model="ir.actions.report.xml">
+            <field name="name">Privacy Partner Data</field>
+            <field name="model">privacy.partner.report</field>
+            <field name="type">ir.actions.report.xml</field>
+            <field name="report_name">privacy.report_partner_xlsx</field>
+            <field name="report_type">xlsx</field>
+            <field name="auto" eval="False"/>
+        </record>
+
+    </data>
+</openerp>
--- 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)
--- a/privacy_partner_report/wizard/privacy_report_partner_wizard.xml
+++ b/privacy_partner_report/wizard/privacy_report_partner_wizard.xml
@ -1,51 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
-<odoo>
-
-    <record id="privacy_partner_report_wizard" model="ir.ui.view">
-        <field name="name">Partner Report</field>
-        <field name="model">privacy.partner.report</field>
-        <field name="arch" type="xml">
-        <form string="Report Options">
-            <group groups="base.group_multi_company">
-                <group>
-                    <span >Select a company</span><br/>
-                    <field name="company_id" options="{'no_create': True}" nolabel="1" />
+<openerp>
+    <data>
+            
+        <record id="privacy_partner_report_wizard" model="ir.ui.view">
+            <field name="name">Partner Report</field>
+            <field name="model">privacy.partner.report</field>
+            <field name="arch" type="xml">
+            <form string="Report Options">
+                <group groups="base.group_multi_company">
+                    <group>
+                        <span >Select a company</span><br/>
+                        <field name="company_id" options="{'no_create': True}" nolabel="1" />
+                    </group>
                </group>
-            </group>
-            <group>
                <group>
-                    <span>Select a partner</span><br/>
-                    <field name="partner_id" options="{'no_create': True}" nolabel="1" domain="[('company_id', 'in', [False, company_id])]"/>
+                    <group>
+                        <span>Select a partner</span><br/>
+                        <field name="partner_id" options="{'no_create': True}" nolabel="1" domain="[('company_id', 'in', [False, company_id])]"/>
+                    </group>
+                </group>
+                <group attrs="{'invisible': [('partner_id', '=', False)]}" col="1">
+                    <field name="table_ids" options="{'no_create': True}" editable="bottom">
+                        <tree>
+                            <field name="model_id"/>
+                            <field name="count_rows" text-align="right"/>
+                        </tree>
+                    </field>
                </group>
-            </group>
-            <group attrs="{'invisible': [('partner_id', '=', False)]}" col="1">
-                <field name="table_ids" options="{'no_create': True}" editable="bottom">
-                    <tree>
-                        <field name="model_id"/>
-                        <field name="count_rows" text-align="right"/>
-                    </tree>
-                </field>
-            </group>
-            <footer>
-                <button name="button_export_xlsx" string="Export XLSX" type="object" default_focus="1" class="oe_highlight"/>
-                or
-                <button string="Cancel" class="oe_link" special="cancel" />
-            </footer>
-        </form>
-        </field>
-    </record>
+                <footer>
+                    <button name="button_export_xlsx" string="Export XLSX" type="object" default_focus="1" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+            </field>
+        </record>

-    <record id="action_privacy_partner_menu" model="ir.actions.act_window">
-        <field name="name">Partner Report</field>
-        <field name="res_model">privacy.partner.report</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="privacy_partner_report_wizard"/>
-        <field name="context">{}</field>
-        <field name="target">new</field>
-    </record>
+        <record id="action_privacy_partner_menu" model="ir.actions.act_window">
+            <field name="name">Partner Report</field>
+            <field name="res_model">privacy.partner.report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="privacy_partner_report_wizard"/>
+            <field name="context">{}</field>
+            <field name="target">new</field>
+        </record>

-</odoo>
+    </data>
+</openerp>