diff --git a/LICENSE b/LICENSE
index 3ffc5678..8410c200 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
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 .
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
-.
\ No newline at end of file
+.
\ No newline at end of file
diff --git a/report_qweb_parameter/README.rst b/report_qweb_parameter/README.rst
index 261adc78..e3659433 100644
--- a/report_qweb_parameter/README.rst
+++ b/report_qweb_parameter/README.rst
@@ -1,5 +1,5 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
- :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+ :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
=====================
@@ -24,7 +24,7 @@ Usage
.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
- :target: https://runbot.odoo-community.org/runbot/143/10.0
+ :target: https://runbot.odoo-community.org/runbot/143/11.0
Bug Tracker
diff --git a/report_qweb_parameter/__init__.py b/report_qweb_parameter/__init__.py
index ec50cfc0..b44d7659 100644
--- a/report_qweb_parameter/__init__.py
+++ b/report_qweb_parameter/__init__.py
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from . import models
diff --git a/report_qweb_parameter/__manifest__.py b/report_qweb_parameter/__manifest__.py
index 99741eb7..1d8d7060 100644
--- a/report_qweb_parameter/__manifest__.py
+++ b/report_qweb_parameter/__manifest__.py
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Creu Blanca
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-# noinspection PyStatementEffect
{
"name": "Report QWeb Parameter",
- "version": "10.0.1.0.1",
+ "version": "11.0.1.0.0",
"license": "AGPL-3",
"summary": """
Add new parameters for qweb templates in order to reduce field length
@@ -16,9 +15,7 @@
"website": "https://github.com/oca/reporting-engine",
"category": "Technical Settings",
"depends": [
- "report",
- ],
- "data": [
+ "web",
],
"demo": [
"demo/test_report_field_length.xml"
diff --git a/report_qweb_parameter/demo/test_report_field_length.xml b/report_qweb_parameter/demo/test_report_field_length.xml
index 2b3d92f3..2b127431 100644
--- a/report_qweb_parameter/demo/test_report_field_length.xml
+++ b/report_qweb_parameter/demo/test_report_field_length.xml
@@ -5,14 +5,14 @@
id="test_report_length_report_id"
model="res.company"
string="Length Report"
- report_type="qweb-pdf"
+ report_type="qweb-html"
name="report_qweb_parameter.test_report_length"
/>
-
+
+ t-esc="docs[0].street" t-if="docs[0].street"/>
-
+
diff --git a/report_qweb_parameter/models/__init__.py b/report_qweb_parameter/models/__init__.py
index 6b04fd25..dd58c12a 100644
--- a/report_qweb_parameter/models/__init__.py
+++ b/report_qweb_parameter/models/__init__.py
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from . import ir_qweb
diff --git a/report_qweb_parameter/models/ir_qweb.py b/report_qweb_parameter/models/ir_qweb.py
index 7042198c..67e80044 100644
--- a/report_qweb_parameter/models/ir_qweb.py
+++ b/report_qweb_parameter/models/ir_qweb.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Creu Blanca
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import models, _
from odoo.exceptions import ValidationError
diff --git a/report_qweb_parameter/tests/__init__.py b/report_qweb_parameter/tests/__init__.py
index e4695dbf..e6422248 100644
--- a/report_qweb_parameter/tests/__init__.py
+++ b/report_qweb_parameter/tests/__init__.py
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from . import test_report_qweb_parameter
diff --git a/report_qweb_parameter/tests/test_report_qweb_parameter.py b/report_qweb_parameter/tests/test_report_qweb_parameter.py
index 70251161..510770ab 100644
--- a/report_qweb_parameter/tests/test_report_qweb_parameter.py
+++ b/report_qweb_parameter/tests/test_report_qweb_parameter.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Creu Blanca
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
import xml.etree.ElementTree as ET
@@ -10,40 +10,40 @@ from odoo.tests import common
class TestReportQWebParameter(common.TransactionCase):
def test_qweb_parameter(self):
- report_object = self.env['ir.actions.report.xml']
report_name = 'report_qweb_parameter.test_report_length'
+ report_obj = self.env['ir.actions.report']
+ report_object = report_obj._get_report_from_name(report_name)
+
docs = self.env['res.company'].search([], limit=1)
vat = docs.vat
website = docs.website
- fax = docs.fax
+ street = docs.street
company_registry = docs.company_registry
docs.update({
- 'fax': '12345678901',
+ 'street': '12345678901',
'vat': '12345678901',
'website': '1234567890',
'company_registry': '1234567890'
})
- rep = report_object.render_report(docs.ids, report_name, False)
- root = ET.fromstring(
- rep[0]
- )
- self.assertEqual(root[1][0][0][0].text, "1234567890")
- self.assertEqual(root[1][0][0][2].text, "1234567890")
- docs.update({'fax': '123456789'})
+ rep = report_object.render(docs.ids, False)
+ root = ET.fromstring(rep[0])
+ self.assertEqual(root[0].text, "1234567890")
+ self.assertEqual(root[2].text, "1234567890")
+ docs.update({'street': '123456789'})
with self.assertRaises(QWebException):
- report_object.render_report(docs.ids, report_name, False)
- docs.update({'fax': '1234567890', 'vat': '123456789'})
+ report_object.render(docs.ids, False)
+ docs.update({'street': '1234567890', 'vat': '123456789'})
with self.assertRaises(QWebException):
- report_object.render_report(docs.ids, report_name, False)
+ report_object.render(docs.ids, False)
docs.update({'vat': '1234567890', 'website': '12345678901'})
with self.assertRaises(QWebException):
- report_object.render_report(docs.ids, report_name, False)
+ report_object.render(docs.ids, False)
docs.update(
{'website': '1234567890', 'company_registry': '12345678901'})
with self.assertRaises(QWebException):
- report_object.render_report(docs.ids, report_name, False)
+ report_object.render(docs.ids, False)
docs.update({
- 'fax': fax,
+ 'street': street,
'vat': vat,
'website': website,
'company_registry': company_registry