[Erp5-report] r33493 kazuhiko - in /erp5/trunk: bt5/erp5_base/ActionTemplateItem/portal_typ...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Mar 8 10:22:56 CET 2010
Author: kazuhiko
Date: Mon Mar 8 10:22:55 2010
New Revision: 33493
URL: http://svn.erp5.org?rev=33493&view=rev
Log:
introduce Parent Delivery Property Movement Group and Parent Delivery Category Movement Group, that should be useful to check payment condition values for grouping.
Added:
erp5/trunk/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group/
- copied from r33487, erp5/trunk/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Category%20Movement%20Group/
erp5/trunk/bt5/erp5_base/ActionTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group/
- copied from r33487, erp5/trunk/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Property%20Movement%20Group/
erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml
- copied, changed from r33487, erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml
erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml
- copied, changed from r33487, erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml
erp5/trunk/products/ERP5/Document/ParentDeliveryCategoryMovementGroup.py
- copied, changed from r33487, erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py
erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py
- copied, changed from r33487, erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py
Removed:
erp5/trunk/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Category%20Movement%20Group/
erp5/trunk/bt5/erp5_base/ActionTemplateItem/portal_types/Split%20Property%20Movement%20Group/
erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml
erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml
erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py
erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py
Modified:
erp5/trunk/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
erp5/trunk/bt5/erp5_base/bt/revision
erp5/trunk/bt5/erp5_base/bt/template_action_path_list
erp5/trunk/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list
erp5/trunk/bt5/erp5_base/bt/template_portal_type_id_list
Modified: erp5/trunk/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=33493&r1=33492&r2=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Mon Mar 8 10:22:55 2010
@@ -25,6 +25,8 @@
<item>Monthly Range Movement Group</item>
<item>Nested Line Movement Group</item>
<item>Order Movement Group</item>
+ <item>Parent Delivery Category Movement Group</item>
+ <item>Parent Delivery Property Movement Group</item>
<item>Parent Explanation Movement Group</item>
<item>Predicate</item>
<item>Property Assignment Movement Group</item>
@@ -32,9 +34,7 @@
<item>Quantity Sign Movement Group</item>
<item>Requirement Movement Group</item>
<item>Root Applied Rule Causality Movement Group</item>
- <item>Split Category Movement Group</item>
<item>Split Movement Group</item>
- <item>Split Property Movement Group</item>
<item>Tax Line Delivery Movement Group</item>
<item>Title Movement Group</item>
<item>Variant Movement Group</item>
@@ -60,6 +60,8 @@
<item>Monthly Range Movement Group</item>
<item>Nested Line Movement Group</item>
<item>Order Movement Group</item>
+ <item>Parent Delivery Category Movement Group</item>
+ <item>Parent Delivery Property Movement Group</item>
<item>Parent Explanation Movement Group</item>
<item>Predicate</item>
<item>Property Assignment Movement Group</item>
@@ -67,9 +69,7 @@
<item>Quantity Sign Movement Group</item>
<item>Requirement Movement Group</item>
<item>Root Applied Rule Causality Movement Group</item>
- <item>Split Category Movement Group</item>
<item>Split Movement Group</item>
- <item>Split Property Movement Group</item>
<item>Tax Line Delivery Movement Group</item>
<item>Title Movement Group</item>
<item>Variant Movement Group</item>
Copied: erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml (from r33487, erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%2520Delivery%2520Category%2520Movement%2520Group.xml?p2=erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%2520Delivery%2520Category%2520Movement%2520Group.xml&p1=erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%2520Category%2520Movement%2520Group.xml&r1=33487&r2=33493&rev=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Category%20Movement%20Group.xml [utf8] Mon Mar 8 10:22:55 2010
@@ -19,7 +19,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Split Category Movement Group</string> </value>
+ <value> <string>ERP5 Parent Delivery Category Movement Group</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -29,7 +29,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addSplitCategoryMovementGroup</string> </value>
+ <value> <string>addParentDeliveryCategoryMovementGroup</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -45,7 +45,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Split Category Movement Group</string> </value>
+ <value> <string>Parent Delivery Category Movement Group</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Copied: erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml (from r33487, erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml)
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%2520Delivery%2520Property%2520Movement%2520Group.xml?p2=erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%2520Delivery%2520Property%2520Movement%2520Group.xml&p1=erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%2520Property%2520Movement%2520Group.xml&r1=33487&r2=33493&rev=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Parent%20Delivery%20Property%20Movement%20Group.xml [utf8] Mon Mar 8 10:22:55 2010
@@ -19,7 +19,7 @@
</item>
<item>
<key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Split Property Movement Group</string> </value>
+ <value> <string>ERP5 Parent Delivery Property Movement Group</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -29,7 +29,7 @@
</item>
<item>
<key> <string>factory</string> </key>
- <value> <string>addSplitPropertyMovementGroup</string> </value>
+ <value> <string>addParentDeliveryPropertyMovementGroup</string> </value>
</item>
<item>
<key> <string>filter_content_types</string> </key>
@@ -45,7 +45,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Split Property Movement Group</string> </value>
+ <value> <string>Parent Delivery Property Movement Group</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
Removed: erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%2520Category%2520Movement%2520Group.xml?rev=33492&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Category%20Movement%20Group.xml (removed)
@@ -1,65 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>content_icon</string> </key>
- <value> <string>document_icon.gif</string> </value>
- </item>
- <item>
- <key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Split Category Movement Group</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string> The purpose of MovementGroup is to define how movements are grouped,\n
- and how values are updated from simulation movements.\n
-</string> </value>
- </item>
- <item>
- <key> <string>factory</string> </key>
- <value> <string>addSplitCategoryMovementGroup</string> </value>
- </item>
- <item>
- <key> <string>filter_content_types</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>movement_group</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Split Category Movement Group</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%2520Property%2520Movement%2520Group.xml?rev=33492&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Split%20Property%20Movement%20Group.xml (removed)
@@ -1,65 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>content_icon</string> </key>
- <value> <string>document_icon.gif</string> </value>
- </item>
- <item>
- <key> <string>content_meta_type</string> </key>
- <value> <string>ERP5 Split Property Movement Group</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string> The purpose of MovementGroup is to define how movements are grouped,\n
- and how values are updated from simulation movements.\n
-</string> </value>
- </item>
- <item>
- <key> <string>factory</string> </key>
- <value> <string>addSplitPropertyMovementGroup</string> </value>
- </item>
- <item>
- <key> <string>filter_content_types</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <tuple>
- <string>movement_group</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Split Property Movement Group</string> </value>
- </item>
- <item>
- <key> <string>init_script</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>permission</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=33493&r1=33492&r2=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Mar 8 10:22:55 2010
@@ -1,1 +1,1 @@
-692
+693
Modified: erp5/trunk/bt5/erp5_base/bt/template_action_path_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_action_path_list?rev=33493&r1=33492&r2=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/template_action_path_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/template_action_path_list [utf8] Mon Mar 8 10:22:55 2010
@@ -57,6 +57,8 @@
Organisation | financial_view
Organisation | jump_to_persons
Organisation | view
+Parent Delivery Category Movement Group | view
+Parent Delivery Property Movement Group | view
Parent Explanation Movement Group | view
Person Module | view
Person | assignment
@@ -81,9 +83,7 @@
Rounding Model | predicate_view
Rounding Model | view
Rounding Tool | view
-Split Category Movement Group | view
Split Movement Group | view
-Split Property Movement Group | view
Tax Line Delivery Movement Group | view
Telephone | change_function
Telephone | view
Modified: erp5/trunk/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list?rev=33493&r1=33492&r2=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/template_portal_type_allowed_content_type_list [utf8] Mon Mar 8 10:22:55 2010
@@ -13,6 +13,8 @@
Delivery Builder | Monthly Range Movement Group
Delivery Builder | Nested Line Movement Group
Delivery Builder | Order Movement Group
+Delivery Builder | Parent Delivery Category Movement Group
+Delivery Builder | Parent Delivery Property Movement Group
Delivery Builder | Parent Explanation Movement Group
Delivery Builder | Predicate
Delivery Builder | Property Assignment Movement Group
@@ -20,9 +22,7 @@
Delivery Builder | Quantity Sign Movement Group
Delivery Builder | Requirement Movement Group
Delivery Builder | Root Applied Rule Causality Movement Group
-Delivery Builder | Split Category Movement Group
Delivery Builder | Split Movement Group
-Delivery Builder | Split Property Movement Group
Delivery Builder | Tax Line Delivery Movement Group
Delivery Builder | Title Movement Group
Delivery Builder | Variant Movement Group
@@ -40,6 +40,8 @@
Order Builder | Monthly Range Movement Group
Order Builder | Nested Line Movement Group
Order Builder | Order Movement Group
+Order Builder | Parent Delivery Category Movement Group
+Order Builder | Parent Delivery Property Movement Group
Order Builder | Parent Explanation Movement Group
Order Builder | Predicate
Order Builder | Property Assignment Movement Group
@@ -47,9 +49,7 @@
Order Builder | Quantity Sign Movement Group
Order Builder | Requirement Movement Group
Order Builder | Root Applied Rule Causality Movement Group
-Order Builder | Split Category Movement Group
Order Builder | Split Movement Group
-Order Builder | Split Property Movement Group
Order Builder | Tax Line Delivery Movement Group
Order Builder | Title Movement Group
Order Builder | Variant Movement Group
Modified: erp5/trunk/bt5/erp5_base/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_portal_type_id_list?rev=33493&r1=33492&r2=33493&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/template_portal_type_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/template_portal_type_id_list [utf8] Mon Mar 8 10:22:55 2010
@@ -35,6 +35,8 @@
Order Tool
Organisation
Organisation Module
+Parent Delivery Category Movement Group
+Parent Delivery Property Movement Group
Parent Explanation Movement Group
Person
Person Module
@@ -50,9 +52,7 @@
Root Applied Rule Causality Movement Group
Rounding Model
Rounding Tool
-Split Category Movement Group
Split Movement Group
-Split Property Movement Group
Tax Line Delivery Movement Group
Telephone
Title Movement Group
Copied: erp5/trunk/products/ERP5/Document/ParentDeliveryCategoryMovementGroup.py (from r33487, erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ParentDeliveryCategoryMovementGroup.py?p2=erp5/trunk/products/ERP5/Document/ParentDeliveryCategoryMovementGroup.py&p1=erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py&r1=33487&r2=33493&rev=33493&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ParentDeliveryCategoryMovementGroup.py [utf8] Mon Mar 8 10:22:55 2010
@@ -25,24 +25,28 @@
#
##############################################################################
-from Products.ERP5.Document.CategoryMovementGroup import CategoryMovementGroup
+from Products.ERP5.Document.ParentDeliveryPropertyMovementGroup \
+ import ParentDeliveryPropertyMovementGroup
-class SplitCategoryMovementGroup(CategoryMovementGroup):
+class ParentDeliveryCategoryMovementGroup(ParentDeliveryPropertyMovementGroup):
"""
- Split Category Movement Group is similar to Category Movement Group,
- but it does grouping only by specified category values and do not
- update documents.
+ Parent Delivery Category Movement Group is similar to Category
+ Movement Group, but it does grouping only by specified category values
+ on its parent simulation movement's delivery value and do not update
+ documents.
This is useful for acquired properties like payment_condition_*.
"""
- meta_type = 'ERP5 Split Category Movement Group'
- portal_type = 'Split Category Movement Group'
+ meta_type = 'ERP5 Parent Delivery Category Movement Group'
+ portal_type = 'Parent Delivery Category Movement Group'
def _getPropertyDict(self, movement, **kw):
property_dict = {}
- for prop in self.getTestedPropertyList():
- property_dict['_%s_list' % prop] = sorted(
- movement.getPropertyList(prop))
+ parent_delivery = self._getParentDelivery(movement)
+ if parent_delivery is not None:
+ for prop in self.getTestedPropertyList():
+ property_dict['_%s_list' % prop] = sorted(
+ movement.getPropertyList(prop))
return property_dict
def test(self, document, property_dict, property_list=None, **kw):
Copied: erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py (from r33487, erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py?p2=erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py&p1=erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py&r1=33487&r2=33493&rev=33493&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ParentDeliveryPropertyMovementGroup.py [utf8] Mon Mar 8 10:22:55 2010
@@ -27,21 +27,24 @@
from Products.ERP5.Document.PropertyMovementGroup import PropertyMovementGroup
-class SplitPropertyMovementGroup(PropertyMovementGroup):
+class ParentDeliveryPropertyMovementGroup(PropertyMovementGroup):
"""
- Split Property Movement Group is similar to Property Movement Group,
- but it does grouping only by specified property values and do not
- update documents.
+ Parent Delivery Property Movement Group is similar to Property
+ Movement Group, but it does grouping only by specified category values
+ on its parent simulation movement's delivery value and do not update
+ documents.
This is useful for acquired properties like payment_condition_*.
"""
- meta_type = 'ERP5 Split Property Movement Group'
- portal_type = 'Split Property Movement Group'
+ meta_type = 'ERP5 Parent Delivery Property Movement Group'
+ portal_type = 'Parent Delivery Property Movement Group'
def _getPropertyDict(self, movement, **kw):
property_dict = {}
- for prop in self.getTestedPropertyList():
- property_dict['_%s' % prop] = movement.getProperty(prop, None)
+ parent_delivery = self._getParentDelivery(movement)
+ if parent_delivery is not None:
+ for prop in self.getTestedPropertyList():
+ property_dict['_%s' % prop] = parent_delivery.getProperty(prop, None)
return property_dict
def test(self, document, property_dict, property_list=None, **kw):
@@ -54,3 +57,14 @@
if property_dict['_%s' % prop] != document.getProperty(prop, None):
return False, property_dict
return True, property_dict
+
+ def _getParentDelivery(self, movement):
+ # try to find local payment conditions from the upper level delivery
+ rule = movement.getParentValue()
+ movement = rule.getParentValue()
+ delivery = movement.getDeliveryValue()
+ while delivery is None and not(rule.isRootAppliedRule()):
+ rule = movement.getParentValue()
+ movement = rule.getParentValue()
+ delivery = movement.getDeliveryValue()
+ return delivery
Removed: erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py?rev=33492&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SplitCategoryMovementGroup.py (removed)
@@ -1,58 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-from Products.ERP5.Document.CategoryMovementGroup import CategoryMovementGroup
-
-class SplitCategoryMovementGroup(CategoryMovementGroup):
- """
- Split Category Movement Group is similar to Category Movement Group,
- but it does grouping only by specified category values and do not
- update documents.
-
- This is useful for acquired properties like payment_condition_*.
- """
- meta_type = 'ERP5 Split Category Movement Group'
- portal_type = 'Split Category Movement Group'
-
- def _getPropertyDict(self, movement, **kw):
- property_dict = {}
- for prop in self.getTestedPropertyList():
- property_dict['_%s_list' % prop] = sorted(
- movement.getPropertyList(prop))
- return property_dict
-
- def test(self, document, property_dict, property_list=None, **kw):
- if property_list not in (None, []):
- target_property_list = [x for x in self.getTestedPropertyList() \
- if x in property_list]
- else:
- target_property_list = self.getTestedPropertyList()
- for prop in target_property_list:
- if property_dict['_%s_list' % prop] != \
- sorted(document.getPropertyList(prop, None)):
- return False, property_dict
- return True, property_dict
Removed: erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py?rev=33492&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SplitPropertyMovementGroup.py (removed)
@@ -1,56 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-from Products.ERP5.Document.PropertyMovementGroup import PropertyMovementGroup
-
-class SplitPropertyMovementGroup(PropertyMovementGroup):
- """
- Split Property Movement Group is similar to Property Movement Group,
- but it does grouping only by specified property values and do not
- update documents.
-
- This is useful for acquired properties like payment_condition_*.
- """
- meta_type = 'ERP5 Split Property Movement Group'
- portal_type = 'Split Property Movement Group'
-
- def _getPropertyDict(self, movement, **kw):
- property_dict = {}
- for prop in self.getTestedPropertyList():
- property_dict['_%s' % prop] = movement.getProperty(prop, None)
- return property_dict
-
- def test(self, document, property_dict, property_list=None, **kw):
- if property_list not in (None, []):
- target_property_list = [x for x in self.getTestedPropertyList() \
- if x in property_list]
- else:
- target_property_list = self.getTestedPropertyList()
- for prop in target_property_list:
- if property_dict['_%s' % prop] != document.getProperty(prop, None):
- return False, property_dict
- return True, property_dict
More information about the Erp5-report
mailing list