diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce.xml
index 933c42ee74559296612e39164a4454db3408594d..9d9f84b030d6c1b40efe63ea1aefa50278ccf06a 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce.xml
@@ -1510,7 +1510,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Commerce for ERP5 - using temp</string> </value>
+ <value> <string>Commerce for ERP5</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
index bff09163f4f408523fc88cd5c4c630edbe1096ec..f0102f1fd360d551b3fd13b3bb25d0fc2673ef82 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_addToShoppingCart.xml
@@ -71,7 +71,7 @@
<value> <string encoding="cdata"><![CDATA[
from Products.ERP5Type.Document import newTempOrderLine\n
-quantity = int(context.REQUEST.get(\'field_my_buy_quantity\', 1))\n
+quantity = int(context.REQUEST.get(\'field_your_buy_quantity\', 1))\n
shopping_cart = context.SaleOrder_getShoppingCart()\n
shopping_cart_items = context.SaleOrder_getShoppingCartItemList()\n
\n
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop.xml
index 9bcf0b3faf57d50f240552e8c8420f008a91cee1..8650b55e293a772bfba4c5228a4d12e9dda6021d 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop.xml
@@ -91,7 +91,7 @@
<string>my_title</string>
<string>my_description</string>
<string>my_price</string>
- <string>my_buy_quantity</string>
+ <string>your_buy_quantity</string>
<string>submit</string>
</list>
</value>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop/my_buy_quantity.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop/your_buy_quantity.xml
similarity index 99%
rename from bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop/my_buy_quantity.xml
rename to bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop/your_buy_quantity.xml
index 80b7e10404070efe55a3570a086272944f4381eb..497fb198e9b8f6d695e2e34f1accc81a9e3a34d0 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop/my_buy_quantity.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Resource_viewAsShop/your_buy_quantity.xml
@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
- <value> <string>my_buy_quantity</string> </value>
+ <value> <string>your_buy_quantity</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
diff --git a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml
index 2b060a8ba98cc3da62b163591c6d3c36b28512c8..676fa2ddc96ee6355f0bad177a4b04d55830448a 100644
--- a/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml
+++ b/bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/SaleOrder_getShoppingCart.xml
@@ -69,6 +69,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>""" Add resource to current (or to be created shopping cart). """\n
+from DateTime import DateTime\n
\n
request = context.REQUEST\n
expire_timeout_days = 90\n
@@ -77,7 +78,6 @@ portal_sessions = context.portal_sessions\n
\n
if session_id is None:\n
## first call so generate session_id and send back via cookie\n
- from DateTime import DateTime\n
now = DateTime()\n
session_id = context.Base_generateSessionID(max_long=20)\n
request.RESPONSE.setCookie(\'session_id\', session_id, expires=(now +expire_timeout_days).fCommon(), path=\'/\')\n
@@ -92,16 +92,13 @@ else:\n
## take shopping cart for this customer\n
shopping_cart_id = \'shopping_cart\'\n
session = portal_sessions[session_id]\n
- temp_container = portal_sessions #context.getPortalObject().temp_shopping_cart\n
if not shopping_cart_id in session.keys():\n
from Products.ERP5Type.Document import newTempOrder\n
- shopping_cart = newTempOrder(temp_container, shopping_cart_id)\n
- shopping_cart = portal_sessions.removeAq(shopping_cart)\n
+ shopping_cart = newTempOrder(portal_sessions, shopping_cart_id)\n
session[shopping_cart_id] = shopping_cart\n
\n
## return just a part of session for shopping cart\n
shopping_cart = session[shopping_cart_id]\n
- shopping_cart = portal_sessions.addAq(session[shopping_cart_id], temp_container)\n
return shopping_cart\n
</string> </value>
</item>
@@ -155,6 +152,7 @@ else:\n
<tuple>
<string>action</string>
<string>new_shopping_cart</string>
+ <string>DateTime</string>
<string>_getattr_</string>
<string>context</string>
<string>request</string>
@@ -162,12 +160,10 @@ else:\n
<string>None</string>
<string>session_id</string>
<string>portal_sessions</string>
- <string>DateTime</string>
<string>now</string>
<string>shopping_cart_id</string>
<string>_getitem_</string>
<string>session</string>
- <string>temp_container</string>
<string>Products.ERP5Type.Document</string>
<string>newTempOrder</string>
<string>shopping_cart</string>
diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision
index 72f523f36edb05f0f59e02607fd52a844817ed85..f70d7bba4ae1f07682e0358bd7a2068094fc023b 100644
--- a/bt5/erp5_commerce/bt/revision
+++ b/bt5/erp5_commerce/bt/revision
@@ -1 +1 @@
-39
\ No newline at end of file
+42
\ No newline at end of file