[Erp5-report] r21001 - in /erp5/trunk/products/ERP5: Document/ PropertySheet/ tests/

nobody at svn.erp5.org nobody at svn.erp5.org
Fri May 16 17:18:52 CEST 2008


Author: jerome
Date: Fri May 16 17:18:51 2008
New Revision: 21001

URL: http://svn.erp5.org?rev=21001&view=rev
Log:
add "default_career_reference" on Person documents for Employee Number

Modified:
    erp5/trunk/products/ERP5/Document/Career.py
    erp5/trunk/products/ERP5/PropertySheet/Person.py
    erp5/trunk/products/ERP5/tests/testERP5Base.py

Modified: erp5/trunk/products/ERP5/Document/Career.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Career.py?rev=21001&r1=21000&r2=21001&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Career.py (original)
+++ erp5/trunk/products/ERP5/Document/Career.py Fri May 16 17:18:51 2008
@@ -57,5 +57,6 @@
                       , PropertySheet.Task
                       , PropertySheet.Arrow
                       , PropertySheet.Path
+                      , PropertySheet.Reference
                       , PropertySheet.Assignment
                       )

Modified: erp5/trunk/products/ERP5/PropertySheet/Person.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Person.py?rev=21001&r1=21000&r2=21001&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Person.py (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Person.py Fri May 16 17:18:51 2008
@@ -191,7 +191,8 @@
     , 'description'         : 'The default career hold some properties of a Person.'
     , 'type'                : 'content'
     , 'portal_type'         : ( 'Career', )
-    , 'acquired_property_id': ( 'start_date', 'stop_date', 'title', 'description'
+    , 'acquired_property_id': ( 'start_date', 'stop_date', 'title',
+                                'description', 'reference'
                               , 'subordination', 'subordination_title', 'subordination_value'
                               , 'subordination_uid_list', 'subordination_uid'
                               , 'collective_agreement_title', 'salary_coefficient'

Modified: erp5/trunk/products/ERP5/tests/testERP5Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Base.py?rev=21001&r1=21000&r2=21001&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Base.py (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Base.py Fri May 16 17:18:51 2008
@@ -508,11 +508,13 @@
     person.setCareerSalaryCoefficient(1)
     person.setCareerCollectiveAgreementTitle('SYNTEC convention')
     person.setCareerActivity('software')
+    person.setCareerReference('1234')
     self.assertEquals(person.getCareerStopDate()                , dummy_date2)
     self.assertEquals(person.getCareerStartDate()               , dummy_date1)
     self.assertEquals(person.getCareerSalaryCoefficient()       , 1)
     self.assertEquals(person.getCareerCollectiveAgreementTitle(), 'SYNTEC convention')
     self.assertEquals(person.getCareerActivityTitle(), 'Software')
+    self.assertEquals(person.getCareerReference(), '1234')
 
     # Set & Check function
     function_categories = self.getCategoryList(base_category='function')
@@ -605,6 +607,7 @@
     # Test getter with 'Career' prefix
     self.assertEquals(person.getCareer()           , default_career.getRelativeUrl())
     self.assertEquals(person.getCareerTitle()      , default_career.getTitle())
+    self.assertEquals(person.getCareerReference(), default_career.getReference())
     self.assertEquals(person.getCareerValue()      , default_career)
     self.assertEquals(person.getCareerDescription(), default_career.getDescription())
 




More information about the Erp5-report mailing list