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

[nobody at svn.erp5.org]

Author: fabien
Date: Fri Dec 14 17:44:35 2007
New Revision: 18335

URL: http://svn.erp5.org?rev=18335&view=rev
Log:
- add WARNINGS and TODO
- change the method who get annotation/ratio line from a reference to search
  first on the paysheet before on the dependencies model tree
- remove some logs

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=18335&r1=18334&r2=18335&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetModel.py (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetModel.py Fri Dec 14 17:44:35 2007
@@ -92,10 +92,6 @@
             reference_dict[reference]=object.getId()
           elif reference is None and get_none_reference:
             reference_dict[object.getId()]=object.getId()
-          else:
-            LOG('PaySheetModel getReferenceList', 0, '"%s" reference '
-                'property is empty' % object.getTitle() or
-                object.getRelativeUrl())
 
       return reference_dict
 

Modified: erp5/trunk/products/ERP5/Document/PaySheetTransaction.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetTransaction.py?rev=18335&r1=18334&r2=18335&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetTransaction.py (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetTransaction.py Fri Dec 14 17:44:35 2007
@@ -33,6 +33,9 @@
 import pprint
 from zLOG import LOG
 
+#XXX TODO: review naming of new methods
+#XXX WARNING: current API naming may change although model should be stable.
+
 class PaySheetTransaction(Invoice):
   """
   A paysheet will store data about the salary of an employee
@@ -79,12 +82,21 @@
     """
     # get ratio lines
     portal_type_list = ['Pay Sheet Model Ratio Line']
+    object_ratio_list = self.contentValues(portal_type=portal_type_list)
+
+    # look for ratio lines on the paysheet
+    if object_ratio_list:
+      for object in object_ratio_list:
+        if object.getReference() == ratio_reference:
+          return object.getQuantity()
+
+    # if not find in the paysheet, look on dependence tree
     sub_object_list = self.getSubObjectValueList(portal_type_list)
     object_ratio_list = sub_object_list
-
     for object in object_ratio_list:
       if object.getReference() == ratio_reference:
         return object.getQuantity()
+
     return None 
 
   security.declareProtected(Permissions.AccessContentsInformation,
@@ -109,12 +121,22 @@
     """
     # get Annotation Lines
     portal_type_list = ['Annotation Line']
+    
+    annotation_line_list = self.contentValues(portal_type=portal_type_list)
+
+    # look for annotation lines on the paysheet
+    if annotation_line_list:
+      for annotation_line in annotation_line_list:
+        if annotation_line.getReference() == reference:
+          return annotation_line
+
+    # if not find in the paysheet, look on dependence tree
     sub_object_list = self.getSubObjectValueList(portal_type_list)
     annotation_line_list = sub_object_list
-
     for annotation_line in annotation_line_list:
       if annotation_line.getReference() == reference:
         return annotation_line
+
     return None 
 
   security.declareProtected(Permissions.AccessContentsInformation,