Browse Source

Fix skip fusion on server when the fusion is local

pull/258/head
Laurent Mignon 8 years ago
committed by Laurent Mignon (ACSONE)
parent
commit
8892b8faa6
  1. 1
      report_py3o/demo/.~lock.res_user.odt#
  2. 2
      report_py3o/py3o_parser.py
  3. 14
      report_py3o/tests/test_report_py3o.py

1
report_py3o/demo/.~lock.res_user.odt#

@ -1 +0,0 @@
,lmi,nbacsonelmi,04.10.2016 15:56,file:///home/lmi/.config/libreoffice/4;

2
report_py3o/py3o_parser.py

@ -166,6 +166,8 @@ class Py3oParser(report_sxw):
"datadict": json.dumps(datadict), "datadict": json.dumps(datadict),
"image_mapping": "{}", "image_mapping": "{}",
} }
if report_xml.py3o_is_local_fusion:
fields['skipfusion'] = '1'
r = requests.post( r = requests.post(
report_xml.py3o_server_id.url, data=fields, files=files) report_xml.py3o_server_id.url, data=fields, files=files)
if r.status_code != 200: if r.status_code != 200:

14
report_py3o/tests/test_report_py3o.py

@ -14,14 +14,14 @@ import openerp.tests
class TestReportPy3o(TransactionCase): class TestReportPy3o(TransactionCase):
def test_reports(self): def test_reports(self):
domain = [('report_type', '=', 'py3o'),
('report_name', '=', 'py3o_user_info')]
reports = self.env['ir.actions.report.xml'].search(domain)
self.assertEqual(1, len(reports))
for r in reports:
report = self.env.ref("report_py3o.res_users_report_py3o")
with mock.patch('openerp.addons.report_py3o.py3o_parser.' with mock.patch('openerp.addons.report_py3o.py3o_parser.'
'Py3oParser.create_single_pdf') as patched_pdf: 'Py3oParser.create_single_pdf') as patched_pdf:
r.render_report(self.env.user.ids,
r.report_name,
# test the call the the create method inside our custom parser
report.render_report(self.env.user.ids,
report.report_name,
{}) {})
self.assertEqual(1, patched_pdf.call_count) self.assertEqual(1, patched_pdf.call_count)
res = report.render_report(
self.env.user.ids, report.report_name, {})
self.assertTrue(res)
Loading…
Cancel
Save