[Erp5-report] r29384 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 2 16:43:47 CEST 2009
Author: mame
Date: Fri Oct 2 16:43:45 2009
New Revision: 29384
URL: http://svn.erp5.org?rev=29384&view=rev
Log:
2009-10-02 mame
- add new colon Quantity on Item_viewTrackingList to display quantity of item at movement date
- On Item_view, Origine field shows now source of the first movement in tracking list.
Added:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml
erp5/trunk/bt5/erp5_item/bt/template_registered_skin_selection_list
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_getTrackingList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.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=29384&r1=29383&r2=29384&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] Fri Oct 2 16:43:45 2009
@@ -58,14 +58,21 @@
if at_date is None:\n
at_date = DateTime()\n
\n
+\n
+\n
last_affectation_list = context.portal_simulation.getCurrentTrackingList(\n
- item=context.getRelativeUrl(), at_date=at_date)\n
+ item=context.getRelativeUrl())\n
+\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
+ item=context.getRelativeUrl(),at_date=last_affectation_date_list[0])\n
\n
if len(last_affectation_list) == 0:\n
return None\n
\n
-if last_affectation_list[0].node_uid is not None:\n
- site = context.portal_catalog.getObject(last_affectation_list[0].delivery_uid)\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
@@ -111,8 +118,14 @@
<string>_getattr_</string>
<string>context</string>
<string>last_affectation_list</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>x</string>
+ <string>last_affectation_date_list</string>
+ <string>_getitem_</string>
+ <string>first_affectation_list</string>
<string>len</string>
- <string>_getitem_</string>
<string>site</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=29384&r1=29383&r2=29384&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] Fri Oct 2 16:43:45 2009
@@ -86,6 +86,7 @@
translated_portal_type = explanation.getTranslatedPortalType(),\n
quantity = explanation.getQuantity(),\n
url=explanation.absolute_url(),\n
+ item_quantity = context.getQuantity(at_date=res.getDate()), \n
variation_category_item_list = [x[0] for x in explanation.getVariationCategoryItemList()],\n
simulation_state=explanation.getTranslatedSimulationStateTitle(),\n
)\n
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml?rev=29384&r1=29383&r2=29384&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList.xml [utf8] Fri Oct 2 16:43:45 2009
@@ -79,6 +79,7 @@
<value>
<list>
<string>listbox</string>
+ <string>listbox_item_quantity</string>
</list>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml?rev=29384&r1=29383&r2=29384&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox.xml [utf8] Fri Oct 2 16:43:45 2009
@@ -120,6 +120,10 @@
<string>simulation_state</string>
<string>State</string>
</tuple>
+ <tuple>
+ <string>item_quantity</string>
+ <string>Quantity</string>
+ </tuple>
</list>
</value>
</item>
@@ -134,6 +138,10 @@
<tuple>
<string>variation_category_item_list</string>
<string>Variation</string>
+ </tuple>
+ <tuple>
+ <string>item_quantity</string>
+ <string>Quantity</string>
</tuple>
</list>
</value>
Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml?rev=29384&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/listbox_item_quantity.xml [utf8] Fri Oct 2 16:43:45 2009
@@ -1,0 +1,253 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="FloatField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_item_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ <item>
+ <key> <string>not_float</string> </key>
+ <value> <string>You did not enter a floating point number.</string> </value>
+ </item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_maxwidth</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_maxwidth</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_maxwidth</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <int>20</int> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=29384&r1=29383&r2=29384&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Fri Oct 2 16:43:45 2009
@@ -1,1 +1,1 @@
-180
+181
Added: erp5/trunk/bt5/erp5_item/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/template_registered_skin_selection_list?rev=29384&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list