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

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Wed Sep 29 11:55:37 2010
New Revision: 38744

URL: http://svn.erp5.org?rev=38744&view=rev
Log:
2010-09-29
* 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)

Modified:
    erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml
    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_editShoppingCart.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml?rev=38744&r1=38743&r2=38744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_editShoppingCart.xml [utf8] Wed Sep 29 11:55:37 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -196,8 +193,6 @@
   shipping.\n
 """\n
 \n
-from Products.ERP5Type.Document import newTempOrderLine\n
-\n
 request = context.REQUEST\n
 translateString = context.Base_translateString \n
 quantity = field_my_buy_quantity\n
@@ -290,8 +285,6 @@ return context.SaleOrder_paymentRedirect
                             <string>field_my_comment</string>
                             <string>field_my_payment_mode</string>
                             <string>kw</string>
-                            <string>Products.ERP5Type.Document</string>
-                            <string>newTempOrderLine</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>request</string>

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=38744&r1=38743&r2=38744&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] Wed Sep 29 11:55:37 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,9 +74,8 @@ 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
-    shopping_cart = newTempOrder(portal_sessions, shopping_cart_id)\n
+    shopping_cart = portal_sessions.newContent(id=shopping_cart_id, portal_type=\'Sale Order\', temp_object=True)\n
     shopping_cart.setPriceCurrency(web_site.WebSite_getShoppingCartDefaultCurrency().getRelativeUrl())\n
     session[shopping_cart_id] = shopping_cart\n
 \n
@@ -144,9 +140,8 @@ else:\n
                             <string>shopping_cart_id</string>
                             <string>_getitem_</string>
                             <string>session</string>
-                            <string>Products.ERP5Type.Document</string>
-                            <string>newTempOrder</string>
                             <string>web_site</string>
+                            <string>True</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=38744&r1=38743&r2=38744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/change_log [utf8] Wed Sep 29 11:55:37 2010
@@ -1,3 +1,6 @@
+2010-09-29
+* 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
 * added navigation for Anonymous user
 

Modified: erp5/trunk/bt5/erp5_commerce/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_commerce/bt/revision?rev=38744&r1=38743&r2=38744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_commerce/bt/revision [utf8] Wed Sep 29 11:55:37 2010
@@ -1 +1 @@
-258
\ No newline at end of file
+259
\ No newline at end of file