Skip to content

S
slapos.core
Commit 7e49ec5e authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Rafael Monnerat
2 Browse files
Options

slapos_jio: fix display of invoice 

Since bea2620a, the controller uses parent_relative_url instead of
portal_type (because the portal_type canbe translated). For "Sale
Invoice Transaction", the module is accounting, so rename the view page
accordingly.
parent 166abc36
Pipeline #10028 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 229 additions and 3 deletions
    master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html.html → master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html.html
    View file @ 7e49ec5e
    ...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
    <script src="renderjs.js" type="text/javascript"></script> <script src="renderjs.js" type="text/javascript"></script>
    <!-- custom script --> <!-- custom script -->
    <script src="gadget_erp5_page_slap_sale_invoice_transaction_view.js" type="text/javascript"></script> <script src="gadget_erp5_page_slap_accounting_view.js" type="text/javascript"></script>
    </head> </head>
    <body> <body>
    ......
    master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html.xml → master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html.xml
    View file @ 7e49ec5e
    ...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
    </item> </item>
    <item> <item>
    <key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
    <value> <string>gadget_erp5_page_slap_sale_invoice_transaction_view.html</string> </value> <value> <string>gadget_erp5_page_slap_accounting_view.html</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>description</string> </key> <key> <string>description</string> </key>
    ...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
    </item> </item>
    <item> <item>
    <key> <string>id</string> </key> <key> <string>id</string> </key>
    <value> <string>rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html</string> </value> <value> <string>rjs_gadget_erp5_page_slap_accounting_view_html</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>language</string> </key> <key> <string>language</string> </key>
    ...@@ -103,225 +103,13 @@ ...@@ -103,225 +103,13 @@
    </item> </item>
    <item> <item>
    <key> <string>title</string> </key> <key> <string>title</string> </key>
    <value> <string>Gadget SlapOS Sale Invoice Transaction View</string> </value> <value> <string>Gadget SlapOS Accounting View</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>version</string> </key> <key> <string>version</string> </key>
    <value> <string>003</string> </value> <value> <string>003</string> </value>
    </item> </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>document_publication_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>edit_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>processing_status_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary> </dictionary>
    </pickle> </pickle>
    </record> </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>publish_alive</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1516641727.65</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>published_alive</string> </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>982.20866.750.15718</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1583401103.11</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>detect_converted_file</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_processing_state</string> </key>
    <value> <string>converted</string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>0.0.0.0</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1516641498.28</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    </pickle>
    </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_js.xml → master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_accounting_view_js.xml
    View file @ 7e49ec5e
    ...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
    </item> </item>
    <item> <item>
    <key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
    <value> <string>gadget_erp5_page_slap_sale_invoice_transaction_view.js</string> </value> <value> <string>gadget_erp5_page_slap_accounting_view.js</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>description</string> </key> <key> <string>description</string> </key>
    ...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
    </item> </item>
    <item> <item>
    <key> <string>id</string> </key> <key> <string>id</string> </key>
    <value> <string>rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_js</string> </value> <value> <string>rjs_gadget_erp5_page_slap_accounting_view_js</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>language</string> </key> <key> <string>language</string> </key>
    ...@@ -99,225 +99,13 @@ ...@@ -99,225 +99,13 @@
    </item> </item>
    <item> <item>
    <key> <string>title</string> </key> <key> <string>title</string> </key>
    <value> <string>Gadget SlapOS Sale Invoice Transaction View</string> </value> <value> <string>Gadget SlapOS Accounting View</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>version</string> </key> <key> <string>version</string> </key>
    <value> <string>003</string> </value> <value> <string>003</string> </value>
    </item> </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>document_publication_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>edit_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>processing_status_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary> </dictionary>
    </pickle> </pickle>
    </record> </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>publish_alive</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1516642548.81</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>published_alive</string> </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>982.32516.46874.3959</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1584106716.12</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>detect_converted_file</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>external_processing_state</string> </key>
    <value> <string>converted</string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>0.0.0.0</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1516641773.94</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    <none/>
    </tuple>
    </pickle>
    </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_jio/bt/template_path_list
    View file @ 7e49ec5e
    ...@@ -12,6 +12,8 @@ web_page_module/rjs_gadget_erp5_page_slap_accept_upgrade_decision_html ...@@ -12,6 +12,8 @@ web_page_module/rjs_gadget_erp5_page_slap_accept_upgrade_decision_html
    web_page_module/rjs_gadget_erp5_page_slap_accept_upgrade_decision_js web_page_module/rjs_gadget_erp5_page_slap_accept_upgrade_decision_js
    web_page_module/rjs_gadget_erp5_page_slap_access_denied_view_html web_page_module/rjs_gadget_erp5_page_slap_access_denied_view_html
    web_page_module/rjs_gadget_erp5_page_slap_access_denied_view_js web_page_module/rjs_gadget_erp5_page_slap_access_denied_view_js
    web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html
    web_page_module/rjs_gadget_erp5_page_slap_accounting_view_js
    web_page_module/rjs_gadget_erp5_page_slap_add_computer_html web_page_module/rjs_gadget_erp5_page_slap_add_computer_html
    web_page_module/rjs_gadget_erp5_page_slap_add_computer_js web_page_module/rjs_gadget_erp5_page_slap_add_computer_js
    web_page_module/rjs_gadget_erp5_page_slap_add_hosting_subscription_html web_page_module/rjs_gadget_erp5_page_slap_add_hosting_subscription_html
    ...@@ -112,8 +114,6 @@ web_page_module/rjs_gadget_erp5_page_slap_rss_critical_ticket_html ...@@ -112,8 +114,6 @@ web_page_module/rjs_gadget_erp5_page_slap_rss_critical_ticket_html
    web_page_module/rjs_gadget_erp5_page_slap_rss_critical_ticket_js web_page_module/rjs_gadget_erp5_page_slap_rss_critical_ticket_js
    web_page_module/rjs_gadget_erp5_page_slap_rss_ticket_html web_page_module/rjs_gadget_erp5_page_slap_rss_ticket_html
    web_page_module/rjs_gadget_erp5_page_slap_rss_ticket_js web_page_module/rjs_gadget_erp5_page_slap_rss_ticket_js
    web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html
    web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_js
    web_page_module/rjs_gadget_erp5_page_slap_select_software_product_html web_page_module/rjs_gadget_erp5_page_slap_select_software_product_html
    web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js
    web_page_module/rjs_gadget_erp5_page_slap_select_software_release_html web_page_module/rjs_gadget_erp5_page_slap_select_software_release_html
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7