[erp5_trade/simplified_invoicing] Enable reports for ERP5JS

8c3c1fde · Romain Courteaud · db647a0d · 8c3c1fde · 8c3c1fde · 8c3c1fde
Commit 8c3c1fde authored Sep 24, 2019 by Romain Courteaud
17 changed files
--- a/bt5/erp5_deferred_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_deferred_style_zuite/testDeferredStyleInvoicesReportAction.xml
+++ b/bt5/erp5_deferred_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_deferred_style_zuite/testDeferredStyleInvoicesReportAction.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>testDeferredStyleInvoicesReportAction</string> </value>
+        </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <unicode></unicode> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/bt5/erp5_deferred_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_deferred_style_zuite/testDeferredStyleInvoicesReportAction.zpt
+++ b/bt5/erp5_deferred_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_deferred_style_zuite/testDeferredStyleInvoicesReportAction.zpt
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Test Form print Action</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test Default Module View</td></tr>
+</thead><tbody>
+<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForDeferredRenderjsUi/macros/init" />
+<tr>
+  <td>open</td>
+  <td>${renderjs_url}/accounting_module</td>
+  <td></td>
+</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
+<tal:block tal:define="click_configuration python: {'text': 'Export'}">
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block tal:define="click_configuration python: {'text': 'Invoices Report'}">
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link" />
+</tal:block>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" />
+<tal:block tal:define="notification_configuration python: {'class': 'error',
+                                                           'text': 'No person found for your user'}">
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
+</tal:block>
+</tbody></table>
+</body>
+</html>
\ No newline at end of file
--- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/invoice_export.xml
+++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/invoice_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -32,7 +32,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/invoice_report.xml
+++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Accounting%20Transaction%20Module/invoice_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -30,7 +30,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -32,7 +32,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Order%20Module/order_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -30,7 +30,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/packing_list_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/packing_list_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/packing_list_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Purchase%20Packing%20List%20Module/packing_list_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Order%20Module/order_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Order%20Module/order_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -32,7 +32,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Order%20Module/order_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Purchase%20Order%20Module/order_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -30,7 +30,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Order%20Module/order_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Order%20Module/order_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -32,7 +32,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Order%20Module/order_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Returned%20Sale%20Order%20Module/order_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -30,7 +30,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -32,7 +32,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Order%20Module/order_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>
@@ -30,7 +30,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>icon</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/packing_list_export.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/packing_list_export.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_exchange</string>
+                <string>action_type/object_jio_exchange</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_exchange</string> </value>
+            <value> <string>object_jio_exchange</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>

--- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/packing_list_report.xml
+++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Sale%20Packing%20List%20Module/packing_list_report.xml
@@ -16,13 +16,13 @@
            <key> <string>categories</string> </key>
            <value>
              <tuple>
-                <string>action_type/object_report</string>
+                <string>action_type/object_jio_report</string>
              </tuple>
            </value>
        </item>
        <item>
            <key> <string>category</string> </key>
-            <value> <string>object_report</string> </value>
+            <value> <string>object_jio_report</string> </value>
        </item>
        <item>
            <key> <string>condition</string> </key>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_launchOrderReport.py
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderModule_launchOrderReport.py
@@ -4,21 +4,27 @@ from json import dumps
 from Products.CMFActivity.ActiveResult import ActiveResult
 portal = context.getPortalObject()
 N_ = portal.Base_translateString
+request = context.REQUEST
+previous_skin_selection = request.get('previous_skin_selection', None)
 # Check deferred style is present
 if not 'Deferred' in portal.portal_skins.getSkinSelections():
+  portal.changeSkin(previous_skin_selection)
  return context.Base_redirect('view', keep_items=dict(
-              portal_status_message=N_("Deferred style must be installed to run this report")))
+              portal_status_message=N_("Deferred style must be installed to run this report"),
+              portal_status_level='error'))
 person_value = portal.portal_membership.getAuthenticatedMember().getUserValue()
 if person_value is None:
-  portal.changeSkin(None)
+  portal.changeSkin(previous_skin_selection)
  return context.Base_redirect('view', keep_items=dict(
-              portal_status_message=N_("No person found for your user")))
+              portal_status_message=N_("No person found for your user"),
+              portal_status_level='error'))
 if person_value.getDefaultEmailText('') in ('', None):
-  portal.changeSkin(None)
+  portal.changeSkin(previous_skin_selection)
  return context.Base_redirect('view', keep_items=dict(
-              portal_status_message=N_("You haven't defined your email address")))
+              portal_status_message=N_("You haven't defined your email address"),
+              portal_status_level='error'))
 parameter_dict, stat_columns, selection_columns = context.OrderModule_getOrderReportParameterDict()
@@ -35,7 +41,6 @@ active_process.postResult(ActiveResult(
      })
      ))
-request = context.REQUEST
 context.getPortalObject().portal_skins.changeSkin("Deferred")
 request.set('portal_skin', "Deferred")
 assert deferred_portal_skin is not None, "No deferred portal skin found in parameters"
@@ -48,6 +53,7 @@ kw.update(parameter_dict)
 kw.pop('format',None)
 return context.Base_activateReport(
  form = getattr(context, report_method_id),
+  previous_skin_selection = previous_skin_selection,
  after_tag=script.id,
  **kw
  )