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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 27 17:50:39 2007
New Revision: 13725

URL: http://svn.erp5.org?rev=13725&view=rev
Log:

Fixes in Trial Balance for transactions with from_date and precision.


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

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml?rev=13725&r1=13724&r2=13725&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml Tue Mar 27 17:50:39 2007
@@ -86,8 +86,8 @@
 \n
 inventory_params = dict(section_uid=section_uid,\n
                         simulation_state=simulation_state,\n
-                        group_by_resource=0,\n
-                        precision=precision)\n
+                        precision=precision,\n
+                        group_by_resource=0)\n
 MARKER = Object()\n
 \n
 # a dictionary (node_relative_url, mirror_section_uid, payment_uid)\n
@@ -287,7 +287,7 @@
                               dict(debit=0, credit=0))\n
 \n
 \n
-initial_balance_date = (from_date - 1).earliestTime()\n
+initial_balance_date = (from_date - 1).latestTime()\n
 \n
 line_list = []\n
 for (node_relative_url, mirror_section_uid, payment_uid), data in \\\n
@@ -416,19 +416,19 @@
     if \'account_type/%s\' % account.getAccountType() in (\n
                                   profit_and_loss_account_type):\n
       initial_debit_balance = getInventory(node_uid=node_uid,\n
-                                 omit_output=1,\n
-                                 from_date=min(period_start_date,\n
-                                               initial_balance_date),\n
-                                 at_date=initial_balance_date,\n
-                                 portal_type=accounting_movement_type_list,\n
-                                 **inventory_params)\n
+                               omit_output=1,\n
+                               from_date=min(period_start_date,\n
+                                             initial_balance_date),\n
+                               at_date=initial_balance_date,\n
+                               portal_type=accounting_movement_type_list,\n
+                               **inventory_params)\n
       initial_credit_balance = - getInventory(node_uid=node_uid,\n
-                                 omit_input=1,\n
-                                 from_date=min(period_start_date,\n
-                                               initial_balance_date),\n
-                                 at_date=initial_balance_date,\n
-                                 portal_type=accounting_movement_type_list,\n
-                                 **inventory_params) or 0\n
+                               omit_input=1,\n
+                               from_date=min(period_start_date,\n
+                                             initial_balance_date),\n
+                               at_date=initial_balance_date,\n
+                               portal_type=accounting_movement_type_list,\n
+                               **inventory_params) or 0\n
     else:\n
       initial_debit_balance = getInventory(node_uid=node_uid,\n
                                  omit_output=1,\n
@@ -454,8 +454,10 @@
   total_initial_debit_balance += round(initial_debit_balance, precision)\n
   total_initial_credit_balance += round(initial_credit_balance, precision)\n
 \n
-  final_debit_balance = initial_debit_balance + data[\'debit\']\n
-  final_credit_balance = initial_credit_balance + data[\'credit\']\n
+  final_debit_balance = round(initial_debit_balance + data[\'debit\'],\n
+                              precision)\n
+  final_credit_balance = round(initial_credit_balance + data[\'credit\'],\n
+                               precision)\n
   \n
   closing_balance = final_debit_balance - final_credit_balance\n
   \n

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml?rev=13725&r1=13724&r2=13725&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml Tue Mar 27 17:50:39 2007
@@ -106,7 +106,6 @@
 \n
 if not from_date:\n
   from_date = period_start_date\n
-from_date = (from_date - 1).latestTime()\n
 \n
 # currency precision\n
 currency = portal.Base_getCurrencyForSection(request[\'section_category\'])\n
@@ -146,6 +145,12 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
             <value>
               <none/>
             </value>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=13725&r1=13724&r2=13725&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Mar 27 17:50:39 2007
@@ -1,1 +1,1 @@
-227
+228