update getCell method to be able to get Cells on effective models

use effective models in PaySheetTransaction.py


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26069 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/PaySheetModel.py

@@ -80,13 +80,18 @@ class PaySheetModel(TradeCondition, XMLMatrix, Delivery):
     cell = XMLMatrix.getCell(self, *kw, **kwd)
     # if cell not found, look on the inherited models
     if cell is None:
-      for specialised_model in self.getSpecialiseValueList():
-        cell = specialised_model.getCell(*kw, **kwd)
+      if kwd.has_key('paysheet'):
+        model_list = self.getInheritanceEffectiveModelTreeAsList(kwd['paysheet'])
+      else:
+        model_list = self.getInheritanceModelTreeAsList()
+      if self in model_list:
+        model_list.remove(self)
+      for specialised_model in model_list:
+        cell = XMLMatrix.getCell(specialised_model, *kw, **kwd)
         if cell is not None:
           return cell
     return cell
 
-
   security.declareProtected(Permissions.AccessContentsInformation,
       'getReferenceDict')
   def getReferenceDict(self, portal_type_list, property_list=()):

product/ERP5/Document/PaySheetTransaction.py

@@ -246,7 +246,7 @@ class PaySheetTransaction(Invoice):
     '''
       return the not editable lines as dict
     '''
-    model = paysheet.getSpecialiseValue()
+    model = paysheet.getSpecialiseValue().getEffectiveModel(paysheet)
 
     def sortByIntIndex(a, b):
       return cmp(a.getIntIndex(), b.getIntIndex())
@@ -314,7 +314,7 @@ class PaySheetTransaction(Invoice):
     # current_amount = base_amount_dict[base_amount][share]
     base_amount_dict = {}
 
-    model = paysheet.getSpecialiseValue()
+    model = paysheet.getSpecialiseValue().getEffectiveModel(paysheet)
 
     def sortByIntIndex(a, b):
       return cmp(a.getIntIndex(), b.getIntIndex())
@@ -503,7 +503,7 @@ class PaySheetTransaction(Invoice):
       If property_list is provided, only subobjects with at least one of those
       properties is defined will be taken into account
     '''
-    model = self.getSpecialiseValue()
+    model = self.getSpecialiseValue().getEffectiveModel(self)
     model_reference_dict = model.getInheritanceModelReferenceDict(
                                    portal_type_list=portal_type_list,
                                    property_list=property_list)