- Added some properties and categories

- Some renaming
- Modified acquisition portal type


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

product/ERP5/PropertySheet/Amortisation.py

@@ -37,80 +37,77 @@ class Amortisation:
         TODO:
 
           - rename categories for more genericity (input_acount -> input)
-
-          - rename vat property
     """
 
     _properties = (
-        # Common properties
         {   'id'          : 'amortisation_start_price',
             'description' : 'The value to use to calculate the accounting amortisation movements (net of tax)',
             'type'        : 'float',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
             'acquisition_accessor_id'       : 'getAmortisationStartPrice',
+            'acquisition_portal_type'       : Expression('python:[]'),
+            'acquisition_depends'           : None,
+            'mode'        : 'w' },
+        {   'id'          : 'extra_cost_price',
+            'description' : 'The extra costs to immobilise with the main price (net of tax)',
+            'type'        : 'float',
+            'acquisition_base_category'     : ('parent',),
+            'acquisition_copy_value'        : 1,
+            'acquisition_mask_value'        : 1,
+            'acquisition_accessor_id'       : 'getExtraCostPrice',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
         {   'id'          : 'disposal_price',
             'description' : 'The estimated price at the end of the lifetime (net of tax)',
             'type'        : 'float',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
             'acquisition_accessor_id'       : 'getDisposalPrice',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
         {   'id'          : 'durability',
             'description' : 'The remaining durability of the item',
             'type'        : 'float',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
             'acquisition_accessor_id'       : 'getDurability',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
         {   'id'          : 'amortisation_duration',
             'description' : 'The remaining amortisation duration in months',
             'type'        : 'int',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
             'acquisition_accessor_id'       : 'getAmortisationDuration',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
-        {   'id'          : 'immobilisation',
-            'description' : 'The item is immobilised after the movement',
-            'type'        : 'boolean',
-            'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
-            'acquisition_copy_value'        : 1,
-            'acquisition_mask_value'        : 1,
-            'acquisition_accessor_id'       : 'getImmobilisation',
-            'acquisition_depends'           : None,
-            'mode'        : 'w' },
-        {   'id'          : 'vat', # XXX Naming problem according to JPS
+        {   'id'          : 'immobilisation_vat',
             'description' : 'The VAT at the beginning of the immobilisation period',
             'type'        : 'float',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
-            'acquisition_accessor_id'       : 'getVat',
+            'acquisition_accessor_id'       : 'getImmobilisationVat',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
         {   'id'          : 'amortisation_method',
             'description' : 'The amortisation method used for this particular immobilisation period',
             'type'        : 'string',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
             'acquisition_accessor_id'       : 'getAmortisationMethod',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
             
@@ -119,14 +116,14 @@ class Amortisation:
             'description' : 'The fiscal coefficient to use in degressive amortisation',
             'type'        : 'float',
             'acquisition_base_category'     : ('parent',),
-            'acquisition_portal_type'       : Expression('python: portal.getPortalItemTypeList()'),
             'acquisition_copy_value'        : 1,
             'acquisition_mask_value'        : 1,
             'acquisition_accessor_id'       : 'getDegressiveCoefficient',
+            'acquisition_portal_type'       : Expression('python:[]'),
             'acquisition_depends'           : None,
             'mode'        : 'w' },
             )
 
-    _categories = ('input_account', 'output_account', 'immobilisation_account',
-                   'amortisation_account', 'depreciation_account',
-                   'vat_account', 'amortisation_type') # XXX Some rename required
+    _categories = ('input_account', 'output_account', 'immobilisation_account', 'amortisation_account',
+                   'depreciation_account', 'extra_cost_account', 'monthly_amortisation_account',
+                   'immobilisation_vat_account') # XXX Some rename required