[Erp5-report] r20487 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 14 15:47:59 CEST 2008
Author: alex
Date: Mon Apr 14 15:47:58 2008
New Revision: 20487
URL: http://svn.erp5.org?rev=20487&view=rev
Log:
fix tales expression of enabled/editable properties when a line contains a variated resource but no cell has been created yet.
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml Mon Apr 14 15:47:58 2008
@@ -57,7 +57,7 @@
<value>
<dictionary>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
@@ -75,7 +75,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -122,7 +122,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>here/isMovement</string> </value>
+ <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity.xml Mon Apr 14 15:47:58 2008
@@ -56,7 +56,7 @@
<value>
<dictionary>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
@@ -113,7 +113,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>here/isMovement</string> </value>
+ <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml Mon Apr 14 15:47:58 2008
@@ -58,7 +58,7 @@
<value>
<dictionary>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
@@ -72,7 +72,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
@@ -82,7 +82,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -135,7 +135,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>here/isMovement</string> </value>
+ <value> <string>python: here.isMovement() and not here.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity.xml Mon Apr 14 15:47:58 2008
@@ -63,13 +63,13 @@
<value>
<dictionary>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>editable</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -134,7 +134,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/isMovement</string> </value>
+ <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml Mon Apr 14 15:47:58 2008
@@ -64,13 +64,13 @@
<value>
<dictionary>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>editable</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -86,7 +86,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
@@ -147,7 +147,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/isMovement</string> </value>
+ <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity.xml Mon Apr 14 15:47:58 2008
@@ -57,13 +57,13 @@
<value>
<dictionary>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>editable</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -122,7 +122,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/isMovement</string> </value>
+ <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/listbox_quantity_unit.xml Mon Apr 14 15:47:58 2008
@@ -58,13 +58,13 @@
<value>
<dictionary>
<item>
- <key> <string>editable</string> </key>
+ <key> <string>editable</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -76,7 +76,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
@@ -135,7 +135,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>cell/isMovement</string> </value>
+ <value> <string>python: cell.isMovement() and not cell.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=20487&r1=20486&r2=20487&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Mon Apr 14 15:47:58 2008
@@ -1,1 +1,1 @@
-258
+260
More information about the Erp5-report
mailing list