[Erp5-report] r26470 - /erp5/trunk/products/ERP5/Document/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 17 09:46:43 CEST 2009
Author: luke
Date: Fri Apr 17 09:46:41 2009
New Revision: 26470
URL: http://svn.erp5.org?rev=26470&view=rev
Log:
- use `document' variable instead of python reserved `object'
Modified:
erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py
erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py
erp5/trunk/products/ERP5/Document/DayMovementGroup.py
erp5/trunk/products/ERP5/Document/MonthlyRangeMovementGroup.py
erp5/trunk/products/ERP5/Document/MovementGroup.py
erp5/trunk/products/ERP5/Document/NestedLineMovementGroup.py
erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py
erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py
erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py
erp5/trunk/products/ERP5/Document/SplitMovementGroup.py
erp5/trunk/products/ERP5/Document/TitleMovementGroup.py
erp5/trunk/products/ERP5/Document/VariantMovementGroup.py
erp5/trunk/products/ERP5/Document/VariationPropertyMovementGroup.py
Modified: erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -44,6 +44,6 @@
property_dict['_base_category_list'] = category_list
return property_dict
- def test(self, object, property_dict, **kw):
+ def test(self, document, property_dict, **kw):
# This movement group does not affect updating.
return True, {}
Modified: erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -45,7 +45,7 @@
movement.getPropertyList(prop, None))
return property_dict
- def test(self, object, property_dict, property_list=None, **kw):
+ 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]
@@ -53,6 +53,6 @@
target_property_list = self.getTestedPropertyList()
for prop in target_property_list:
if property_dict['%s_list' % prop] != \
- sorted(object.getPropertyList(prop, None)):
+ sorted(document.getPropertyList(prop, None)):
return False, property_dict
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/DayMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DayMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DayMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DayMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -43,10 +43,10 @@
property_dict['stop_date'] = addToDate(start_date, day=1)
return property_dict
- def test(self, object, property_dict, **kw):
+ def test(self, document, property_dict, **kw):
start_date = property_dict['start_date']
stop_date = property_dict['stop_date']
- if object.getStartDate() <= start_date < stop_date <= object.getStopDate():
+ if document.getStartDate() <= start_date < stop_date <= document.getStopDate():
return True, property_dict
else:
return False, property_dict
Modified: erp5/trunk/products/ERP5/Document/MonthlyRangeMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/MonthlyRangeMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/MonthlyRangeMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/MonthlyRangeMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -52,14 +52,14 @@
property_dict[property_name] = end_of_month
return property_dict
- def test(self, object, property_dict, property_list=None, **kw):
+ def test(self, document, property_dict, property_list=None, **kw):
start_date = property_dict.get('start_date', None)
stop_date = property_dict.get('stop_date', None)
if start_date is None or stop_date is None:
return False, property_dict
- target_start_date = object.getProperty('start_date', None)
- target_stop_date = object.getProperty('stop_date', None)
+ target_start_date = document.getProperty('start_date', None)
+ target_stop_date = document.getProperty('stop_date', None)
if target_start_date is None or target_stop_date is None:
return False, property_dict
Modified: erp5/trunk/products/ERP5/Document/MovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/MovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/MovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/MovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -54,7 +54,7 @@
# This method should be defined in sub classes.
raise NotImplementedError
- def test(self, object, property_dict, **kw):
+ def test(self, document, property_dict, **kw):
# This method should be defined in sub classes.
raise NotImplementedError
Modified: erp5/trunk/products/ERP5/Document/NestedLineMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/NestedLineMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/NestedLineMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/NestedLineMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -39,14 +39,14 @@
def _getPropertyDict(self, movement, **kw):
return {}
- def test(self, object, property_dict, property_list=None, **kw):
+ 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[prop] != object.getProperty(prop, None):
+ if property_dict[prop] != document.getProperty(prop, None):
return False, property_dict
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -45,8 +45,8 @@
property_dict['parent_explanation_value'] = parent_explanation_value
return property_dict
- def test(self, object, property_dict, **kw):
- if object.getParentExplanationValue() == \
+ def test(self, document, property_dict, **kw):
+ if document.getParentExplanationValue() == \
property_dict['parent_explanation_value']:
return True, property_dict
else:
Modified: erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -44,13 +44,13 @@
property_dict[prop] = movement.getProperty(prop, None)
return property_dict
- def test(self, object, property_dict, property_list=None, **kw):
+ 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[prop] != object.getProperty(prop, None):
+ if property_dict[prop] != document.getProperty(prop, None):
return False, property_dict
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -84,8 +84,8 @@
[tmp_list[0], {'quantity_sign':0}],
]
- def test(self, object, property_dict, **kw):
- if object.getQuantitySign() == property_dict['quantity_sign']:
+ def test(self, document, property_dict, **kw):
+ if document.getQuantitySign() == property_dict['quantity_sign']:
return True, property_dict
else:
return False, property_dict
Modified: erp5/trunk/products/ERP5/Document/SplitMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SplitMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SplitMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SplitMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -38,7 +38,7 @@
def _getPropertyDict(self, movement, **kw):
return {}
- def test(self, object, property_dict, **kw):
+ def test(self, document, property_dict, **kw):
return True, property_dict
def _separate(self, movement_list):
Modified: erp5/trunk/products/ERP5/Document/TitleMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TitleMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TitleMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TitleMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -40,8 +40,8 @@
property_dict['title'] = self._getTitle(movement)
return property_dict
- def test(self, object, property_dict, **kw):
- # If title is different, we want to update existing object instead
+ def test(self, document, property_dict, **kw):
+ # If title is different, we want to update existing document instead
# of creating a new one.
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/VariantMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/VariantMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/VariantMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/VariantMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -44,8 +44,8 @@
property_dict['variation_category_list'] = category_list
return property_dict
- def test(self, object, property_dict, **kw):
- category_list = object.getVariationCategoryList()
+ def test(self, document, property_dict, **kw):
+ category_list = document.getVariationCategoryList()
if category_list is None:
category_list = []
category_list.sort()
Modified: erp5/trunk/products/ERP5/Document/VariationPropertyMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/VariationPropertyMovementGroup.py?rev=26470&r1=26469&r2=26470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/VariationPropertyMovementGroup.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/VariationPropertyMovementGroup.py [utf8] Fri Apr 17 09:46:41 2009
@@ -41,9 +41,9 @@
def _getPropertyDict(self, movement, **kw):
return {'variation_property_dict':movement.getVariationPropertyDict()}
- def test(self, object, property_dict, **kw):
+ def test(self, document, property_dict, **kw):
updatable = False
- variation_property_dict = object.getVariationPropertyDict()
+ variation_property_dict = document.getVariationPropertyDict()
variation_property_list = variation_property_dict.keys()
if len(variation_property_list) == \
len(property_dict['variation_property_dict']):
More information about the Erp5-report
mailing list