Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
erp5_rtl_support
Commits
6271d9f9
Commit
6271d9f9
authored
Jan 25, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into lazy_simulation_causality
parents
f7dc56af
9e31191f
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
224 additions
and
17 deletions
+224
-17
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view.xml
...inTemplateItem/portal_skins/erp5_simulation/Rule_view.xml
+1
-0
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_same_total_quantity.xml
...kins/erp5_simulation/Rule_view/my_same_total_quantity.xml
+84
-0
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration.xml
...portal_skins/erp5_simulation/Solver_viewConfiguration.xml
+0
-0
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfiguration/my_configuration.xml
..._simulation/Solver_viewConfiguration/my_configuration.xml
+0
-0
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfigurationFormBox.xml
...skins/erp5_simulation/Solver_viewConfigurationFormBox.xml
+122
-0
bt5/erp5_simulation/bt/revision
bt5/erp5_simulation/bt/revision
+1
-1
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Accept%20Solver.xml
..._test/PathTemplateItem/portal_solvers/Accept%20Solver.xml
+1
-1
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
...n_test/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
+1
-1
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
...emplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
+1
-1
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
...athTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
+1
-1
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/GenericSolver_viewConfigurationFormBox.xml
...imulation_test/GenericSolver_viewConfigurationFormBox.xml
+1
-1
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/GenericSolver_viewConfigurationFormBox/my_tested_property_list.xml
...lver_viewConfigurationFormBox/my_tested_property_list.xml
+0
-0
product/ERP5Type/dynamic/lazy_class.py
product/ERP5Type/dynamic/lazy_class.py
+1
-1
product/ERP5Type/tests/ERP5TypeTestCase.py
product/ERP5Type/tests/ERP5TypeTestCase.py
+10
-0
product/ERP5Type/tests/testDynamicClassGeneration.py
product/ERP5Type/tests/testDynamicClassGeneration.py
+0
-10
No files found.
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view.xml
View file @
6271d9f9
...
@@ -102,6 +102,7 @@
...
@@ -102,6 +102,7 @@
<string>
my_reference
</string>
<string>
my_reference
</string>
<string>
my_version
</string>
<string>
my_version
</string>
<string>
my_trade_phase_list
</string>
<string>
my_trade_phase_list
</string>
<string>
my_same_total_quantity
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Rule_view/my_same_total_quantity.xml
0 → 100644
View file @
6271d9f9
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_same_total_quantity
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_checkbox
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_simulation
_test/SkinTemplateItem/portal_skins/erp5_simulation_test
/Solver_viewConfiguration.xml
→
bt5/erp5_simulation
/SkinTemplateItem/portal_skins/erp5_simulation
/Solver_viewConfiguration.xml
View file @
6271d9f9
File moved
bt5/erp5_simulation
_test/SkinTemplateItem/portal_skins/erp5_simulation_test
/Solver_viewConfiguration/my_configuration.xml
→
bt5/erp5_simulation
/SkinTemplateItem/portal_skins/erp5_simulation
/Solver_viewConfiguration/my_configuration.xml
View file @
6271d9f9
File moved
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Solver_viewConfigurationFormBox.xml
0 → 100644
View file @
6271d9f9
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ERP5Form"
module=
"Products.ERP5Form.Form"
/>
</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/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_objects
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
edit_order
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
encoding
</string>
</key>
<value>
<string>
UTF-8
</string>
</value>
</item>
<item>
<key>
<string>
enctype
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
group_list
</string>
</key>
<value>
<list>
<string>
left
</string>
</list>
</value>
</item>
<item>
<key>
<string>
groups
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
left
</string>
</key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
Solver_viewConfigurationFormBox
</string>
</value>
</item>
<item>
<key>
<string>
method
</string>
</key>
<value>
<string>
POST
</string>
</value>
</item>
<item>
<key>
<string>
name
</string>
</key>
<value>
<string>
Solver_viewConfiguration
</string>
</value>
</item>
<item>
<key>
<string>
pt
</string>
</key>
<value>
<string>
embedded_form_render
</string>
</value>
</item>
<item>
<key>
<string>
row_length
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
stored_encoding
</string>
</key>
<value>
<string>
UTF-8
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Configuration
</string>
</value>
</item>
<item>
<key>
<string>
unicode_mode
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
update_action
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
update_action_title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_simulation/bt/revision
View file @
6271d9f9
167
168
\ No newline at end of file
\ No newline at end of file
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Accept%20Solver.xml
View file @
6271d9f9
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_form_id
</string>
</key>
<key>
<string>
configuration_form_id
</string>
</key>
<value>
<string>
Solver_viewConfigurationFormBox
</string>
</value>
<value>
<string>
Generic
Solver_viewConfigurationFormBox
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
configuration_property_list
</string>
</key>
<key>
<string>
configuration_property_list
</string>
</key>
...
...
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
View file @
6271d9f9
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_form_id
</string>
</key>
<key>
<string>
configuration_form_id
</string>
</key>
<value>
<string>
Solver_viewConfigurationFormBox
</string>
</value>
<value>
<string>
Generic
Solver_viewConfigurationFormBox
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
...
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
View file @
6271d9f9
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_form_id
</string>
</key>
<key>
<string>
configuration_form_id
</string>
</key>
<value>
<string>
Solver_viewConfigurationFormBox
</string>
</value>
<value>
<string>
Generic
Solver_viewConfigurationFormBox
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
configuration_property_list
</string>
</key>
<key>
<string>
configuration_property_list
</string>
</key>
...
...
bt5/erp5_simulation_test/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
View file @
6271d9f9
...
@@ -111,7 +111,7 @@
...
@@ -111,7 +111,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
configuration_form_id
</string>
</key>
<key>
<string>
configuration_form_id
</string>
</key>
<value>
<string>
Solver_viewConfigurationFormBox
</string>
</value>
<value>
<string>
Generic
Solver_viewConfigurationFormBox
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
configuration_groupable
</string>
</key>
<key>
<string>
configuration_groupable
</string>
</key>
...
...
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/Solver_viewConfigurationFormBox.xml
→
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/
Generic
Solver_viewConfigurationFormBox.xml
View file @
6271d9f9
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Solver_viewConfigurationFormBox
</string>
</value>
<value>
<string>
Generic
Solver_viewConfigurationFormBox
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
method
</string>
</key>
<key>
<string>
method
</string>
</key>
...
...
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/Solver_viewConfigurationFormBox/my_tested_property_list.xml
→
bt5/erp5_simulation_test/SkinTemplateItem/portal_skins/erp5_simulation_test/
Generic
Solver_viewConfigurationFormBox/my_tested_property_list.xml
View file @
6271d9f9
File moved
product/ERP5Type/dynamic/lazy_class.py
View file @
6271d9f9
...
@@ -231,7 +231,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder):
...
@@ -231,7 +231,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder):
cls
.
loadClass
()
cls
.
loadClass
()
return
getattr
(
cls
,
name
)
return
getattr
(
cls
,
name
)
raise
AttributeError
raise
AttributeError
(
"'%r' has no attribute '%s'"
%
(
cls
,
name
))
def
generatePortalTypeAccessors
(
cls
,
site
,
portal_type_category_list
):
def
generatePortalTypeAccessors
(
cls
,
site
,
portal_type_category_list
):
category_tool
=
getattr
(
site
,
'portal_categories'
,
None
)
category_tool
=
getattr
(
site
,
'portal_categories'
,
None
)
...
...
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @
6271d9f9
...
@@ -522,6 +522,16 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
...
@@ -522,6 +522,16 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
self
.
assertEquals
(
set
(
a
),
set
(
b
),
msg
)
self
.
assertEquals
(
set
(
a
),
set
(
b
),
msg
)
assertSameSet
=
failIfDifferentSet
assertSameSet
=
failIfDifferentSet
def
assertHasAttribute
(
self
,
obj
,
attribute
,
msg
=
None
):
self
.
failIfEqual
(
None
,
getattr
(
obj
,
attribute
,
None
),
msg
or
"'%r': no attribute '%s'"
%
(
obj
,
attribute
))
def
failIfHasAttribute
(
self
,
obj
,
attribute
,
msg
=
None
):
self
.
assertEquals
(
None
,
getattr
(
obj
,
attribute
,
None
),
msg
or
"'%r': attribute '%s' present"
%
(
obj
,
attribute
))
def
assertWorkflowTransitionFails
(
self
,
object
,
workflow_id
,
transition_id
,
def
assertWorkflowTransitionFails
(
self
,
object
,
workflow_id
,
transition_id
,
error_message
=
None
,
state_variable
=
'simulation_state'
):
error_message
=
None
,
state_variable
=
'simulation_state'
):
"""
"""
...
...
product/ERP5Type/tests/testDynamicClassGeneration.py
View file @
6271d9f9
...
@@ -616,16 +616,6 @@ class TestZodbPropertySheet(ERP5TypeTestCase):
...
@@ -616,16 +616,6 @@ class TestZodbPropertySheet(ERP5TypeTestCase):
transaction
.
commit
()
transaction
.
commit
()
self
.
test_module
.
getId
()
self
.
test_module
.
getId
()
def
assertHasAttribute
(
self
,
obj
,
attribute
,
msg
=
None
):
self
.
failIfEqual
(
None
,
getattr
(
obj
,
attribute
,
None
),
msg
or
'%s: no attribute %s'
%
(
obj
.
__name__
,
attribute
))
def
failIfHasAttribute
(
self
,
obj
,
attribute
,
msg
=
None
):
self
.
assertEquals
(
None
,
getattr
(
obj
,
attribute
,
None
),
msg
or
'%s: attribute %s present'
%
(
obj
.
__name__
,
attribute
))
def
testAssignUnassignZodbPropertySheet
(
self
):
def
testAssignUnassignZodbPropertySheet
(
self
):
"""
"""
From an existing portal type, assign ZODB Property Sheets and
From an existing portal type, assign ZODB Property Sheets and
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment