[Erp5-report] r38778 nicolas.dumazet - in /erp5/trunk/bt5/erp5_commerce: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Sep 30 10:26:31 2010
New Revision: 38778

URL: http://svn.erp5.org?rev=38778&view=rev
Log:
revert r38744:38752 now that Order is an abstract portal type

Modified:
    erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml
    erp5/trunk/bt5/erp5_commerce/bt/change_log
    erp5/trunk/bt5/erp5_commerce/bt/revision

Modified: erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml?rev=38778&r1=38777&r2=38778&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml [utf8] Thu Sep 30 10:26:31 2010
@@ -2,7 +2,10 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
@@ -74,9 +77,9 @@ else:\n
   shopping_cart_id = \'shopping_cart\'\n
   session = portal_sessions[session_id]\n
   if not shopping_cart_id in session.keys():\n
+    from Products.ERP5Type.Document import newTempOrder\n
     web_site = context.getWebSiteValue()\n
-    from Products.ERP5Type.Document import newTempSaleOrder\n
-    shopping_cart = newTempSaleOrder(portal_sessions, shopping_cart_id)\n
+    shopping_cart = newTempOrder(portal_sessions, shopping_cart_id)\n
     shopping_cart.setPriceCurrency(web_site.WebSite_getShoppingCartDefaultCurrency().getRelativeUrl())\n
     session[shopping_cart_id] = shopping_cart\n
 \n
@@ -141,9 +144,9 @@ else:\n
                             <string>shopping_cart_id</string>
                             <string>_getitem_</string>
                             <string>session</string>
-                            <string>web_site</string>
                             <string>Products.ERP5Type.Document</string>
-                            <string>newTempSaleOrder</string>
+                            <string>newTempOrder</string>
+                            <string>web_site</string>
                             <string>shopping_cart</string>
                             <string>_write_</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_commerce/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/change_log?rev=38778&r1=38777&r2=38778&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/change_log [utf8] Thu Sep 30 10:26:31 2010
@@ -1,4 +1,7 @@
-2010-09-29
+2010-09-30 nicolas.dumazet
+* Revert changes from 29th after adding Order abstract portal type to erp5_trade
+
+2010-09-29 nicolas.dumazet
 * do not use newTempOrder, create temporary sale order instead (portal type classes require the portal type to exist to create temporary objects, and 'Order' portal type does not exist)
 
 2009-09-14 lucas

Modified: erp5/trunk/bt5/erp5_commerce/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/revision?rev=38778&r1=38777&r2=38778&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] Thu Sep 30 10:26:31 2010
@@ -1 +1 @@
-260
\ No newline at end of file
+261