[Erp5-report] r41900 jm - in /erp5/trunk: bt5/erp5_apparel/SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jm
Date: Fri Dec 31 03:30:19 2010
New Revision: 41900

URL: http://svn.erp5.org?rev=41900&view=rev
Log:
Fix testApparelModel (MappedValue does not inherit Amount anymore)

Modified:
    erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyComposition.xml
    erp5/trunk/bt5/erp5_apparel/bt/revision
    erp5/trunk/products/ERP5/tests/testApparelModel.py

Modified: erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyComposition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyComposition.xml?rev=41900&r1=41899&r2=41900&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyComposition.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModel_copyComposition.xml [utf8] Fri Dec 31 03:30:19 2010
@@ -83,8 +83,8 @@ elif len(colour_range.contentValues(port
         cell = fabric.getCell(cat, base_id=\'composition\')\n
         if cell is not None:\n
           new_cell = context.newCell(cat, base_id=\'composition\',\n
-                                      portal_type=\'Mapped Value\')\n
-          new_cell.setQuantity(cell.getQuantity())\n
+                                     portal_type=\'Mapped Value\', # XXX\n
+                                     quantity=cell.getProperty(\'quantity\'))\n
       if len(poly_list):\n
         msg = context.Base_translateString(\'${count} Compositions created.\',\n
             mapping={\'count\': len(poly_list)})\n

Modified: erp5/trunk/bt5/erp5_apparel/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_apparel/bt/revision?rev=41900&r1=41899&r2=41900&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_apparel/bt/revision [utf8] Fri Dec 31 03:30:19 2010
@@ -1 +1 @@
-272
\ No newline at end of file
+273
\ No newline at end of file

Modified: erp5/trunk/products/ERP5/tests/testApparelModel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testApparelModel.py?rev=41900&r1=41899&r2=41900&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testApparelModel.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testApparelModel.py [utf8] Fri Dec 31 03:30:19 2010
@@ -152,13 +152,13 @@ class TestApparelModel(ERP5TypeTestCase)
         'composition/acrylique',
         base_id = 'composition')
     self.assertNotEquals(acrylique, None)
-    self.assertEqual(acrylique.getQuantity(), 0.88)
+    self.assertEqual(acrylique.getProperty('quantity'), 0.88)
 
     elasthane = apparel_model.getCell(
         'composition/elasthane',
         base_id = 'composition')
     self.assertNotEquals(elasthane, None)
-    self.assertEqual(elasthane.getQuantity(), 0.12)
+    self.assertEqual(elasthane.getProperty('quantity'), 0.12)
 
     # check indexes are present
     self.assertTrue(apparel_model.index.has_key('composition'))