From b27aee89bf4d37443934a3f85f2f83d3aa251a74 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date: Thu, 9 Jul 2020 10:47:11 +0900
Subject: [PATCH] Fix imports
---
.../erp5_apparel/ApparelModel_Printout.xml | 2 +-
.../portal_components/test.erp5.testBudget.py | 2 +-
.../portal_components/test.erp5.testDeferredStyle.py | 2 +-
.../module.erp5.TransformDocToDocx.py | 2 +-
.../module.erp5.TransformDocToHtml.py | 2 +-
.../module.erp5.TransformDocxToDocy.py | 2 +-
.../module.erp5.TransformDocxToOdt.py | 2 +-
.../module.erp5.TransformDocyToDocx.py | 2 +-
.../module.erp5.TransformOdpToHtml.py | 2 +-
.../module.erp5.TransformOdpToPdf.py | 2 +-
.../module.erp5.TransformOdpToPptx.py | 2 +-
.../module.erp5.TransformOdpToSxi.py | 2 +-
.../module.erp5.TransformOdsToHtml.py | 2 +-
.../module.erp5.TransformOdsToPdf.py | 2 +-
.../module.erp5.TransformOdsToXlsx.py | 2 +-
.../module.erp5.TransformOdtToDocx.py | 2 +-
.../module.erp5.TransformOdtToHtml.py | 2 +-
.../module.erp5.TransformPdfToBmp.py | 2 +-
.../module.erp5.TransformPptToPptx.py | 2 +-
.../module.erp5.TransformPptxToOdp.py | 2 +-
.../module.erp5.TransformPptxToPpty.py | 2 +-
.../module.erp5.TransformPptyToPptx.py | 2 +-
.../module.erp5.TransformSxiToHtml.py | 2 +-
.../module.erp5.TransformSxiToOdp.py | 2 +-
.../module.erp5.TransformXlsToOds.py | 2 +-
.../module.erp5.TransformXlsToXlsx.py | 2 +-
.../module.erp5.TransformXlsxToOds.py | 2 +-
.../module.erp5.TransformXlsxToXlsy.py | 2 +-
.../module.erp5.TransformXlsyToXlsx.py | 2 +-
.../portal_transforms/html_to_odt.xml | 2 +-
.../portal_transforms/odt_to_doc.xml | 2 +-
.../portal_transforms/odt_to_pdf.xml | 2 +-
.../portal_transforms/odt_to_xml.xml | 2 +-
.../test.erp5.testFormPrintoutAsODG.py | 2 +-
.../test.erp5.testFormPrintoutAsODT.py | 2 +-
.../test.erp5.testOOoDynamicStyle.py | 2 +-
.../erp5_core/ToolTemplateItem/portal_transforms.xml | 10 +++++-----
product/ERP5/tests/testAccountingReports.py | 4 ++--
product/ERP5/tests/testAdvancedInvoicing.py | 2 +-
product/ERP5/tests/testCRM.py | 4 ++--
product/ERP5/tests/testInvoice.py | 8 ++++----
product/ERP5/tests/testOrder.py | 12 ++++++------
product/ERP5/tests/testPackingList.py | 2 +-
product/ERP5/tests/testTradeModelLine.py | 2 +-
product/ERP5Form/tests/testOOoChart.py | 2 +-
45 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_Printout.xml b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_Printout.xml
index b8899d05c0..ce2e4b48f8 100644
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_Printout.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_Printout.xml
@@ -22,7 +22,7 @@
<global name="__newobj__" module="copy_reg"/>
</klass>
<tuple>
- <global name="ODGStrategy" module="Products.ERP5OOo.FormPrintout"/>
+ <global name="ODGStrategy" module="erp5.component.module.FormPrintout"/>
</tuple>
<state>
<dictionary>
diff --git a/bt5/erp5_budget/TestTemplateItem/portal_components/test.erp5.testBudget.py b/bt5/erp5_budget/TestTemplateItem/portal_components/test.erp5.testBudget.py
index df99a04485..afdb669737 100644
--- a/bt5/erp5_budget/TestTemplateItem/portal_components/test.erp5.testBudget.py
+++ b/bt5/erp5_budget/TestTemplateItem/portal_components/test.erp5.testBudget.py
@@ -1811,7 +1811,7 @@ class TestBudget(ERP5TypeTestCase):
self.assertEqual(.5, line_list[3][2]['consumed_ratio'])
# validate report ODF
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
odf = budget.Budget_viewBudgetConsumptionReport()
err_list = odf_validator.validate(odf)
diff --git a/bt5/erp5_deferred_style/TestTemplateItem/portal_components/test.erp5.testDeferredStyle.py b/bt5/erp5_deferred_style/TestTemplateItem/portal_components/test.erp5.testDeferredStyle.py
index 8945a06ccb..9897b72ce1 100644
--- a/bt5/erp5_deferred_style/TestTemplateItem/portal_components/test.erp5.testDeferredStyle.py
+++ b/bt5/erp5_deferred_style/TestTemplateItem/portal_components/test.erp5.testDeferredStyle.py
@@ -31,7 +31,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import createZODBPythonScript
from Testing import ZopeTestCase
from AccessControl.SecurityManagement import newSecurityManager
-from Products.ERP5OOo.tests.utils import Validator
+from erp5.component.module.OOoTestUtil import Validator
from lxml import html
import email, urlparse, httplib
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToDocx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToDocx.py
index 01d18942de..53e1288c51 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToDocx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToDocx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class DocToDocx:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToHtml.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToHtml.py
index 723d6f79a6..40bfc01cfd 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToHtml.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToHtml.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class DocToHtml:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToDocy.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToDocy.py
index 0cadc4504f..c178d56862 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToDocy.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToDocy.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class DocxToDocy:
"""Transforms docx to docy by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToOdt.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToOdt.py
index 83eaf0e899..4b63535647 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToOdt.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToOdt.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class DocxToOdt:
"""Transforms docx to odt by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocyToDocx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocyToDocx.py
index badf8625a5..98556e1f26 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocyToDocx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocyToDocx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class DocyToDocx:
"""Transforms docy to docx by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToHtml.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToHtml.py
index 94fd8e4e26..9de33cd0a5 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToHtml.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToHtml.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdpToHtml:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPdf.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPdf.py
index 3a9257bc20..bae1cb30a7 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPdf.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPdf.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdpToPdf:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPptx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPptx.py
index c0aba948c1..a39a5b2ed1 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPptx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPptx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdpToPptx:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToSxi.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToSxi.py
index 8a3c38db1d..f0afcc79f6 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToSxi.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToSxi.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdpToSxi:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToHtml.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToHtml.py
index 870513d430..9c9fc35d17 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToHtml.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToHtml.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdsToHtml:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToPdf.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToPdf.py
index a71fb9c978..e689b33454 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToPdf.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToPdf.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdsToPdf:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToXlsx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToXlsx.py
index bf12f8fd9f..4e444c3090 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToXlsx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToXlsx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdsToXlsx:
"""Transforms ods to xlsx by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToDocx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToDocx.py
index 8ab2436f29..71a3b6cfed 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToDocx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToDocx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdtToDocx:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToHtml.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToHtml.py
index 940c784ef5..881999eb10 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToHtml.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToHtml.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class OdtToHtml:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPdfToBmp.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPdfToBmp.py
index a22d1b3778..4be1743286 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPdfToBmp.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPdfToBmp.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class PdfToBmp:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptToPptx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptToPptx.py
index dda99a425a..99da9fe3c7 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptToPptx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptToPptx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class PptToPptx:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToOdp.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToOdp.py
index 6487c67d90..4ed0c128ba 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToOdp.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToOdp.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class PptxToOdp:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToPpty.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToPpty.py
index 00b339b3d4..e0b5eedaf8 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToPpty.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToPpty.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class PptxToPpty:
"""Transforms pptx to ppty by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptyToPptx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptyToPptx.py
index 23598a4080..59872ce59b 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptyToPptx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptyToPptx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class PptyToPptx:
"""Transforms ppty to pptx by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToHtml.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToHtml.py
index 83c5089f27..50eb60ace2 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToHtml.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToHtml.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class SxiToHtml:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToOdp.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToOdp.py
index fd05a8094c..6b85f364dd 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToOdp.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToOdp.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class SxiToOdp:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToOds.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToOds.py
index bc940b5849..d17c9acdf1 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToOds.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToOds.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class XlsToOds:
"""Transforms xls to ods by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToXlsx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToXlsx.py
index 991f40db3e..bf4f9da6b2 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToXlsx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToXlsx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class XlsToXlsx:
"""Transforms xls to xlsx by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToOds.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToOds.py
index e1bfb24758..3811d7f427 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToOds.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToOds.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class XlsxToOds:
"""Transforms xlsx to ods by using Cloudooo"""
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToXlsy.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToXlsy.py
index 0501218579..5e64341270 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToXlsy.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToXlsy.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class XlsxToXlsy:
diff --git a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsyToXlsx.py b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsyToXlsx.py
index 6f37cf3e2d..8b49d87c4f 100644
--- a/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsyToXlsx.py
+++ b/bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsyToXlsx.py
@@ -1,6 +1,6 @@
from Products.PortalTransforms.interfaces import itransform
from zope.interface import implements
-from Products.ERP5OOo.transforms.oood_commandtransform import OOOdCommandTransform, OOoDocumentDataStream
+from erp5.component.module.OOOdCommandTransform import OOOdCommandTransform, OOoDocumentDataStream
class XlsyToXlsx:
"""Transforms xlsy to xlsx by using Cloudooo"""
diff --git a/bt5/erp5_dms/PathTemplateItem/portal_transforms/html_to_odt.xml b/bt5/erp5_dms/PathTemplateItem/portal_transforms/html_to_odt.xml
index dc8215151b..456bdfa314 100644
--- a/bt5/erp5_dms/PathTemplateItem/portal_transforms/html_to_odt.xml
+++ b/bt5/erp5_dms/PathTemplateItem/portal_transforms/html_to_odt.xml
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.html_to_odt</string> </value>
+ <value> <string>erp5.component.module.TransformHtmlToOdt</string> </value>
</item>
<item>
<key> <string>output</string> </key>
diff --git a/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_doc.xml b/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_doc.xml
index bc5336a28c..c9e9533fa6 100644
--- a/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_doc.xml
+++ b/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_doc.xml
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_doc</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToDoc</string> </value>
</item>
<item>
<key> <string>output</string> </key>
diff --git a/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_pdf.xml b/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_pdf.xml
index bf70579c55..78c3b35ff9 100644
--- a/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_pdf.xml
+++ b/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_pdf.xml
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_pdf</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToPdf</string> </value>
</item>
<item>
<key> <string>output</string> </key>
diff --git a/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_xml.xml b/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_xml.xml
index 05ea12020d..5504f02ccf 100644
--- a/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_xml.xml
+++ b/bt5/erp5_dms/PathTemplateItem/portal_transforms/odt_to_xml.xml
@@ -64,7 +64,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_xml</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToXml</string> </value>
</item>
<item>
<key> <string>output</string> </key>
diff --git a/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODG.py b/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODG.py
index 2195409b7c..8006025c69 100644
--- a/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODG.py
+++ b/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODG.py
@@ -31,7 +31,7 @@ import unittest
import Products.ERP5
from erp5.component.module.TestFormPrintoutMixin import TestFormPrintoutMixin
from erp5.component.module.OOoUtils import OOoBuilder
-from Products.ERP5OOo.tests.utils import Validator
+from erp5.component.module.OOoTestUtil import Validator
from Products.ERP5Type.tests.utils import FileUpload
from lxml import etree
import os
diff --git a/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODT.py b/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODT.py
index 10c76ee7b4..468eccb606 100644
--- a/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODT.py
+++ b/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testFormPrintoutAsODT.py
@@ -36,7 +36,7 @@ from erp5.component.module.TestFormPrintoutMixin import TestFormPrintoutMixin
from Products.ERP5Type.tests.utils import createZODBPythonScript
from Products.MimetypesRegistry.mime_types.magic import guessMime
from erp5.component.module.OOoUtils import OOoBuilder
-from Products.ERP5OOo.tests.utils import Validator
+from erp5.component.module.OOoTestUtil import Validator
from Products.ERP5Type.tests.utils import FileUpload
from DateTime import DateTime
from lxml import etree
diff --git a/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testOOoDynamicStyle.py b/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testOOoDynamicStyle.py
index 7612d707c6..a2b59aab66 100644
--- a/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testOOoDynamicStyle.py
+++ b/bt5/erp5_odt_style/TestTemplateItem/portal_components/test.erp5.testOOoDynamicStyle.py
@@ -35,7 +35,7 @@ from zipfile import ZipFile
from Products.ERP5Type.tests.utils import FileUpload
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import DummyLocalizer
-from Products.ERP5OOo.tests.utils import Validator
+from erp5.component.module.OOoTestUtil import Validator
from erp5.component.module.OOoUtils import OOoBuilder
diff --git a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
index e70ae0a773..3ca2f6ee26 100644
--- a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
+++ b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
@@ -38603,7 +38603,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_pdf</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToPdf</string> </value>
</item>
<item>
<key> <string>output</string> </key>
@@ -38707,7 +38707,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_doc</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToDoc</string> </value>
</item>
<item>
<key> <string>output</string> </key>
@@ -38811,7 +38811,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_doc</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToDoc</string> </value>
</item>
<item>
<key> <string>output</string> </key>
@@ -39123,7 +39123,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.odt_to_xml</string> </value>
+ <value> <string>erp5.component.module.TransformOdtToXml</string> </value>
</item>
<item>
<key> <string>output</string> </key>
@@ -41976,7 +41976,7 @@
</item>
<item>
<key> <string>module</string> </key>
- <value> <string>Products.ERP5OOo.transforms.html_to_odt</string> </value>
+ <value> <string>erp5.component.module.TransformHtmlToOdt</string> </value>
</item>
<item>
<key> <string>output</string> </key>
diff --git a/product/ERP5/tests/testAccountingReports.py b/product/ERP5/tests/testAccountingReports.py
index b1b7795b79..3f08794e6a 100644
--- a/product/ERP5/tests/testAccountingReports.py
+++ b/product/ERP5/tests/testAccountingReports.py
@@ -4552,7 +4552,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
# for now, we simply check that that the report is rendered with no error
# and it produces valid odf
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
odf = self.portal.account_module.AccountModule_viewProfitAndLossReport()
err_list = odf_validator.validate(odf)
@@ -4573,7 +4573,7 @@ class TestAccountingReports(AccountingTestCase, ERP5ReportTestCase):
# for now, we simply check that that the report is rendered with no error
# and it produces valid odf
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
odf = self.portal.account_module.AccountModule_viewBalanceSheetReport()
err_list = odf_validator.validate(odf)
diff --git a/product/ERP5/tests/testAdvancedInvoicing.py b/product/ERP5/tests/testAdvancedInvoicing.py
index 623c3e0971..205fdc4f87 100644
--- a/product/ERP5/tests/testAdvancedInvoicing.py
+++ b/product/ERP5/tests/testAdvancedInvoicing.py
@@ -392,7 +392,7 @@ class TestAdvancedInvoice(TestSaleInvoiceMixin, ERP5TypeTestCase):
self.tic()
odt = invoice.Invoice_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
diff --git a/product/ERP5/tests/testCRM.py b/product/ERP5/tests/testCRM.py
index 8f6e97d804..1695445994 100644
--- a/product/ERP5/tests/testCRM.py
+++ b/product/ERP5/tests/testCRM.py
@@ -34,8 +34,8 @@ from unittest import expectedFailure
from Products.CMFCore.WorkflowCore import WorkflowException
from Products.ERP5Type.tests.utils import FileUpload
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5OOo.tests.testIngestion import FILENAME_REGULAR_EXPRESSION
-from Products.ERP5OOo.tests.testIngestion import REFERENCE_REGULAR_EXPRESSION
+from erp5.component.test.testIngestion import FILENAME_REGULAR_EXPRESSION
+from erp5.component.test.testIngestion import REFERENCE_REGULAR_EXPRESSION
from email.header import decode_header
from email.mime.multipart import MIMEMultipart
from email.mime.base import MIMEBase
diff --git a/product/ERP5/tests/testInvoice.py b/product/ERP5/tests/testInvoice.py
index f9829a50cb..cc17b1691f 100644
--- a/product/ERP5/tests/testInvoice.py
+++ b/product/ERP5/tests/testInvoice.py
@@ -1665,7 +1665,7 @@ class TestInvoice(TestInvoiceMixin):
product_total_price=str(10*3+20*5+60*5+60*3+7*20+130*0.2+300*0.05+20*0.1)
if text_content.find(product_total_price) == -1 :
self.fail('fail to get the total price of the products with tax')
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -1704,7 +1704,7 @@ class TestInvoice(TestInvoiceMixin):
self.tic()
odt = invoice.Invoice_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -1756,7 +1756,7 @@ class TestInvoice(TestInvoiceMixin):
self.tic()
odt = invoice.Invoice_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -1803,7 +1803,7 @@ class TestInvoice(TestInvoiceMixin):
self.assertEqual('0103/12/31', data_dict['stop_date'])
# rendering is valid odf
odt = invoice.Invoice_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
diff --git a/product/ERP5/tests/testOrder.py b/product/ERP5/tests/testOrder.py
index b60896f7b9..9a614b1dfb 100644
--- a/product/ERP5/tests/testOrder.py
+++ b/product/ERP5/tests/testOrder.py
@@ -2748,7 +2748,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.tic()
odt = order.Order_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -2784,7 +2784,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.tic()
odt = order.Order_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -2822,7 +2822,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.tic()
odt = order.Order_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -2863,7 +2863,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.tic()
odt = order.Order_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -2907,7 +2907,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.tic()
odt = order.Order_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
@@ -2947,7 +2947,7 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
self.tic()
odt = order.Order_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
diff --git a/product/ERP5/tests/testPackingList.py b/product/ERP5/tests/testPackingList.py
index 0544faceaf..3a919bda91 100644
--- a/product/ERP5/tests/testPackingList.py
+++ b/product/ERP5/tests/testPackingList.py
@@ -1789,7 +1789,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
self.tic()
odt = packing_list.PackingList_viewAsODT()
- from Products.ERP5OOo.tests.utils import Validator
+ from erp5.component.module.OOoTestUtil import Validator
odf_validator = Validator()
err_list = odf_validator.validate(odt)
if err_list:
diff --git a/product/ERP5/tests/testTradeModelLine.py b/product/ERP5/tests/testTradeModelLine.py
index 0d1cb3b341..567264b30a 100644
--- a/product/ERP5/tests/testTradeModelLine.py
+++ b/product/ERP5/tests/testTradeModelLine.py
@@ -38,7 +38,7 @@ from Products.ERP5Type.Base import Base
from Products.ERP5Type.Utils import simple_decorator
from DateTime import DateTime
from Products.ERP5Type.tests.utils import createZODBPythonScript
-from Products.ERP5OOo.tests.utils import Validator
+from erp5.component.module.OOoTestUtil import Validator
def save_result_as(name):
diff --git a/product/ERP5Form/tests/testOOoChart.py b/product/ERP5Form/tests/testOOoChart.py
index d00f51a894..896af0c916 100644
--- a/product/ERP5Form/tests/testOOoChart.py
+++ b/product/ERP5Form/tests/testOOoChart.py
@@ -31,7 +31,7 @@ from DocumentTemplate import String
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Testing import ZopeTestCase
-from Products.ERP5OOo.tests.utils import Validator
+from erp5.component.module.OOoTestUtil import Validator
from Acquisition import aq_base
from Products.ERP5Type.Globals import get_request
from Products.ERP5.Document.Document import VALID_IMAGE_FORMAT_LIST
--
2.30.9