[Erp5-report] r30935 - in /erp5/trunk: bt5/erp5_accounting/SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Nov 30 16:35:52 CET 2009
Author: kazuhiko
Date: Mon Nov 30 16:35:49 2009
New Revision: 30935
URL: http://svn.erp5.org?rev=30935&view=rev
Log:
getResourceRelativeUrl() is just same as getResource().
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml
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
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml
erp5/trunk/bt5/erp5_trade/bt/revision
erp5/trunk/products/ERP5/Document/EmploymentContract.py
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml?rev=30935&r1=30934&r2=30935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertDestinationPrice.xml [utf8] Mon Nov 30 16:35:49 2009
@@ -82,7 +82,7 @@
else:\n
currency = line.getResourceValue()\n
exchange_ratio = currency.getPrice(context=line.asContext(\n
- categories=[\'resource/%s\' % line.getResourceRelativeUrl(), \n
+ categories=[\'resource/%s\' % line.getResource(), \n
\'price_currency/currency_module/%s\' %\n
line.getDestinationSectionValue().getPriceCurrencyId()],\n
start_date=line.getStopDate()))\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml?rev=30935&r1=30934&r2=30935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_convertSourcePrice.xml [utf8] Mon Nov 30 16:35:49 2009
@@ -77,7 +77,7 @@
else:\n
currency = line.getResourceValue()\n
exchange_ratio = currency.getPrice(context=line.asContext(\n
- categories=[\'resource/%s\' % line.getResourceRelativeUrl(), \n
+ categories=[\'resource/%s\' % line.getResource(), \n
\'price_currency/currency_module/%s\' %\n
line.getSourceSectionValue().getPriceCurrencyId()],\n
start_date=line.getStartDate()))\n
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=30935&r1=30934&r2=30935&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] Mon Nov 30 16:35:49 2009
@@ -59,7 +59,7 @@
"""\n
\n
currency = context.getResourceValue()\n
-exchange_ratio = currency.getPrice(context=context.asContext(categories=[\'resource/%s\' % context.getResourceRelativeUrl(), \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
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=30935&r1=30934&r2=30935&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] Mon Nov 30 16:35:49 2009
@@ -54,7 +54,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>currency = context.getResourceValue()\n
-exchange_ratio = currency.getPrice(context=context.asContext(categories=[\'resource/%s\' % context.getResourceRelativeUrl(), \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
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=30935&r1=30934&r2=30935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Mon Nov 30 16:35:49 2009
@@ -1,1 +1,1 @@
-1069
+1070
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml?rev=30935&r1=30934&r2=30935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml [utf8] Mon Nov 30 16:35:49 2009
@@ -79,10 +79,10 @@
cell = result[int(line_id)-1]\n
cell.setResourceValue(product) \n
line["quantity_unit"] = cell.getQuantityUnit()\n
- line["resource_relative_url"] = cell.getResourceRelativeUrl()\n
- request.form["field_listbox_resource_relative_url_new_%s"%line_id]=cell.getResourceRelativeUrl()\n
- kw["field_listbox_resource_relative_url_new_%s"%line_id]=cell.getResourceRelativeUrl()\n
- request.set("field_listbox_resource_relative_url_new_%s"%line_id,cell.getResourceRelativeUrl())\n
+ line["resource_relative_url"] = cell.getResource()\n
+ request.form["field_listbox_resource_relative_url_new_%s"%line_id]=cell.getResource()\n
+ kw["field_listbox_resource_relative_url_new_%s"%line_id]=cell.getResource()\n
+ request.set("field_listbox_resource_relative_url_new_%s"%line_id,cell.getResource())\n
request.form["field_listbox_reference_new_%s"%line_id] = product.getReference() or \'\'\n
request.form["field_listbox_title_new_%s"%line_id] = product.getTitle()\n
request.form["field_listbox_quantity_unit_new_%s"%line_id] = cell.getQuantityUnit()\n
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=30935&r1=30934&r2=30935&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Mon Nov 30 16:35:49 2009
@@ -1,1 +1,1 @@
-790
+791
Modified: erp5/trunk/products/ERP5/Document/EmploymentContract.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/EmploymentContract.py?rev=30935&r1=30934&r2=30935&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/EmploymentContract.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/EmploymentContract.py [utf8] Mon Nov 30 16:35:49 2009
@@ -109,5 +109,5 @@
destination_section = employer,
quantity = self.getQuantity(),
quantity_unit = self.getQuantityUnit(),
- resource = self.getResourceRelativeUrl()
+ resource = self.getResource()
)
More information about the Erp5-report
mailing list