Skip to content

erp5
erp5
Commit b847b45e authored by Cédric Le Ninivin's avatar Cédric Le Ninivin
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9075a38f 1e3062c1
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 28 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalTradeConditionModule_viewInternalTradeConditionList/listbox.xml
View file @ b847b45e
...@@ -115,10 +115,6 @@ ...@@ -115,10 +115,6 @@
</tuple> </tuple>
<tuple> <tuple>
<string>default_destination_project_title</string> <string>default_destination_project_title</string>
<string></string>
</tuple>
<tuple>
<string>Client Project</string>
<string>Client Project</string> <string>Client Project</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeConditionModule_viewPurchaseTradeConditionList/listbox.xml
View file @ b847b45e
...@@ -114,10 +114,6 @@ ...@@ -114,10 +114,6 @@
</tuple> </tuple>
<tuple> <tuple>
<string>default_destination_project_title</string> <string>default_destination_project_title</string>
<string></string>
</tuple>
<tuple>
<string>Client Project</string>
<string>Client Project</string> <string>Client Project</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeConditionModule_viewSaleTradeConditionList/listbox.xml
View file @ b847b45e
...@@ -114,10 +114,6 @@ ...@@ -114,10 +114,6 @@
</tuple> </tuple>
<tuple> <tuple>
<string>default_destination_project_title</string> <string>default_destination_project_title</string>
<string></string>
</tuple>
<tuple>
<string>Client Project</string>
<string>Client Project</string> <string>Client Project</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_appcache.xml
View file @ b847b45e
...@@ -108,13 +108,14 @@ ...@@ -108,13 +108,14 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
CACHE MANIFEST\n CACHE MANIFEST\n
# generated on Tue, 29 Jul 2016 13:00:00 GMT .\n # generated on Fri, 30 Sep 2016 13:00:00 GMT\n
# XXX + fonts\n # XXX + fonts\n
# images/ajax-loader.gif\n # images/ajax-loader.gif\n
CACHE:\n CACHE:\n
font-awesome/font-awesome-webfont.eot?v=4.6.3\n font-awesome/font-awesome-webfont.eot?v=4.6.3\n
font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3\n font-awesome/font-awesome-webfont.eot?#iefix&v=4.6.3\n
font-awesome/font-awesome-webfont.woff?v=4.6.3\n font-awesome/font-awesome-webfont.woff?v=4.6.3\n
font-awesome/font-awesome-webfont.woff2?v=4.6.3\n
font-awesome/font-awesome-webfont.ttf?v=4.6.3\n font-awesome/font-awesome-webfont.ttf?v=4.6.3\n
font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular\n font-awesome/font-awesome-webfont.svg?v=4.6.3#fontawesomeregular\n
URI.js\n URI.js\n
...@@ -354,7 +355,7 @@ NETWORK:\n ...@@ -354,7 +355,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>952.57579.5740.15394</string> </value> <value> <string>954.17206.22181.11161</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -372,7 +373,7 @@ NETWORK:\n ...@@ -372,7 +373,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1469799631.33</float> <float>1475244194.36</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.js
View file @ b847b45e
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
"key": "field_listbox", "key": "field_listbox",
"lines": 1000, "lines": 1000,
"list_method": "portal_catalog", "list_method": "portal_catalog",
"query": "urn:jio:allDocs?query=meta_type%3A%22ERP5%20Folder%22%20AND%20id%3A%22%25_module%22", "query": "urn:jio:allDocs?query=parent_uid%3A%220%22%20AND%20meta_type%3A%22ERP5%20Folder%22%20AND%20id%3A%22%25_module%22",
"portal_type": [], "portal_type": [],
"search_column_list": column_list, "search_column_list": column_list,
"sort_column_list": column_list, "sort_column_list": column_list,
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.xml
View file @ b847b45e
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>952.57689.22903.13841</string> </value> <value> <string>952.64761.25287.18397</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1469806084.35</float> <float>1475244399.84</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSection_viewRenderJSPreference.xml
View file @ b847b45e
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<list> <list>
<string>left</string> <string>left</string>
<string>right</string> <string>right</string>
<string>center</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -68,30 +69,38 @@ ...@@ -68,30 +69,38 @@
<key> <string>groups</string> </key> <key> <string>groups</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>center</string> </key>
<value>
<list>
<string>my_configuration_content_security_policy</string>
<string>my_configuration_x_frame_options</string>
</list>
</value>
</item>
<item> <item>
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_configuration_default_view_action_reference</string> <string>my_configuration_default_view_action_reference</string>
<string>my_configuration_view_action_category</string> <string>my_configuration_view_action_category</string>
<string>my_configuration_frontpage_gadget_url</string>
<string>my_configuration_panel_gadget_url</string>
<string>my_configuration_application_title</string> <string>my_configuration_application_title</string>
<string>my_configuration_hateoas_url</string> <string>my_configuration_hateoas_url</string>
<string>my_configuration_manifest_url</string> <string>my_configuration_frontpage_gadget_url</string>
<string>my_configuration_jio_gadget_url</string>
<string>my_configuration_translation_gadget_url</string>
<string>my_configuration_router_gadget_url</string>
<string>my_configuration_header_gadget_url</string>
<string>my_configuration_content_security_policy</string>
<string>my_configuration_x_frame_options</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list/> <list>
<string>my_configuration_panel_gadget_url</string>
<string>my_configuration_manifest_url</string>
<string>my_configuration_jio_gadget_url</string>
<string>my_configuration_translation_gadget_url</string>
<string>my_configuration_router_gadget_url</string>
<string>my_configuration_header_gadget_url</string>
</list>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
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