[Erp5-report] r27860 - in /erp5/trunk/products/ERP5: Document/ PropertySheet/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jul 2 10:43:29 CEST 2009
Author: fabien
Date: Thu Jul 2 10:43:26 2009
New Revision: 27860
URL: http://svn.erp5.org?rev=27860&view=rev
Log:
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
Removed:
erp5/trunk/products/ERP5/PropertySheet/PaySheetModelLine.py
Modified:
erp5/trunk/products/ERP5/Document/PaySheetModelLine.py
erp5/trunk/products/ERP5/PropertySheet/PaySheetModel.py
erp5/trunk/products/ERP5/PropertySheet/TradeCondition.py
erp5/trunk/products/ERP5/PropertySheet/TradeModelLine.py
Modified: erp5/trunk/products/ERP5/Document/PaySheetModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetModelLine.py?rev=27860&r1=27859&r2=27860&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetModelLine.py [utf8] Thu Jul 2 10:43:26 2009
@@ -62,7 +62,6 @@
, PropertySheet.VariationRange
, PropertySheet.MappedValue
, PropertySheet.TradeModelLine
- , PropertySheet.PaySheetModelLine
, PropertySheet.Predicate
, PropertySheet.Reference
)
Modified: erp5/trunk/products/ERP5/PropertySheet/PaySheetModel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/PaySheetModel.py?rev=27860&r1=27859&r2=27860&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/PaySheetModel.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/PaySheetModel.py [utf8] Thu Jul 2 10:43:26 2009
@@ -38,12 +38,6 @@
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'
},
)
Removed: erp5/trunk/products/ERP5/PropertySheet/PaySheetModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/PaySheetModelLine.py?rev=27859&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/PaySheetModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/PaySheetModelLine.py (removed)
@@ -1,51 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Nexedi SA and Contributors. All Rights Reserved.
-# Fabien Morin <fabien at 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')
Modified: erp5/trunk/products/ERP5/PropertySheet/TradeCondition.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/TradeCondition.py?rev=27860&r1=27859&r2=27860&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/TradeCondition.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/TradeCondition.py [utf8] Thu Jul 2 10:43:26 2009
@@ -40,6 +40,11 @@
' 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',
Modified: erp5/trunk/products/ERP5/PropertySheet/TradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/TradeModelLine.py?rev=27860&r1=27859&r2=27860&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/TradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/TradeModelLine.py [utf8] Thu Jul 2 10:43:26 2009
@@ -41,6 +41,12 @@
'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 = (
More information about the Erp5-report
mailing list