diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
index dc77ab5d51f82be7eca4f383adaf7d2da0f24e7c..bede87cedd71b22ae9e245e10724b0ce0e8e03aa 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -27,12 +21,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -151,7 +139,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>3</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -171,36 +159,18 @@
             <key> <string>title</string> </key>
             <value> <string>Task Invoice Builder</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -208,13 +178,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..31f679d133cbcb38215143994bdfd5282fc4a2e5
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/base_variant_movement_group_in_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>base_variant_movement_group_in_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Variant Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>base_variant_movement_group_in_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6d636dcb368990ba27a2ea0bab3c6072e7162719
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_delivery.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <string>collect_order_group/delivery</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>category_movement_group_on_delivery</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_section</string>
+                <string>destination_section</string>
+                <string>source_project</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>category_movement_group_on_delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fbd6696390d0424b9bc28a3bf90e6fe8478608d5
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/category_movement_group_on_line.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>category_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>resource</string>
+                <string>source</string>
+                <string>destination</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>category_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..829350da0ba6238450560cd01500ea63ab4f6f82
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/property_movement_group_on_line.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>property_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>start_date</string>
+                <string>stop_date</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>property_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1eea530c4fec1653756a7988f9c0f89ed1867aa
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/title_movement_group_on_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="TitleMovementGroup" module="Products.ERP5Type.Document.TitleMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>title_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Title Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>title_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23383e8c5890072e3a7b350d10161f7c063fb11d
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_invoice_builder/variant_movement_group_on_cell.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/cell</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>variant_movement_group_on_cell</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Variant Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>variant_movement_group_on_cell</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
index 6d710f0d970ab763e8fff8f9781ceda22dc193d3..8440998f7ddb78c0724efbfbc0b520a4b1d18a34 100644
--- a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder.xml
@@ -9,12 +9,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -35,9 +29,7 @@
         </item>
         <item>
             <key> <string>comment</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>delivery_line_collect_order\t(\'RequirementMovementGroup\', \'SplitMovementGroup\')</string> </value>
         </item>
         <item>
             <key> <string>delivery_after_generation_script_id</string> </key>
@@ -112,6 +104,10 @@
             <key> <string>id</string> </key>
             <value> <string>task_report_builder</string> </value>
         </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>5</string> </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Delivery Builder</string> </value>
@@ -124,36 +120,18 @@
             <key> <string>title</string> </key>
             <value> <string>Task Report Builder</string> </value>
         </item>
-        <item>
-            <key> <string>uid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="Length" module="BTrees.Length"/>
     </pickle>
     <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
@@ -161,13 +139,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="OOBTree" module="BTrees._OOBTree"/>
     </pickle>
     <pickle>
       <none/>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..81bbf96a9734f8e55df19de4120cc468631e7fc2
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/base_variant_movement_group_in_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="BaseVariantMovementGroup" module="Products.ERP5Type.Document.BaseVariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>base_variant_movement_group_in_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Variant Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>base_variant_movement_group_in_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d80c79e69ab954d9bcff4d4b2dbbfadf644b7d0
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_delivery.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <string>collect_order_group/delivery</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>category_movement_group_on_delivery</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>source</string>
+                <string>destination</string>
+                <string>source_section</string>
+                <string>destination_section</string>
+                <string>price_currency</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>category_movement_group_on_delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..405e0305b8716441e6229f59659a70aa49e3389f
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/category_movement_group_on_line.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="CategoryMovementGroup" module="Products.ERP5Type.Document.CategoryMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/category</string>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>category_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>resource</string>
+                <string>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>category_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd83abc1e0afc873180621d18b7358bb2363fb55
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/order_movement_group_on_delivery.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="OrderMovementGroup" module="Products.ERP5Type.Document.OrderMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/delivery</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>order_movement_group_on_delivery</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Order Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>order_movement_group_on_delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
new file mode 100644
index 0000000000000000000000000000000000000000..60fcaab534ae21edda56b28138a3a37e241dc021
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_delivery.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <string>collect_order_group/delivery</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>property_movement_group_on_delivery</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>start_date</string>
+                <string>stop_date</string>
+                <string>source_project</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>property_movement_group_on_delivery</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0d6b675fe7a609db6022b3c9fb90e0a36330f6f0
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/property_movement_group_on_line.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>divergence_scope/property</string>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>property_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>tested_property</string> </key>
+            <value>
+              <tuple>
+                <string>quantity_unit</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>property_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0aca0e7d0069da867d4ca1ab8f6ade126849db54
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/requirement_movement_group_on_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="RequirementMovementGroup" module="Products.ERP5Type.Document.RequirementMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>requirement_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>5</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Requirement Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>requirement_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9036caf26e852bd33fcdd52e553fc220c477aba1
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/split_movement_group_on_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="SplitMovementGroup" module="Products.ERP5Type.Document.SplitMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>split_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>6</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Split Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>split_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1eea530c4fec1653756a7988f9c0f89ed1867aa
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/title_movement_group_on_line.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="TitleMovementGroup" module="Products.ERP5Type.Document.TitleMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/line</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>title_movement_group_on_line</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Title Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>title_movement_group_on_line</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
new file mode 100644
index 0000000000000000000000000000000000000000..23383e8c5890072e3a7b350d10161f7c063fb11d
--- /dev/null
+++ b/bt5/erp5_project/PathTemplateItem/portal_deliveries/task_report_builder/variant_movement_group_on_cell.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="VariantMovementGroup" module="Products.ERP5Type.Document.VariantMovementGroup"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>collect_order_group/cell</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>variant_movement_group_on_cell</string> </value>
+        </item>
+        <item>
+            <key> <string>int_index</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Variant Movement Group</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>variant_movement_group_on_cell</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_project/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 3a5dc16f809e0702008b9551be1c8fc1319147a0..bec4b6a7893c48e5a01efb1bd31dcb6c1ae92051 100644
--- a/bt5/erp5_project/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_project/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -25,7 +25,7 @@
  </chain>
  <chain>
   <type>Task Report</type>
-  <workflow>delivery_simulation_interaction_workflow, delivery_causality_interaction_workflow, edit_workflow, task_report_causality_workflow, task_report_workflow</workflow>
+  <workflow>delivery_causality_workflow, delivery_simulation_interaction_workflow, delivery_causality_interaction_workflow, edit_workflow, task_report_workflow</workflow>
  </chain>
  <chain>
   <type>Task Report Line</type>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getBuilderList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getBuilderList.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f8378bcf48c0c5d11b73fb718fc9fde41f36f21
--- /dev/null
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getBuilderList.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>return [context.getPortalObject().portal_deliveries.task_report_builder]\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>TaskReport_getBuilderList</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getRuleReference.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getRuleReference.xml
new file mode 100644
index 0000000000000000000000000000000000000000..459c77ba4e95784994515f5f5b8b08184ed3e311
--- /dev/null
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_getRuleReference.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>return \'default_delivery_rule\'\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>TaskReport_getRuleReference</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_project/bt/change_log b/bt5/erp5_project/bt/change_log
index d1b3e4a90ff23c318d62806f3642c873379b31d3..5c98747e2152b43cc7f33b1521dae7253f484aec 100644
--- a/bt5/erp5_project/bt/change_log
+++ b/bt5/erp5_project/bt/change_log
@@ -1,3 +1,7 @@
+2008-09-16 Kazuhiko
+* revise task_invoice_builder and task_report_builder using new API.
+* use  delivery_causality_workflow instead of invoice_causality_workflow in Task Report.
+
 2008-09-10 vincentd
 * Set default selection for Quantity Unit and Currency and fix a little pb on Client
 
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 4af6ab79ff3523de3924cae3e3051bc45ab9c7a7..316941dd7da08cf2cd5477dbe52ed1440256594c 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-598
\ No newline at end of file
+599
\ No newline at end of file
diff --git a/bt5/erp5_project/bt/template_path_list b/bt5/erp5_project/bt/template_path_list
index df6573287a05df23fca68005668e65e1737f80bb..ff684b81a295865cdbc2b8104cb41ed607733f67 100644
--- a/bt5/erp5_project/bt/template_path_list
+++ b/bt5/erp5_project/bt/template_path_list
@@ -1,5 +1,7 @@
 portal_deliveries/task_invoice_builder
+portal_deliveries/task_invoice_builder/**
 portal_deliveries/task_report_builder
+portal_deliveries/task_report_builder/**
 portal_domains/preferred_group_person_list_domain
 portal_domains/project_person_domain
 portal_domains/project_person_task_report_domain
diff --git a/bt5/erp5_project/bt/template_portal_type_workflow_chain_list b/bt5/erp5_project/bt/template_portal_type_workflow_chain_list
index 97701f4ed564ed392a5020edf498f230f8cc77e2..48206d5d4ca2e5c16a6d9e83f4138c1bb55a6877 100644
--- a/bt5/erp5_project/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_project/bt/template_portal_type_workflow_chain_list
@@ -11,9 +11,9 @@ Task Report Line | delivery_movement_causality_interaction_workflow
 Task Report Line | delivery_movement_simulation_interaction_workflow
 Task Report Line | edit_workflow
 Task Report | delivery_causality_interaction_workflow
+Task Report | delivery_causality_workflow
 Task Report | delivery_simulation_interaction_workflow
 Task Report | edit_workflow
-Task Report | task_report_causality_workflow
 Task Report | task_report_workflow
 Task | edit_workflow
 Task | order_simulation_interaction_workflow