[Erp5-report] r41292 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:49:00 CET 2010
Author: jerome
Date: Thu Dec 9 18:49:00 2010
New Revision: 41292
URL: http://svn.erp5.org?rev=41292&view=rev
Log:
Repair dialog to select / create items.
Quantity vs Expected quantities should not be editable.
Also only show this on delivery lines (because order does not have simulation to be compared against)
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/matrixbox.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/your_simulation_quantity.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/matrixbox.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/matrixbox.xml?rev=41292&r1=41291&r2=41292&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/matrixbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/matrixbox.xml [utf8] Thu Dec 9 18:49:00 2010
@@ -9,7 +9,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -51,6 +53,12 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -70,6 +78,10 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_matrixbox</string> </value>
</item>
@@ -87,4 +99,17 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: not context.isMovement() and context.getPortalType() in context.getPortalDeliveryTypeList()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/your_simulation_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/your_simulation_quantity.xml?rev=41292&r1=41291&r2=41292&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/your_simulation_quantity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewItemCreationDialog/your_simulation_quantity.xml [utf8] Thu Dec 9 18:49:00 2010
@@ -10,7 +10,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>input_style</string>
+ <string>editable</string>
+ <string>enabled</string>
</list>
</value>
</item>
@@ -53,20 +54,24 @@
<value>
<dictionary>
<item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>input_style</string> </key>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
@@ -78,6 +83,14 @@
<value>
<dictionary>
<item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_simulation_quantity</string> </value>
</item>
@@ -103,7 +116,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
+ <value> <string>python: context.isMovement() and context.getPortalType() in context.getPortalDeliveryTypeList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/matrixbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/matrixbox.xml?rev=41292&r1=41291&r2=41292&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/matrixbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/matrixbox.xml [utf8] Thu Dec 9 18:49:00 2010
@@ -9,7 +9,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>enabled</string>
+ </list>
</value>
</item>
<item>
@@ -51,6 +53,12 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -70,6 +78,10 @@
<value>
<dictionary>
<item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_matrixbox</string> </value>
</item>
@@ -87,4 +99,17 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: not context.isMovement() and context.getPortalType() in context.getPortalDeliveryTypeList()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml?rev=41292&r1=41291&r2=41292&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_simulation_quantity.xml [utf8] Thu Dec 9 18:49:00 2010
@@ -10,7 +10,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>input_style</string>
+ <string>editable</string>
+ <string>enabled</string>
</list>
</value>
</item>
@@ -53,20 +54,24 @@
<value>
<dictionary>
<item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>input_style</string> </key>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
@@ -78,6 +83,14 @@
<value>
<dictionary>
<item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_simulation_quantity</string> </value>
</item>
@@ -103,7 +116,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
+ <value> <string>python: context.isMovement() and context.getPortalType() in context.getPortalDeliveryTypeList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml?rev=41292&r1=41291&r2=41292&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item_trade/DeliveryLine_viewSelectItemListDialog/my_total_quantity.xml [utf8] Thu Dec 9 18:49:00 2010
@@ -10,7 +10,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>input_style</string>
+ <string>editable</string>
+ <string>enabled</string>
</list>
</value>
</item>
@@ -53,20 +54,24 @@
<value>
<dictionary>
<item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
+ <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>input_style</string> </key>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
@@ -78,6 +83,14 @@
<value>
<dictionary>
<item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_dialog_mode_total_quantity</string> </value>
</item>
@@ -103,7 +116,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: preferences.getPreference(\'preferred_float_number_style\', \'-1 234.5\')</string> </value>
+ <value> <string>python: context.isMovement() and context.getPortalType() in context.getPortalDeliveryTypeList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=41292&r1=41291&r2=41292&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Thu Dec 9 18:49:00 2010
@@ -1 +1 @@
-242
\ No newline at end of file
+246
\ No newline at end of file
More information about the Erp5-report
mailing list