[Erp5-report] r17204 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Oct 26 14:15:55 2007
New Revision: 17204

URL: http://svn.erp5.org?rev=17204&view=rev
Log:
revert 17187 for now, it seems to have bad side effects.


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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml?rev=17204&r1=17203&r2=17204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml Fri Oct 26 14:15:55 2007
@@ -3,8 +3,11 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
       </tuple>
     </pickle>
     <pickle>
@@ -147,9 +150,8 @@
   if at_date is None and line.getGroupingReference():\n
     continue\n
   \n
-  if node_value is not None and (\n
-      node_value.getAccountTypeId() in (\'payable\', \'receivable\')\n
-      or (account_id is not None and node_value.getId() in account_id)):\n
+  if node_value is not None and \\\n
+      node_value.getAccountTypeId() in (\'payable\', \'receivable\'):\n
     if account_id is not None and node_value.getId() not in account_id:\n
       continue\n
     key = (node_value.getRelativeUrl(), mirror_section)\n
@@ -316,7 +318,6 @@
                             <string>date</string>
                             <string>total_amount</string>
                             <string>node</string>
-                            <string>_inplacevar_</string>
                             <string>sum</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=17204&r1=17203&r2=17204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Fri Oct 26 14:15:55 2007
@@ -1,1 +1,1 @@
-446
+445