[Erp5-report] r41294 jerome - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/e...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Dec 9 18:55:48 CET 2010
Author: jerome
Date: Thu Dec 9 18:55:48 2010
New Revision: 41294
URL: http://svn.erp5.org?rev=41294&view=rev
Log:
Item_getCurrentOwnerValue: if item has no owner in current inventory, look at future inventory, for cases when the item has still not moved, but there's a planned movement.
( + other minor or xml fixes )
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getVariationCategoryTitleList.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml?rev=41294&r1=41293&r2=41294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOriginValue.xml [utf8] Thu Dec 9 18:55:48 2010
@@ -51,19 +51,18 @@
<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
\n
-\n
-\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(\n
item=context.getRelativeUrl())\n
if not last_affectation_list:\n
return None\n
last_affectation_date_list = [x.getDate() for x in last_affectation_list]\n
last_affectation_date_list.sort()\n
-first_affectation_list = context.portal_simulation.getCurrentTrackingList(\n
+first_affectation_list = portal.portal_simulation.getCurrentTrackingList(\n
item=context.getRelativeUrl(),at_date=last_affectation_date_list[0])\n
\n
if len(last_affectation_list) == 0:\n
@@ -72,8 +71,6 @@ if len(last_affectation_list) == 0:\n
if first_affectation_list[0].node_uid is not None:\n
site = context.portal_catalog.getObject(first_affectation_list[0].delivery_uid)\n
return site\n
-\n
-return None\n
</string> </value>
</item>
<item>
@@ -112,9 +109,10 @@ return None\n
<tuple>
<string>at_date</string>
<string>DateTime</string>
- <string>None</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
+ <string>None</string>
<string>last_affectation_list</string>
<string>append</string>
<string>$append0</string>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml?rev=41294&r1=41293&r2=41294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentOwnerValue.xml [utf8] Thu Dec 9 18:55:48 2010
@@ -51,20 +51,17 @@
<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
-\n
-last_affectation_list = context.portal_simulation.getCurrentTrackingList(\n
+last_affectation_list = portal.portal_simulation.getCurrentTrackingList(\n
item=context.getRelativeUrl(), at_date=at_date)\n
\n
-if len(last_affectation_list) == 0:\n
- return None\n
-\n
-if last_affectation_list[0].section_uid is not None:\n
- return context.portal_catalog.getObject(last_affectation_list[0].section_uid)\n
+if not last_affectation_list:\n
+ last_affectation_list = portal.portal_simulation.getFutureTrackingList(\n
+ item=context.getRelativeUrl(), at_date=at_date)\n
\n
-return None\n
+if last_affectation_list and last_affectation_list[0].section_uid:\n
+ return portal.portal_catalog.getObject(last_affectation_list[0].section_uid)\n
</string> </value>
</item>
<item>
@@ -103,11 +100,10 @@ return None\n
<tuple>
<string>at_date</string>
<string>DateTime</string>
- <string>None</string>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
<string>last_affectation_list</string>
- <string>len</string>
<string>_getitem_</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml?rev=41294&r1=41293&r2=41294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getTrackingList.xml [utf8] Thu Dec 9 18:55:48 2010
@@ -153,7 +153,8 @@ return history_list\n
<string>section_value</string>
<string>resource_value</string>
<string>None</string>
- <string>$list0</string>
+ <string>append</string>
+ <string>$append0</string>
<string>x</string>
<string>_getitem_</string>
</tuple>
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=41294&r1=41293&r2=41294&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 18:55:48 2010
@@ -124,7 +124,8 @@ return []\n
<string>last_affectation</string>
<string>None</string>
<string>movement</string>
- <string>$list0</string>
+ <string>append</string>
+ <string>$append0</string>
<string>_getiter_</string>
<string>x</string>
<string>variation_list</string>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=41294&r1=41293&r2=41294&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Thu Dec 9 18:55:48 2010
@@ -1 +1 @@
-246
\ No newline at end of file
+247
\ No newline at end of file
More information about the Erp5-report
mailing list