Commit 2c40abcd authored by Jérome Perrin's avatar Jérome Perrin

The simulation movement corresponding to the invoice transaction line should

have the order price currency as resource.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18793 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent aac7556e
...@@ -101,7 +101,7 @@ class InvoiceTransactionRule(Rule, PredicateMatrix): ...@@ -101,7 +101,7 @@ class InvoiceTransactionRule(Rule, PredicateMatrix):
delivery = simulation_movement.getDeliveryValue() delivery = simulation_movement.getDeliveryValue()
if delivery is not None: if delivery is not None:
resource = delivery.getProperty('price_currency', None) resource = delivery.getProperty('price_currency', None)
if (resource is not None) and \ if (resource is None) and \
(simulation_movement.getParentValue().getParentValue() \ (simulation_movement.getParentValue().getParentValue() \
== portal_simulation) : == portal_simulation) :
# we are on the first simulation movement, we'll try # we are on the first simulation movement, we'll try
......
...@@ -1914,6 +1914,44 @@ class TestInvoice(TestPackingListMixin, ...@@ -1914,6 +1914,44 @@ class TestInvoice(TestPackingListMixin,
""") """)
sequence_list.play(self, quiet=quiet) sequence_list.play(self, quiet=quiet)
def test_invoice_transaction_line_resource(self):
# tests that simulation movements corresponding to accounting line have a
# good resource in the simulation
sequence_list = SequenceList()
sequence = sequence_list.addSequenceString('''
stepCreateEntities
stepCreateCurrency
stepCreateSaleInvoiceTransactionRule
stepCreateOrder
stepSetOrderProfile
stepSetOrderPriceCurrency
stepCreateNotVariatedResource
stepTic
stepCreateOrderLine
stepSetOrderLineResource
stepSetOrderLineDefaultValues
stepOrderOrder
stepTic
''')
sequence_list.play(self, quiet=1)
order = sequence.get('order')
order_price_currency = order.getPriceCurrency()
self.assertNotEquals(None, order_price_currency)
related_applied_rule = order.getCausalityRelatedValue(
portal_type='Applied Rule')
delivery_movement = related_applied_rule.contentValues()[0]
invoice_applied_rule = delivery_movement.contentValues()[0]
invoice_movement = invoice_applied_rule.contentValues()[0]
invoice_transaction_applied_rule = invoice_movement.contentValues()[0]
invoice_transaction_movement =\
invoice_transaction_applied_rule.contentValues()[0]
self.assertEquals(order_price_currency,
invoice_transaction_movement.getResource())
# TODO: price currency have to be copied on simulation movements too
# self.assertEquals(order_price_currency,
# invoice_transaction_movement.getPriceCurrency())
#class TestPurchaseInvoice(TestInvoice): #class TestPurchaseInvoice(TestInvoice):
# order_portal_type = 'Purchase Order' # order_portal_type = 'Purchase Order'
# order_line_portal_type = 'Purchase Order Line' # order_line_portal_type = 'Purchase Order Line'
......
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