diff --git a/product/ERP5/Document/BusinessLink.py b/product/ERP5/Document/BusinessLink.py
index 3702b04cfc09a7c0a8abb5e5f1c2c9e4aad3e290..8f369c24778f9b3063db102f5d87115c06592a61 100644
--- a/product/ERP5/Document/BusinessLink.py
+++ b/product/ERP5/Document/BusinessLink.py
@@ -4,7 +4,7 @@
 # Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
 #                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #                    Yusuke Muraoka <yusuke@nexedi.com>
-#                    ?ukasz Nowak <luke@nexedi.com>
+#                    艁ukasz Nowak <luke@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsibility of assessing all potential
diff --git a/product/ERP5/Document/InvoiceSimulationRule.py b/product/ERP5/Document/InvoiceSimulationRule.py
index f152928be6b71bbde7c371f718d86118358bfb98..824b0f2f0a98faf39919a7402e848ca4f17792d6 100644
--- a/product/ERP5/Document/InvoiceSimulationRule.py
+++ b/product/ERP5/Document/InvoiceSimulationRule.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2009 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsibility of assessing all potential
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
 
diff --git a/product/ERP5/Document/InvoiceTransactionSimulationRule.py b/product/ERP5/Document/InvoiceTransactionSimulationRule.py
index c128ee35e3ad7464a57421449855793bdd7af581..7136935189e56a5b154aa539b58d56f64d58399c 100644
--- a/product/ERP5/Document/InvoiceTransactionSimulationRule.py
+++ b/product/ERP5/Document/InvoiceTransactionSimulationRule.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2009 Nexedi SARL and Contributors. All Rights Reserved.
+# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsibility of assessing all potential
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
 
diff --git a/product/ERP5/Document/SimulatedDeliveryBuilder.py b/product/ERP5/Document/SimulatedDeliveryBuilder.py
index cc9116d11f0836585dc48eda3e7e7013c71efe60..0aae5d24a8c28ff9c9e13910cb8c65ea4b4214b9 100644
--- a/product/ERP5/Document/SimulatedDeliveryBuilder.py
+++ b/product/ERP5/Document/SimulatedDeliveryBuilder.py
@@ -93,7 +93,7 @@ class SimulatedDeliveryBuilder(BuilderMixin):
   def callBeforeBuildingScript(self):  # XXX-JPS
     """
       Redefine this method, because it seems nothing interesting can be
-      done before building Delivery. 
+      done before building Delivery.
     """
     pass
 
diff --git a/product/ERP5/Document/TradeModelSimulationRule.py b/product/ERP5/Document/TradeModelSimulationRule.py
index f17f7a3e43cff048498d1a74c0cdf9f8e935588f..a055dd5a3eda8405fb90928f5adf1e24eabc72f5 100644
--- a/product/ERP5/Document/TradeModelSimulationRule.py
+++ b/product/ERP5/Document/TradeModelSimulationRule.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #
 ##############################################################################
 
diff --git a/product/ERP5/PropertySheet/BusinessLink.py b/product/ERP5/PropertySheet/BusinessLink.py
index 2b29a97abbe23110bc9cf0a9f9bae6bf565eb3be..790c2604fd174776e75ce0d68c9acb1bc7068ab1 100644
--- a/product/ERP5/PropertySheet/BusinessLink.py
+++ b/product/ERP5/PropertySheet/BusinessLink.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 # Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
-#                    Lukasz Nowak <luke@nexedi.com>
+#                    艁ukasz Nowak <luke@nexedi.com>
 #                    Yusuke Muraoka <yusuke@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
