clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-costa-rica/6.1-fix_conciliation_bank into lp:openerp-costa-rica/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-fix_conciliation_bank/+merge/164489

[FIX] Fix compute balance for conciliation_bank, profit_statement and situation_balance report. Add filter_type in the parameters
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-fix_conciliation_bank/+merge/164489
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica/6.1.

=== modified file 'l10n_cr_account_banking_reports/report/conciliation_bank.py'
--- l10n_cr_account_banking_reports/report/conciliation_bank.py	2013-01-17 20:03:34 +0000
+++ l10n_cr_account_banking_reports/report/conciliation_bank.py	2013-05-17 18:55:39 +0000
@@ -196,57 +196,60 @@
         accounting_total = 0.0
         bank_total = 0.0
 
-        if fiscalyear: 
-            fiscal_year_id = fiscalyear.id
-        else:
-            fiscal_year_id = False
-            
+        fiscal_year_id = fiscalyear.id
+               
         if filter_type == 'filter_date':
-            period_ids = False
+            end_period = False
             end_date = filter_data[1]
+        
         elif filter_type == 'filter_period':
-            period_ids = self.pool.get('account.period').search(cr, uid, [('date_stop', '<=', filter_data[1].date_stop)])
-            end_date = False
-        
-        
+            end_period = filter_data[1]
+            end_date = False                  
+                
         #TODO: Set the max date or period list for the balance query from the wizard data
         #      If the wizard is filtered by date, the max date is entered as is
         #      If the wizard is filtered by period, the query needs the valid list of periods in a WHERE statement form
         balance_query_filter = ''
