slapos_accounting:

* restore previous price setting
* set round price
* disable invoice generation for consumption to see test impacted
* XXX consumption price must be set to 0
  XXX migrate existing packing list

master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/default_subscription_trade_condition/subscription_price_eur.xml

@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>base_price</string> </key>
-            <value> <float>0.83</float> </value>
+            <value> <float>1.0</float> </value>
         </item>
         <item>
             <key> <string>base_price_per_slice</string> </key>

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/InstanceTree_requestUpdateOpenSaleOrder.py

@@ -97,27 +97,9 @@ if instance_tree.getCausalityState() == 'diverged':
       # Define the start date of the period, this can variates with the time.
       # start_date_delta = 0
       if subscription_request is not None:
-        """
-        # Copy from Subscription Condition the source and Source Section into the line
-        # RAFAEL: As the model is use single Open Order, it isn't possible to use multiple
-        #  companies per region, so we rely on Subscription Conditions to Describe the
-        #  providers.
-        edit_kw["source"] = subscription_request.getSource()
-        edit_kw["source_section"] = subscription_request.getSourceSection()
-        """
         # Quantity is double because the first invoice has to
         # charge for 2 months
         edit_kw['quantity'] = subscription_request.getQuantity()
-        """
-        edit_kw['price'] = subscription_request.getPrice()
-        edit_kw['price_currency'] = subscription_request.getPriceCurrency()
-        # While create move the start date to be at least 1 months
-        # So we can charge 3 months at once
-        # You can increase 65 days to generate 3 months
-        # You can increase 32 days to generate 2 months
-        # You can increase 0 days to keep generating one month only
-        # start_date_delta = 0
-        """
 
       open_order_line.edit(
         activate_kw=activate_kw,

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py

@@ -72,7 +72,7 @@ for movement in movement_list:
     specialise=specialise,
     price_currency=movement.getPriceCurrency(),
     start_date=movement.getStartDate(),
-    price=movement.getPrice(0.0)
+    price=movement.getPrice(0.0),
   )
 
   instance_tree = movement.getAggregateValue(portal_type="Instance Tree")

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputerConsumptionTioXMLFile_solveInvoicingGeneration.py

@@ -111,6 +111,7 @@ else:
       destination_project=project,
       resource_value=service,
       quantity_unit=service.getQuantityUnit(),
+      price=0,
     )
   delivery.confirm(comment="Created from %s" % context.getRelativeUrl())
   delivery.start()

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSConsumptionSkins.py

@@ -378,6 +378,7 @@ class TestSlapOSComputerConsumptionTioXMLFile_solveInvoicingGeneration(
     
     self.assertEqual(line.getTitle(), "fooà")
     self.assertEqual(line.getQuantity(), 42.42)
+    self.assertEqual(line.getPrice(), 0)
     self.assertEqual(line.getAggregateList(), [
       self.compute_node.partition1.getRelativeUrl(),
       self.start_requested_software_instance.getRelativeUrl(),
@@ -434,6 +435,7 @@ class TestSlapOSComputerConsumptionTioXMLFile_solveInvoicingGeneration(
     
     self.assertEqual(line.getTitle(), "fooà")
     self.assertEqual(line.getQuantity(), 42.42)
+    self.assertEqual(line.getPrice(), 0)
     self.assertEqual(line.getAggregateList(), [
       self.compute_node.partition2.getRelativeUrl(),
       self.stop_requested_software_instance.getRelativeUrl(),