Commit 5db52eee authored by Georgios Dagkakis's avatar Georgios Dagkakis

Movement: Do not crash if section has no 'getPriceCurrency' attribute

/reviewed-on !859
parent 7cc3d26d
...@@ -516,7 +516,9 @@ class Movement(XMLObject, Amount, CompositionMixin, AmountGeneratorMixin): ...@@ -516,7 +516,9 @@ class Movement(XMLObject, Amount, CompositionMixin, AmountGeneratorMixin):
def _getAssetPrice(self,section,date): def _getAssetPrice(self,section,date):
price = self.getPrice() price = self.getPrice()
if section is None or not price: if section is None or not price or getattr(
section.aq_base, 'getPriceCurrencyValue', None
) is None:
return price return price
currency_value = self.getPriceCurrencyValue() currency_value = self.getPriceCurrencyValue()
if currency_value: if currency_value:
......
...@@ -1635,6 +1635,32 @@ class TestInventoryList(InventoryAPITestCase): ...@@ -1635,6 +1635,32 @@ class TestInventoryList(InventoryAPITestCase):
self.assertTrue(result is not None) self.assertTrue(result is not None)
self.assertEqual(internal_data[cur]['after']['total_price'], round(result)) self.assertEqual(internal_data[cur]['after']['total_price'], round(result))
def test_TotalPriceIndexationWhenSectionIsPerson(self):
"""
Checks that when source_section or destination_section is Person
total_price is indexed correctly.
Added after a bug that caused bad indexation in such cases
"""
getInventoryList = self.getSimulationTool().getInventoryList
movement = self._makeMovement(quantity=1, price=5)
person_1 = self.portal.person_module.newContent(portal_type='Person')
person_2 = self.portal.person_module.newContent(portal_type='Person')
currency = self.portal.currency_module.newContent(
portal_type='Currency'
)
movement.edit(
source_section_value=person_1,
destination_section_value=person_2,
price_currency_value=currency,
)
self.tic()
inventory_list_1 = getInventoryList(section_uid=person_1.getUid())
self.assertEqual(len(inventory_list_1), 1)
self.assertEqual(inventory_list_1[0].total_price, -5.0)
inventory_list_2 = getInventoryList(section_uid=person_2.getUid())
self.assertEqual(len(inventory_list_2), 1)
self.assertEqual(inventory_list_2[0].total_price, 5.0)
class TestMovementHistoryList(InventoryAPITestCase): class TestMovementHistoryList(InventoryAPITestCase):
"""Tests Movement history list methods. """Tests Movement history list methods.
""" """
......
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