From 91065dd9a6d3a2ac8d7df6251168c02eb4bafc10 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Tue, 29 Nov 2016 13:53:52 +0100
Subject: [PATCH 01/11] import code from launchpad

---
 l10n_nl_intrastat/__init__.py                 |   2 +
 l10n_nl_intrastat/__openerp__.py              |  59 ++++
 l10n_nl_intrastat/i18n/l10n_nl_intrastat.pot  | 172 +++++++++++
 l10n_nl_intrastat/i18n/nl.po                  | 172 +++++++++++
 l10n_nl_intrastat/model/__init__.py           |   1 +
 l10n_nl_intrastat/model/l10n_nl_intrastat.py  | 289 ++++++++++++++++++
 .../security/ir.model.access.csv              |   3 +
 l10n_nl_intrastat/view/l10n_nl_intrastat.xml  |  74 +++++
 8 files changed, 772 insertions(+)
 create mode 100644 l10n_nl_intrastat/__init__.py
 create mode 100644 l10n_nl_intrastat/__openerp__.py
 create mode 100644 l10n_nl_intrastat/i18n/l10n_nl_intrastat.pot
 create mode 100644 l10n_nl_intrastat/i18n/nl.po
 create mode 100644 l10n_nl_intrastat/model/__init__.py
 create mode 100644 l10n_nl_intrastat/model/l10n_nl_intrastat.py
 create mode 100644 l10n_nl_intrastat/security/ir.model.access.csv
 create mode 100644 l10n_nl_intrastat/view/l10n_nl_intrastat.xml

