[Erp5-report] r12066 - in /erp5/trunk/products/ERP5: Document/ Interface/ TargetSolver/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Jan 13 17:33:59 CET 2007
Author: jp
Date: Sat Jan 13 17:33:53 2007
New Revision: 12066
URL: http://svn.erp5.org?rev=12066&view=rev
Log:
Use of getParentValue instead of .aq_parent
Modified:
erp5/trunk/products/ERP5/Document/AmountFilter.py
erp5/trunk/products/ERP5/Document/AppliedRule.py
erp5/trunk/products/ERP5/Document/AssortedResource.py
erp5/trunk/products/ERP5/Document/Capacity.py
erp5/trunk/products/ERP5/Document/DeliveryCell.py
erp5/trunk/products/ERP5/Document/DeliveryLine.py
erp5/trunk/products/ERP5/Document/ExternalWebPage.py
erp5/trunk/products/ERP5/Document/ImmobilisableItem.py
erp5/trunk/products/ERP5/Document/Order.py
erp5/trunk/products/ERP5/Document/SimulationMovement.py
erp5/trunk/products/ERP5/Document/Wiki.py
erp5/trunk/products/ERP5/Interface/Predicate.py
erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py
erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py
Modified: erp5/trunk/products/ERP5/Document/AmountFilter.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AmountFilter.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AmountFilter.py (original)
+++ erp5/trunk/products/ERP5/Document/AmountFilter.py Sat Jan 13 17:33:53 2007
@@ -76,7 +76,7 @@
security.declareProtected(Permissions.AccessContentsInformation, 'update')
def update(self, amount_line):
- context = self.aq_parent.asContext(**amount_line)
+ context = self.getParentValue().asContext(**amount_line)
# Test predicate
if self.test(context):
# Update amount_line
Modified: erp5/trunk/products/ERP5/Document/AppliedRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AppliedRule.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AppliedRule.py (original)
+++ erp5/trunk/products/ERP5/Document/AppliedRule.py Sat Jan 13 17:33:53 2007
@@ -81,7 +81,7 @@
if self.isRootAppliedRule():
return 1
else:
- parent_value = self.aq_parent
+ parent_value = self.getParentValue()
rule = self.getSpecialiseValue()
return rule.test(parent_value)
Modified: erp5/trunk/products/ERP5/Document/AssortedResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AssortedResource.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AssortedResource.py (original)
+++ erp5/trunk/products/ERP5/Document/AssortedResource.py Sat Jan 13 17:33:53 2007
@@ -154,7 +154,7 @@
"""
Nice for A
"""
- transformation = self.aq_parent
+ transformation = self.getParentValue()
transformation_category_list = transformation.getVariationCategoryList()
variation_category_list = []
for p in cell_index:
@@ -176,7 +176,7 @@
"""
Nice for C
"""
- transformation = self.aq_parent
+ transformation = self.getParentValue()
transformation_category_list = transformation.getVariationCategoryList()
variation_category_list = []
for p in cell_index:
@@ -192,7 +192,7 @@
Nice for C
"""
#LOG('getAssortmentVariationBaseCategoryList', 0, repr(self))
- transformation = self.aq_parent
+ transformation = self.getParentValue()
return transformation.getVariationBaseCategoryList()
# XXX Should be moved to somewhere more global, as this is general.
@@ -228,7 +228,7 @@
# Update the range of cells according to the currently selected base categories.
def _updateCellRange(self, base=1, current_category=None):
- transformation = self.aq_parent
+ transformation = self.getParentValue()
kwd = {'base_id': 'quantity'}
kw = []
base_category_list = self._getSortedBaseCategoryList(self.getQVariationBaseCategoryList())
@@ -282,7 +282,7 @@
kwd = {}
kwd['base_id'] = 'variation'
kw = []
- transformation = self.aq_parent
+ transformation = self.getParentValue()
line_id = transformation.getVariationBaseCategoryLine()
column_id = transformation.getVariationBaseCategoryColumn()
line = [[None]]
@@ -358,7 +358,7 @@
base=base,
current_category=current_category)
tab_category_item_list_list.append(tab_category_item_list)
- transformation = self.aq_parent
+ transformation = self.getParentValue()
transformation_category_item_list = transformation.getVariationCategoryItemList(
display_id=display_id,
base=base,
@@ -380,9 +380,9 @@
security.declareProtected(Permissions.AccessContentsInformation, 'getVLineItemList')
def getVLineItemList(self):
- base_category = self.aq_parent.getVariationBaseCategoryLine()
+ base_category = self.getParentValue().getVariationBaseCategoryLine()
if base_category in self.getVVariationBaseCategoryList():
- clist = self.aq_parent.getCategoryMembershipList(base_category, base=1)
+ clist = self.getParentValue().getCategoryMembershipList(base_category, base=1)
else:
clist = [None]
result = []
@@ -392,9 +392,9 @@
security.declareProtected(Permissions.AccessContentsInformation, 'getVColumnItemList')
def getVColumnItemList(self):
- base_category = self.aq_parent.getVariationBaseCategoryColumn()
+ base_category = self.getParentValue().getVariationBaseCategoryColumn()
if base_category in self.getVVariationBaseCategoryList():
- clist = self.aq_parent.getCategoryMembershipList(base_category, base=1)
+ clist = self.getParentValue().getCategoryMembershipList(base_category, base=1)
else:
clist = [None]
result = []
@@ -407,7 +407,7 @@
security.declareProtected(Permissions.AccessContentsInformation, 'getVTabItemList')
def getVTabItemList(self):
- transformation = self.aq_parent
+ transformation = self.getParentValue()
line_id = transformation.getVariationBaseCategoryLine()
column_id = transformation.getVariationBaseCategoryColumn()
base_category_list = transformation.getVariationBaseCategoryList()
@@ -458,7 +458,7 @@
"""
Check the constitency of transformation elements
"""
- transformation = self.aq_parent
+ transformation = self.getParentValue()
transformation_category_list = transformation.getVariationCategoryList()
error_list = XMLMatrix._checkConsistency(self, fixit=fixit)
@@ -518,7 +518,7 @@
# First, we set initial values for quantity and variation
# Currently, we only consider discrete variations
# Continuous variations will be implemented in a future version of ERP5
- transformation = self.aq_parent
+ transformation = self.getParentValue()
error_list = []
variation = []
line_item_list = []
Modified: erp5/trunk/products/ERP5/Document/Capacity.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Capacity.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Capacity.py (original)
+++ erp5/trunk/products/ERP5/Document/Capacity.py Sat Jan 13 17:33:53 2007
@@ -59,7 +59,7 @@
Overload reindexing in order to forward any modifications of capacity
to simulation tool
"""
- self.aq_parent.updateCapacity()
+ self.getParentValue().updateCapacity()
XMLObject.reindexObject(self)
Modified: erp5/trunk/products/ERP5/Document/DeliveryCell.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryCell.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryCell.py (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryCell.py Sat Jan 13 17:33:53 2007
@@ -78,7 +78,7 @@
"""
Explicitly acquire simulation_state from parent
"""
- return self.aq_parent.getSimulationState()
+ return self.getParentValue().getSimulationState()
# MatrixBox methods
@@ -96,7 +96,7 @@
Only account movements which are not associated to a delivery
Whenever delivery is there, delivery has priority
"""
- return self.aq_parent.aq_parent.isAccountable()
+ return self.getParentValue().getParentValue().isAccountable()
security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' )
def getProperty(self, key, d=None):
@@ -114,7 +114,7 @@
return getattr(self, key)
else:
LOG("Not Found Property %s"%key, -100,"")
- return self.aq_parent.getProperty(key)
+ return self.getParentValue().getProperty(key)
#except:
# LOG("WARNING: ERP5", 0, 'Could not access mapped value property %s' % key)
# return None
Modified: erp5/trunk/products/ERP5/Document/DeliveryLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryLine.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryLine.py (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryLine.py Sat Jan 13 17:33:53 2007
@@ -123,7 +123,7 @@
Only account movements which are not associated to a delivery
Whenever delivery is there, delivery has priority
"""
- return self.aq_parent.isAccountable() and (not self.hasCellContent())
+ return self.getParentValue().isAccountable() and (not self.hasCellContent())
def _getTotalPrice(self, context, fast=1):
""" Returns the total price for this line or the cells it contains. """
Modified: erp5/trunk/products/ERP5/Document/ExternalWebPage.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ExternalWebPage.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ExternalWebPage.py (original)
+++ erp5/trunk/products/ERP5/Document/ExternalWebPage.py Sat Jan 13 17:33:53 2007
@@ -128,7 +128,7 @@
return self
else:
while 1:
- ob=ob.aq_parent
+ ob=ob.getParentValue()
if ob==self.getPortalObject():
return self
if hasattr(ob,'urldict') and len(ob.urldict)>0:
Modified: erp5/trunk/products/ERP5/Document/ImmobilisableItem.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ImmobilisableItem.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ImmobilisableItem.py (original)
+++ erp5/trunk/products/ERP5/Document/ImmobilisableItem.py Sat Jan 13 17:33:53 2007
@@ -990,7 +990,7 @@
else:
# Delete first rules and re expand if possible
for my_applied_rule in my_applied_rule_list[:-1]:
- my_applied_rule.aq_parent._delObject(my_applied_rule.getId())
+ my_applied_rule.getParentValue()._delObject(my_applied_rule.getId())
my_applied_rule = my_applied_rule_list[-1]
# We are now certain we have a single applied rule
# It is time to expand it
Modified: erp5/trunk/products/ERP5/Document/Order.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Order.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Order.py (original)
+++ erp5/trunk/products/ERP5/Document/Order.py Sat Jan 13 17:33:53 2007
@@ -132,7 +132,7 @@
Delete related Applied Rule
"""
for o in self.getCausalityRelatedValueList(portal_type='Applied Rule'):
- o.aq_parent.activate().deleteContent(o.getId())
+ o.getParentValue().activate().deleteContent(o.getId())
Delivery.manage_beforeDelete(self, item, container)
##########################################################################
Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py Sat Jan 13 17:33:53 2007
@@ -159,7 +159,7 @@
if order is not None:
return order.getSimulationState()
try:
- parent_state = self.aq_parent.getSimulationState()
+ parent_state = self.getParentValue().getSimulationState()
return parent_to_movement_simulation_state[parent_state]
except (KeyError, AttributeError):
LOG('ERP5 WARNING:',100, 'Could not acquire getSimulationState on %s'
@@ -295,7 +295,7 @@
security.declareProtected( Permissions.AccessContentsInformation,
'isOrderable')
def isOrderable(self):
- applied_rule = self.aq_parent
+ applied_rule = self.getParentValue()
rule = applied_rule.getSpecialiseValue()
if rule is not None:
return rule.isOrderable(self)
@@ -306,7 +306,7 @@
security.declareProtected( Permissions.AccessContentsInformation,
'isDeliverable')
def isDeliverable(self):
- applied_rule = self.aq_parent
+ applied_rule = self.getParentValue()
rule = applied_rule.getSpecialiseValue()
if rule is not None:
return rule.isDeliverable(self)
Modified: erp5/trunk/products/ERP5/Document/Wiki.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Wiki.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Wiki.py (original)
+++ erp5/trunk/products/ERP5/Document/Wiki.py Sat Jan 13 17:33:53 2007
@@ -100,9 +100,9 @@
}
def _getTopLevelUrl(self):
- o = self.aq_parent
+ o = self.getParentValue()
while o.meta_type == 'ERP5 Wiki':
- o = o.aq_parent
+ o = o.getParentValue()
return o.absolute_url()
def _render_text(self, text):
Modified: erp5/trunk/products/ERP5/Interface/Predicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Interface/Predicate.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Interface/Predicate.py (original)
+++ erp5/trunk/products/ERP5/Interface/Predicate.py Sat Jan 13 17:33:53 2007
@@ -58,4 +58,3 @@
ZSQLCatalog
"""
pass
-
Modified: erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py (original)
+++ erp5/trunk/products/ERP5/TargetSolver/SplitAndDefer.py Sat Jan 13 17:33:53 2007
@@ -53,11 +53,11 @@
if movement_quantity > new_movement_quantity:
split_index = 0
new_id = "%s_split_%s" % (simulation_movement.getId(), split_index)
- while getattr(simulation_movement.aq_parent, new_id, None) is not None:
+ while getattr(simulation_movement.getParentValue(), new_id, None) is not None:
split_index += 1
new_id = "%s_split_%s" % (simulation_movement.getId(), split_index)
# Adopt different dates for defferred movements
- new_movement = simulation_movement.aq_parent.newContent(
+ new_movement = simulation_movement.getParentValue().newContent(
portal_type="Simulation Movement",
id=new_id,
efficiency=simulation_movement.getEfficiency(),
Modified: erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py?rev=12066&r1=12065&r2=12066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py (original)
+++ erp5/trunk/products/ERP5/TargetSolver/SplitQuantity.py Sat Jan 13 17:33:53 2007
@@ -46,11 +46,11 @@
"""
split_index = 0
new_id = "%s_split_%s" % (simulation_movement.getId(), split_index)
- while getattr(simulation_movement.aq_parent, new_id, None) is not None:
+ while getattr(simulation_movement.getParentValue(), new_id, None) is not None:
split_index += 1
new_id = "%s_split_%s" % (simulation_movement.getId(), split_index)
# Adopt different dates for defferred movements
- new_movement = simulation_movement.aq_parent.newContent(
+ new_movement = simulation_movement.getParentValue().newContent(
portal_type = "Simulation Movement",
id = new_id,
efficiency = simulation_movement.getEfficiency(),
More information about the Erp5-report
mailing list