[Erp5-report] r34826 nicolas.dumazet - in /erp5/trunk/bt5/erp5_pdm: SkinTemplateItem/portal...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 28 10:58:03 CEST 2010
Author: nicolas.dumazet
Date: Wed Apr 28 10:57:54 2010
New Revision: 34826
URL: http://svn.erp5.org?rev=34826&view=rev
Log:
Allow to mirror/invert an unit definition
Added:
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml
Modified:
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml
erp5/trunk/bt5/erp5_pdm/bt/revision
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml?rev=34826&r1=34825&r2=34826&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view.xml [utf8] Wed Apr 28 10:57:54 2010
@@ -97,6 +97,7 @@
<value>
<list>
<string>my_quantity_unit</string>
+ <string>my_inverse</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml?rev=34826&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml (added)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_inverse.xml [utf8] Wed Apr 28 10:57:54 2010
@@ -1,0 +1,104 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>description</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_inverse</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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Define an inverted quantity: if checked, the Quantity Unit will be defined as 1/quantity of the reference unit.</string> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_checkbox</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Inverse Ratio</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml?rev=34826&r1=34825&r2=34826&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionDefinition_view/my_quantity.xml [utf8] Wed Apr 28 10:57:54 2010
@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>description</string>
<string>input_style</string>
</list>
@@ -57,11 +58,25 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </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>input_style</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -75,6 +90,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>description</string> </key>
<value> <string>Amount of standard Quantity Unit</string> </value>
@@ -101,4 +120,20 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: context.getProperty(\'quantity\')</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml?rev=34826&r1=34825&r2=34826&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/QuantityUnitConversionModule_getUniversalDefinitionDict.xml [utf8] Wed Apr 28 10:57:54 2010
@@ -77,11 +77,11 @@
if unit_uid is None:\n
continue\n
\n
- quantity = definition.getQuantity()\n
- if not quantity:\n
+ definition_ratio = definition.getConversionRatio()\n
+ if not definition_ratio:\n
continue\n
\n
- result[unit_uid] = (definition.getUid(), quantity)\n
+ result[unit_uid] = (definition.getUid(), definition_ratio)\n
\n
return result\n
\n
Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=34826&r1=34825&r2=34826&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Wed Apr 28 10:57:54 2010
@@ -1,1 +1,1 @@
-494
+495
More information about the Erp5-report
mailing list