Commit 2fa3077b authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

revert r34722 and r34728 that is done by misunderstanding.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35044 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1d84ead6
No related merge requests found
......@@ -605,10 +605,8 @@ class TestInvoiceMixin(TestPackingListMixin,
portal_type=self.invoice_portal_type)
self.assertEquals(len(related_invoice_list), 1)
invoice = related_invoice_list[0]
self.assertEquals(packing_list.getSourceAdministration(),
invoice.getSource())
self.assertEquals(packing_list.getDestinationAdministration(),
invoice.getDestination())
self.assertEquals(packing_list.getSource(), invoice.getSource())
self.assertEquals(packing_list.getDestination(), invoice.getDestination())
self.assertEquals(packing_list.getDestinationSection(), \
invoice.getDestinationSection())
self.assertEquals(packing_list.getSourceSection(), \
......
......@@ -74,19 +74,6 @@ class InvoicingRule(Rule):
def isDeliverable(self, movement):
return movement.getResource() is not None
def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
business_path, current_property_dict):
"""
In Invoice Simulation Rule, source should be source_administration
of the input movement or its order's source. Same for destination.
"""
root_simulation_movement = movement.getRootSimulationMovement()
source = movement.getSourceAdministration() or \
root_simulation_movement.getSource()
destination = movement.getDestinationAdministration() or \
root_simulation_movement.getDestination()
return {'source':source, 'destination':destination}
security.declareProtected(Permissions.AccessContentsInformation,
'getExpandablePropertyList')
def getExpandablePropertyList(self, default=None):
......
......@@ -1964,10 +1964,8 @@ class TestSaleInvoiceMixin(TestInvoiceMixin,
portal_type=self.invoice_portal_type)
self.assertEquals(len(related_invoice_list), 1)
invoice = related_invoice_list[0]
self.assertEquals(packing_list.getSourceAdministration(),
invoice.getSource())
self.assertEquals(packing_list.getDestinationAdministration(),
invoice.getDestination())
self.assertEquals(packing_list.getSource(), invoice.getSource())
self.assertEquals(packing_list.getDestination(), invoice.getDestination())
self.assertEquals(packing_list.getDestinationSection(), \
invoice.getDestinationSection())
self.assertEquals(packing_list.getSourceSection(), \
......
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