move calculation_script_id property from PaySheetModelLine to TradeModelLine.

move default_calculation_script_id property from PaySheetModel to TradeCondition. Rename it as calculation_script_id to be consistent with TradeModelLine.
Now PaySheetModelLine propertysheet became useless, so remove it


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

product/ERP5/Document/PaySheetModelLine.py

@@ -62,7 +62,6 @@ class PaySheetModelLine(TradeModelLine):
                     , PropertySheet.VariationRange
                     , PropertySheet.MappedValue
                     , PropertySheet.TradeModelLine
-                    , PropertySheet.PaySheetModelLine
                     , PropertySheet.Predicate
                     , PropertySheet.Reference
                     )

product/ERP5/PropertySheet/PaySheetModel.py

@@ -38,12 +38,6 @@ class PaySheetModel:
           context settings variation',
       'type'        : 'lines',
       'default'     : [],
-      'mode'        : 'w' 
-    },
-    { 'id'          : 'default_calculation_script_id',
-      'description' : 'If no script found on Pay Sheet Model Lines, this\
-          script is used to do localised calculs',
-      'type'        : 'string',
-      'mode'        : 'w',
+      'mode'        : 'w'
     },
   )

product/ERP5/PropertySheet/PaySheetModelLine.py

-##############################################################################
-#
-# Copyright (c) 2007 Nexedi SA and Contributors. All Rights Reserved.
-#                    Fabien Morin <fabien@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from Products.CMFCore.Expression import Expression
-
-class PaySheetModelLine:
-  """
-    Properties for Pay Sheet Model Lines.
-  """
-  _properties = (
-    { 'id'          : 'calculation_script_id',
-      'description' : 'If no script found on Pay Sheet Model Lines, this'
-                      ' script is used to do localised calculs',
-      'type'        : 'string',
-      'mode'        : 'w',
-    },
-    { 'id'          : 'source_annotation_line_reference',
-      'description' : 'The Service Provider will be the one defined in'
-                      ' the Annotation Line with this reference.',
-      'type'        : 'string',
-      'mode'        : 'w',
-    },
-  )
-
-
-  _categories = ( 'tax_category', 'grade', 'base_amount', 'salary_range')

product/ERP5/PropertySheet/TradeCondition.py

@@ -40,6 +40,11 @@ class TradeCondition:
                             ' default destination',
             'type'        : 'string',
             'mode'        : 'w' },
+        {   'id'          : 'calculation_script_id',
+            'description' : 'If no script found on Trade Model Lines, this\
+                script is used to do localised calculs',
+            'type'        : 'string',
+            'mode'        : 'w' },
         {   'id'          : 'destination_decision_source_reference',
             'description' : 'The reference of the destination_decision'+
                             ' for default source',

product/ERP5/PropertySheet/TradeModelLine.py

@@ -41,6 +41,12 @@ class TradeModelLine:
       'mode'        : 'w',
       'default'     : True,
     },
+    { 'id'          : 'calculation_script_id',
+      'description' : 'If a scrip is defined on Trade Model Line, this script'\
+                        ' is used to do localised calculs',
+      'type'        : 'string',
+      'mode'        : 'w',
+    },
   )
 
   _categories = (