diff --git a/l10n_nl_intrastat/__init__.py b/l10n_nl_intrastat/__init__.py
new file mode 100644
index 000000000..5f214a295
--- /dev/null
+++ b/l10n_nl_intrastat/__init__.py
@@ -0,0 +1,2 @@
+import model
+
diff --git a/l10n_nl_intrastat/__openerp__.py b/l10n_nl_intrastat/__openerp__.py
new file mode 100644
index 000000000..7281fc8e0
--- /dev/null
+++ b/l10n_nl_intrastat/__openerp__.py
@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Intrastat report for the Netherlands (ICP)
+#
+#    Based on lp:new-report-intrastat, 
+#    Copyright (C) 2010-2011 Akretion (http://www.akretion.com). All Rights Reserved
+#    @author Alexis de Lattre <alexis.delattre@akretion.com>
+#
+#    Modifications Copyright (C) 2012 Therp BV <http://therp.nl>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Intrastat reporting (ICP) for the Netherlands',
+    'version': '1.0',
+    'category': 'Localisation/Report Intrastat',
+    'license': 'AGPL-3',
+    'description': """
+Opgaaf IntraCommunautaire Prestaties (ICP)
+
+Based on Akretion's Intrastat framework, this module provides an
+intrastat report for the Netherlands. Only generating the required data
+for a manual declaration is supported. Message communication with the
+tax authority has not yet been implemented.
+
+The intrastat base module requires the country field required on
+partner addresses. Selected countries are marked for inclusion in this report.
+
+Amounts for products and services are reported separately. All services
+are reported, regardless of the 'Accessory cost setting' which is used in
+the French version of this report.
+
+To exclude specific lines from the report, you can mark specific taxes
+as such. If such a tax is applied to the line, the line will not be
+included in the reported amounts.
+""",
+    'author': 'Therp BV',
+    'website': 'https://launchpad.net/new-report-intrastat',
+    'depends': ['intrastat_base'],
+    'data': [
+        'view/l10n_nl_intrastat.xml',
+        'security/ir.model.access.csv',
+    ],
+}
+
diff --git a/l10n_nl_intrastat/i18n/l10n_nl_intrastat.pot b/l10n_nl_intrastat/i18n/l10n_nl_intrastat.pot
new file mode 100644
index 000000000..71de90fe6
--- /dev/null
+++ b/l10n_nl_intrastat/i18n/l10n_nl_intrastat.pot
@@ -0,0 +1,172 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* l10n_nl_intrastat
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-10-23 11:48+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_nl_intrastat
+#: model:ir.model,name:l10n_nl_intrastat.model_l10n_nl_report_intrastat
+msgid "Declaration of intracommunautary transactions (ICP)"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,amount_service:0
+msgid "Amount services"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: selection:l10n_nl.report.intrastat,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,amount_product:0
+msgid "Amount products"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:144
+#, python-format
+msgid ""
+"Missing country on the invoice addresses of the following partners:\n"
+"%s"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,notes:0
+msgid "You can add some comments here if you want."
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,company_id:0
+msgid "Related company."
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,date_done:0
+msgid "Last date when the intrastat declaration was converted to 'Done' state."
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,vat:0
+msgid "VAT"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,total_amount:0
+msgid "Total amount"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,country_code:0
+msgid "Country Code"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: view:l10n_nl.report.intrastat:0 field:l10n_nl.report.intrastat,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: model:ir.model,name:l10n_nl_intrastat.model_l10n_nl_report_intrastat_line
+msgid "ICP report line"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:219
+#, python-format
+msgid "Cannot remove IPC reports in a non-draft state"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:119
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:143
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:218
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,state:0
+msgid ""
+"State of the declaration. When the state is set to 'Done', the parameters "
+"become read-only."
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,report_id:0
+msgid "ICP report"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,line_ids:0
+msgid "ICP line"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,total_amount:0
+msgid "Total amount in company currency of the declaration."
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:120
+#, python-format
+msgid "Cannot generate reports lines in a non-draft state"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: view:l10n_nl.report.intrastat:0
+msgid "Generate lines"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: selection:l10n_nl.report.intrastat,state:0
+msgid "Done"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: view:l10n_nl.report.intrastat:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: model:ir.actions.act_window,name:l10n_nl_intrastat.l10n_nl_intrastat_tree_action
+#: model:ir.ui.menu,name:l10n_nl_intrastat.l10n_nl_intrastat_report_menu
+msgid "ICP Report"
+msgstr ""
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,date_done:0
+msgid "Date done"
+msgstr ""
diff --git a/l10n_nl_intrastat/i18n/nl.po b/l10n_nl_intrastat/i18n/nl.po
new file mode 100644
index 000000000..c2bf38289
--- /dev/null
+++ b/l10n_nl_intrastat/i18n/nl.po
@@ -0,0 +1,172 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_nl_intrastat
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-04 11:31+0000\n"
+"PO-Revision-Date: 2012-12-04 11:31+0000\n"
+"Last-Translator: <stefan@therp.nl>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_nl_intrastat
+#: model:ir.model,name:l10n_nl_intrastat.model_l10n_nl_report_intrastat
+msgid "Declaration of intracommunautary transactions (ICP)"
+msgstr "Opgaaf Intracommunautaire Prestaties (ICP)"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,amount_service:0
+msgid "Amount services"
+msgstr "Totaalbedrag diensten"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: l10n_nl_intrastat
+#: selection:l10n_nl.report.intrastat,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,amount_product:0
+msgid "Amount products"
+msgstr "Totaalbedrag leveringen"
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:144
+#, python-format
+msgid "Missing country on the invoice addresses of the following partners:\n"
+"%s"
+msgstr "Ontbrekend land op het factuuradresvan de volgende partner:\n"
+"%s"
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,notes:0
+msgid "You can add some comments here if you want."
+msgstr "Hier kunnen eventuele aantekeningen geplaatst worden."
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,company_id:0
+msgid "Related company."
+msgstr "Bedrijf van deze aangifte."
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,date_done:0
+msgid "Last date when the intrastat declaration was converted to 'Done' state."
+msgstr "Datum van de laatste statuswijziging naar 'Gereed'."
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,vat:0
+msgid "VAT"
+msgstr "BTW-nummer"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,total_amount:0
+msgid "Total amount"
+msgstr "Totaalbedrag"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,country_code:0
+msgid "Country Code"
+msgstr "Landcode"
+
+#. module: l10n_nl_intrastat
+#: view:l10n_nl.report.intrastat:0
+#: field:l10n_nl.report.intrastat,notes:0
+msgid "Notes"
+msgstr "Aantekeningen"
+
+#. module: l10n_nl_intrastat
+#: model:ir.model,name:l10n_nl_intrastat.model_l10n_nl_report_intrastat_line
+msgid "ICP report line"
+msgstr "ICP aangifteregel"
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:219
+#, python-format
+msgid "Cannot remove IPC reports in a non-draft state"
+msgstr "Alleen aangiften in concept-status kunnen worden verwijderd"
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:119
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:143
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:218
+#, python-format
+msgid "Error"
+msgstr "Fout"
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,state:0
+msgid "State of the declaration. When the state is set to 'Done', the parameters become read-only."
+msgstr "Status van de aangifte. Wanneer de status op 'Gereed' staat, worden de gegevens alleen-lezen."
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,report_id:0
+msgid "ICP report"
+msgstr "Aangifte ICP"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,line_ids:0
+msgid "ICP line"
+msgstr "ICP-regel"
+
+#. module: l10n_nl_intrastat
+#: help:l10n_nl.report.intrastat,total_amount:0
+msgid "Total amount in company currency of the declaration."
+msgstr "Totaalbedrag van de aangifte in de bedrijfsvaluta"
+
+#. module: l10n_nl_intrastat
+#: code:addons/l10n_nl_intrastat/model/l10n_nl_intrastat.py:120
+#, python-format
+msgid "Cannot generate reports lines in a non-draft state"
+msgstr "Kan alleen regels genereren voor een aangifte in concept-status"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: l10n_nl_intrastat
+#: view:l10n_nl.report.intrastat:0
+msgid "Generate lines"
+msgstr "Regels aanmaken"
+
+#. module: l10n_nl_intrastat
+#: selection:l10n_nl.report.intrastat,state:0
+msgid "Done"
+msgstr "Gereed"
+
+#. module: l10n_nl_intrastat
+#: view:l10n_nl.report.intrastat:0
+msgid "Cancel"
+msgstr "Annuleer"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat.line,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: l10n_nl_intrastat
+#: model:ir.actions.act_window,name:l10n_nl_intrastat.l10n_nl_intrastat_tree_action
+#: model:ir.ui.menu,name:l10n_nl_intrastat.l10n_nl_intrastat_report_menu
+msgid "ICP Report"
+msgstr "Aangifte ICP"
+
+#. module: l10n_nl_intrastat
+#: field:l10n_nl.report.intrastat,date_done:0
+msgid "Date done"
+msgstr "Datum gereed"
+
diff --git a/l10n_nl_intrastat/model/__init__.py b/l10n_nl_intrastat/model/__init__.py
new file mode 100644
index 000000000..0cc5e41b3
--- /dev/null
+++ b/l10n_nl_intrastat/model/__init__.py
@@ -0,0 +1 @@
+import l10n_nl_intrastat
diff --git a/l10n_nl_intrastat/model/l10n_nl_intrastat.py b/l10n_nl_intrastat/model/l10n_nl_intrastat.py
new file mode 100644
index 000000000..6d648a9fc
--- /dev/null
+++ b/l10n_nl_intrastat/model/l10n_nl_intrastat.py
@@ -0,0 +1,289 @@
+# -*- encoding: utf-8 -*-
+"""Define intrastat report (ICP) for dutch tax authorities."""
+##############################################################################
+#
+#    OpenERP Report intrastat for NL
+#    Copyright (C) 2012 - 2015 Therp BV <http://therp.nl>
+#
+#    Based on and containing code snippets from lp:new-report-intrastat
+#    by Alexis de Lattre <alexis.delattre@akretion.com>,
+#    Copyright (C) 2010-2011 Akretion (http://www.akretion.com).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp import api, models, fields, _
+from openerp.exceptions import Warning
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from openerp.addons.decimal_precision import decimal_precision as dp
+
+
+class ReportIntrastat(models.Model):
+    """Define intrastat report (ICP) for dutch tax authorities."""
+    _name = "l10n_nl.report.intrastat"
+    _description = "Declaration of intracommunautary transactions (ICP)"
+    _order = "period_id desc"
+    _rec_name = 'period_id'
+
+    def _default_period_id(self):
+        """
+        By default, take the previous period relative to the
+        current date. Courtesy of Alexis.
+        """
+        period_model = self.env['account.period']
+        date = datetime.strftime(
+            datetime.today() + relativedelta(day=1, months=-1), '%Y-%m-%d')
+        period_ids = period_model.find(dt=date)
+        return period_ids and period_ids[0] or False
+
+    def _default_company_id(self):
+        """Default company is active user company."""
+        return self.env.user.company_id.id
+
+    period_id = fields.Many2one(
+        string='Period',
+        comodel_name='account.period',
+        states={'done': [('readonly', True)]},
+        default=_default_period_id,
+    )
+    company_id = fields.Many2one(
+        string='Company',
+        comodel_name='res.company',
+        required=True,
+        states={'done': [('readonly', True)]},
+        help="Related company.",
+        default=_default_company_id,
+    )
+    total_amount = fields.Float(
+        string='Total amount',
+        readonly=True,
+        help="Total amount in company currency of the declaration.",
+        digits=dp.get_precision('Account'),
+    )
+    state = fields.Selection(
+        string='State',
+        selection=[
+            ('draft', 'Draft'),
+            ('done', 'Done'),
+        ],
+        default='draft',
+        readonly=True,
+        help=(
+            "State of the declaration. When the state is set to 'Done', "
+            "the parameters become read-only."
+        ),
+    )
+    date_done = fields.Date(
+        string='Date done',
+        readonly=True,
+        help=(
+            "Last date when the intrastat declaration was converted to "
+            "'Done' state."
+        ),
+    )
+    notes = fields.Text(
+        string='Notes',
+        help="You can add some comments here if you want.",
+    )
+    line_ids = fields.One2many(
+        string='ICP line',
+        comodel_name='l10n_nl.report.intrastat.line',
+        inverse_name='report_id',
+        readonly=True,
+    )
+
+    @api.one
+    def set_draft(self):
+        """
+        Reset report state to draft.
+        """
+        return self.write({'state': 'draft'})
+
+    @api.one
+    def generate_lines(self):
+        """
+        Collect the data lines for the given report.
+        Unlink any existing lines first.
+        """
+        # Generating lines is only allowed for report in draft state:
+        if self.state != 'draft':
+            raise Warning(_(
+                'Cannot generate reports lines in a non-draft state'))
+        # Other models:
+        report_line_model = self.env['l10n_nl.report.intrastat.line']
+        currency_model = self.env['res.currency']
+        invoice_model = self.env['account.invoice']
+        invoice_line_model = self.env['account.invoice.line']
+
+        total_amount = 0.0
+        partner_amounts_map = {}
+        # Check wether all configuration done to generate report
+        self.env['report.intrastat.common']._check_generate_lines(self)
+
+        # Remove existing lines
+        for line_obj in self.line_ids:
+            line_obj.unlink()
+        # Define search for invoices for period and company:
+        company_obj = self.company_id  # simplify access
+        invoice_domain = [
+            ('type', 'in', ('out_invoice', 'out_refund')),
+            ('period_id', '=', self.period_id.id),
+            ('state', 'in', ('open', 'paid')),
+            ('company_id', '=', company_obj.id),
+        ]
+        # Signal invoices without a country
+        # (Should not happen, as country_id on parter is set to required)
+        invalid_invoices = invoice_model.search_read(
+            domain=invoice_domain + [('partner_id.country_id', '=', False)],
+            fields=['partner_id']
+        )
+        if invalid_invoices:
+            raise Warning(
+                _(
+                    "Missing country on the invoice addresses of the"
+                    " following partners:\n%s"
+                ) % "\n".join(
+                    inv['partner_id'][1] for inv in invalid_invoices)
+            )
+        # Search invoices that need intrastat reporting:
+        invoice_records = invoice_model.search(
+            invoice_domain + [
+                ('partner_id.country_id.intrastat', '=', True),
+                ('partner_id.country_id.id', '!=', company_obj.country_id.id),
+            ]
+        )
+        invoice_ids = [inv['id'] for inv in invoice_records]
+        invoice_line_records = invoice_line_model.search(
+            [('invoice_id', 'in', invoice_ids)])
+
+        # Gather amounts from invoice lines
+        for line in invoice_line_records:
+            # Ignore invoiceline if taxes should not be included in intrastat:
+            if any(
+                    tax.exclude_from_intrastat_if_present
+                    for tax in line.invoice_line_tax_id):
+                continue
+            # Report is per commercial partner:
+            commercial_partner_id = (
+                line.invoice_id.partner_id.commercial_partner_id.id)
+            if commercial_partner_id not in partner_amounts_map:
+                partner_amounts_map[commercial_partner_id] = {
+                    'amount_product': 0.0,
+                    'amount_service': 0.0,
+                }
+            amounts = partner_amounts_map[commercial_partner_id]
+            # Determine product or service:
+            if (line.product_id
+                    and (
+                        line.product_id.type == 'service'
+                        or line.product_id.is_accessory_cost)):
+                amount_type = 'amount_service'
+            else:
+                amount_type = 'amount_product'
+            sign = line.invoice_id.type == 'out_refund' and -1 or 1
+            amount = sign * line.price_subtotal
+            # Convert currency amount if necessary:
+            line_currency_obj = line.invoice_id.currency_id  # simplify
+            invoice_date = line.invoice_id.date_invoice
+            if (line_currency_obj
+                    and line_currency_obj.id != company_obj.currency_id.id):
+                amount = (
+                    line_currency_obj.with_context(date=invoice_date).compute(
+                        amount, company_obj.currency_id, round=True)
+                )
+            # Accumulate totals:
+            amounts[amount_type] += amount  # per partner and type
+            total_amount += amount  # grand total
+
+        # Create report lines
+        for (partner_id, vals) in partner_amounts_map.items():
+            if not (vals['amount_service'] or vals['amount_product']):
+                continue
+            vals.update({
+                'partner_id': partner_id,
+                'report_id': self.id
+            })
+            report_line_model.create(vals)
+
+        return self.write({
+            'total_amount': total_amount,
+            'date_done': fields.Date.today(),
+            'state': 'done',
+        })
+
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Do not allow unlinking of confirmed reports
+        """
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        non_draft_ids = self.search(
+            cr, uid,
+            [('id', 'in', ids), ('state', '!=', 'draft')],
+            context=context
+        )
+        if non_draft_ids:
+            raise Warning(_('Cannot remove IPC reports in a non-draft state'))
+        return super(ReportIntrastat, self).unlink(
+            cr, uid, ids, context=context)
+
+
+class ReportIntrastatLine(models.Model):
+    """Lines for dutch ICP report."""
+    _name = "l10n_nl.report.intrastat.line"
+    _description = "ICP report line"
+    _order = "report_id, country_code"
+    _rec_name = 'partner_id'
+
+    report_id = fields.Many2one(
+        string='ICP report',
+        comodel_name='l10n_nl.report.intrastat',
+        readonly=True,
+        required=True,
+        ondelete="CASCADE"
+    )
+    partner_id = fields.Many2one(
+        string='Partner',
+        comodel_name='res.partner',
+        readonly=True,
+        required=True,
+    )
+    vat = fields.Char(
+        string='VAT',
+        related='partner_id.vat',
+        store=True,
+        readonly=True,
+    )
+    country_code = fields.Char(
+        string='Country Code',
+        related='partner_id.country_id.code',
+        store=True,
+        readonly=True,
+    )
+    amount_product = fields.Float(
+        string='Amount products',
+        readonly=True,
+        digits=dp.get_precision('Account'),
+    )
+    amount_service = fields.Float(
+        string='Amount services',
+        readonly=True,
+        digits=dp.get_precision('Account'),
+    )
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/l10n_nl_intrastat/security/ir.model.access.csv b/l10n_nl_intrastat/security/ir.model.access.csv
new file mode 100644
index 000000000..c850ace5d
--- /dev/null
+++ b/l10n_nl_intrastat/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_l10n_nl_report_intrastat","Account manager can use ICP reports","model_l10n_nl_report_intrastat","account.group_account_manager",1,1,1,1
+"access_l10n_nl_report_intrastat_line","Account manager can use ICP report lines","model_l10n_nl_report_intrastat_line","account.group_account_manager",1,1,1,1
diff --git a/l10n_nl_intrastat/view/l10n_nl_intrastat.xml b/l10n_nl_intrastat/view/l10n_nl_intrastat.xml
new file mode 100644
index 000000000..ebb874c9e
--- /dev/null
+++ b/l10n_nl_intrastat/view/l10n_nl_intrastat.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="l10n_nl_intrastat_report_form" model="ir.ui.view">
+            <field name="name">l10n_nl.intrastat.report.form</field>
+            <field name="model">l10n_nl.report.intrastat</field>
+            <field name="arch" type="xml">
+                <form string="ICP Declaration">
+                    <field name="period_id"/>
+                    <field name="total_amount"/>
+                    <field name="state"/>
+                    <field name="date_done"/>
+                    <field name="company_id"/>
+                    <button icon="gtk-execute"
+                            name="generate_lines"
+                            string="Generate lines"
+                            type="object"
+                            states="draft"
+                            colspan="1"/>
+                    <button icon="gtk-cancel"
+                            name="set_draft"
+                            string="Cancel"
+                            type="object"
+                            states="done"
+                            colspan="1"/>
+                    <separator colspan="4" string="Notes"/>
+                    <field name="notes" colspan="4" nolabel="1"/>
+                    <field name="line_ids" colspan="4" nolabel="1" mode="tree"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="l10n_nl_intrastat_report_tree" model="ir.ui.view">
+            <field name="name">l10n_nl.intrastat.report.tree</field>
+            <field name="model">l10n_nl.report.intrastat</field>
+            <field name="arch" type="xml">
+                <tree string="ICP Declarations">
+                    <field name="period_id"/>
+                    <field name="state"/>
+                    <field name="date_done"/>
+                    <field name="company_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="l10n_nl_intrastat_report_line_tree" model="ir.ui.view">
+            <field name="name">l10n_nl.intrastat.report.line.tree</field>
+            <field name="model">l10n_nl.report.intrastat.line</field>
+            <field name="arch" type="xml">
+                <tree string="ICP Declaration lines">
+                    <field name="partner_id"/>
+                    <field name="country_code"/>
+                    <field name="vat"/>
+                    <field name="amount_product"/>
+                    <field name="amount_service"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="l10n_nl_intrastat_tree_action" model="ir.actions.act_window">
+            <field name="name">ICP Report</field>
+            <field name="res_model">l10n_nl.report.intrastat</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem
+            id="l10n_nl_intrastat_report_menu"
+            parent="intrastat_base.menu_intrastat_base_root"
+            action="l10n_nl_intrastat_tree_action" />
+
+    </data>
+</openerp>

From 40cd29784d7aad0b7f73a0a059c759cbe5864c64 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Tue, 29 Nov 2016 13:54:18 +0100
Subject: [PATCH 02/11] bump version

---
 l10n_nl_intrastat/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l10n_nl_intrastat/__openerp__.py b/l10n_nl_intrastat/__openerp__.py
index 7281fc8e0..2b8951a76 100644
--- a/l10n_nl_intrastat/__openerp__.py
+++ b/l10n_nl_intrastat/__openerp__.py
@@ -26,7 +26,7 @@
 
 {
     'name': 'Intrastat reporting (ICP) for the Netherlands',
-    'version': '1.0',
+    'version': '8.0.1.0.0',
     'category': 'Localisation/Report Intrastat',
     'license': 'AGPL-3',
     'description': """

