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-conciliation_bank into lp:openerp-costa-rica.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

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

[FIX] Fix filter types from conciliation bank report. Remove "No Filters" from filter type.
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-costa-rica/6.1-conciliation_bank/+merge/135762
Your team CLEARCORP development team is subscribed to branch lp:openerp-costa-rica.

=== modified file 'l10n_cr_account_banking_reports/report/conciliation_bank.py'
--- l10n_cr_account_banking_reports/report/conciliation_bank.py	2012-11-13 22:48:52 +0000
+++ l10n_cr_account_banking_reports/report/conciliation_bank.py	2012-11-22 19:40:26 +0000
@@ -29,9 +29,6 @@
 from openerp.addons.account_financial_report_webkit.report.common_reports import CommonReportHeaderWebkit
 from openerp.addons.account_financial_report_webkit.report.partners_ledger import PartnersLedgerWebkit
 
-
-
-
 class conciliation_bank(report_sxw.rml_parse, CommonReportHeaderWebkit):
     
     def __init__(self, cursor, uid, name, context):

=== modified file 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py'
--- l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py	2012-11-22 19:40:26 +0000
@@ -24,7 +24,6 @@
 
 from osv import fields, osv
 
-
 class l10n_cr_ConciliationBankWizard(osv.osv_memory):
 
     _inherit = "partners.ledger.webkit"
@@ -34,8 +33,13 @@
     _columns = {
         'bank_account_ids': fields.many2one('account.account', 'Bank Account', domain="[('user_type.code','=','BKVI')]", help="Bank Account"),
         'bank_balance': fields.float('Bank Balance'),
-    }
-
+        'filter': fields.selection([('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
+    }
+    
+    _defaults = {
+        'filter': 'filter_period',
+    }
+    
     def pre_print_report(self, cr, uid, ids, data, context=None):
         data = super(l10n_cr_ConciliationBankWizard, self).pre_print_report(cr, uid, ids, data, context)
         if context is None: