Commit a16fb3e4 authored by Guillaume Michon's avatar Guillaume Michon

Updated to correctly test the immobilisation system adapted for DeliveryBuilders


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3330 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a87ca8cd
...@@ -1743,17 +1743,17 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -1743,17 +1743,17 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, }, 'value': 13719.18, 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
# immobilisation end and start # immobilisation end and start
{ 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'source':'immobilisation_1', { 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'source':'immobilisation_1',
...@@ -1853,17 +1853,17 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -1853,17 +1853,17 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 2221.62, 'destination_section':None, 'destination':None, }, 'value': 2221.62, 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
# Correction 2 # Correction 2
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
...@@ -1941,17 +1941,17 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -1941,17 +1941,17 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, }, 'value': 13719.18, 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
# immobilisation end and start # immobilisation end and start
{ 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'source':'immobilisation_1', { 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'source':'immobilisation_1',
...@@ -2051,17 +2051,17 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -2051,17 +2051,17 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 2221.62, 'destination_section':None, 'destination':None, }, 'value': 2221.62, 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': 13719.18, 'destination_section':None, 'destination':None, 'value': 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': 13719.18 }, #'profit_quantity': 13719.18 },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': - 13719.18, 'destination_section':None, 'destination':None, 'value': - 13719.18, 'destination_section':None, 'destination':None,},
'profit_quantity': - 13719.18 }, #'profit_quantity': - 13719.18 },
# Correction 2 # Correction 2
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
...@@ -4134,6 +4134,37 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4134,6 +4134,37 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None, }, 'value': 6000., 'destination_section':None, 'destination':None, },
], # After profit_and_loss (quantity modified) ], # After profit_and_loss (quantity modified)
# [ # immobilisation start
# { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'immobilisation_1',
# 'value': - 30000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'in_out_1',
# 'value': 33000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'vat_1',
# 'value': - 3000., 'destination_section':None, 'destination':None, },
# # annuities
# { 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
# 'value': - 6000., 'destination_section':None, 'destination':None,},
# { 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
# 'value': 6000., 'destination_section':None, 'destination':None,},
# { 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
# 'value': - 6000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
# 'value': 6000., 'destination_section':None, 'destination':None,
# 'profit_quantity': -6000. },
# { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
# 'value': - 6000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
# 'value': 6000., 'destination_section':None, 'destination':None,
# 'profit_quantity': 6000. },
# { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
# 'value': - 6000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
# 'value': 6000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
# 'value': - 6000., 'destination_section':None, 'destination':None, },
# { 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
# 'value': 6000., 'destination_section':None, 'destination':None, },
# ], # After profit_and_loss (source modified)
[ # immobilisation start [ # immobilisation start
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'immobilisation_1', { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'immobilisation_1',
'value': - 30000., 'destination_section':None, 'destination':None, }, 'value': - 30000., 'destination_section':None, 'destination':None, },
...@@ -4154,39 +4185,8 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4154,39 +4185,8 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None,
'profit_quantity': 6000. },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None, }, 'value': 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', #'profit_quantity': 6000. },
'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None, },
], # After profit_and_loss (source modified)
[ # immobilisation start
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'immobilisation_1',
'value': - 30000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'in_out_1',
'value': 33000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'source':'vat_1',
'value': - 3000., 'destination_section':None, 'destination':None, },
# annuities
{ 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None,},
{ 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None,},
{ 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None,
'profit_quantity': -6000. },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None,
'profit_quantity': 6000. },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
...@@ -4217,8 +4217,8 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4217,8 +4217,8 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None, 'value': 6000., 'destination_section':None, 'destination':None,},
'profit_quantity': 6000. }, #'profit_quantity': 6000. },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
...@@ -4249,8 +4249,8 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4249,8 +4249,8 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None, 'value': 6000., 'destination_section':None, 'destination':None,},
'profit_quantity': 6000. }, #'profit_quantity': 6000. },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
...@@ -4282,8 +4282,8 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4282,8 +4282,8 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
'value': 6000., 'destination_section':None, 'destination':None, 'value': 6000., 'destination_section':None, 'destination':None,},
'profit_quantity': 6000. }, #'profit_quantity': 6000. },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'depreciation_1',
'value': - 6000., 'destination_section':None, 'destination':None, }, 'value': - 6000., 'destination_section':None, 'destination':None, },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1', { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'source':'amortisation_1',
...@@ -4301,141 +4301,209 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4301,141 +4301,209 @@ class TestImmobilisation(ERP5TypeTestCase):
} }
aggregated = [ [ { 'date':DateTime('2001/01/01'), 'source_section':'nexedi', 'destination_section':None, aggregated = [ [
'data': [ { 'source':'immobilisation_1', 'value': - 200000., 'destination':None, }, { 'date':DateTime('2001/01/01'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'in_out_1', 'value': 220000., 'destination':None, }, 'data': [
{ 'source':'vat_1', 'value': - 20000., 'destination':None, } ] }, { 'source':'immobilisation_1', 'value': -200000.00, 'destination':None },
{ 'date':DateTime('2001/06/12'), 'source_section':'nexedi', 'destination_section':None, { 'source':'in_out_1', 'value': 220000.00, 'destination':None },
'data': [ { 'source':'immobilisation_1', 'value': - 300000., 'destination':None, }, { 'source':'vat_1', 'value': -20000.00, 'destination':None },
{ 'source':'in_out_1', 'value': 330000., 'destination':None, }, ] },
{ 'source':'vat_1', 'value': - 30000., 'destination':None, } ] }, { 'date':DateTime('2001/06/12'), 'source_section':'nexedi', 'destination_section':None,
{ 'date':DateTime('2001/12/15'), 'source_section':'nexedi', 'destination_section':None, 'data': [
'data': [ { 'source':'immobilisation_1', 'value': 300000., 'destination':None, }, { 'source':'immobilisation_1', 'value': -300000.00, 'destination':None },
{ 'source':'amortisation_1', 'value': - 15287.67, 'destination':None, }, { 'source':'in_out_1', 'value': 330000.00, 'destination':None },
{ 'source':'in_out_2', 'value': - 313183.56, 'destination':None, }, { 'source':'vat_1', 'value': -30000.00, 'destination':None },
{ 'source':'vat_1', 'value': 28471.23, 'destination':None, } ] }, ] },
{ 'date':DateTime('2002/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2001/12/15'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 35287.67, 'destination':None, }, 'data': [
{ 'source':'amortisation_1', 'value': 35287.67, 'destination':None, } ] }, { 'source':'immobilisation_1', 'value': 300000.00, 'destination':None },
{ 'date':DateTime('2002/02/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'amortisation_1', 'value': -15287.67, 'destination':None },
'data': [ { 'source':'immobilisation_1', 'value': - 600000., 'destination':None, }, { 'source':'in_out_2', 'value': -313183.56, 'destination':None },
{ 'source':'in_out_1', 'value': 660000., 'destination':None, }, { 'source':'vat_1', 'value': 28471.23, 'destination':None },
{ 'source':'vat_1', 'value': - 60000., 'destination':None, } ] }, ] },
{ 'date':DateTime('2002/06/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2002/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'immobilisation_1', 'value': - 284712.33, 'destination':None, }, 'data': [
{ 'source':'in_out_1', 'value': 313183.56, 'destination':None, }, { 'source':'depreciation_1', 'value': -35287.67, 'destination':None },
{ 'source':'vat_1', 'value': - 28471.23, 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 35287.67, 'destination':None },
{ 'date':DateTime('2002/07/06'), 'source_section':'nexedi', 'destination_section':None, ] },
'data': [ { 'source':'immobilisation_1', 'value': - 20000., 'destination':None, }, { 'date':DateTime('2002/02/01'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'in_out_1', 'value': 22000., 'destination':None, }, 'data': [
{ 'source':'vat_1', 'value': - 2000., 'destination':None, } ] }, { 'source':'immobilisation_1', 'value': -600000.00, 'destination':None },
{ 'date':DateTime('2002/12/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'in_out_1', 'value': 660000.00, 'destination':None },
'data': [ { 'source':'immobilisation_1', 'value': 200000., 'destination':None, }, { 'source':'vat_1', 'value': -60000.00, 'destination':None },
{ 'source':'amortisation_1', 'value': - 38301.37, 'destination':None, }, ] },
{ 'source':'in_out_2', 'value': - 177868.49, 'destination':None, }, { 'date':DateTime('2002/06/01'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'vat_1', 'value': 16169.86, 'destination':None, } ] }, 'data': [
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'immobilisation_1', 'value': -284712.33, 'destination':None },
'data': [ { 'source':'depreciation_1', 'value': - 201031.08, 'destination':None, }, { 'source':'in_out_1', 'value': 313183.56, 'destination':None },
{ 'source':'amortisation_1', 'value': 201031.08, 'destination':None, },] }, { 'source':'vat_1', 'value': -28471.23, 'destination':None },
{ 'date':DateTime('2003/03/12'), 'source_section':'coramy', 'destination_section':None, ] },
'data': [ { 'source':'immobilisation_1', 'value': - 100000., 'destination':None, }, { 'date':DateTime('2002/07/06'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'in_out_1', 'value': 110000., 'destination':None, }, 'data': [
{ 'source':'vat_1', 'value': - 10000., 'destination':None, }, { 'source':'immobilisation_1', 'value': -20000.00, 'destination':None },
{ 'source':'immobilisation_2', 'value': - 200000., 'destination':None, }, { 'source':'in_out_1', 'value': 22000.00, 'destination':None },
{ 'source':'in_out_3', 'value': 215000., 'destination':None, }, { 'source':'vat_1', 'value': -2000.00, 'destination':None },
{ 'source':'vat_2', 'value': - 15000., 'destination':None, } ] }, ] },
{ 'date':DateTime('2003/03/12'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2002/12/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'immobilisation_1', 'value': 284712.33, 'destination':None, }, 'data': [
{ 'source':'amortisation_1', 'value': - 23315.54, 'destination':None, }, { 'source':'immobilisation_1', 'value': 200000.00, 'destination':None },
{ 'source':'in_out_2', 'value': - 287536.46, 'destination':None, }, { 'source':'amortisation_1', 'value': -38301.37, 'destination':None },
{ 'source':'vat_1', 'value': 26139.68,'destination':None, } ] }, { 'source':'in_out_2', 'value': -177868.49, 'destination':None },
{ 'date':DateTime('2003/03/15'), 'source_section':'coramy', 'destination_section':'nexedi', { 'source':'vat_1', 'value': 16169.86, 'destination':None },
'data': [ { 'source':'immobilisation_1', 'value': - 20000., 'destination':'immobilisation_1'}, ] },
{ 'source':'in_out_2', 'value': 14405.48, 'destination':'in_out_2', }, { 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'vat_1', 'value': - 1309.59, 'destination':'vat_1', }, 'data': [
{ 'source':'amortisation_1', 'value': 6904.11, 'destination':'amortisation_1'}]}, { 'source':'depreciation_1', 'value': -201031.08, 'destination':None },
{ 'date':DateTime('2003/04/01'), 'source_section':'coramy', 'destination_section':None, { 'source':'amortisation_1', 'value': 201031.08, 'destination':None },
'data': [ { 'source':'depreciation_2', 'value': - 4166.67, 'destination':None, }, ] },
{ 'source':'amortisation_2', 'value': 4166.67, 'destination':None, }, { 'date':DateTime('2003/03/12'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'depreciation_1', 'value': - 1553.04, 'destination':None, }, 'data': [
{ 'source':'amortisation_1', 'value': 1553.04, 'destination':None, } ] }, { 'source':'immobilisation_1', 'value': 284712.33, 'destination':None },
{ 'date':DateTime('2003/12/30'), 'source_section':'coramy', 'destination_section':None, { 'source':'amortisation_1', 'value': -23315.54, 'destination':None },
'data': [ { 'source':'immobilisation_2', 'value': 200000., 'destination':None, }, { 'source':'in_out_2', 'value': -287536.46, 'destination':None },
{ 'source':'amortisation_2', 'value': - 40885.42, 'destination':None, }, { 'source':'vat_1', 'value': 26139.68, 'destination':None },
{ 'source':'in_out_4', 'value': - 171048.18, 'destination':None, }, ] },
{ 'source':'vat_2', 'value': 11933.59, 'destination':None, } ] }, { 'date':DateTime('2003/03/12'), 'source_section':'coramy', 'destination_section':None,
{ 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'destination_section':None, 'data': [
'data': [ { 'source':'depreciation_1', 'value': - 165559.29, 'destination':None, }, { 'source':'immobilisation_1', 'value': -100000.00, 'destination':None },
{ 'source':'amortisation_1', 'value': 165559.29, 'destination':None, } ] }, { 'source':'in_out_1', 'value': 110000.00, 'destination':None },
{ 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'destination_section':'nexedi', { 'source':'vat_1', 'value': -10000.00, 'destination':None },
'data': [ { 'source':'in_out_1', 'value': 186806.64, 'destination':'in_out_2', }, { 'source':'immobilisation_2', 'value': -200000.00, 'destination':None },
{ 'source':'immobilisation_1', 'value': - 300000., 'destination':'immobilisation_1'}, { 'source':'in_out_3', 'value': 215000.00, 'destination':None },
{ 'source':'vat_1', 'value': - 16982.42, 'destination':'vat_1' }, { 'source':'vat_2', 'value': -15000.00, 'destination':None },
{ 'source':'amortisation_1', 'value': 130175.78, 'destination':'amortisation_1'}]}, ] },
{ 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2003/03/15'), 'source_section':'coramy', 'destination_section':'nexedi',
'data': [ { 'source':'immobilisation_1', 'value': 200000., 'destination':None, }, 'data': [
{ 'source':'amortisation_1', 'value': - 199976.79, 'destination':None, }, { 'source':'immobilisation_1', 'value': -20000.00, 'destination':'immobilisation_1' },
{ 'source':'in_out_2', 'value': - 110025.53, 'destination':None, }, { 'source':'in_out_2', 'value': 14405.48, 'destination':'in_out_2' },
{ 'source':'in_out_1', 'value': 110000., 'destination':None, }, { 'source':'vat_1', 'value': -1309.59, 'destination':'vat_1' },
{ 'source':'vat_1', 'value': 2.32, 'destination':None, }]}, { 'source':'amortisation_1', 'value': 6904.11, 'destination':'amortisation_1' },
{ 'date':DateTime('2004/04/01'), 'source_section':'coramy', 'destination_section':None, ] },
'data': [ { 'source':'depreciation_2', 'value': - 36718.75, 'destination':None, }, { 'date':DateTime('2003/04/01'), 'source_section':'coramy', 'destination_section':None,
{ 'source':'amortisation_2', 'value': 36718.75, 'destination':None, }, 'data': [
{ 'source':'depreciation_1', 'value': - 29815.20, 'destination':None, }, { 'source':'depreciation_1', 'value': -1553.04, 'destination':None },
{ 'source':'amortisation_1', 'value': 29815.20, 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 1553.04, 'destination':None },
{ 'date':DateTime('2004/08/15'), 'source_section':'coramy', 'destination_section':None, { 'source':'depreciation_2', 'value': -4166.67, 'destination':None },
'data': [ { 'source':'immobilisation_1', 'value': 100000., 'destination':None, }, { 'source':'amortisation_2', 'value': 4166.67, 'destination':None },
{ 'source':'amortisation_1', 'value': - 28547.95, 'destination':None, }, ] },
{ 'source':'in_out_2', 'value': - 78597.26, 'destination':None, }, { 'date':DateTime('2003/12/30'), 'source_section':'coramy', 'destination_section':None,
{ 'source':'vat_1', 'value': 7145.21, 'destination':None, } ] }, 'data': [
{ 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'immobilisation_2', 'value': 200000.00, 'destination':None },
'data': [ { 'source':'immobilisation_1', 'value': 79824.22, 'destination':None, }, { 'source':'amortisation_2', 'value': -40885.42, 'destination':None },
{ 'source':'in_out_1', 'value': 201000., 'destination':None, }, { 'source':'in_out_4', 'value': -171048.18, 'destination':None },
{ 'source':'vat_1', 'value': 1964.66, 'destination':None, }, { 'source':'vat_2', 'value': 11933.59, 'destination':None },
{ 'source':'depreciation_1', 'value': - 152260.84, 'destination':None, }, ] },
{ 'source':'amortisation_1', 'value': 12083.23, 'destination':None, }, { 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'destination_section':None,
{ 'source':'in_out_2', 'value': - 142611.26, 'destination':None, } ] }, 'data': [
{ 'date':DateTime('2005/04/01'), 'source_section':'coramy', 'destination_section':None, { 'source':'depreciation_1', 'value': -165559.29, 'destination':None },
'data': [ { 'source':'depreciation_1', 'value': - 10275.60, 'destination':None, }, { 'source':'amortisation_1', 'value': 165559.29, 'destination':None },
{ 'source':'amortisation_1', 'value': 10275.60, 'destination':None, } ] }, ] },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'destination_section':'nexedi',
'data': [ { 'source':'depreciation_1', 'value': - 121250., 'destination':None, }, 'data': [
{ 'source':'amortisation_1', 'value': 121250., 'destination':None, } ] }, { 'source':'immobilisation_1', 'value': -300000.00, 'destination':'immobilisation_1' },
{ 'date':DateTime('2006/06/24'), 'source_section':'nexedi', 'destination_section':None, { 'source':'in_out_1', 'value': 186806.64, 'destination':'in_out_2' },
'data': [ { 'source':'immobilisation_3', 'value': - 150000., 'destination':None, }, { 'source':'vat_1', 'value': -16982.42, 'destination':'vat_1' },
{ 'source':'in_out_5', 'value': 165000., 'destination':None, }, { 'source':'amortisation_1', 'value': 130175.78, 'destination':'amortisation_1' },
{ 'source':'vat_3', 'value': - 15000., 'destination':None, } ] }, ] },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2004/02/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_3', 'value': - 62691.47, 'destination':None, }, 'data': [
{ 'source':'amortisation_3', 'value': 62691.47, 'destination':None, }, { 'source':'immobilisation_1', 'value': 300000.00, 'destination':None },
{ 'source':'depreciation_1', 'value': - 21484.38, 'destination':None, }, { 'source':'amortisation_1', 'value': -199976.79, 'destination':None },
{ 'source':'amortisation_1', 'value': 21484.38, 'destination':None, } ] }, { 'source':'in_out_2', 'value': -110025.53, 'destination':None },
{ 'date':DateTime('2007/02/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'vat_1', 'value': 10002.32, 'destination':None },
'data': [ { 'source':'immobilisation_3', 'value': 150000., 'destination':None, }, { 'source':'immobilisation_1', 'value': -100000.00, 'destination':None },
{ 'source':'in_out_6', 'value': - 84846.83, 'destination':None, }, { 'source':'in_out_1', 'value': 110000.00, 'destination':None },
{ 'source':'vat_3', 'value': 7713.35, 'destination':None, }, { 'source':'vat_1', 'value': -10000.00, 'destination':None },
{ 'source':'amortisation_3', 'value': - 72866.52, 'destination':None, } ] }, ] },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2004/04/01'), 'source_section':'coramy', 'destination_section':None,
'data': [ { 'source':'depreciation_3', 'value': - 10175.05, 'destination':None, }, 'data': [
{ 'source':'amortisation_3', 'value': 10175.05, 'destination':None, }, { 'source':'depreciation_1', 'value': -29815.20, 'destination':None },
{ 'source':'depreciation_1', 'value': - 14770.51, 'destination':None, }, { 'source':'amortisation_1', 'value': 29815.20, 'destination':None },
{ 'source':'amortisation_1', 'value': 14770.51, 'destination':None, } ] }, { 'source':'depreciation_2', 'value': -36718.75, 'destination':None },
{ 'date':DateTime('2009/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'amortisation_2', 'value': 36718.75, 'destination':None },
'data': [ { 'source':'depreciation_1', 'value': - 10154.72, 'destination':None, }, ] },
{ 'source':'amortisation_1', 'value': 10154.72, 'destination':None, } ] }, { 'date':DateTime('2004/08/15'), 'source_section':'coramy', 'destination_section':None,
{ 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'destination_section':None, 'data': [
'data': [ { 'source':'depreciation_1', 'value': - 6981.37, 'destination':None, }, { 'source':'immobilisation_1', 'value': 100000.00, 'destination':None },
{ 'source':'amortisation_1', 'value': 6981.37, 'destination':None, } ] }, { 'source':'amortisation_1', 'value': -28547.95, 'destination':None },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'in_out_2', 'value': -78597.26, 'destination':None },
'data': [ { 'source':'depreciation_1', 'value': - 5119.67, 'destination':None, }, { 'source':'vat_1', 'value': 7145.21, 'destination':None },
{ 'source':'amortisation_1', 'value': 5119.67, 'destination':None, } ] }, ] },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 5119.67, 'destination':None, }, 'data': [
{ 'source':'amortisation_1', 'value': 5119.67, 'destination':None, } ] }, { 'source':'depreciation_1', 'value': -152260.84, 'destination':None },
{ 'date':DateTime('2013/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'source':'amortisation_1', 'value': 152260.84, 'destination':None },
'data': [ { 'source':'depreciation_1', 'value': - 5119.67, 'destination':None, }, { 'source':'immobilisation_1', 'value': 269824.22, 'destination':None },
{ 'source':'amortisation_1', 'value': 5119.67, 'destination':None, } ] }, { 'source':'amortisation_1', 'value': -140177.62, 'destination':None },
], { 'source':'in_out_2', 'value': -142611.26, 'destination':None },
{ 'source':'vat_1', 'value': 12964.66, 'destination':None },
{ 'source':'immobilisation_1', 'value': -190000.00, 'destination':None },
{ 'source':'in_out_1', 'value': 201000.00, 'destination':None },
{ 'source':'vat_1', 'value': -11000.00, 'destination':None },
] },
{ 'date':DateTime('2005/04/01'), 'source_section':'coramy', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -10275.60, 'destination':None },
{ 'source':'amortisation_1', 'value': 10275.60, 'destination':None },
] },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -121250.00, 'destination':None },
{ 'source':'amortisation_1', 'value': 121250.00, 'destination':None },
] },
{ 'date':DateTime('2006/06/24'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'immobilisation_3', 'value': -150000.00, 'destination':None },
{ 'source':'in_out_5', 'value': 165000.00, 'destination':None },
{ 'source':'vat_3', 'value': -15000.00, 'destination':None },
] },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -21484.38, 'destination':None },
{ 'source':'amortisation_1', 'value': 21484.38, 'destination':None },
{ 'source':'depreciation_3', 'value': -62691.47, 'destination':None },
{ 'source':'amortisation_3', 'value': 62691.47, 'destination':None },
] },
{ 'date':DateTime('2007/02/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'immobilisation_3', 'value': 150000.00, 'destination':None },
{ 'source':'in_out_6', 'value': -84846.83, 'destination':None },
{ 'source':'vat_3', 'value': 7713.35, 'destination':None },
{ 'source':'amortisation_3', 'value': -72866.52, 'destination':None },
] },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -14770.51, 'destination':None },
{ 'source':'amortisation_1', 'value': 14770.51, 'destination':None },
{ 'source':'depreciation_3', 'value': -10175.05, 'destination':None },
{ 'source':'amortisation_3', 'value': 10175.05, 'destination':None },
] },
{ 'date':DateTime('2009/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -10154.72, 'destination':None },
{ 'source':'amortisation_1', 'value': 10154.72, 'destination':None },
] },
{ 'date':DateTime('2010/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -6981.37, 'destination':None },
{ 'source':'amortisation_1', 'value': 6981.37, 'destination':None },
] },
{ 'date':DateTime('2011/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -5119.67, 'destination':None },
{ 'source':'amortisation_1', 'value': 5119.67, 'destination':None },
] },
{ 'date':DateTime('2012/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -5119.67, 'destination':None },
{ 'source':'amortisation_1', 'value': 5119.67, 'destination':None },
] },
{ 'date':DateTime('2013/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [
{ 'source':'depreciation_1', 'value': -5119.67, 'destination':None },
{ 'source':'amortisation_1', 'value': 5119.67, 'destination':None },
] },
],
# Solvers test # Solvers test
[ [
...@@ -4502,14 +4570,59 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4502,14 +4570,59 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'source':'amortisation_1', 'value': 22000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 22000., 'destination':None, } ] },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, }, 'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 10000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 10000., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, }, 'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, },
{ 'source':'amortisation_1', 'value': 0., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 0., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
], ],
# Solvers test, depreciation account changed # Solvers test, depreciation account changed, not solved
[
{ 'date':DateTime('2001/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'immobilisation_1', 'value': - 10000., 'destination':None, },
{ 'source':'in_out_1', 'value': 11000., 'destination':None, },
{ 'source':'vat_1', 'value': - 1000., 'destination':None, } ] },
{ 'date':DateTime('2002/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'immobilisation_1', 'value': - 50000., 'destination':None, },
{ 'source':'in_out_1', 'value': 55000., 'destination':None, },
{ 'source':'vat_1', 'value': - 5000., 'destination':None, },
{ 'source':'depreciation_1', 'value': - 2000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 2000., 'destination':None, } ] },
{ 'date':DateTime('2003/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'immobilisation_1', 'value': - 30000., 'destination':None, },
{ 'source':'in_out_1', 'value': 33000., 'destination':None, },
{ 'source':'vat_1', 'value': - 3000., 'destination':None, },
{ 'source':'depreciation_1', 'value': - 12000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 12000., 'destination':None, } ] },
{ 'date':DateTime('2004/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 22000., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 22000., 'destination':None, } ] },
{ 'date':DateTime('2005/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 22000., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 22000., 'destination':None, } ] },
{ 'date':DateTime('2006/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 22000., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 22000., 'destination':None, } ] },
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 10000., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 0., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
],
# Solvers test, depreciation account changed, solved
[ [
{ 'date':DateTime('2001/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2001/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'immobilisation_1', 'value': - 10000., 'destination':None, }, 'data': [ { 'source':'immobilisation_1', 'value': - 10000., 'destination':None, },
...@@ -4542,11 +4655,13 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4542,11 +4655,13 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, }, 'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, }, { 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 16000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 16000., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, }, 'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, }, { 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 6000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 6000., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
], ],
...@@ -4586,13 +4701,16 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4586,13 +4701,16 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2007/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, }, 'data': [ { 'source':'depreciation_1', 'value': - 10000., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, }, { 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 16000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 16000., 'destination':None, },
{ 'source':'depreciation_1', 'value': 0., 'destination':None, }, ] },
{ 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2008/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, }, 'data': [ { 'source':'depreciation_1', 'value': - 0., 'destination':None, },
{ 'source':'depreciation_1', 'value': - 0., 'destination':None, },
{ 'source':'depreciation_2', 'value': - 6000., 'destination':None, }, { 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
{ 'source':'amortisation_1', 'value': 6000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 6000., 'destination':None, } ] },
{ 'date':DateTime('2009/01/01'), 'source_section':'nexedi', 'destination_section':None, { 'date':DateTime('2009/01/01'), 'source_section':'nexedi', 'destination_section':None,
'data': [ { 'source':'depreciation_2', 'value': - 6000., 'destination':None, }, 'data': [ { 'source':'depreciation_2', 'value': - 6000., 'destination':None, },
#{ 'source':'depreciation_1', 'value': - 0., 'destination':None, },
{ 'source':'amortisation_1', 'value': 6000., 'destination':None, } ] }, { 'source':'amortisation_1', 'value': 6000., 'destination':None, } ] },
], ],
...@@ -4687,7 +4805,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4687,7 +4805,7 @@ class TestImmobilisation(ERP5TypeTestCase):
{ 'date':DateTime('2008/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None}, ], { 'date':DateTime('2008/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None}, ],
# Profit and loss # Profit and loss
[ { 'date':DateTime('2005/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ], [ { 'date':DateTime('2005/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ],
[ { 'date':DateTime('2006/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ], #[ { 'date':DateTime('2006/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ],
[ { 'date':DateTime('2007/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ], [ { 'date':DateTime('2007/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ],
[ { 'date':DateTime('2007/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ], [ { 'date':DateTime('2007/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ],
[ { 'date':DateTime('2008/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ], [ { 'date':DateTime('2008/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None} ],
...@@ -4696,16 +4814,16 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4696,16 +4814,16 @@ class TestImmobilisation(ERP5TypeTestCase):
solver_dict = { 'solver_3' : ['update_from_simulation_amortisation', 'update_from_simulation_amortisation', solver_dict = { 'solver_3' : ['update_from_simulation_amortisation', 'update_from_simulation_amortisation',
'update_from_simulation_amortisation', 'profit_loss_amortisation', 'update_from_simulation_amortisation', 'profit_loss_amortisation',
'profit_loss_amortisation', 'profit_loss_amortisation', 'profit_loss_amortisation', 'profit_loss_amortisation', 'profit_loss_amortisation', #'profit_loss_amortisation',
'profit_loss_amortisation', 'profit_loss_amortisation', 'profit_loss_amortisation' ] } 'profit_loss_amortisation', 'profit_loss_amortisation', 'profit_loss_amortisation' ] }
transaction_change_list = [ transaction_change_list = [
{ 'transaction': { 'date':DateTime('2005/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None, { 'transaction': { 'date':DateTime('2005/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None,
'source':'account/amortisation_1', 'destination':None}, 'source':'account/amortisation_1', 'destination':None},
'changes': { 'Quantity':36000. } }, 'changes': { 'Quantity':36000. } },
{ 'transaction': { 'date':DateTime('2006/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None, # { 'transaction': { 'date':DateTime('2006/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None,
'source':'account/amortisation_1', 'destination':None}, # 'source':'account/amortisation_1', 'destination':None},
'changes': { 'Source':'account/amortisation_2' } }, # 'changes': { 'Source':'account/amortisation_2' } },
{ 'transaction': { 'date':DateTime('2007/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None, { 'transaction': { 'date':DateTime('2007/01/01'), 'source_section':'organisation/nexedi', 'destination_section':None,
'source':'account/amortisation_1', 'destination':None}, 'source':'account/amortisation_1', 'destination':None},
'changes': { 'Quantity':0. } }, 'changes': { 'Quantity':0. } },
...@@ -4783,7 +4901,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -4783,7 +4901,7 @@ class TestImmobilisation(ERP5TypeTestCase):
return getattr(self.getPortal(), 'account', None) return getattr(self.getPortal(), 'account', None)
def getDeliveryModule(self): def getDeliveryModule(self):
return getattr(self.getPortal(), 'purchase_packing_list', None) return getattr(self.getPortal(), 'purchase_packing_list_module', None)
def getPortalId(self): def getPortalId(self):
return self.getPortal().getId() return self.getPortal().getId()
...@@ -5040,7 +5158,31 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5040,7 +5158,31 @@ class TestImmobilisation(ERP5TypeTestCase):
immobilisation_list = list(item.objectValues()) immobilisation_list = list(item.objectValues())
sequence.edit(immobilisation_list = immobilisation_list) sequence.edit(immobilisation_list = immobilisation_list)
def stepUpdateAllFromSimulation(self, sequence=None, **kw):
"""
Launch updateFromSimulation on all amortisation transactions
"""
accounting = self.getAccountingModule()
for transaction in accounting.objectValues():
LOG('transaction %s' % repr(transaction), 0, '(source_section : %s, destination_section : %s, date : %s)' % (repr(transaction.getSourceSection()), repr(transaction.getDestinationSection()), repr(transaction.getStopDate())))
for line in transaction.objectValues():
LOG('--- line %s' % repr(line), 0, '(source : %s, destination : %s, quantity : %s, uid : %s)' % (repr(line.getSource()), repr(line.getDestination()), repr(line.getQuantity()), repr(line.getUid())))
movements = line.getDeliveryRelatedValueList()
total = 0
for movement in movements:
LOG('------ movement', 0, repr(movement.getQuantity()))
total += movement.getQuantity()
LOG('total for line :', 0, repr(total))
# if line.getQuantity() != total:
# LOG('line %s is divergent (transaction %s)' % (repr(line), repr(transaction)), 0, '')
# else:
# LOG('line %s is convergent (transaction %s)' % (repr(line), repr(transaction)), 0, '')
if self.getWorkflowTool().getStatusOf('amortisation_transaction_divergence_workflow',transaction)\
['amortisation_causality_state'] == 'diverged':
LOG('transaction %s is detected divergent by the system' % repr(transaction), 0, '')
self.getWorkflowTool().doActionFor(transaction, 'update_from_simulation_amortisation', 'amortisation_transaction_divergence_workflow')
def stepApplySolver(self, sequence=None, **kw): def stepApplySolver(self, sequence=None, **kw):
""" """
Apply the solvers on the amortisation transactions Apply the solvers on the amortisation transactions
...@@ -5071,12 +5213,25 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5071,12 +5213,25 @@ class TestImmobilisation(ERP5TypeTestCase):
for sub in transaction.contentValues(): for sub in transaction.contentValues():
LOG('transaction contains %s' % repr(sub), 0, 'source %s, dest %s, qty %s' % (repr(sub.getSource()), repr(sub.getDestination()), repr(sub.getQuantity()))) LOG('transaction contains %s' % repr(sub), 0, 'source %s, dest %s, qty %s' % (repr(sub.getSource()), repr(sub.getDestination()), repr(sub.getQuantity())))
self.getWorkflowTool().doActionFor(transaction, solver_type, 'amortisation_transaction_divergence_workflow') self.getWorkflowTool().doActionFor(transaction, solver_type, 'amortisation_transaction_divergence_workflow')
transaction.updateFromSimulation() #transaction.updateFromSimulation()
LOG('new state :', 0, self.getWorkflowTool().getStatusOf('amortisation_transaction_divergence_workflow',transaction)['amortisation_causality_state']) LOG('new state :', 0, self.getWorkflowTool().getStatusOf('amortisation_transaction_divergence_workflow',transaction)['amortisation_causality_state'])
found = 1 found = 1
break break
if not found: if not found:
LOG('TEST WARNING :', 0, 'transaction %s not found' % repr(to_solve)) LOG('TEST WARNING :', 0, 'transaction %s not found' % repr(to_solve))
LOG('after applying solver', 0, '')
for transaction in accounting.objectValues():
LOG('transaction %s' % repr(transaction), 0, '(source_section : %s, destination_section : %s, date : %s)' % (repr(transaction.getSourceSection()), repr(transaction.getDestinationSection()), repr(transaction.getStopDate())))
LOG('workflow state :', 0, self.getWorkflowTool().getStatusOf('amortisation_transaction_divergence_workflow',transaction)['amortisation_causality_state'])
LOG('state by testing... isDivergent :', 0, transaction.isDivergent())
for line in transaction.objectValues():
LOG('--- line %s' % repr(line), 0, '(source : %s, destination : %s, quantity : %s, uid : %s)' % (repr(line.getSource()), repr(line.getDestination()), repr(line.getQuantity()), repr(line.getUid())))
movements = line.getDeliveryRelatedValueList()
total = 0
for movement in movements:
LOG('------ movement (isDivergent : %s)' % repr(movement.isDivergent()), 0, repr(movement.getQuantity()))
total += movement.getQuantity()
LOG('total for line :', 0, repr(total))
self.solver_step[immobilisation_list_name] = solver_step + 1 self.solver_step[immobilisation_list_name] = solver_step + 1
...@@ -5121,6 +5276,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5121,6 +5276,7 @@ class TestImmobilisation(ERP5TypeTestCase):
def stepIncrementStep(self, sequence=None, **kw): def stepIncrementStep(self, sequence=None, **kw):
immobilisation_list_name = sequence.get('immobilisation_list_name') immobilisation_list_name = sequence.get('immobilisation_list_name')
LOG('==================== STEP INCREMENTED =====================', 0, '')
self.current_step[immobilisation_list_name] = self.current_step[immobilisation_list_name] + 1 self.current_step[immobilisation_list_name] = self.current_step[immobilisation_list_name] + 1
...@@ -5130,6 +5286,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5130,6 +5286,7 @@ class TestImmobilisation(ERP5TypeTestCase):
If all of the immobilisations are already constructed, unvalidate or validate the If all of the immobilisations are already constructed, unvalidate or validate the
next immobilisation to be validated or unvalidated next immobilisation to be validated or unvalidated
""" """
LOG('===================== NEXT STEP ===============================', 0, '')
immobilisation_list_name = sequence.get('immobilisation_list_name') immobilisation_list_name = sequence.get('immobilisation_list_name')
immobilisation_list = sequence.get('immobilisation_list') or [] immobilisation_list = sequence.get('immobilisation_list') or []
step = self.current_step.get(immobilisation_list_name, -1) step = self.current_step.get(immobilisation_list_name, -1)
...@@ -5263,8 +5420,6 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5263,8 +5420,6 @@ class TestImmobilisation(ERP5TypeTestCase):
applied_rule = applied_rule_list[0] applied_rule = applied_rule_list[0]
# Verify each written simulation movement # Verify each written simulation movement
LOG('testImmobilisation :', 0, 'applied rule... objectValues = %s, contentValues = %s' % (repr(applied_rule.objectValues()), repr(applied_rule.contentValues())))
simulation_movement_list = list(applied_rule.objectValues()) simulation_movement_list = list(applied_rule.objectValues())
LOG('test :', 0, 'simulation_movement_list = %s' % repr(simulation_movement_list)) LOG('test :', 0, 'simulation_movement_list = %s' % repr(simulation_movement_list))
simulation_movement_list.sort(lambda a,b: cmp(a.getStopDate(), b.getStopDate())) simulation_movement_list.sort(lambda a,b: cmp(a.getStopDate(), b.getStopDate()))
...@@ -5302,7 +5457,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5302,7 +5457,7 @@ class TestImmobilisation(ERP5TypeTestCase):
if expected_movement is not None: if expected_movement is not None:
del expected[i-1] del expected[i-1]
# Then verify if there are expected simulation movements # Then verify if there are expected simulation movements
# which have not been matched # which have not been matched
LOG('testImmobilisation :',0,'verifying if expected values have all been matched... remaining = %s' % repr(expected)) LOG('testImmobilisation :',0,'verifying if expected values have all been matched... remaining = %s' % repr(expected))
...@@ -5491,6 +5646,11 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5491,6 +5646,11 @@ class TestImmobilisation(ERP5TypeTestCase):
expected_transaction = current_transaction expected_transaction = current_transaction
i += 1 i += 1
if expected_transaction is None:
LOG('PROBLEM : unable to match accounting transaction to an expected one', 0, '')
for accounting_transaction_line in accounting_transaction.objectValues():
LOG('transaction line : ', 0, 'source=%s, destination=%s, value=%s' % (repr(accounting_transaction_line.getSource()), repr(accounting_transaction_line.getDestination()), repr(accounting_transaction_line.getQuantity())))
self.failUnless(expected_transaction is not None) self.failUnless(expected_transaction is not None)
# We matched this accounting transaction with an expected one # We matched this accounting transaction with an expected one
# Now we check if each of its lines matchs with an expected one # Now we check if each of its lines matchs with an expected one
...@@ -5562,18 +5722,20 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5562,18 +5722,20 @@ class TestImmobilisation(ERP5TypeTestCase):
self.failUnless(matching_movement is not None) self.failUnless(matching_movement is not None)
if matching_movement == expected_list[j-1]: if matching_movement == expected_list[j-1]:
j -= 1 j -= 1
del expected_list[j] del expected_list[j]
LOG('testImmobilisation :', 0, 'Verify if transaction %s is empty... remaining = %s' % (repr(accounting_transaction.getId()), repr(expected_transaction['data']))) LOG('testImmobilisation :', 0, 'Verify if transaction %s is empty... remaining expected = %s' % (repr(accounting_transaction.getId()), repr(expected_transaction['data'])))
# Deleting 0 remaining lines # Deleting 0 remaining lines
for i in range(len(expected_transaction['data'][:])): for k in range(len(expected_transaction['data'][:])):
remaining_line = expected_transaction['data'][i] remaining_line = expected_transaction['data'][k]
if remaining_line['value'] == 0: if remaining_line['value'] == 0:
del expected_transaction['data'][i] del expected_transaction['data'][k]
self.assertEquals( len(expected_transaction['data']), 0 ) self.assertEquals( len(expected_transaction['data']), 0 )
LOG('verify aggregation... expected before delete =', 0, repr(expected))
del expected[i-1] del expected[i-1]
LOG('verify aggregation... expected after delete =', 0, repr(expected))
LOG('testImmobilisation :', 0, 'Verify if all expected transaction have been matched... remaining = %s' % repr(expected)) LOG('testImmobilisation :', 0, 'Verify if all expected transaction have been matched... remaining = %s' % repr(expected))
self.assertEquals(len(expected), 0) self.assertEquals(len(expected), 0)
...@@ -5657,7 +5819,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5657,7 +5819,7 @@ class TestImmobilisation(ERP5TypeTestCase):
### The following tests verify the behavior when a reexpand is made after the aggregation ### The following tests verify the behavior when a reexpand is made after the aggregation
# 9) # 9)
# On linear test : no changes has been made, the simulation should have not changed # On linear test : no changes have been made, the simulation should have not changed
# Then : change of the last immobilisation movement duration, it should change the annuities values and add some annuities # Then : change of the last immobilisation movement duration, it should change the annuities values and add some annuities
# Then : change of disposal value to create some new movements to add to this period # Then : change of disposal value to create some new movements to add to this period
sequence_string = 'PrepareLinearTest Tic RetrieveData ArtificialExpand VerifySimulation ' sequence_string = 'PrepareLinearTest Tic RetrieveData ArtificialExpand VerifySimulation '
...@@ -5680,7 +5842,7 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5680,7 +5842,7 @@ class TestImmobilisation(ERP5TypeTestCase):
# 12) # 12)
# On degressive test : annulation of some immobilisation movements, it should annulate entire aggregated periods # On degressive test : annulation of some immobilisation movements, it should annulate entire aggregated periods
# Then : validate the transactions and reexpand, it should create correction movements # Then : validate the transactions and reexpand, it should create correction movements
# Then : validate and expand again, it should create correction movements takins in account existing correction movements # Then : validate and expand again, it should create correction movements taking in account existing correction movements
# Then : re-expand, the created correction movements which are not validated should be modified # Then : re-expand, the created correction movements which are not validated should be modified
sequence_string = 'PrepareDegressiveTest Tic RetrieveData Tic NextTestStep Tic ' sequence_string = 'PrepareDegressiveTest Tic RetrieveData Tic NextTestStep Tic '
sequence_string += 'VerifySimulation Tic NextTestStep Tic VerifySimulation Tic DeleteAggregation ' sequence_string += 'VerifySimulation Tic NextTestStep Tic VerifySimulation Tic DeleteAggregation '
...@@ -5704,15 +5866,15 @@ class TestImmobilisation(ERP5TypeTestCase): ...@@ -5704,15 +5866,15 @@ class TestImmobilisation(ERP5TypeTestCase):
sequence_string += 'NextTestStep Tic VerifySimulation ApplySolver Tic VerifyAggregation VerifyConvergence ' sequence_string += 'NextTestStep Tic VerifySimulation ApplySolver Tic VerifyAggregation VerifyConvergence '
# 2- updateFromSimulation : restore the duration, and modify an account => movements are annulated and recreated, # 2- updateFromSimulation : restore the duration, and modify an account => movements are annulated and recreated,
# it just affects the lines # it just affects the lines
sequence_string += 'NextTestStep Tic ApplySolver Tic VerifyAggregation VerifyConvergence ' sequence_string += 'NextTestStep Tic VerifySimulation VerifyAggregation ApplySolver Tic VerifyAggregation VerifyConvergence '
# 3- updateFromSimulation : modify the immobilisation date => movements are annulated and recreated, it affects transactions # 3- updateFromSimulation : modify the immobilisation date => movements are annulated and recreated, it affects transactions
sequence_string += 'NextTestStep Tic VerifySimulation ApplySolver Tic VerifyAggregation VerifyConvergence ' sequence_string += 'NextTestStep Tic VerifySimulation ApplySolver Tic UpdateAllFromSimulation Tic VerifyAggregation VerifyConvergence '
# 4- Clean the aggregation to be clearer, and reestablish the original conditions # 4- Clean the aggregation to be clearer, and reestablish the original conditions
sequence_string += 'DeleteAggregation NextTestStep Tic VerifySimulation Aggregate Tic VerifyAggregation VerifyConvergence ' sequence_string += 'DeleteAggregation NextTestStep Tic VerifySimulation Aggregate Tic VerifyAggregation VerifyConvergence '
# 5- ProfitAndLoss : quantity is doubled, profit_quantity should be set in some simulation movements # 5- ProfitAndLoss : quantity is doubled, profit_quantity should be set in some simulation movements
sequence_string += 'ChangeTransactionProperties Tic IncrementStep ApplySolver VerifySimulation VerifyConvergence ' sequence_string += 'ChangeTransactionProperties Tic IncrementStep ApplySolver VerifySimulation VerifyConvergence '
# 6- ProfitAndLoss : source is modified, the movement should be disconnected # # 6- ProfitAndLoss : source is modified, the movement should be disconnected
sequence_string += 'ChangeTransactionProperties Tic IncrementStep ApplySolver VerifySimulation VerifyConvergence ' # sequence_string += 'ChangeTransactionProperties Tic IncrementStep ApplySolver VerifySimulation VerifyConvergence '
# 7- ProfitAndLoss : a transaction is set to 0 # 7- ProfitAndLoss : a transaction is set to 0
sequence_string += 'ChangeTransactionProperties Tic IncrementStep ApplySolver VerifySimulation VerifyConvergence ' sequence_string += 'ChangeTransactionProperties Tic IncrementStep ApplySolver VerifySimulation VerifyConvergence '
# 8- ProfitAndLoss : the previous transaction is reset to 8000 # 8- ProfitAndLoss : the previous transaction is reset to 8000
......
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