Skip to content

erp5
erp5
Commit 87efe0da authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Merge remote-tracking branch 'origin/master' into lazy_simulation_causality

parents b747ea85 f6edb446
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 566 deletions
bt5/erp5_base/PortalTypeTemplateItem/portal_types/Organisation.xml
View file @ 87efe0da
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="Base Type" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -63,9 +63,7 @@ ...@@ -63,9 +63,7 @@
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <value> <string>Organisation_init</string> </value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>permission</string> </key> <key> <string>permission</string> </key>
...@@ -104,7 +102,9 @@ ...@@ -104,7 +102,9 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>domain_name</string> </key> <key> <string>domain_name</string> </key>
<value> <none/> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>property_name</string> </key> <key> <string>property_name</string> </key>
...@@ -121,7 +121,9 @@ ...@@ -121,7 +121,9 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>domain_name</string> </key> <key> <string>domain_name</string> </key>
<value> <none/> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>property_name</string> </key> <key> <string>property_name</string> </key>
......
bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml
View file @ 87efe0da
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/> <global name="Base Type" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -81,16 +81,34 @@ ...@@ -81,16 +81,34 @@
</item> </item>
<item> <item>
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string></string> </value> <value> <string>Person_init</string> </value>
</item> </item>
<item> <item>
<key> <string>permission</string> </key> <key> <string>permission</string> </key>
<value> <string></string> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Person</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_mixin</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
...@@ -153,7 +171,9 @@ ...@@ -153,7 +171,9 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>domain_name</string> </key> <key> <string>domain_name</string> </key>
<value> <none/></value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>property_name</string> </key> <key> <string>property_name</string> </key>
...@@ -170,8 +190,9 @@ ...@@ -170,8 +190,9 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>domain_name</string> </key> <key> <string>domain_name</string> </key>
<value> <none/></value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>property_name</string> </key> <key> <string>property_name</string> </key>
......
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Organisation_init.xml 0 → 100644
View file @ 87efe0da
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<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>_body</string> </key>
<value> <string># this script can be overridden as you wish.\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Organisation_init</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_init.xml 0 → 100644
View file @ 87efe0da
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<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_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<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>_body</string> </key>
<value> <string># this script can be overridden as you wish.\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>*args, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Person_init</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/bt/revision
View file @ 87efe0da
1007 1008
\ No newline at end of file \ No newline at end of file
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_flat_75_e3eafa_40x100.png.xml
View file @ 87efe0da
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts88758160.36</string> </value> <value> <string>ts26729974.89</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
</item> </item>
<item> <item>
<key> <string>data</string> </key> <key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAACgAAABkCAYAAAD0ZHJ6AAAAfUlEQVRoge3OMQGAIAAAQaR/SzYj <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAACgAAABkCAYAAAGDY0LsAAAAnElEQVRoge3XMQqDQBQA0Zj739LO
uEgEhht0+Etw17qfd/zY/DpwUlAVVAVVQVVQFVQFVUFVUBVUBVVBVVAVVAVVQVVQFVQFVUFVUBVU I9gkdcRCmJ9CfFMu33F2BcVl3fbP68D7uPCgxcWB/HJ6IJevNninQc/aoMEHD15+AYzfmZCQkJCQ
BVVBVVAVVAVVQVVQFVQFVUFVUBVUBVVBVVAVVAVVQVVQFVQFVUFVUBVUBVVBVVBtJgUEjvinIRsA kPDvQh96QkJCQkJCQkJCQkJCQsI7Csf/6KcZ3/E0AisCKwIrAisCKwIrAisCKwIrAisCKwIrAisC
AAAASUVORK5CYII=</string> </value> KwIrAisCKwIrAisCKwIrAisCKwIrX1OvG9y6+zfEAAAAAElFTkSuQmCC</string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>height</string> </key>
...@@ -39,7 +39,7 @@ AAAASUVORK5CYII=</string> </value> ...@@ -39,7 +39,7 @@ AAAASUVORK5CYII=</string> </value>
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <long>182</long> </value> <value> <int>213</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_glass_65_e3eafa_1x400.png.xml
View file @ 87efe0da
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts88758159.87</string> </value> <value> <string>ts26730001.25</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
</item> </item>
<item> <item>
<key> <string>data</string> </key> <key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAP0lEQVQ4je3PIQoAIBBE0T97/5Na <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAAEYXzpNAAAAYElEQVQ4je3UMQ6AMAxD0W+3wP2v
zGJYgyIYzIJMeewPE5ZSewaAMeZbWk8CcqUkQoIQ+5rJkeJYPP/DGHNlALzkCvpHuC1xAAAAAElF ycJcRVAWuAFqhrI8ZUucSGE/ohsggxYdr1V4qRrcnNTkcXa8LcLWXMlTaXHhWoxrAReP3n0WE998
TkSuQmCC</string> </value> XlpcWHqfjA22eCpJWOlD/nzJDWKaHoVAKvSFAAAAAElFTkSuQmCC</string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>height</string> </key>
...@@ -38,7 +38,7 @@ TkSuQmCC</string> </value> ...@@ -38,7 +38,7 @@ TkSuQmCC</string> </value>
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <long>120</long> </value> <value> <int>153</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_glass_75_d0e0f6_1x400.png.xml
View file @ 87efe0da
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts88758159.6</string> </value> <value> <string>ts26730022.12</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
</item> </item>
<item> <item>
<key> <string>data</string> </key> <key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAAEYXzpNAAAAaklEQVQ4je3SMQ6DQAxE0T/jhQQJ <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAAGQCAYAAABvWArbAAAAQ0lEQVQ4je3PoQ2AQABD0f+7/4oM
5f6XywFSJ9EiioUGbhDhYtM8ufOMbJ6vZTNABu/a8Hw3ngZfvJzU5nVt+DEFDqmr5ql8l4bHInwb gEZwCjAcigEIqXlJm1SUZR1nAEopv2XbDyIQnV0CiZLIJDP6dOq9jX7hTCnljQtFvQnqrH32ZgAA
hMe4+uuy6Pjm/fKpDUvgEsLF5xQGWzrIT/rnR+zCPB5F8Svp1wAAAABJRU5ErkJggg==</string> </value> AABJRU5ErkJggg==</string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>height</string> </key>
...@@ -38,7 +38,7 @@ hMe4+uuy6Pjm/fKpDUvgEsLF5xQGWzrIT/rnR+zCPB5F8Svp1wAAAABJRU5ErkJggg==</string> </ ...@@ -38,7 +38,7 @@ hMe4+uuy6Pjm/fKpDUvgEsLF5xQGWzrIT/rnR+zCPB5F8Svp1wAAAABJRU5ErkJggg==</string> </
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <long>163</long> </value> <value> <int>124</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/PathTemplateItem/portal_skins/erp5_jquery/jquery/ui/css/erp5-theme/images/ui-bg_highlight-soft_75_dae6f6_1x100.png.xml
View file @ 87efe0da
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts88758160.21</string> </value> <value> <string>ts26730088.07</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
</item> </item>
<item> <item>
<key> <string>data</string> </key> <key> <string>data</string> </key>
<value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAYAAAEwK2r2AAAAXElEQVQYlbWOywqAMBAD4/7/l3rz <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAYAAABHLFpgAAAAPElEQVQYldWOMQ4AIAwCz/7/pW6u
aG0zXuoDrWARL8NCSHY0TomQpCuKUcyLFSlzS3eoNQDUWspWFHd0H2FQlEJVy94k4d3Al+ddABRG DsXBtB2cjXEhkCME+pgygI9EUrgdCwQ9gILmiguMLEPDvJZ16/1zWbNfInzfuAnZAAAAAElFTkSu
Vc1skjYKdFzDOf3FpYEVGvxMleH2x/0AAAAASUVORK5CYII=</string> </value> QmCC</string> </value>
</item> </item>
<item> <item>
<key> <string>height</string> </key> <key> <string>height</string> </key>
...@@ -38,7 +38,7 @@ Vc1skjYKdFzDOf3FpYEVGvxMleH2x/0AAAAASUVORK5CYII=</string> </value> ...@@ -38,7 +38,7 @@ Vc1skjYKdFzDOf3FpYEVGvxMleH2x/0AAAAASUVORK5CYII=</string> </value>
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <long>149</long> </value> <value> <int>117</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_jquery_ui/bt/change_log
View file @ 87efe0da
2012-01-16 Kazuhiko
* jquery-ui 1.8.17.
2011-09-07 Kazuhiko 2011-09-07 Kazuhiko
* jquery-ui 1.8.16. * jquery-ui 1.8.16.
......
bt5/erp5_jquery_ui/bt/description
View file @ 87efe0da
This Business Template contains only static files of jQuery UI. This Business Template contains only static files of jQuery UI.
Current version is jquery-ui-1.8.16. Current version is jquery-ui-1.8.17.
bt5/erp5_jquery_ui/bt/revision
View file @ 87efe0da
16 17
\ No newline at end of file \ No newline at end of file
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