[Erp5-report] r33338 kazuhiko - in /erp5/trunk: bt5/erp5_base/CategoryTemplateItem/portal_c...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Mar 3 20:21:26 CET 2010
Author: kazuhiko
Date: Wed Mar 3 20:21:25 2010
New Revision: 33338
URL: http://svn.erp5.org?rev=33338&view=rev
Log:
use the new base category 'property_mapping' instead of reusing the exising 'mapping' base category.
Added:
erp5/trunk/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml
Modified:
erp5/trunk/bt5/erp5_base/bt/change_log
erp5/trunk/bt5/erp5_base/bt/revision
erp5/trunk/bt5/erp5_base/bt/template_base_category_list
erp5/trunk/products/ERP5/Document/MirrorMovementGroup.py
erp5/trunk/products/ERP5/Document/SimulationMovement.py
erp5/trunk/products/ERP5/PropertySheet/Simulation.py
Added: erp5/trunk/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml?rev=33338&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml (added)
+++ erp5/trunk/bt5/erp5_base/CategoryTemplateItem/portal_categories/property_mapping.xml [utf8] Wed Mar 3 20:21:25 2010
@@ -1,0 +1,51 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>acquisition_base_category</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>acquisition_portal_type</string> </key>
+ <value> <string>python:[]</string> </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>property_mapping</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>property_mapping</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Base Category</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Property Mapping</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=33338&r1=33337&r2=33338&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Wed Mar 3 20:21:25 2010
@@ -1,3 +1,6 @@
+2010-03-03 kazuhiko
+* add property_mapping base category.
+
2010-03-03 yo
* Allow OrderBuilder to specify a method to select simulation movements and methods to separate cells.
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=33338&r1=33337&r2=33338&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Mar 3 20:21:25 2010
@@ -1,1 +1,1 @@
-688
+689
Modified: erp5/trunk/bt5/erp5_base/bt/template_base_category_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_base_category_list?rev=33338&r1=33337&r2=33338&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/template_base_category_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/template_base_category_list [utf8] Wed Mar 3 20:21:25 2010
@@ -17,6 +17,7 @@
group
insurance_coverage
legal_parent
+property_mapping
marital_status
market_segment
nationality
Modified: erp5/trunk/products/ERP5/Document/MirrorMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/MirrorMovementGroup.py?rev=33338&r1=33337&r2=33338&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/MirrorMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/MirrorMovementGroup.py [utf8] Wed Mar 3 20:21:25 2010
@@ -61,7 +61,7 @@
applied_rule.getSpecialiseValue().objectValues(
portal_type='Mapped Property') or [])
if len(mapping_list) > 0:
- movement.setMappingValue(mapping_list[0])
+ movement.setPropertyMappingValue(mapping_list[0])
return [[movement_list, {}]]
def _isMirrored(document):
Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=33338&r1=33337&r2=33338&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] Wed Mar 3 20:21:25 2010
@@ -613,7 +613,7 @@
security.declareProtected(Permissions.AccessContentsInformation,
'getMappedProperty')
def getMappedProperty(self, property):
- mapping = self.getMappingValue()
+ mapping = self.getPropertyMappingValue()
if mapping is not None:
return mapping.getMappedProperty(self, property)
else:
Modified: erp5/trunk/products/ERP5/PropertySheet/Simulation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Simulation.py?rev=33338&r1=33337&r2=33338&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Simulation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Simulation.py [utf8] Wed Mar 3 20:21:25 2010
@@ -65,4 +65,4 @@
'mode' : 'w' },
)
- _categories = ('order', 'delivery', 'delivery_mode', 'incoterm', 'payment_mode', 'solver', 'specialise', 'mapping')
+ _categories = ('order', 'delivery', 'delivery_mode', 'incoterm', 'payment_mode', 'solver', 'specialise', 'property_mapping')
More information about the Erp5-report
mailing list