From 96cd2db778115f1eba76fce1cbdc51cf3b9befd7 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Tue, 29 Nov 2016 14:04:13 +0100
Subject: [PATCH 03/11] Repair broken check_generate_lines call

---
 l10n_nl_intrastat/model/l10n_nl_intrastat.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/l10n_nl_intrastat/model/l10n_nl_intrastat.py b/l10n_nl_intrastat/model/l10n_nl_intrastat.py
index 6d648a9fc..458e62f8e 100644
--- a/l10n_nl_intrastat/model/l10n_nl_intrastat.py
+++ b/l10n_nl_intrastat/model/l10n_nl_intrastat.py
@@ -37,6 +37,7 @@ class ReportIntrastat(models.Model):
     _description = "Declaration of intracommunautary transactions (ICP)"
     _order = "period_id desc"
     _rec_name = 'period_id'
+    _inherit = ['intrastat.common']
 
     def _default_period_id(self):
         """
@@ -130,8 +131,8 @@ def generate_lines(self):
 
         total_amount = 0.0
         partner_amounts_map = {}
-        # Check wether all configuration done to generate report
-        self.env['report.intrastat.common']._check_generate_lines(self)
+        # Check whether all configuration done to generate report
+        self._check_generate_lines()
 
         # Remove existing lines
         for line_obj in self.line_ids:

From 6a5a0d5996d571ea1f57113da7dcc0a901f2addd Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Tue, 29 Nov 2016 14:12:32 +0100
Subject: [PATCH 04/11] encoding, folder structure

---
 l10n_nl_intrastat/__init__.py                            | 3 ++-
 l10n_nl_intrastat/__openerp__.py                         | 2 +-
 l10n_nl_intrastat/{model => models}/__init__.py          | 1 +
 l10n_nl_intrastat/{model => models}/l10n_nl_intrastat.py | 0
 l10n_nl_intrastat/{view => views}/l10n_nl_intrastat.xml  | 0
 5 files changed, 4 insertions(+), 2 deletions(-)
 rename l10n_nl_intrastat/{model => models}/__init__.py (51%)
 rename l10n_nl_intrastat/{model => models}/l10n_nl_intrastat.py (100%)
 rename l10n_nl_intrastat/{view => views}/l10n_nl_intrastat.xml (100%)

diff --git a/l10n_nl_intrastat/__init__.py b/l10n_nl_intrastat/__init__.py
index 5f214a295..601ffa6a9 100644
--- a/l10n_nl_intrastat/__init__.py
+++ b/l10n_nl_intrastat/__init__.py
@@ -1,2 +1,3 @@
-import model
+# -*- coding: utf-8 -*-
+from . import models
 
diff --git a/l10n_nl_intrastat/__openerp__.py b/l10n_nl_intrastat/__openerp__.py
index 2b8951a76..84ae7418b 100644
--- a/l10n_nl_intrastat/__openerp__.py
+++ b/l10n_nl_intrastat/__openerp__.py
@@ -52,7 +52,7 @@
     'website': 'https://launchpad.net/new-report-intrastat',
     'depends': ['intrastat_base'],
     'data': [
-        'view/l10n_nl_intrastat.xml',
+        'views/l10n_nl_intrastat.xml',
         'security/ir.model.access.csv',
     ],
 }
diff --git a/l10n_nl_intrastat/model/__init__.py b/l10n_nl_intrastat/models/__init__.py
similarity index 51%
rename from l10n_nl_intrastat/model/__init__.py
rename to l10n_nl_intrastat/models/__init__.py
index 0cc5e41b3..d87cba8af 100644
--- a/l10n_nl_intrastat/model/__init__.py
+++ b/l10n_nl_intrastat/models/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 import l10n_nl_intrastat
diff --git a/l10n_nl_intrastat/model/l10n_nl_intrastat.py b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
similarity index 100%
rename from l10n_nl_intrastat/model/l10n_nl_intrastat.py
rename to l10n_nl_intrastat/models/l10n_nl_intrastat.py
diff --git a/l10n_nl_intrastat/view/l10n_nl_intrastat.xml b/l10n_nl_intrastat/views/l10n_nl_intrastat.xml
similarity index 100%
rename from l10n_nl_intrastat/view/l10n_nl_intrastat.xml
rename to l10n_nl_intrastat/views/l10n_nl_intrastat.xml

From 2faf7399ea30549eb53d56683fd54c149007c83c Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Tue, 29 Nov 2016 17:22:51 +0100
Subject: [PATCH 05/11] tests: generation of report and checking of total
 amount

---
 l10n_nl_intrastat/tests/__init__.py |  3 ++
 l10n_nl_intrastat/tests/test_all.py | 59 +++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 l10n_nl_intrastat/tests/__init__.py
 create mode 100644 l10n_nl_intrastat/tests/test_all.py

diff --git a/l10n_nl_intrastat/tests/__init__.py b/l10n_nl_intrastat/tests/__init__.py
new file mode 100644
index 000000000..9818fd62f
--- /dev/null
+++ b/l10n_nl_intrastat/tests/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import test_all
diff --git a/l10n_nl_intrastat/tests/test_all.py b/l10n_nl_intrastat/tests/test_all.py
new file mode 100644
index 000000000..ac122ed04
--- /dev/null
+++ b/l10n_nl_intrastat/tests/test_all.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from openerp.tests.common import TransactionCase
+
+
+class TestIntrastatNL(TransactionCase):
+    """Tests for this module"""
+
+    def setUp(self):
+        super(TestIntrastatNL, self).setUp()
+        self.intrastat_report = self.env['l10n_nl.report.intrastat']
+
+    def test_generate_report(self):
+        # Set our company's country to NL
+        company = self.env.ref('base.main_company')
+        company.country_id = self.env.ref('base.nl')
+        # Create an empty, draft intrastat report
+        report = self.intrastat_report.create({
+            'company_id': company.id
+        })
+        self.assertEquals(report.state, 'draft')
+        # Check if the period has correctly defaulted to last month
+        a_date_in_last_month = datetime.today() \
+            + relativedelta(day=1, months=-1)
+        period_name = datetime.strftime(a_date_in_last_month, 'X %m/%Y')
+        self.assertEquals(report.period_id.name, period_name)
+        # Generate lines and store initial total
+        report.generate_lines()
+        total = report.total_amount
+        # Product: On site Monitoring, a service
+        product = self.env.ref('product.product_product_1')
+        # Create a new invoice to MediaPole (de), dated last month.
+        # Total price: 250
+        invoice = self.env['account.invoice'].create({
+            'account_id': self.env.ref('account.a_recv').id,
+            'date_invoice': a_date_in_last_month,
+            'partner_id': self.env.ref('base.res_partner_8').id,
+            'invoice_line': [
+                (0, False, {
+                    'name': 'Test sale',
+                    'account_id': self.env.ref('account.a_sale').id,
+                    'price_unit': 50.0,
+                    'product_id': product.id,
+                    'quantity': 5.0,
+                    'uos_id': self.env.ref('product.product_uom_unit').id
+                })
+            ]
+        })
+        # validate the invoice
+        invoice.signal_workflow('invoice_open')
+        # generate lines again
+        report.set_draft()
+        report.generate_lines()
+        # Test if the difference between the previous and current amount is 250
+        self.assertEquals(report.total_amount - total, 250.0)
+

From 0509415863e20f79493c9d813776a1fcd914d729 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Fri, 2 Dec 2016 18:37:16 +0100
Subject: [PATCH 06/11] linting fixes

---
 l10n_nl_intrastat/__openerp__.py              |  6 +++---
 l10n_nl_intrastat/models/__init__.py          |  3 ++-
 l10n_nl_intrastat/models/l10n_nl_intrastat.py | 21 +++++--------------
 l10n_nl_intrastat/tests/test_all.py           |  1 -
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/l10n_nl_intrastat/__openerp__.py b/l10n_nl_intrastat/__openerp__.py
index 84ae7418b..eb45f9aa4 100644
--- a/l10n_nl_intrastat/__openerp__.py
+++ b/l10n_nl_intrastat/__openerp__.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Intrastat report for the Netherlands (ICP)
@@ -32,7 +32,7 @@
     'description': """
 Opgaaf IntraCommunautaire Prestaties (ICP)
 
