[Erp5-report] r28573 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Aug 24 11:34:54 2009
New Revision: 28573

URL: http://svn.erp5.org?rev=28573&view=rev
Log:
When we apply trade condition on an invoice transaction, we can also initialise the resource using price currency

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml?rev=28573&r1=28572&r2=28573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml [utf8] Mon Aug 24 11:34:54 2009
@@ -87,6 +87,12 @@
     v = getPropertyFromTradeCondition(trade_condition, category)\n
     if v:\n
       new_category_dict[category] = v\n
+      # for accounting transactions, we also initialize resource with the price\n
+      # currency\n
+      if category == \'price_currency\' and \\\n
+          context.getPortalType() in \\\n
+          context.getPortalAccountingTransactionTypeList():\n
+        new_category_dict[\'resource\'] = v\n
 \n
 \n
 def copyPaymentCondition(order, trade_condition):\n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=28573&r1=28572&r2=28573&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Mon Aug 24 11:34:54 2009
@@ -1,1 +1,1 @@
-721
+722