support cancellation amount in accounting reports

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27718 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml

@@ -53,7 +53,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return getattr(brain, \'credit_price\', max(-(brain.total_price or 0), 0))\n
+            <value> <string>credit_price = getattr(brain, \'credit_price\', None)\n
+if credit_price is None:\n
+  if brain.isCancellationAmount():\n
+    credit_price = min(-(brain.total_price or 0), 0)\n
+  else:\n
+    credit_price = max(-(brain.total_price or 0), 0)\n
+return credit_price\n
 </string> </value>
         </item>
         <item>
@@ -94,8 +100,11 @@
                             <string>selection</string>
                             <string>kwd</string>
                             <string>getattr</string>
-                            <string>max</string>
+                            <string>None</string>
+                            <string>credit_price</string>
                             <string>_getattr_</string>
+                            <string>min</string>
+                            <string>max</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml

@@ -53,7 +53,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return getattr(brain, \'debit_price\', max(brain.total_price, 0))\n
+            <value> <string>debit_price = getattr(brain, \'debit_price\', None)\n
+if debit_price is None:\n
+  if brain.isCancellationAmount():\n
+    debit_price = min(brain.total_price, 0)\n
+  else:\n
+    debit_price = max(brain.total_price, 0)\n
+return debit_price\n
 </string> </value>
         </item>
         <item>
@@ -94,8 +100,11 @@
                             <string>selection</string>
                             <string>kwd</string>
                             <string>getattr</string>
-                            <string>max</string>
+                            <string>None</string>
+                            <string>debit_price</string>
                             <string>_getattr_</string>
+                            <string>min</string>
+                            <string>max</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_accounting/bt/revision

-944
+945
\ No newline at end of file