[Erp5-report] r41280 nicolas - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Dec 9 17:11:07 CET 2010
Author: nicolas
Date: Thu Dec 9 17:11:07 2010
New Revision: 41280
URL: http://svn.erp5.org?rev=41280&view=rev
Log:
Falback with getFutureTrackingList to display useful informations on Item_view
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml?rev=41280&r1=41279&r2=41280&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getResourceValue.xml [utf8] Thu Dec 9 17:11:07 2010
@@ -51,21 +51,28 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from DateTime import DateTime\n
+portal = context.getPortalObject()\n
\n
if at_date is None:\n
at_date = DateTime()\n
kw[\'at_date\'] = at_date\n
kw[\'item\'] = context.getRelativeUrl()\n
\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(**kw)\n
\n
if kw.get(\'src__\',0):\n
return last_affectation_list\n
\n
+if not last_affectation_list:\n
+ # Falback in Future inventory\n
+ if at_date is not None:\n
+ del kw[\'at_date\']\n
+ last_affectation_list = portal.portal_simulation.getFutureTrackingList(**kw)\n
+\n
if len(last_affectation_list):\n
last_affectation = last_affectation_list[0]\n
if last_affectation.resource_uid is not None:\n
- resource_value = context.portal_catalog.getObject(last_affectation.resource_uid)\n
+ resource_value = portal.portal_catalog.getObject(last_affectation.resource_uid)\n
return resource_value\n
\n
return None\n
@@ -108,10 +115,11 @@ return None\n
<string>at_date</string>
<string>kw</string>
<string>DateTime</string>
- <string>None</string>
- <string>_write_</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
+ <string>None</string>
+ <string>_write_</string>
<string>_apply_</string>
<string>last_affectation_list</string>
<string>len</string>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml?rev=41280&r1=41279&r2=41280&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryList.xml [utf8] Thu Dec 9 17:11:07 2010
@@ -51,7 +51,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from DateTime import DateTime\n
-\n
+portal = context.getPortalObject()\n
\n
if at_date is None:\n
at_date = DateTime()\n
@@ -59,15 +59,21 @@ kw[\'at_date\'] = at_date\n
\n
kw[\'item\'] = context.getRelativeUrl()\n
\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(**kw)\n
\n
if kw.get(\'src__\',0):\n
return last_affectation_list\n
\n
+if not last_affectation_list:\n
+ # Falback in Future inventory\n
+ if at_date is None:\n
+ del kw[\'at_date\']\n
+ last_affectation_list = portal.portal_simulation.getFutureTrackingList(**kw)\n
+\n
if len(last_affectation_list):\n
last_affectation = last_affectation_list[0]\n
if last_affectation.delivery_uid is not None:\n
- movement = context.portal_catalog.getObject(last_affectation.delivery_uid)\n
+ movement = portal.portal_catalog.getObject(last_affectation.delivery_uid)\n
return movement.getVariationCategoryList()\n
\n
return []\n
@@ -110,10 +116,11 @@ return []\n
<string>at_date</string>
<string>kw</string>
<string>DateTime</string>
- <string>None</string>
- <string>_write_</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
+ <string>None</string>
+ <string>_write_</string>
<string>_apply_</string>
<string>last_affectation_list</string>
<string>len</string>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml?rev=41280&r1=41279&r2=41280&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml [utf8] Thu Dec 9 17:11:07 2010
@@ -51,18 +51,24 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from DateTime import DateTime\n
+portal = context.getPortalObject()\n
\n
kw[\'at_date\'] = DateTime()\n
kw[\'item\'] = context.getRelativeUrl()\n
\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(**kw)\n
\n
if kw.get(\'src__\',0):\n
return last_affectation_list\n
+\n
+if not last_affectation_list:\n
+ # Falback in Future inventory\n
+ last_affectation_list = portal.portal_simulation.getFutureTrackingList(**kw)\n
+\n
if len(last_affectation_list):\n
last_affectation = last_affectation_list[0]\n
if last_affectation.delivery_uid is not None:\n
- movement = context.portal_catalog.getObject(last_affectation.delivery_uid)\n
+ movement = portal.portal_catalog.getObject(last_affectation.delivery_uid)\n
variation_list = [x[0] for x in movement.getVariationCategoryItemList()]\n
variation = \',\'.join(variation_list)\n
return variation\n
@@ -107,9 +113,10 @@ return []\n
<string>current</string>
<string>kw</string>
<string>DateTime</string>
- <string>_write_</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
+ <string>_write_</string>
<string>_apply_</string>
<string>last_affectation_list</string>
<string>len</string>
@@ -117,8 +124,7 @@ return []\n
<string>last_affectation</string>
<string>None</string>
<string>movement</string>
- <string>append</string>
- <string>$append0</string>
+ <string>$list0</string>
<string>_getiter_</string>
<string>x</string>
<string>variation_list</string>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml?rev=41280&r1=41279&r2=41280&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationRangeCategoryItemList.xml [utf8] Thu Dec 9 17:11:07 2010
@@ -51,6 +51,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from DateTime import DateTime\n
+portal = context.getPortalObject()\n
\n
if at_date is None:\n
at_date = DateTime()\n
@@ -58,14 +59,21 @@ kw[\'at_date\'] = at_date\n
\n
kw[\'item\'] = context.getRelativeUrl()\n
\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(**kw)\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(**kw)\n
\n
if kw.get(\'src__\',0):\n
return last_affectation_list\n
+\n
+if not last_affectation_list:\n
+ # Falback in Future inventory\n
+ if at_date is None:\n
+ del kw[\'at_date\']\n
+ last_affectation_list = portal.portal_simulation.getFutureTrackingList(**kw)\n
+\n
if len(last_affectation_list):\n
last_affectation = last_affectation_list[0]\n
if last_affectation.delivery_uid is not None:\n
- movement = context.portal_catalog.getObject(last_affectation.delivery_uid)\n
+ movement = portal.portal_catalog.getObject(last_affectation.delivery_uid)\n
return movement.getVariationRangeCategoryItemList(display_base_category=0)\n
\n
return []\n
@@ -108,10 +116,11 @@ return []\n
<string>at_date</string>
<string>kw</string>
<string>DateTime</string>
- <string>None</string>
- <string>_write_</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
+ <string>None</string>
+ <string>_write_</string>
<string>_apply_</string>
<string>last_affectation_list</string>
<string>len</string>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=41280&r1=41279&r2=41280&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Thu Dec 9 17:11:07 2010
@@ -1 +1 @@
-234
\ No newline at end of file
+236
\ No newline at end of file
More information about the Erp5-report
mailing list