-Based on Akretion's Intrastat framework, this module provides an
+Based on the OCA Intrastat framework, this module provides an
 intrastat report for the Netherlands. Only generating the required data
 for a manual declaration is supported. Message communication with the
 tax authority has not yet been implemented.
@@ -48,7 +48,7 @@
 as such. If such a tax is applied to the line, the line will not be
 included in the reported amounts.
 """,
-    'author': 'Therp BV',
+    'author': 'Therp BV, Odoo Community Association (OCA)',
     'website': 'https://launchpad.net/new-report-intrastat',
     'depends': ['intrastat_base'],
     'data': [
diff --git a/l10n_nl_intrastat/models/__init__.py b/l10n_nl_intrastat/models/__init__.py
index d87cba8af..0b408b742 100644
--- a/l10n_nl_intrastat/models/__init__.py
+++ b/l10n_nl_intrastat/models/__init__.py
@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
-import l10n_nl_intrastat
+
+from . import l10n_nl_intrastat
diff --git a/l10n_nl_intrastat/models/l10n_nl_intrastat.py b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
index 458e62f8e..b169e4934 100644
--- a/l10n_nl_intrastat/models/l10n_nl_intrastat.py
+++ b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """Define intrastat report (ICP) for dutch tax authorities."""
 ##############################################################################
 #
@@ -225,23 +225,14 @@ def generate_lines(self):
             'state': 'done',
         })
 
-    def unlink(self, cr, uid, ids, context=None):
+    @api.multi
+    def unlink(self):
         """
         Do not allow unlinking of confirmed reports
         """
-        if not ids:
-            return True
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        non_draft_ids = self.search(
-            cr, uid,
-            [('id', 'in', ids), ('state', '!=', 'draft')],
-            context=context
-        )
-        if non_draft_ids:
+        if self.search([('state', '!=', 'draft')]):
             raise Warning(_('Cannot remove IPC reports in a non-draft state'))
-        return super(ReportIntrastat, self).unlink(
-            cr, uid, ids, context=context)
+        return super(ReportIntrastat, self).unlink()
 
 
 class ReportIntrastatLine(models.Model):
@@ -286,5 +277,3 @@ class ReportIntrastatLine(models.Model):
         readonly=True,
         digits=dp.get_precision('Account'),
     )
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/l10n_nl_intrastat/tests/test_all.py b/l10n_nl_intrastat/tests/test_all.py
index ac122ed04..c4320083f 100644
--- a/l10n_nl_intrastat/tests/test_all.py
+++ b/l10n_nl_intrastat/tests/test_all.py
@@ -56,4 +56,3 @@ def test_generate_report(self):
         report.generate_lines()
         # Test if the difference between the previous and current amount is 250
         self.assertEquals(report.total_amount - total, 250.0)
-

From 2592b2253649933ded60cef5a96b09b72c2d7cf7 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Fri, 2 Dec 2016 18:41:22 +0100
Subject: [PATCH 07/11] readme

---
 l10n_nl_intrastat/README.rst | 76 ++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 l10n_nl_intrastat/README.rst

diff --git a/l10n_nl_intrastat/README.rst b/l10n_nl_intrastat/README.rst
new file mode 100644
index 000000000..cc07c58ab
--- /dev/null
+++ b/l10n_nl_intrastat/README.rst
@@ -0,0 +1,76 @@
+.. 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
+
+=============================================
+Intrastat reporting (ICP) for the Netherlands
+=============================================
+
+Based on the OCA Intrastat framework, this module provides an
+intrastat report for the Netherlands. Only generating the required data
+for a manual declaration is supported. Message communication with the
+tax authority has not yet been implemented.
+
+Installation
+============
+
+Just install.
+
+Configuration
+=============
+
+To configure this module, you need to:
+
+#. Configure the country of your company (NL)
+#. Configure some accounting periods
+
+Usage
+=====
+
+To use this module, you need to:
+
+#. Invoice some companies in other EU countries
+#. Go to Accounting - Legal Reports - Intrastat - ICP report
+#. View there the values for each period
+#. Manually copy the values into your ICP tax entry
+
+Known issues / Roadmap
+======================
+
+* The Dutch tax authority accepts an XML format, generate this to avoid manual processing.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/{project_repo}/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Therp BV
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.

From c2a9a59826e35b35528c80824ec92c44b6e0e6f4 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Fri, 2 Dec 2016 18:45:46 +0100
Subject: [PATCH 08/11] flake8

---
 l10n_nl_intrastat/__openerp__.py              | 6 +++---
 l10n_nl_intrastat/models/l10n_nl_intrastat.py | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/l10n_nl_intrastat/__openerp__.py b/l10n_nl_intrastat/__openerp__.py
index eb45f9aa4..7f9b4a92f 100644
--- a/l10n_nl_intrastat/__openerp__.py
+++ b/l10n_nl_intrastat/__openerp__.py
@@ -3,8 +3,9 @@
 #
 #    Intrastat report for the Netherlands (ICP)
 #
-#    Based on lp:new-report-intrastat, 
-#    Copyright (C) 2010-2011 Akretion (http://www.akretion.com). All Rights Reserved
+#    Based on lp:new-report-intrastat,
+#    Copyright (C) 2010-2011 Akretion (http://www.akretion.com).
+#    All Rights Reserved
 #    @author Alexis de Lattre <alexis.delattre@akretion.com>
 #
 #    Modifications Copyright (C) 2012 Therp BV <http://therp.nl>
@@ -56,4 +57,3 @@
         'security/ir.model.access.csv',
     ],
 }
-
diff --git a/l10n_nl_intrastat/models/l10n_nl_intrastat.py b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
index b169e4934..a3626d98c 100644
--- a/l10n_nl_intrastat/models/l10n_nl_intrastat.py
+++ b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
@@ -125,7 +125,6 @@ def generate_lines(self):
                 'Cannot generate reports lines in a non-draft state'))
         # Other models:
         report_line_model = self.env['l10n_nl.report.intrastat.line']
-        currency_model = self.env['res.currency']
         invoice_model = self.env['account.invoice']
         invoice_line_model = self.env['account.invoice.line']
 
@@ -187,10 +186,9 @@ def generate_lines(self):
                 }
             amounts = partner_amounts_map[commercial_partner_id]
             # Determine product or service:
-            if (line.product_id
-                    and (
-                        line.product_id.type == 'service'
-                        or line.product_id.is_accessory_cost)):
+            if (line.product_id and
+                (line.product_id.type == 'service' or
+                    line.product_id.is_accessory_cost)):
                 amount_type = 'amount_service'
             else:
                 amount_type = 'amount_product'

From 09aec5ff3938250506826b9a7b2d20bc46364157 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Fri, 2 Dec 2016 19:01:49 +0100
Subject: [PATCH 09/11] flake

---
 l10n_nl_intrastat/models/l10n_nl_intrastat.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/l10n_nl_intrastat/models/l10n_nl_intrastat.py b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
index a3626d98c..20a097034 100644
--- a/l10n_nl_intrastat/models/l10n_nl_intrastat.py
+++ b/l10n_nl_intrastat/models/l10n_nl_intrastat.py
@@ -197,8 +197,8 @@ def generate_lines(self):
             # Convert currency amount if necessary:
             line_currency_obj = line.invoice_id.currency_id  # simplify
             invoice_date = line.invoice_id.date_invoice
-            if (line_currency_obj
-                    and line_currency_obj.id != company_obj.currency_id.id):
+            if (line_currency_obj and
+                    line_currency_obj.id != company_obj.currency_id.id):
                 amount = (
                     line_currency_obj.with_context(date=invoice_date).compute(
                         amount, company_obj.currency_id, round=True)

From 53554dd78362384d53e110d0035bacc88129abf0 Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Wed, 11 Jan 2017 16:55:24 +0100
Subject: [PATCH 10/11] short license headers and flake errors

---
 l10n_nl_chart_rgs/scripts/csv_to_chart_xml.py |  1 +
 l10n_nl_intrastat/__openerp__.py              | 51 ++-----------------
 l10n_nl_partner_name/scripts/guess_names.py   |  2 +
 3 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/l10n_nl_chart_rgs/scripts/csv_to_chart_xml.py b/l10n_nl_chart_rgs/scripts/csv_to_chart_xml.py
index e5ca64f38..8267e3144 100644
--- a/l10n_nl_chart_rgs/scripts/csv_to_chart_xml.py
+++ b/l10n_nl_chart_rgs/scripts/csv_to_chart_xml.py
@@ -188,5 +188,6 @@ def main():
     print FOOTER
     return 0
 
+
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/l10n_nl_intrastat/__openerp__.py b/l10n_nl_intrastat/__openerp__.py
index 7f9b4a92f..a7822ad4a 100644
--- a/l10n_nl_intrastat/__openerp__.py
+++ b/l10n_nl_intrastat/__openerp__.py
@@ -1,54 +1,13 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Intrastat report for the Netherlands (ICP)
-#
-#    Based on lp:new-report-intrastat,
-#    Copyright (C) 2010-2011 Akretion (http://www.akretion.com).
-#    All Rights Reserved
-#    @author Alexis de Lattre <alexis.delattre@akretion.com>
-#
-#    Modifications Copyright (C) 2012 Therp BV <http://therp.nl>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
+# Copyright 2010-2011 Akretion (http://www.akretion.com).
+# Modifications Copyright 2012-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     'name': 'Intrastat reporting (ICP) for the Netherlands',
-    'version': '8.0.1.0.0',
+    'version': '8.0.1.0.1',
     'category': 'Localisation/Report Intrastat',
     'license': 'AGPL-3',
-    'description': """
-Opgaaf IntraCommunautaire Prestaties (ICP)
-
-Based on the OCA Intrastat framework, this module provides an
-intrastat report for the Netherlands. Only generating the required data
-for a manual declaration is supported. Message communication with the
-tax authority has not yet been implemented.
-
-The intrastat base module requires the country field required on
-partner addresses. Selected countries are marked for inclusion in this report.
-
-Amounts for products and services are reported separately. All services
-are reported, regardless of the 'Accessory cost setting' which is used in
-the French version of this report.
-
-To exclude specific lines from the report, you can mark specific taxes
-as such. If such a tax is applied to the line, the line will not be
-included in the reported amounts.
-""",
+    'summary': """Intrastat report for the Netherlands""",
     'author': 'Therp BV, Odoo Community Association (OCA)',
     'website': 'https://launchpad.net/new-report-intrastat',
     'depends': ['intrastat_base'],
diff --git a/l10n_nl_partner_name/scripts/guess_names.py b/l10n_nl_partner_name/scripts/guess_names.py
index d0f0ce8fa..542a7dc42 100644
--- a/l10n_nl_partner_name/scripts/guess_names.py
+++ b/l10n_nl_partner_name/scripts/guess_names.py
@@ -24,6 +24,7 @@ def openerp_execute(model, method, *pargs, **kwargs):
         args.openerp_db, openerp_uid,
         args.openerp_passwd, model, method, *pargs, **kwargs)
 
+
 infixes = ['van', 'der', 'ter', 'de', 'v/d']
 initial = re.compile(r'^([A-Z]{1,3}\.{0,1}){1,4}$')
 
@@ -34,6 +35,7 @@ def openerp_execute(model, method, *pargs, **kwargs):
 def add_token(values, key, token, delimiter=' '):
     values[key] = (values[key] + ' ' if values[key] else '') + token
 
+
 while True:
     ids = openerp_execute(
         'res.partner', 'search',

From 9871f319bdabfc3be604e8559074715f6f16204b Mon Sep 17 00:00:00 2001
From: Tom <antiflu@gmail.com>
Date: Wed, 11 Jan 2017 17:07:22 +0100
Subject: [PATCH 11/11] oca dependencies

---
 oca_dependencies.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oca_dependencies.txt b/oca_dependencies.txt
index 3839e0144..95e17d245 100644
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@@ -1 +1,2 @@
 partner-contact https://github.com/OCA/partner-contact 8.0
+intrastat https://github.com/sunflowerit/intrastat 8.0-intrastat_base-tests