[Erp5-report] r27529 - /erp5/trunk/products/ERP5/Document/PaySheetTransaction.py

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Jun 11 16:00:51 CEST 2009


Author: fabien
Date: Thu Jun 11 16:00:47 2009
New Revision: 27529

URL: http://svn.erp5.org?rev=27529&view=rev
Log:
- remove some unused imports
- after updateAggregatedAmountList, if some lines don't have movmenent, remove them

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

Modified: erp5/trunk/products/ERP5/Document/PaySheetTransaction.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetTransaction.py?rev=27529&r1=27528&r2=27529&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetTransaction.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetTransaction.py [utf8] Thu Jun 11 16:00:47 2009
@@ -29,8 +29,6 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5.Document.Invoice import Invoice
-from Products.ERP5Type.Utils import cartesianProduct
-from zLOG import LOG, DEBUG, INFO
 
 #XXX TODO: review naming of new methods
 #XXX WARNING: current API naming may change although model should be stable.
@@ -157,7 +155,7 @@
   security.declareProtected(Permissions.ModifyPortalContent,
                             'applyTransformation')
   def applyTransformation(self):
-    '''use a delivery builder to create all the paysheet lines using 
+    '''use a delivery builder to create all the paysheet lines using
       movements return by updateAggregatedAmountList
     '''
     portal = self.getPortalObject()
@@ -166,6 +164,9 @@
     for movement in movement_dict['movement_to_delete_list']:
       parent = movement.getParentValue()
       parent.manage_delObjects(movement.getId())
+      if len(parent.contentValues(portal_type='Pay Sheet Cell')) == 0:
+        # the line contain no movements, remove it
+        self.manage_delObjects(parent.getId())
     business_process_list = paysheet_model.findSpecialiseValueList(\
         context=paysheet_model,
         portal_type_list=['Business Process'])




More information about the Erp5-report mailing list