[Erp5-report] r44811 nicolas - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Mar 30 18:44:57 2011
New Revision: 44811

URL: http://svn.erp5.org?rev=44811&view=rev
Log:
Support new portal_type Internal Trade Condition for Internal Orders

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

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml?rev=44811&r1=44810&r2=44811&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_getSpecialisedAggregatedAmountList.xml [utf8] Wed Mar 30 18:44:57 2011
@@ -50,7 +50,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>specialise = context.getSpecialiseValue(portal_type=(\'Purchase Trade Condition\',\'Sale Trade Condition\'))\n
+            <value> <string>specialise = context.getSpecialiseValue(portal_type=(\'Purchase Trade Condition\',\n
+                                                     \'Sale Trade Condition\',\n
+                                                     \'Internal Trade Condition\',))\n
 \n
 if specialise is not None:\n
   rounding = kwargs.get(\'rounding\', False)\n

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalOrder_applyTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalOrder_applyTradeCondition.xml?rev=44811&r1=44810&r2=44811&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalOrder_applyTradeCondition.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InternalOrder_applyTradeCondition.xml [utf8] Wed Mar 30 18:44:57 2011
@@ -57,7 +57,7 @@
 \n
 order = context\n
 Base_translateString = context.Base_translateString\n
-trade_condition_portal_type_list = (\'Purchase Trade Condition\', \'Sale Trade Condition\',)\n
+trade_condition_portal_type_list = (\'Internal Trade Condition\',)\n
 \n
 trade_condition_list = order.getSpecialiseValueList(\n
     portal_type=trade_condition_portal_type_list)\n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=44811&r1=44810&r2=44811&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Mar 30 18:44:57 2011
@@ -1 +1 @@
-1117
\ No newline at end of file
+1118
\ No newline at end of file