- added variable_additional_price and non_discountable_additional_price to

  price calculation (look at comments in Documents/Resource.py code for
  details).


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

product/ERP5/PropertySheet/SupplyLine.py

@@ -53,6 +53,16 @@ class SupplyLine:
        'description' : 'A surcharge ratio',
        'type'        : 'float',
        'mode'        : 'w' },
+    {  'id'          : 'variable_additional_price',
+       'description' : 'A per unit additional price that depends on a'\
+                       'continuous property',
+       'type'        : 'float',
+       'mode'        : 'w' },
+    {  'id'          : 'non_discountable_additional_price',
+       'description' : 'A per unit additional price that is not impacted by'\
+                       'discount ratio',
+       'type'        : 'float',
+       'mode'        : 'w' },
     # Pricing calculation
     # Matrix definition
     # Quantity step
@@ -86,6 +96,18 @@ class SupplyLine:
        'type'        : 'float',
        'multivalued' : 1,
        'mode'        : 'w' },
+    {  'id'          : 'variable_additional_price_quantity_step',
+       'description' : 'A list of quantity values which define ' \
+                       'acceptable ranges',
+       'type'        : 'float',
+       'multivalued' : 1,
+       'mode'        : 'w' },
+    {  'id'          : 'non_discountable_additional_price_quantity_step',
+       'description' : 'A list of quantity values which define ' \
+                       'acceptable ranges',
+       'type'        : 'float',
+       'multivalued' : 1,
+       'mode'        : 'w' },
     # Base category
     {  'id'          : 'p_variation_base_category',
        # XXX Compatibility