Commit 0ca63bac authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

revert r.25510 and r.25512 that are not required.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25514 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent fe603477
...@@ -270,7 +270,7 @@ class DeliveryBuilder(OrderBuilder): ...@@ -270,7 +270,7 @@ class DeliveryBuilder(OrderBuilder):
delivery_module = getattr(portal, self.getDeliveryModule()) delivery_module = getattr(portal, self.getDeliveryModule())
delivery_to_update_list = [delivery] delivery_to_update_list = [delivery]
self._resetUpdated() self._resetUpdated()
delivery_list = self._unrestrictedProcessDeliveryGroup( delivery_list = self._processDeliveryGroup(
delivery_module, delivery_module,
root_group_node, root_group_node,
self.getDeliveryMovementGroupList(), self.getDeliveryMovementGroupList(),
......
...@@ -307,7 +307,7 @@ class OrderBuilder(XMLObject, Amount, Predicate): ...@@ -307,7 +307,7 @@ class OrderBuilder(XMLObject, Amount, Predicate):
# We do not want to update the same object more than twice in one # We do not want to update the same object more than twice in one
# _deliveryGroupProcessing(). # _deliveryGroupProcessing().
self._resetUpdated() self._resetUpdated()
delivery_list = self._unrestrictedProcessDeliveryGroup( delivery_list = self._processDeliveryGroup(
delivery_module, delivery_module,
movement_group_node, movement_group_node,
self.getDeliveryMovementGroupList(), self.getDeliveryMovementGroupList(),
...@@ -315,10 +315,6 @@ class OrderBuilder(XMLObject, Amount, Predicate): ...@@ -315,10 +315,6 @@ class OrderBuilder(XMLObject, Amount, Predicate):
**kw) **kw)
return delivery_list return delivery_list
def _unrestrictedProcessDeliveryGroup(self, *args, **kw):
"""This method wraps _processDeliveryGroup with UnrestrictedMethod."""
return UnrestrictedMethod(self._processDeliveryGroup)(*args, **kw)
def _processDeliveryGroup(self, delivery_module, movement_group_node, def _processDeliveryGroup(self, delivery_module, movement_group_node,
collect_order_list, movement_group_node_list=None, collect_order_list, movement_group_node_list=None,
delivery_to_update_list=None, delivery_to_update_list=None,
...@@ -775,6 +771,6 @@ class OrderBuilder(XMLObject, Amount, Predicate): ...@@ -775,6 +771,6 @@ class OrderBuilder(XMLObject, Amount, Predicate):
tv['builder_processed_list'] = {} tv['builder_processed_list'] = {}
# for backward compatibilities. # for backward compatibilities.
_deliveryGroupProcessing = _unrestrictedProcessDeliveryGroup _deliveryGroupProcessing = _processDeliveryGroup
_deliveryLineGroupProcessing = _processDeliveryLineGroup _deliveryLineGroupProcessing = _processDeliveryLineGroup
_deliveryCellGroupProcessing = _processDeliveryCellGroup _deliveryCellGroupProcessing = _processDeliveryCellGroup
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment