merge master

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py

@@ -1167,7 +1167,7 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
                      relative_url=None, restricted=None, list_method=None,
                      default_param_json=None, form_relative_url=None, extra_param_json=None):
 
-  if (restricted == 1) and (portal.portal_membership.isAnonymousUser()):
+  if (restricted == 1) and (portal.portal_membership.isAnonymousUser() and (response is not None)):
     login_relative_url = site_root.getLayoutProperty("configuration_login", default="")
     if (login_relative_url):
       response.setHeader(

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary/my_view_mode_price.xml

@@ -136,7 +136,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value>
+            <value> <string>python: here.Movement_isQuantityEnabled()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js

@@ -82,6 +82,7 @@
         sub_element.setAttribute('class', 'ui-icon-carat-r ui-btn-icon-notext');
         sub_element.href = row.jump;
         sub_element.textContent = ' ';
+        td_element.appendChild(sub_element);
         tr_element.appendChild(td_element);
       }
 

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PythonScript_view/my_body.xml

@@ -90,11 +90,11 @@
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_text_content</string> </value>
+                    <value> <string>my_view_mode_text_content</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>Base_viewWebFieldLibrary</string> </value>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>height</string> </key>