diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/arrow_not_same_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/arrow_not_same_constraint.xml
index c065f0501abf84e1ae36d51c522386bbf78c44c3..860c3346805df1f6ec82bcf6361ad0292d512e81 100644
--- a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/arrow_not_same_constraint.xml
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/arrow_not_same_constraint.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>expression</string> </key>
-            <value> <string>python: context.getSource() != context.getDestination() and context.getSourceSection() != context.getDestinationSection()</string> </value>
+            <value> <string>python: context.getSource() != context.getDestination() and context.getSourceSection() != context.getDestinationSection() and context.getSourceDecision() != context.getDestinationDecision()</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/destination_decision_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/destination_decision_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..de873ca8b0c589a620362f09bc40f3f6b87448db
--- /dev/null
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPurchasePackingListConstraint/destination_decision_constraint.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>destination_decision</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: (\'Organisation\', \'Person\')</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_decision_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/arrow_not_same_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/arrow_not_same_constraint.xml
index c065f0501abf84e1ae36d51c522386bbf78c44c3..860c3346805df1f6ec82bcf6361ad0292d512e81 100644
--- a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/arrow_not_same_constraint.xml
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/arrow_not_same_constraint.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>expression</string> </key>
-            <value> <string>python: context.getSource() != context.getDestination() and context.getSourceSection() != context.getDestinationSection()</string> </value>
+            <value> <string>python: context.getSource() != context.getDestination() and context.getSourceSection() != context.getDestinationSection() and context.getSourceDecision() != context.getDestinationDecision()</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/destination_decision_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/destination_decision_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..de873ca8b0c589a620362f09bc40f3f6b87448db
--- /dev/null
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSaleOrderConstraint/destination_decision_constraint.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>destination_decision</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: (\'Organisation\', \'Person\')</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_decision_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/arrow_not_same_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/arrow_not_same_constraint.xml
index c065f0501abf84e1ae36d51c522386bbf78c44c3..860c3346805df1f6ec82bcf6361ad0292d512e81 100644
--- a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/arrow_not_same_constraint.xml
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/arrow_not_same_constraint.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>expression</string> </key>
-            <value> <string>python: context.getSource() != context.getDestination() and context.getSourceSection() != context.getDestinationSection()</string> </value>
+            <value> <string>python: context.getSource() != context.getDestination() and context.getSourceSection() != context.getDestinationSection() and context.getSourceDecision() != context.getDestinationDecision()</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/destination_decision_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/destination_decision_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..de873ca8b0c589a620362f09bc40f3f6b87448db
--- /dev/null
+++ b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/destination_decision_constraint.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_identity_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_range_criterion</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>destination_decision</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: (\'Organisation\', \'Person\')</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_decision_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/master/bt5/vifib_erp5/bt/revision b/master/bt5/vifib_erp5/bt/revision
index 6d540e9f236101856eb2bf19a40e20084d6afd26..be6c136492c29e96d1d42c240ce1fe2d5f9d302c 100644
--- a/master/bt5/vifib_erp5/bt/revision
+++ b/master/bt5/vifib_erp5/bt/revision
@@ -1 +1 @@
-382
\ No newline at end of file
+383
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/bt/template_local_role_list b/master/bt5/vifib_erp5/bt/template_local_role_list
index ebc19fa2fbd0d7062e362d4bf46931b54f9e8876..48cf8a0f9050d6aeddb0314449cb9e2a4a4fd5ca 100644
--- a/master/bt5/vifib_erp5/bt/template_local_role_list
+++ b/master/bt5/vifib_erp5/bt/template_local_role_list
@@ -34,7 +34,6 @@ accounting_module/test_vifib_user_developer_payment
 business_process_module
 business_process_module/vifib_purchase_business_process
 business_process_module/vifib_sale_business_process
-business_process_module/vifib_simple_sale_business_process
 campaign_module
 component_module
 computer_module
@@ -87,7 +86,6 @@ sale_opportunity_module
 sale_order_module
 sale_packing_list_module
 sale_trade_condition_module
-sale_trade_condition_module/vifib_simple_trade_condition
 sale_trade_condition_module/vifib_trade_condition
 service_module
 service_module/computer_registration
diff --git a/master/bt5/vifib_erp5/bt/template_local_roles_list b/master/bt5/vifib_erp5/bt/template_local_roles_list
index d02d4bf0d451d46fd75e169d1ba8fe872e2ad491..48cf8a0f9050d6aeddb0314449cb9e2a4a4fd5ca 100644
--- a/master/bt5/vifib_erp5/bt/template_local_roles_list
+++ b/master/bt5/vifib_erp5/bt/template_local_roles_list
@@ -34,7 +34,6 @@ accounting_module/test_vifib_user_developer_payment
 business_process_module
 business_process_module/vifib_purchase_business_process
 business_process_module/vifib_sale_business_process
-business_process_module/vifib_simple_sale_business_process
 campaign_module
 component_module
 computer_module
@@ -88,7 +87,6 @@ sale_order_module
 sale_packing_list_module
 sale_trade_condition_module
 sale_trade_condition_module/vifib_trade_condition
-sale_trade_condition_module/vifib_simple_trade_condition
 service_module
 service_module/computer_registration
 service_module/vifib_discount