Commit 5a55be1d authored by Jérome Perrin's avatar Jérome Perrin

Make it possible to unset asset price once it has been set.

Add many tests for asset price


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22657 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0269075c
...@@ -911,6 +911,7 @@ class Movement(XMLObject, Amount): ...@@ -911,6 +911,7 @@ class Movement(XMLObject, Amount):
Set the source total asset price Set the source total asset price
""" """
if source_debit in (None, ''): if source_debit in (None, ''):
self.setSourceTotalAssetPrice(None)
return return
try: try:
source_debit = float(source_debit) source_debit = float(source_debit)
...@@ -925,6 +926,7 @@ class Movement(XMLObject, Amount): ...@@ -925,6 +926,7 @@ class Movement(XMLObject, Amount):
Set the source total asset price Set the source total asset price
""" """
if source_credit in (None, ''): if source_credit in (None, ''):
self.setSourceTotalAssetPrice(None)
return return
try: try:
source_credit = float(source_credit) source_credit = float(source_credit)
...@@ -939,6 +941,7 @@ class Movement(XMLObject, Amount): ...@@ -939,6 +941,7 @@ class Movement(XMLObject, Amount):
Set the destination total asset price Set the destination total asset price
""" """
if destination_debit in (None, ''): if destination_debit in (None, ''):
self.setDestinationTotalAssetPrice(None)
return return
try: try:
destination_debit = float(destination_debit) destination_debit = float(destination_debit)
...@@ -953,6 +956,7 @@ class Movement(XMLObject, Amount): ...@@ -953,6 +956,7 @@ class Movement(XMLObject, Amount):
Set the destination total asset price Set the destination total asset price
""" """
if destination_credit in (None, ''): if destination_credit in (None, ''):
self.setDestinationTotalAssetPrice(None)
return return
try: try:
destination_credit = float(destination_credit) destination_credit = float(destination_credit)
......
...@@ -333,7 +333,57 @@ class TestMovement(ERP5TypeTestCase): ...@@ -333,7 +333,57 @@ class TestMovement(ERP5TypeTestCase):
self.assertEquals(0, mvt.getDestinationCredit()) self.assertEquals(0, mvt.getDestinationCredit())
self.assertEquals(10, mvt.getQuantity()) self.assertEquals(10, mvt.getQuantity())
# TODO: test asset price def testSourceAssetCredit(self):
mvt = self._makeOne('mvt')
mvt.edit(source_asset_credit=100)
self.assertEquals(100, mvt.getSourceAssetCredit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getSourceInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(source_asset_credit=None, source_credit=200)
self.assertEquals(0.0, mvt.getSourceAssetCredit())
self.assertEquals(200, mvt.getSourceCredit())
def testSourceAssetDebit(self):
mvt = self._makeOne('mvt')
mvt.edit(source_asset_debit=100)
self.assertEquals(100, mvt.getSourceAssetDebit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(source_asset_debit=None, source_debit=200)
self.assertEquals(0.0, mvt.getSourceAssetDebit())
self.assertEquals(200, mvt.getSourceDebit())
def testDestinationAssetCredit(self):
mvt = self._makeOne('mvt')
mvt.edit(destination_asset_credit=100)
self.assertEquals(100, mvt.getDestinationAssetCredit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getDestinationInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(destination_asset_credit=None, destination_credit=200)
self.assertEquals(0.0, mvt.getDestinationAssetCredit())
self.assertEquals(200, mvt.getDestinationCredit())
def testDestinationAssetDebit(self):
mvt = self._makeOne('mvt')
mvt.edit(destination_asset_debit=100)
self.assertEquals(100, mvt.getDestinationAssetDebit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(destination_asset_debit=None, destination_debit=200)
self.assertEquals(0.0, mvt.getDestinationAssetDebit())
self.assertEquals(200, mvt.getDestinationDebit())
class TestAccountingTransactionLine(TestMovement): class TestAccountingTransactionLine(TestMovement):
...@@ -366,6 +416,10 @@ class TestAccountingTransactionLine(TestMovement): ...@@ -366,6 +416,10 @@ class TestAccountingTransactionLine(TestMovement):
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetDebit()) self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetCredit()) self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetPrice()) self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetPrice())
self.assertEquals(None, mvt.getSourceTotalAssetPrice())
self.assertEquals(None, mvt.getDestinationTotalAssetPrice())
self.assertEquals(0.0, mvt.getSourceAssetDebit())
self.assertEquals(0.0, mvt.getSourceAssetCredit())
def testDefautSourceTotalAssetCredit(self): def testDefautSourceTotalAssetCredit(self):
mvt = self._makeOne('mvt') mvt = self._makeOne('mvt')
...@@ -373,6 +427,10 @@ class TestAccountingTransactionLine(TestMovement): ...@@ -373,6 +427,10 @@ class TestAccountingTransactionLine(TestMovement):
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetDebit()) self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetCredit()) self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getSourceInventoriatedTotalAssetPrice()) self.assertEquals(-100, mvt.getSourceInventoriatedTotalAssetPrice())
self.assertEquals(None, mvt.getSourceTotalAssetPrice())
self.assertEquals(None, mvt.getDestinationTotalAssetPrice())
self.assertEquals(0.0, mvt.getSourceAssetDebit())
self.assertEquals(0.0, mvt.getSourceAssetCredit())
def testDefautDestinationTotalAssetDebit(self): def testDefautDestinationTotalAssetDebit(self):
mvt = self._makeOne('mvt') mvt = self._makeOne('mvt')
...@@ -380,6 +438,10 @@ class TestAccountingTransactionLine(TestMovement): ...@@ -380,6 +438,10 @@ class TestAccountingTransactionLine(TestMovement):
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetDebit()) self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetCredit()) self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetPrice()) self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetPrice())
self.assertEquals(None, mvt.getSourceTotalAssetPrice())
self.assertEquals(None, mvt.getDestinationTotalAssetPrice())
self.assertEquals(0.0, mvt.getDestinationAssetDebit())
self.assertEquals(0.0, mvt.getDestinationAssetCredit())
def testDefautDestinationTotalAssetCredit(self): def testDefautDestinationTotalAssetCredit(self):
mvt = self._makeOne('mvt') mvt = self._makeOne('mvt')
...@@ -387,9 +449,78 @@ class TestAccountingTransactionLine(TestMovement): ...@@ -387,9 +449,78 @@ class TestAccountingTransactionLine(TestMovement):
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetDebit()) self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetCredit()) self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getDestinationInventoriatedTotalAssetPrice()) self.assertEquals(-100, mvt.getDestinationInventoriatedTotalAssetPrice())
self.assertEquals(None, mvt.getSourceTotalAssetPrice())
self.assertEquals(None, mvt.getDestinationTotalAssetPrice())
self.assertEquals(0.0, mvt.getDestinationAssetDebit())
self.assertEquals(0.0, mvt.getDestinationAssetCredit())
# TODO: more asset price tests def testSourceAssetCredit(self):
mvt = self._makeOne('mvt')
mvt.edit(source_asset_credit=100)
self.assertEquals(100, mvt.getSourceAssetCredit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getSourceInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(source_asset_credit=None, source_credit=200)
self.assertEquals(0.0, mvt.getSourceAssetCredit())
self.assertEquals(200, mvt.getSourceCredit())
# this is only true for Accounting Transaction Line:
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(200, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(-200, mvt.getSourceInventoriatedTotalAssetPrice())
def testSourceAssetDebit(self):
mvt = self._makeOne('mvt')
mvt.edit(source_asset_debit=100)
self.assertEquals(100, mvt.getSourceAssetDebit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(source_asset_debit=None, source_debit=200)
self.assertEquals(0.0, mvt.getSourceAssetDebit())
self.assertEquals(200, mvt.getSourceDebit())
# this is only true for Accounting Transaction Line:
self.assertEquals(200, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetCredit())
self.assertEquals(200, mvt.getSourceInventoriatedTotalAssetPrice())
def testDestinationAssetCredit(self):
mvt = self._makeOne('mvt')
mvt.edit(destination_asset_credit=100)
self.assertEquals(100, mvt.getDestinationAssetCredit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getDestinationInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(destination_asset_credit=None, destination_credit=200)
self.assertEquals(0.0, mvt.getDestinationAssetCredit())
self.assertEquals(200, mvt.getDestinationCredit())
# this is only true for Accounting Transaction Line:
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(200, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(-200, mvt.getDestinationInventoriatedTotalAssetPrice())
def testDestinationAssetDebit(self):
mvt = self._makeOne('mvt')
mvt.edit(destination_asset_debit=100)
self.assertEquals(100, mvt.getDestinationAssetDebit())
self.assertEquals(0, mvt.getQuantity())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetPrice())
# reset and set quantity instead
mvt.edit(destination_asset_debit=None, destination_debit=200)
self.assertEquals(0.0, mvt.getDestinationAssetDebit())
self.assertEquals(200, mvt.getDestinationDebit())
# this is only true for Accounting Transaction Line:
self.assertEquals(200, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(200, mvt.getDestinationInventoriatedTotalAssetPrice())
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
......
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