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

[nobody at svn.erp5.org]

Author: jerome
Date: Sat Apr 19 16:02:45 2008
New Revision: 20687

URL: http://svn.erp5.org?rev=20687&view=rev
Log:
now that movement group include tax movements, we have to handle them explictly here

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

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryMovement_getCorrespondingTaxLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryMovement_getCorrespondingTaxLineList.xml?rev=20687&r1=20686&r2=20687&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryMovement_getCorrespondingTaxLineList.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryMovement_getCorrespondingTaxLineList.xml Sat Apr 19 16:02:45 2008
@@ -86,8 +86,10 @@
       if tax_line not in contributed_tax_line_list:\n
         contributed_tax_line_list.append(tax_line)\n
 \n
+non_tax_movement_type_list = [t for t in context.getPortalMovementTypeList()\n
+                              if t not in context.getPortalTaxMovementTypeList()]\n
 other_movement_list = [m for m in context.getExplanationValue().getMovementList(\n
-                        portal_type=context.getPortalMovementTypeList())]\n
+                         portal_type=non_tax_movement_type_list)]\n
 # 2 for each tax line, calculate the corresponding ratio\n
 for tax_line in contributed_tax_line_list:\n
   base_total_price = 0\n
@@ -182,6 +184,8 @@
                             <string>tax_line</string>
                             <string>append</string>
                             <string>$append0</string>
+                            <string>t</string>
+                            <string>non_tax_movement_type_list</string>
                             <string>m</string>
                             <string>other_movement_list</string>
                             <string>base_total_price</string>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=20687&r1=20686&r2=20687&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Sat Apr 19 16:02:45 2008
@@ -1,1 +1,1 @@
-328
+329