[Erp5-report] r39047 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Oct 12 10:33:17 2010
New Revision: 39047

URL: http://svn.erp5.org?rev=39047&view=rev
Log:
simplify scripts

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationExchangeRate.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourceExchangeRate.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationExchangeRate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationExchangeRate.xml?rev=39047&r1=39046&r2=39047&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationExchangeRate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getDestinationExchangeRate.xml [utf8] Tue Oct 12 10:33:17 2010
@@ -50,16 +50,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
-Script used to get the exchange ratio used \n
-in the conversion of the destination price\n
-"""\n
-\n
-currency = context.getResourceValue()\n
-exchange_ratio = currency.getPrice(context=context.asContext(categories=[\'resource/%s\' % context.getResource(), \n
-                                     \'price_currency/currency_module/%s\' % context.getDestinationSectionValue().getPriceCurrencyId()],\n
-                                      start_date=context.getStopDate()))\n
-return exchange_ratio\n
+            <value> <string>return context.getResourceValue().getPrice(\n
+    context=context.asContext(categories=[context.getResource(base=True),\n
+                                          context.getDestinationSectionValue().getPriceCurrency(base=True)],\n
+                              start_date=context.getStopDate()))\n
 </string> </value>
         </item>
         <item>
@@ -98,8 +92,7 @@ return exchange_ratio\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>currency</string>
-                            <string>exchange_ratio</string>
+                            <string>True</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourceExchangeRate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourceExchangeRate.xml?rev=39047&r1=39046&r2=39047&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourceExchangeRate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getSourceExchangeRate.xml [utf8] Tue Oct 12 10:33:17 2010
@@ -50,11 +50,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>currency = context.getResourceValue()\n
-exchange_ratio = currency.getPrice(context=context.asContext(categories=[\'resource/%s\' % context.getResource(), \n
-                                     \'price_currency/currency_module/%s\' % context.getSourceSectionValue().getPriceCurrencyId()],\n
-                                      start_date=context.getStartDate()))\n
-return exchange_ratio\n
+            <value> <string>return context.getResourceValue().getPrice(\n
+    context=context.asContext(categories=[context.getResource(base=True),\n
+                                          context.getSourceSectionValue().getPriceCurrency(base=True)],\n
+                              start_date=context.getStartDate()))\n
 </string> </value>
         </item>
         <item>
@@ -93,8 +92,7 @@ return exchange_ratio\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>currency</string>
-                            <string>exchange_ratio</string>
+                            <string>True</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=39047&r1=39046&r2=39047&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Oct 12 10:33:17 2010
@@ -1 +1 @@
-1368
\ No newline at end of file
+1369
\ No newline at end of file