[Erp5-report] r18325 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: fabien
Date: Fri Dec 14 10:15:01 2007
New Revision: 18325

URL: http://svn.erp5.org?rev=18325&view=rev
Log:
move copyInheritanceSubObjects method from PaySheetModel class to
PaySheetTransaction class because object are copied into the paysheet, not in
the model

Modified:
    erp5/trunk/products/ERP5/Document/PaySheetModel.py
    erp5/trunk/products/ERP5/Document/PaySheetTransaction.py

Modified: erp5/trunk/products/ERP5/Document/PaySheetModel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetModel.py?rev=18325&r1=18324&r2=18325&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetModel.py (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetModel.py Fri Dec 14 10:15:01 2007
@@ -92,7 +92,6 @@
 
       return reference_list
 
-
     def getInheritanceModelReferenceDict(self, model_reference_dict,
         model_list, portal_type_list, reference_list):
       '''
@@ -112,7 +111,8 @@
             reference_list.append(reference)
             unique_list.append(reference)
 
-        model_reference_dict[model.getRelativeUrl()]=unique_list
+        if unique_list != []:
+          model_reference_dict[model.getRelativeUrl()]=unique_list
 
         new_model_list = model.getSpecialiseValueList()
         model_reference_dict = self.getInheritanceModelReferenceDict(\
@@ -121,17 +121,3 @@
             portal_type_list=portal_type_list,
             reference_list=reference_list,)
       return model_reference_dict
-
-    def copyInheritanceSubObjects(self, model_reference_dict):
-      '''
-        copy all sub objects containing in the dict into the current model
-      '''
-      key_list = model_reference_dict.keys()
-
-      for key in key_list:
-        id_list = model_reference_dict[key]
-        model = self.getPortalObject().restrictedTraverse(key)
-        if model is None:
-          LOG("copyInheritanceSubObjects,", 0, "can't find model %s" % key)
-        copied_data = model.manage_copyObjects(ids=id_list)
-        self.manage_pasteObjects(copied_data)

Modified: erp5/trunk/products/ERP5/Document/PaySheetTransaction.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetTransaction.py?rev=18325&r1=18324&r2=18325&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetTransaction.py (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetTransaction.py Fri Dec 14 10:15:01 2007
@@ -491,3 +491,17 @@
       post_calculation_script()
 
     return pay_sheet_line_list
+
+  def copyInheritanceSubObjects(self, model_reference_dict):
+    '''
+      copy all sub objects containing in the dict into the current paysheet
+    '''
+    key_list = model_reference_dict.keys()
+
+    for key in key_list:
+      id_list = model_reference_dict[key]
+      model = self.getPortalObject().restrictedTraverse(key)
+      if model is None:
+        LOG("copyInheritanceSubObjects,", 0, "can't find model %s" % key)
+      copied_data = model.manage_copyObjects(ids=id_list)
+      self.manage_pasteObjects(copied_data)