[Erp5-report] r22657 - in /erp5/trunk/products/ERP5: Document/Movement.py tests/testAmount.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 25 13:56:52 CEST 2008
Author: jerome
Date: Fri Jul 25 13:56:51 2008
New Revision: 22657
URL: http://svn.erp5.org?rev=22657&view=rev
Log:
Make it possible to unset asset price once it has been set.
Add many tests for asset price
Modified:
erp5/trunk/products/ERP5/Document/Movement.py
erp5/trunk/products/ERP5/tests/testAmount.py
Modified: erp5/trunk/products/ERP5/Document/Movement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Movement.py?rev=22657&r1=22656&r2=22657&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Movement.py (original)
+++ erp5/trunk/products/ERP5/Document/Movement.py Fri Jul 25 13:56:51 2008
@@ -911,6 +911,7 @@
Set the source total asset price
"""
if source_debit in (None, ''):
+ self.setSourceTotalAssetPrice(None)
return
try:
source_debit = float(source_debit)
@@ -925,6 +926,7 @@
Set the source total asset price
"""
if source_credit in (None, ''):
+ self.setSourceTotalAssetPrice(None)
return
try:
source_credit = float(source_credit)
@@ -939,6 +941,7 @@
Set the destination total asset price
"""
if destination_debit in (None, ''):
+ self.setDestinationTotalAssetPrice(None)
return
try:
destination_debit = float(destination_debit)
@@ -953,6 +956,7 @@
Set the destination total asset price
"""
if destination_credit in (None, ''):
+ self.setDestinationTotalAssetPrice(None)
return
try:
destination_credit = float(destination_credit)
Modified: erp5/trunk/products/ERP5/tests/testAmount.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testAmount.py?rev=22657&r1=22656&r2=22657&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testAmount.py (original)
+++ erp5/trunk/products/ERP5/tests/testAmount.py Fri Jul 25 13:56:51 2008
@@ -333,7 +333,57 @@
self.assertEquals(0, mvt.getDestinationCredit())
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):
@@ -366,6 +416,10 @@
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetCredit())
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):
mvt = self._makeOne('mvt')
@@ -373,13 +427,21 @@
self.assertEquals(0, mvt.getSourceInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getSourceInventoriatedTotalAssetCredit())
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):
mvt = self._makeOne('mvt')
mvt.edit(destination_debit=100)
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetCredit())
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):
mvt = self._makeOne('mvt')
@@ -387,9 +449,78 @@
self.assertEquals(0, mvt.getDestinationInventoriatedTotalAssetDebit())
self.assertEquals(100, mvt.getDestinationInventoriatedTotalAssetCredit())
self.assertEquals(-100, mvt.getDestinationInventoriatedTotalAssetPrice())
-
- # TODO: more asset price tests
-
+ self.assertEquals(None, mvt.getSourceTotalAssetPrice())
+ self.assertEquals(None, mvt.getDestinationTotalAssetPrice())
+ self.assertEquals(0.0, mvt.getDestinationAssetDebit())
+ self.assertEquals(0.0, mvt.getDestinationAssetCredit())
+
+ 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():
suite = unittest.TestSuite()
More information about the Erp5-report
mailing list