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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Mar 12 10:02:01 2007
New Revision: 13327

URL: http://svn.erp5.org?rev=13327&view=rev
Log:
Define debit_price directly on the brain for the summary line.


Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml?rev=13327&r1=13326&r2=13327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml Mon Mar 12 10:02:01 2007
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return max(-(brain.total_price or 0), 0)\n
+            <value> <string>return getattr(brain, \'credit_price\', max(-(brain.total_price or 0), 0))\n
 </string> </value>
         </item>
         <item>
@@ -120,6 +120,7 @@
                             <string>brain</string>
                             <string>selection</string>
                             <string>kwd</string>
+                            <string>getattr</string>
                             <string>max</string>
                             <string>_getattr_</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml?rev=13327&r1=13326&r2=13327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml Mon Mar 12 10:02:01 2007
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return max(brain.total_price, 0)\n
+            <value> <string>return getattr(brain, \'debit_price\', max(brain.total_price, 0))\n
 </string> </value>
         </item>
         <item>
@@ -120,6 +120,7 @@
                             <string>brain</string>
                             <string>selection</string>
                             <string>kwd</string>
+                            <string>getattr</string>
                             <string>max</string>
                             <string>_getattr_</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml?rev=13327&r1=13326&r2=13327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml Mon Mar 12 10:02:01 2007
@@ -133,8 +133,8 @@
         uid=\'new_000\',\n
         date=from_date,\n
         simulation_state_title="",\n
-        Movement_getCreditPrice=previous_total_credit,\n
-        Movement_getDebitPrice=previous_total_debit,\n
+        credit_price=previous_total_credit,\n
+        debit_price=previous_total_debit,\n
         total_price=net_balance,\n
         running_total_price=net_balance,\n
         is_previous_balance=True,\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=13327&r1=13326&r2=13327&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Mon Mar 12 10:02:01 2007
@@ -1,1 +1,1 @@
-210
+211