diff --git a/product/ERP5Legacy/Document/BPMBuilder.py b/product/ERP5Legacy/Document/BPMBuilder.py
index 0eb63332123da2f142cc7a9be7e9729ab847e931..41cd9854d0950246c9afc3222a831a755b2661de 100644
--- a/product/ERP5Legacy/Document/BPMBuilder.py
+++ b/product/ERP5Legacy/Document/BPMBuilder.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 # Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
-#                    ?ukasz Nowak <luke@nexedi.com>
+#                    艁ukasz Nowak <luke@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsibility of assessing all potential
diff --git a/product/ERP5Legacy/Document/DeliveryBuilder.py b/product/ERP5Legacy/Document/DeliveryBuilder.py
index abe58a4b617d34e15ac41c5f29edfde220e2fcc9..fece1a0ff0de164db7b25c7d5fb835685f8e0eed 100644
--- a/product/ERP5Legacy/Document/DeliveryBuilder.py
+++ b/product/ERP5Legacy/Document/DeliveryBuilder.py
@@ -94,7 +94,7 @@ class DeliveryBuilder(OrderBuilder):
   def callBeforeBuildingScript(self):  # XXX-JPS
     """
       Redefine this method, because it seems nothing interesting can be
-      done before building Delivery. 
+      done before building Delivery.
     """
     pass
 
diff --git a/product/ERP5Legacy/Document/ProductionOrderModelRootSimulationRule.py b/product/ERP5Legacy/Document/ProductionOrderModelRootSimulationRule.py
index 79817336c262563ec0e11dddd4a0f313f00f7ad1..87636f487cadacfc930d5d5e3c4bc83e7dbcf983 100644
--- a/product/ERP5Legacy/Document/ProductionOrderModelRootSimulationRule.py
+++ b/product/ERP5Legacy/Document/ProductionOrderModelRootSimulationRule.py
@@ -46,7 +46,7 @@ class ProductionOrderModelRootSimulationRule(ProductionOrderModelRule):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
-      business_link, current_property_dict):
+      business_path, current_property_dict):
     """Order rule specific update dictionary"""
     return {
       'delivery': movement.getRelativeUrl(),
diff --git a/product/ERP5Legacy/Document/ProductionOrderRootSimulationRule.py b/product/ERP5Legacy/Document/ProductionOrderRootSimulationRule.py
index b6cdeaa300b178b12fd1f4f90ea54c76dab8b85c..fcfece2c4841a1cb245b3353ddd1de4704901c98 100644
--- a/product/ERP5Legacy/Document/ProductionOrderRootSimulationRule.py
+++ b/product/ERP5Legacy/Document/ProductionOrderRootSimulationRule.py
@@ -46,7 +46,7 @@ class ProductionOrderRootSimulationRule(ProductionOrderRule):
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
   def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
-      business_link, current_property_dict):
+      business_path, current_property_dict):
     """Order rule specific update dictionary"""
     return {
       'delivery': movement.getRelativeUrl(),
diff --git a/product/ERP5Legacy/tests/testLegacyRuleOrder.py b/product/ERP5Legacy/tests/testLegacyRuleOrder.py
index ce56a06076eb38fe0b28baf84cae11e5df25edf2..d7c17fb70a05d7e0eb2feea2d267934e949bf68b 100644
--- a/product/ERP5Legacy/tests/testLegacyRuleOrder.py
+++ b/product/ERP5Legacy/tests/testLegacyRuleOrder.py
@@ -66,21 +66,6 @@ class TestOrderMixin(SubcontentReindexingWrapper):
             'erp5_trade_simulation_legacy', 'erp5_project_simulation_legacy',
             'erp5_administration')
 
-  def validateRules(self):
-    """
-    try to validate all rules in rule_tool.
-    """
-    rule_tool = self.getRuleTool()
-    for rule in rule_tool.contentValues(
-        portal_type=rule_tool.getPortalRuleTypeList()):
-      if rule.getValidationState() != 'validated':
-        rule.validate()
-
-    for rule in rule_tool.contentValues(
-      portal_type=rule_tool.getPortalRuleTypeList()):
-      if rule.getValidationState() == 'validated' and rule.getReference() == 'default_accounting_transaction_rule':
-        rule.invalidate()
-
   def login(self, quiet=0, run=1):
     uf = self.getPortal().acl_users
     uf._doAddUser('rc', '', ['Manager', 'Member', 'Assignee'], [])