Fix imports

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>

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)

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
 

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToDocx.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocToHtml.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToDocy.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocxToOdt.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformDocyToDocx.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToHtml.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPdf.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToPptx.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdpToSxi.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToHtml.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToPdf.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdsToXlsx.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToDocx.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformOdtToHtml.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPdfToBmp.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptToPptx.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToOdp.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptxToPpty.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformPptyToPptx.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToHtml.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformSxiToOdp.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToOds.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsToXlsx.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToOds.py

 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"""

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsxToXlsy.py

 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:

bt5/erp5_dms/ModuleComponentTemplateItem/portal_components/module.erp5.TransformXlsyToXlsx.py

 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"""

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>

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>

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>

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>

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

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

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
 
 

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>

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)

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:

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

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:

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:

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:

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):

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