[Erp5-report] r38310 jerome - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/e...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Sep 13 16:00:58 CEST 2010


Author: jerome
Date: Mon Sep 13 16:00:55 2010
New Revision: 38310

URL: http://svn.erp5.org?rev=38310&view=rev
Log:
- set int_index on currency exchange cells, based on currency_exchange_type's int_indexs
- make a bigger precision on exchange rate field

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox_base_price.xml
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml?rev=38310&r1=38309&r2=38310&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox.xml [utf8] Mon Sep 13 16:00:55 2010
@@ -13,6 +13,7 @@
                 <string>columns</string>
                 <string>editable_columns</string>
                 <string>hidden</string>
+                <string>sort</string>
                 <string>title</string>
                 <string>url_columns</string>
               </list>
@@ -144,6 +145,17 @@
                     <value> <int>0</int> </value>
                 </item>
                 <item>
+                    <key> <string>sort</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>int_index</string>
+                          <string>ASC</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox_base_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox_base_price.xml?rev=38310&r1=38309&r2=38310&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox_base_price.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchangeLine_view/listbox_base_price.xml [utf8] Mon Sep 13 16:00:55 2010
@@ -10,6 +10,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>precision</string>
                 <string>title</string>
               </list>
             </value>
@@ -80,6 +81,10 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
+                    <key> <string>precision</string> </key>
+                    <value> <int>10</int> </value>
+                </item>
+                <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml?rev=38310&r1=38309&r2=38310&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow/scripts/CurrencyExchangeLine_updateMatrix.xml [utf8] Mon Sep 13 16:00:55 2010
@@ -79,6 +79,10 @@ if cell_range_key_list != [[None, None]]
     c.setCriterion(\'stop_date\', min=context.getStartDate(), max=context.getStopDate())\n
     if c.getBasePrice() is None and context.getBasePrice() is not None:\n
       c.setBasePrice(context.getBasePrice())\n
+    # set an int index for display\n
+    currency_exchange_type_value_list = c.getValueList(\'currency_exchange_type\')\n
+    if currency_exchange_type_value_list:\n
+      c.setIntIndex(currency_exchange_type_value_list[0].getIntIndex())\n
 </string> </value>
         </item>
         <item>
@@ -138,6 +142,7 @@ if cell_range_key_list != [[None, None]]
                             <string>category_list</string>
                             <string>_apply_</string>
                             <string>c</string>
+                            <string>currency_exchange_type_value_list</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=38310&r1=38309&r2=38310&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Sep 13 16:00:55 2010
@@ -1 +1 @@
-833
\ No newline at end of file
+834
\ No newline at end of file




More information about the Erp5-report mailing list