[Erp5-report] r27196 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue May 26 17:40:33 CEST 2009
Author: mame
Date: Tue May 26 17:40:31 2009
New Revision: 27196
URL: http://svn.erp5.org?rev=27196&view=rev
Log:
2009-05-26 mame
*add column show_history
*modified script that shows quantity_unit
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml?rev=27196&r1=27195&r2=27196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] Tue May 26 17:40:31 2009
@@ -70,8 +70,9 @@
base_id = \'movement\'\n
for line in kw.get(\'listbox\'):\n
if line.has_key(\'listbox_key\') and line[\'quantity\'] in (\'\',None):\n
- request.set(\'portal_status_message\', \n
- translateString(\'Please Define Quantity for Item Defined On Line %s\'%line[\'listbox_key\']))\n
+ msg = translateString(\'Please Define Quantity for Item Defined On Line %s\'%line[\'listbox_key\'], mapping = kw)\n
+ return context.Base_redirect(form_id, keep_items=dict(\n
+ portal_status_message=msg))\n
if line.has_key(\'listbox_key\') and (line[\'title\'] or line[\'reference\'] not in (\'\', None)):\n
module = context.getDefaultModule(type)\n
item = module.newContent(portal_type=type,\n
@@ -162,6 +163,8 @@
<string>line</string>
<string>_getitem_</string>
<string>None</string>
+ <string>msg</string>
+ <string>dict</string>
<string>module</string>
<string>item</string>
<string>filter</string>
@@ -172,7 +175,6 @@
<string>_apply_</string>
<string>cell</string>
<string>_inplacevar_</string>
- <string>dict</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml?rev=27196&r1=27195&r2=27196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml [utf8] Tue May 26 17:40:31 2009
@@ -368,6 +368,10 @@
<string>translated_validation_state_title</string>
<string>Simulation State</string>
</tuple>
+ <tuple>
+ <string>history</string>
+ <string>Show History</string>
+ </tuple>
</list>
</value>
</item>
@@ -420,6 +424,10 @@
<string>variation_category_item_list</string>
<string>Variation</string>
</tuple>
+ <tuple>
+ <string>history</string>
+ <string>Show History</string>
+ </tuple>
</list>
</value>
</item>
@@ -482,6 +490,10 @@
<value> <int>0</int> </value>
</item>
<item>
+ <key> <string>row_css_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>search</string> </key>
<value> <int>0</int> </value>
</item>
@@ -534,7 +546,12 @@
<item>
<key> <string>url_columns</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string>history</string>
+ <string>Item_getTrackingFormUrl</string>
+ </tuple>
+ </list>
</value>
</item>
</dictionary>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml?rev=27196&r1=27195&r2=27196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getQuantityUnit.xml [utf8] Tue May 26 17:40:31 2009
@@ -57,7 +57,7 @@
result = context.Item_getResourceValue() and context.Item_getResourceValue().getQuantityUnitList() and [(\'\', \'\')] + [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in context.Item_getResourceValue().getQuantityUnitValueList()] or [(\'\', \'\')]\n
\n
else:\n
- result = [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in context.AggregateValue().getQuantityUnitValueList()] or [(\'\', \'\')]\n
+ result = [(x.getTranslatedLogicalPath(), x.getCategoryRelativeUrl(base=0)) for x in context.getAggregateRelatedValue().getQuantityUnitValueList()] or [(\'\', \'\')]\n
return result\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27196&r1=27195&r2=27196&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Tue May 26 17:40:31 2009
@@ -1,1 +1,1 @@
-128
+129
More information about the Erp5-report
mailing list