[Erp5-report] r35044 kazuhiko - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/Document/ E...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu May  6 11:00:18 2010
New Revision: 35044

URL: http://svn.erp5.org?rev=35044&view=rev
Log:
revert r34722 and r34728 that is done by misunderstanding.

Modified:
    erp5/trunk/products/ERP5/tests/testInvoice.py
    erp5/trunk/products/ERP5Legacy/Document/InvoicingRule.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacyInvoice.py

Modified: erp5/trunk/products/ERP5/tests/testInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testInvoice.py?rev=35044&r1=35043&r2=35044&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testInvoice.py [utf8] Thu May  6 11:00:18 2010
@@ -605,10 +605,8 @@
                      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(), \

Modified: erp5/trunk/products/ERP5Legacy/Document/InvoicingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/Document/InvoicingRule.py?rev=35044&r1=35043&r2=35044&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/Document/InvoicingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/Document/InvoicingRule.py [utf8] Thu May  6 11:00:18 2010
@@ -74,19 +74,6 @@
   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):

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyInvoice.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyInvoice.py?rev=35044&r1=35043&r2=35044&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyInvoice.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyInvoice.py [utf8] Thu May  6 11:00:18 2010
@@ -1964,10 +1964,8 @@
                      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(), \