Stabilise categories.

Setup quantity unit on tax.

Also allow to tax everything.

master/bt5/vifib_data/PathTemplateItem/service_module/cpu_consumption.xml

@@ -58,8 +58,9 @@
               <tuple>
                 <string>quantity_unit/unit/piece</string>
                 <string>product_line/cloud/usage</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/memory_consumption.xml

@@ -58,8 +58,9 @@
               <tuple>
                 <string>quantity_unit/unit/piece</string>
                 <string>product_line/cloud/usage</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_cleanup.xml

@@ -114,8 +114,9 @@
               <tuple>
                 <string>quantity_unit/unit/piece</string>
                 <string>product_line/cloud/configuration</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_hosting.xml

@@ -87,8 +87,9 @@
               <tuple>
                 <string>quantity_unit/unit/piece</string>
                 <string>product_line/cloud/configuration</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_setup.xml

@@ -87,8 +87,9 @@
               <tuple>
                 <string>quantity_unit/unit/piece</string>
                 <string>product_line/cloud/configuration</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_update.xml

@@ -87,8 +87,9 @@
               <tuple>
                 <string>quantity_unit/unit/piece</string>
                 <string>product_line/cloud/configuration</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_setup.xml

@@ -66,8 +66,9 @@
             <value>
               <tuple>
                 <string>quantity_unit/unit/piece</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/purchase</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/PathTemplateItem/service_module/vifib_usage_report.xml

@@ -62,10 +62,11 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>quantity_unit/volume/cubic_meter</string>
                 <string>product_line/cloud/usage</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>quantity_unit/unit/piece</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data/bt/revision

-98
\ No newline at end of file
+99
\ No newline at end of file

master/bt5/vifib_erp5/PathTemplateItem/service_module/computer_registration.xml

@@ -65,8 +65,9 @@
             <value>
               <tuple>
                 <string>quantity_unit/unit/piece</string>
-                <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>use/trade/sale</string>
+                <string>base_contribution/base_amount/invoicing/discounted</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_discount.xml

@@ -57,6 +57,8 @@
             <value>
               <tuple>
                 <string>use/trade/discount</string>
+                <string>quantity_unit/unit/piece</string>
+                <string>base_contribution/base_amount/invoicing/taxable</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_registration.xml

@@ -77,6 +77,7 @@
                 <string>base_contribution/base_amount/invoicing/discounted</string>
                 <string>base_contribution/base_amount/invoicing/taxable</string>
                 <string>use/trade/sale</string>
+                <string>product_line/cloud/support</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_tax.xml

@@ -57,6 +57,7 @@
             <value>
               <tuple>
                 <string>use/trade/tax</string>
+                <string>quantity_unit/unit/piece</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_erp5/bt/revision

-390
\ No newline at end of file
+391
\ No newline at end of file