Skip to content

erp5
erp5
Commit 9cbb0e08 authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Clean up 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2580 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5ac99792
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 66 deletions
product/ERP5/PropertySheet/Assignment.py
View file @ 9cbb0e08
...@@ -55,19 +55,6 @@ class Assignment(Path): ...@@ -55,19 +55,6 @@ class Assignment(Path):
'acquisition_accessor_id' : 'getTitle', 'acquisition_accessor_id' : 'getTitle',
'acquisition_depends' : None, 'acquisition_depends' : None,
'mode' : 'w' }, 'mode' : 'w' },
{ 'id' : 'address',
'description' : 'The organisations this persons works for',
'type' : 'content',
'portal_type' : ('Address'),
'acquisition_base_category' : ('subordination', ),
'acquisition_portal_type' : ('Organisation',),
'acquisition_copy_value' : 0,
'acquisition_mask_value' : 1,
'acquisition_sync_value' : 0,
'acquisition_accessor_id' : 'getDefaultAddressValue',
'acquisition_depends' : None,
'mode' : 'r' },
) )
_categories = ('activity', 'function', 'grade', 'role', 'skill', 'destination', 'group', 'product_line', 'subordination', 'region', ) _categories = ('activity', 'function', 'grade', 'site', 'role', 'skill', 'destination', 'group', 'subordination',)
product/ERP5/PropertySheet/Organisation.py
View file @ 9cbb0e08
...@@ -87,18 +87,18 @@ class Organisation: ...@@ -87,18 +87,18 @@ class Organisation:
{ 'id' : 'social_code', { 'id' : 'social_code',
'description' : 'The social code of this organisation', 'description' : 'The social code of this organisation',
'type' : 'string', 'type' : 'string',
'mode' : 'w' }, 'mode' : 'w' },
{ 'id' : 'creation_date', { 'id' : 'creation_date',
'description' : 'The date of the creation of this organisation', 'description' : 'The date of the creation of this organisation',
'type' : 'date', 'type' : 'date',
'mode' : 'w' }, 'mode' : 'w' },
# (Kev) This property is too banking-centric to appear here as a general organisation property. The following must be renamed to something more abstract like "business_code", "domain_uid", "business_domain_special_organisation_id" or something like that. # (Kev) This property is too banking-centric to appear here as a general organisation property. The following must be renamed to something more abstract like "business_code", "domain_uid", "business_domain_special_organisation_id" or something like that.
{ 'id' : 'bic_code', { 'id' : 'bic_code',
'description' : 'The Bank Identifier Code is a unique code that identifies individual banking and financial institution offices around the world.', 'description' : 'The Bank Identifier Code is a unique code that identifies individual banking and financial institution offices around the world.',
'type' : 'string', 'type' : 'string',
'mode' : 'w' }, 'mode' : 'w' },
# Acquisition # Acquisition
{ 'id' : 'address', { 'id' : 'address',
'storage_id' : 'default_address', 'storage_id' : 'default_address',
...@@ -157,32 +157,10 @@ class Organisation: ...@@ -157,32 +157,10 @@ class Organisation:
'description' : 'The date which ends the organisation financial year', 'description' : 'The date which ends the organisation financial year',
'type' : 'date', 'type' : 'date',
'mode' : 'w' }, 'mode' : 'w' },
# XXXX Coramy Specific : needs to be transfered in Coramy Organisation
# as soon as possible
{ 'id' : 'code_comptable',
'description' : 'The reference of the organisation for accounting application',
'type' : 'string',
'mode' : 'w' },
{ 'id' : 'ean13_code',
'description' : 'The ean_13 of the organisation',
'type' : 'string',
'mode' : 'w' },
{ 'id' : 'eu_vat_code',
'description' : 'The european vat code of the organisation',
'type' : 'string',
'mode' : 'w' },
{ 'id' : 'siren_code',
'description' : 'The french siren code of the organisation',
'type' : 'string',
'mode' : 'w' },
) )
_categories = ( 'role', 'group', 'activity', 'skill', 'market_segment', 'region', _categories = ( 'role', 'group', 'activity', 'skill', 'market_segment', 'region',
'social_form', 'function', 'source', 'destination', 'source_section', 'social_form', 'function', 'source', 'destination', 'source_section',
'destination_section', 'price_currency', 'economical_class', 'site', 'destination_section', 'price_currency', 'economical_class', 'site',
# Virtual Categories # Virtual Categories
'source_region', 'destination_region', ) 'source_region', 'destination_region', )
\ No newline at end of file
product/ERP5/PropertySheet/Person.py
View file @ 9cbb0e08
...@@ -61,13 +61,13 @@ class Person: ...@@ -61,13 +61,13 @@ class Person:
{ 'id' : 'social_code', { 'id' : 'social_code',
'description' : 'The social code of this person', 'description' : 'The social code of this person',
'type' : 'string', 'type' : 'string',
'mode' : 'w' }, 'mode' : 'w' },
# Compatibility with early releases # Compatibility with early releases
# Contact fields # Contact fields
{ 'id' : 'address', { 'id' : 'address',
'storage_id' : 'default_address', 'storage_id' : 'default_address',
'description' : 'The organisations this persons works for', 'description' : 'The current address of the person',
'type' : 'content', 'type' : 'content',
'portal_type' : ('Address'), 'portal_type' : ('Address'),
'acquisition_base_category' : ('subordination', ), 'acquisition_base_category' : ('subordination', ),
...@@ -81,7 +81,7 @@ class Person: ...@@ -81,7 +81,7 @@ class Person:
'mode' : 'w' }, 'mode' : 'w' },
{ 'id' : 'telephone', { 'id' : 'telephone',
'storage_id' : 'default_telephone', 'storage_id' : 'default_telephone',
'description' : 'The organisations this persons works for', 'description' : 'The current telephone of the person',
'type' : 'content', 'type' : 'content',
'portal_type' : ('Telephone'), 'portal_type' : ('Telephone'),
'acquisition_base_category' : ('subordination', ), 'acquisition_base_category' : ('subordination', ),
...@@ -94,7 +94,7 @@ class Person: ...@@ -94,7 +94,7 @@ class Person:
'mode' : 'w' }, 'mode' : 'w' },
{ 'id' : 'fax', { 'id' : 'fax',
'storage_id' : 'default_fax', 'storage_id' : 'default_fax',
'description' : 'The organisations this persons works for', 'description' : 'The current fax of the person',
'type' : 'content', 'type' : 'content',
'portal_type' : ('Fax'), 'portal_type' : ('Fax'),
'acquisition_base_category' : ('subordination', ), 'acquisition_base_category' : ('subordination', ),
...@@ -107,7 +107,7 @@ class Person: ...@@ -107,7 +107,7 @@ class Person:
'mode' : 'w' }, 'mode' : 'w' },
{ 'id' : 'email', { 'id' : 'email',
'storage_id' : 'default_email', 'storage_id' : 'default_email',
'description' : 'The organisations this persons works for', 'description' : 'The current email of the person',
'type' : 'content', 'type' : 'content',
'portal_type' : ('Email'), 'portal_type' : ('Email'),
'acquisition_base_category' : ('subordination', ), 'acquisition_base_category' : ('subordination', ),
...@@ -121,27 +121,18 @@ class Person: ...@@ -121,27 +121,18 @@ class Person:
# Subordination properties # Subordination properties
{ 'id' : 'career', { 'id' : 'career',
'storage_id' : 'default_career', 'storage_id' : 'default_career',
'description' : 'The current career status of a person.', 'description' : 'The current career step of a person.',
'type' : 'content', 'type' : 'content',
'portal_type' : ('Career'), 'portal_type' : ('Career'),
'acquired_property_id' : ('subordination_title', 'subordination', 'value_uids',
# 'acquisition_base_category' : ('subordination', ), # Useless 'subordination_uid_list',
# 'acquisition_portal_type' : ('Organisation',), # Useless 'grade', 'skill_list', 'role',
# 'acquisition_copy_value' : 0, # Useless ),
# 'acquisition_mask_value' : 1, # Useless 'mode' : 'w' },
# 'acquisition_sync_value' : 0, # Useless
# 'acquisition_accessor_id' : 'getDefaultEmailValue', # Useless
# 'acquisition_depends' : None,
'acquired_property_id' : ('title', 'subordination_title', 'subordination',
'value_uids','subordination_uid_list', 'role', 'skill_list', 'product_line_list', 'function', 'group', 'activity', 'grade', 'default_address_value'), # User address_region_uid_list to forward accessors
'mode' : 'w' },
) )
_categories = ( 'group', 'market_segment', 'region', 'role', 'function', 'activity', _categories = ( 'region', 'gender', 'product_line', 'subordination', 'nationality', 'marital_status',
'gender', 'product_line', 'subordination', 'assignment', 'nationality', # Acquired Categories via Career
'marital_status', 'grade', 'role',
# Virtual Categories # Virtual Categories
'source_region', 'destination_region', ) 'source_region', 'destination_region', )
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7