+        
         if account_is_foreign:
             
             bank_balance = account_webkit_report_library_obj.get_account_balance(cr,
                                                 uid,
                                                 [reconciled_account.id],
-                                                ['balance'],
-                                                end_date=end_date,
-                                                period_ids=period_ids,
+                                                ['foreign_balance'],
+                                                end_date=end_daforeing_balancete,
+                                                end_period_id=end_period.id,
                                                 fiscal_year_id=fiscal_year_id,
-                                                context=context)[reconciled_account.id]['balance']
+                                                filter_type=filter_type,
+                                                context=context)[reconciled_account.id]['foreign_balance']
+                                                
             accounting_balance = account_webkit_report_library_obj.get_account_balance(cr,
                                                 uid,
                                                 [parent_account_id],
-                                                ['balance'],
+                                                ['foreign_balance'],
                                                 end_date=end_date,
-                                                period_ids=period_ids,
+                                                end_period_id=end_period.id,
                                                 fiscal_year_id=fiscal_year_id,
-                                                context=context)[parent_account_id]['balance']
+                                                filter_type = filter_type,
+                                                context=context)[parent_account_id]['foreign_balance']
         else:
             bank_balance = account_webkit_report_library_obj.get_account_balance(cr,
                                                 uid,
                                                 [reconciled_account.id],
                                                 ['balance'],
                                                 end_date=end_date,
-                                                period_ids=period_ids,
+                                                end_period_id=end_period.id,
                                                 fiscal_year_id=fiscal_year_id,
+                                                filter_type = filter_type, 
                                                 context=context)[reconciled_account.id]['balance']
             accounting_balance = account_webkit_report_library_obj.get_account_balance(cr,
                                                 uid,
                                                 [parent_account_id],
                                                 ['balance'],
                                                 end_date=end_date,
-                                                period_ids=period_ids,
+                                                end_period_id=end_period.id,
                                                 fiscal_year_id=fiscal_year_id,
+                                                filter_type = filter_type, 
                                                 context=context)[parent_account_id]['balance']
             
             '''

=== modified file 'l10n_cr_account_financial_statements/report/profit_statement_report.py'
--- l10n_cr_account_financial_statements/report/profit_statement_report.py	2012-11-14 05:24:25 +0000
+++ l10n_cr_account_financial_statements/report/profit_statement_report.py	2013-05-17 18:55:39 +0000
@@ -104,6 +104,7 @@
         period = account_period_obj.browse(cr, uid, self._get_form_param('period_from', data))
         last_period = self.get_last_period(cr, uid, period)
         fiscal_year = self.get_fiscalyear(cr, uid, period)
+        filter_type = self._get_filter(data)
         
         #build account_ids list
         income_account_ids = library_obj.get_account_child_ids(cr, uid, category_account_ids['income'])
@@ -114,12 +115,12 @@
         expense_accounts = account_account_obj.browse(cr, uid, expense_account_ids)
         
         #build balances
-        income_period_balances =        library_obj.get_account_balance(cr, uid, income_account_ids,  ['balance'], start_period_id=period.id, end_period_id=period.id)
-        expense_period_balances =       library_obj.get_account_balance(cr, uid, expense_account_ids, ['balance'], start_period_id=period.id, end_period_id=period.id)
-        income_last_period_balances =   library_obj.get_account_balance(cr, uid, income_account_ids,  ['balance'], start_period_id=last_period.id, end_period_id=last_period.id)
-        expense_last_period_balances =  library_obj.get_account_balance(cr, uid, expense_account_ids, ['balance'], start_period_id=last_period.id, end_period_id=last_period.id)
-        income_fiscal_year_balances =   library_obj.get_account_balance(cr, uid, income_account_ids,  ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
-        expense_fiscal_year_balances =  library_obj.get_account_balance(cr, uid, expense_account_ids, ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
+        income_period_balances =        library_obj.get_account_balance(cr, uid, income_account_ids,  ['balance'], start_period_id=period.id, end_period_id=period.id,filter_type=filter_type)
+        expense_period_balances =       library_obj.get_account_balance(cr, uid, expense_account_ids, ['balance'], start_period_id=period.id, end_period_id=period.id,filter_type=filter_type)
+        income_last_period_balances =   library_obj.get_account_balance(cr, uid, income_account_ids,  ['balance'], start_period_id=last_period.id, end_period_id=last_period.id,filter_type=filter_type)
+        expense_last_period_balances =  library_obj.get_account_balance(cr, uid, expense_account_ids, ['balance'], start_period_id=last_period.id, end_period_id=last_period.id,filter_type=filter_type)
+        income_fiscal_year_balances =   library_obj.get_account_balance(cr, uid, income_account_ids,  ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id,filter_type=filter_type)
+        expense_fiscal_year_balances =  library_obj.get_account_balance(cr, uid, expense_account_ids, ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id, filter_type=filter_type)
         
         #build total balances
         total_income_balances = {

=== modified file 'l10n_cr_account_financial_statements/report/situation_balance_report.py'
--- l10n_cr_account_financial_statements/report/situation_balance_report.py	2012-11-14 08:22:28 +0000
+++ l10n_cr_account_financial_statements/report/situation_balance_report.py	2013-05-17 18:55:39 +0000
@@ -117,6 +117,7 @@
         period = account_period_obj.browse(cr, uid, self._get_form_param('period_from', data))
         fiscal_year = self.get_fiscalyear(cr, uid, period)
         opening_period = self.get_opening_period(cr, uid, period)
+        filter_type = self._get_filter(data)
         
         #build account_ids list
         asset_account_ids = library_obj.get_account_child_ids(cr, uid, category_account_ids['asset'])
@@ -133,17 +134,17 @@
         expense_account = category_account_ids['expense']
         
         #build balances
-        asset_period_balances =     library_obj.get_account_balance(cr, uid, asset_account_ids,  ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
-        liability_period_balances = library_obj.get_account_balance(cr, uid, liability_account_ids, ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
-        equity_period_balances =    library_obj.get_account_balance(cr, uid, equity_account_ids, ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
-        income_period_balance =     library_obj.get_account_balance(cr, uid, [income_account_id],  ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
-        expense_period_balance =    library_obj.get_account_balance(cr, uid, [expense_account_id], ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id)
+        asset_period_balances =     library_obj.get_account_balance(cr, uid, asset_account_ids,  ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id,filter_type=filter_type)
+        liability_period_balances = library_obj.get_account_balance(cr, uid, liability_account_ids, ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id, filter_type=filter_type)
+        equity_period_balances =    library_obj.get_account_balance(cr, uid, equity_account_ids, ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id, filter_type=filter_type)
+        income_period_balance =     library_obj.get_account_balance(cr, uid, [income_account_id],  ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id, filter_type=filter_type)
+        expense_period_balance =    library_obj.get_account_balance(cr, uid, [expense_account_id], ['balance'], end_period_id=period.id, fiscal_year_id=fiscal_year.id,filter_type=filter_type)
         
-        asset_fiscal_year_balances =     library_obj.get_account_balance(cr, uid, asset_account_ids,  ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id)
-        liability_fiscal_year_balances = library_obj.get_account_balance(cr, uid, liability_account_ids, ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id)
-        equity_fiscal_year_balances =    library_obj.get_account_balance(cr, uid, equity_account_ids, ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id)
-        income_fiscal_year_balance =     library_obj.get_account_balance(cr, uid, [income_account_id],  ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id)
-        expense_fiscal_year_balance =    library_obj.get_account_balance(cr, uid, [expense_account_id], ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id)
+        asset_fiscal_year_balances =     library_obj.get_account_balance(cr, uid, asset_account_ids,  ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id,filter_type=filter_type)
+        liability_fiscal_year_balances = library_obj.get_account_balance(cr, uid, liability_account_ids, ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id,filter_type=filter_type)
+        equity_fiscal_year_balances =    library_obj.get_account_balance(cr, uid, equity_account_ids, ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id,filter_type=filter_type)
+        income_fiscal_year_balance =     library_obj.get_account_balance(cr, uid, [income_account_id],  ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id,filter_type=filter_type)
+        expense_fiscal_year_balance =    library_obj.get_account_balance(cr, uid, [expense_account_id], ['balance'], start_period_id=opening_period.id, end_period_id=opening_period.id,filter_type=filter_type)