Merge lp:~rr.clearcorp/openerp-costa-rica/7.0-l10n_cr_exchange_rates into lp:openerp-costa-rica/6.1

[Ronald Rubi]

[ADD] Add module l10n_cr_exchange_rates

[lp:~rr.clearcorp/openerp-costa-rica/7.0-l10n_cr_exchange_rates]

251. By Ronald Rubi on 2013-11-06

[MRG] Add module l10n_cr_exchange_rates

252. By Ronald Rubi on 2013-11-29

[MRG] New module l10n_cr_account_banking_cr_bcr intended to read and parse bank statements files for a the module account_banking_ccorp from openerp-ccorp-addons

253. By Ronald Rubi on 2013-12-02

[MRG] l10n_cr_account_banking_cr_bac module to parse bank statements from BAC SanJose using the module account_banking_ccorp

254. By Ronald Rubi on 2013-12-03

[MRG] Add field Exchange rate date in l10n_cr_exchange_rates

255. By Ronald Rubi on 2013-12-03

[MRG] Fix exchange_rate_date in l10n_cr_exchange_rates

256. By Ronald Rubi on 2013-12-04

[MRG] Changed BCRParser keyword to find the ending balance of the bank statatements files and modified davivienda's parser to work with openerp v 7.0

257. By Ronald Rubi on 2013-12-04

[MRG] Fixed account number comparisson

258. By Ronald Rubi on 2013-12-05

[MRG] Fix adjustment, unreconcile accounts, l10n_cr_exchange_rates

259. By Ronald Rubi on 2013-12-05

[MRG] l10n_cr_account_banking_cr_davivienda: Fixed missing line importing DaVivienda's bank statements file

260. By Ronald Rubi on 2013-12-06

[MRG] Created parser for BNCR Bank Statements Files

261. By Ronald Rubi on 2013-12-06

[FIX] Add periods in create_move_lines_unreconcile, l10n_cr_exchange_rates

262. By Ronald Rubi on 2013-12-06

[FIX] Use moves in draft, l10n_cr_exchange_rates

Unmerged revisions

262. By Ronald Rubi on 2013-12-06

[FIX] Use moves in draft, l10n_cr_exchange_rates

261. By Ronald Rubi on 2013-12-06

[FIX] Add periods in create_move_lines_unreconcile, l10n_cr_exchange_rates

260. By Ronald Rubi on 2013-12-06

[MRG] Created parser for BNCR Bank Statements Files

259. By Ronald Rubi on 2013-12-05

[MRG] l10n_cr_account_banking_cr_davivienda: Fixed missing line importing DaVivienda's bank statements file

258. By Ronald Rubi on 2013-12-05

[MRG] Fix adjustment, unreconcile accounts, l10n_cr_exchange_rates

257. By Ronald Rubi on 2013-12-04

[MRG] Fixed account number comparisson

256. By Ronald Rubi on 2013-12-04

[MRG] Changed BCRParser keyword to find the ending balance of the bank statatements files and modified davivienda's parser to work with openerp v 7.0

255. By Ronald Rubi on 2013-12-03

[MRG] Fix exchange_rate_date in l10n_cr_exchange_rates

254. By Ronald Rubi on 2013-12-03

[MRG] Add field Exchange rate date in l10n_cr_exchange_rates

253. By Ronald Rubi on 2013-12-02

[MRG] l10n_cr_account_banking_cr_bac module to parse bank statements from BAC SanJose using the module account_banking_ccorp

=== added directory 'TODO-7.0'
=== renamed directory 'l10n_cr_account_financial_report_webkit' => 'TODO-7.0/l10n_cr_account_financial_report_webkit'
=== renamed directory 'l10n_cr_account_financial_statements' => 'TODO-7.0/l10n_cr_account_financial_statements'
=== renamed directory 'l10n_cr_account_voucher' => 'TODO-7.0/l10n_cr_account_voucher'
=== renamed directory 'l10n_cr_base' => 'TODO-7.0/l10n_cr_base'
=== added directory 'l10n_cr_account_banking_cr_bac'
=== renamed directory 'l10n_cr_account_banking_cr_bac' => 'l10n_cr_account_banking_cr_bac.moved'
=== added file 'l10n_cr_account_banking_cr_bac/__init__.py'
--- l10n_cr_account_banking_cr_bac/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bac/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import bac_mt940
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'l10n_cr_account_banking_cr_bac/__init__.py'
--- l10n_cr_account_banking_cr_bac/__init__.py	2012-07-12 00:37:04 +0000
+++ l10n_cr_account_banking_cr_bac/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import bac_mt940
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_banking_cr_bac/__openerp__.py'
--- l10n_cr_account_banking_cr_bac/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bac/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'BAC Account Banking',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'CLEARCORP S.A.',
+    'website': 'http://www.clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'depends': [
+                'account_banking_ccorp',
+                ],
+    'init_xml': [],
+    'update_xml': [
+    ],
+    'demo_xml': [],
+    'description': '''
+    Module to import BAC CR format transation files (S.W.I.F.T MT940).
+    ''',
+    'active': False,
+    'installable': True,
+}

=== added file 'l10n_cr_account_banking_cr_bac/bac_mt940.py'
--- l10n_cr_account_banking_cr_bac/bac_mt940.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bac/bac_mt940.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,283 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+# Import of BAC data in Swift MT940 format
+#
+
+from account_banking_ccorp.parsers import models
+from mt940_parser import BACParser
+import re
+from openerp.osv import osv, fields
+import logging
+import datetime
+from openerp.tools.translate import _
+import base64
+
+bt = models.mem_bank_transaction
+logger = logging.getLogger('bac_mt940')
+
+def record2float(record, value):
+    if record['creditmarker'][-1] == 'C':
+        return float(record[value])
+    return -float(record[value])
+
+class transaction(models.mem_bank_transaction):
+
+    mapping = {
+        'execution_date' : 'valuedate',
+        'effective_date' : 'valuedate',
+        'local_currency' : 'currency',
+        'transfer_type' : 'bookingcode',
+        'reference' : 'custrefno',
+        'message' : 'furtherinfo',
+        'name' : 'infoline1'
+    }
+
+    type_map = {
+        'NTRF': bt.ORDER,
+        'NMSC': bt.ORDER,
+        'NPAY': bt.PAYMENT_BATCH,
+        'NCHK': bt.CHECK,
+        'NCLR': bt.ORDER,
+    }
+
+    def __init__(self, record, *args, **kwargs):
+        '''
+        Transaction creation
+        '''
+        super(transaction, self).__init__(*args, **kwargs)
+        for key, value in self.mapping.iteritems():
+            if record.has_key(value):
+                setattr(self, key, record[value])
+
+        self.transferred_amount = record2float(record, 'amount')
+
+        # Set the transfer type based on the bookingcode
+        if record.get('bookingcode','ignore') in self.type_map:
+            self.transfer_type = self.type_map[record['bookingcode']]
+        else:
+            # Default to the generic order, so it will be eligible for matching
+            self.transfer_type = bt.ORDER
+
+        if not self.is_valid():
+            logger.info("Invalid: %s", record)
+    def is_valid(self):
+        '''
+        We don't have remote_account so override base
+        '''
+        return (self.execution_date
+                and self.transferred_amount and True) or False
+
+class statement(models.mem_bank_statement):
+    '''
+    Bank statement imported data
+    '''
+
+    def import_record(self, record,**kwargs):
+        def _transmission_number():
+            self.id = record['transref']
+        def _account_number():
+            # The wizard doesn't check for sort code
+            self.local_account = record['sortcode'] + record['accnum']
+        def _statement_number():
+            self.id = self.local_account + '-' + record['statementnr']
+        def _opening_balance():
+            self.start_balance = record2float(record,'startingbalance')
+            self.local_currency = record['currencycode']
+        def _closing_balance():
+            self.end_balance = record2float(record, 'endingbalance')
+            today = datetime.datetime.today() 
+            dateString = today.strftime("%Y-%m-%d %H:%M:%S")
+            self.id = dateString + '-' + self.id
+        def _transaction_new():
+            self.transactions.append(transaction(record))
+        def _transaction_info():
+            self.transaction_info(record)
+        def _not_used():
+            logger.info("Didn't use record: %s", record)
+        def _forward_available():
+            self.end_balance = record2float(record, 'endingbalance')
+            self.date = record['bookingdate']
+
+        rectypes = {
+            '20' : _transmission_number,
+            '25' : _account_number,
+            '28' : _statement_number,
+            '28C': _statement_number,
+            '60F': _opening_balance,
+            '62F': _closing_balance,
+            '64' : _forward_available,
+           #'62M': _interim_balance,
+            '61' : _transaction_new,
+            '86' : _transaction_info,
+            }
+
+        rectypes.get(record['recordid'], _not_used)()
+
+    def transaction_info(self, record):
+        '''
+        Add extra information to transaction
+        '''
+        # Additional information for previous transaction
+        if len(self.transactions) < 1:
+            logger.info("Received additional information for non existent transaction:")
+            logger.info(record)
+        else:
+            transaction = self.transactions[-1]
+            #transaction.id = ','.join([record[k] for k in ['infoline{0}'.format(i) for i in range(2,5)] if record.has_key(k)])
+            transaction.id = record['infoline1']    
+
+def raise_error(message, line):
+    raise osv.osv.except_osv(_('Import error'),
+        'Error in import:%s\n\n%s' % (message, line))
+
+class parser_bac_mt940(models.parser):
+    code = 'BAC-MT940'
+    name = _('BAC Swift MT940 statement export')
+    country_code = 'CR'
+    doc = _('''\
+            This format is available through
+            the BAC web interface.
+            ''')
+    
+    def parse(self, cr, statements_file,**kwargs):
+        '''
+            ** Kwargs parameter is used for a dynamic list of parameters. 
+            The wizard imported extracts used in all parsers and not all parsers have all the necessary information in your file, 
+            so get information from the wizard and passed by the ** kwargs. 
+            Then in the parses that are needed, are extracted from the ** kwargs and if needed, 
+            the parser still works the same way without this parameter.
+            
+            The rest of the methods must receive this parameter. (As the method that parse the header and the lines).
+        '''
+        result = []        
+        parser = BACParser()
+        list_record = []
+        inversion_colocada = 0
+        
+        """
+            **kwargs have all the parameters that have the wizard and 
+            has all the parameters passed from the wizard before calling 
+            the method that parses the file.            
+        """        
+        #pass to encoding with the correct type of file.        
+        data = base64.decodestring(statements_file)
+    
+        # Split into statements
+        statements = [st for st in re.split('[\r\n]*(?=:20:)', data)]
+        # Split by records
+        statement_list = [re.split('[\r\n ]*(?=:\d\d[\w]?:)', st) for st in statements]
+        
+        '''
+            In the first position of the statement_list is the account number.
+            If the account number that pass in the **kwargs dictionary.                
+        '''
+        account_number_wizard = kwargs['account_number']
+        #statement_list is a list, extract the first position 
+        accnum = statement_list[1][1]    
+        
+        #find the number in the account string.
+        if accnum.find(account_number_wizard) > -1:
+            for statement_lines in statement_list:
+                stmnt = statement()
+                
+                """EXTRACCION DE DATOS """
+                for record in statement_lines:               
+                    records = parser.parse_record(record,**kwargs)
+    
+                    if records is not None:
+                        ############START PAGO CAPITAL INVERSION
+                        if records['recordid'] == '60F':
+                            start_balance = float(records['startingbalance'])
+                        if records['recordid'] == '61':
+                            amount = float(records['amount'])
+                        if records['recordid'] == '86' and records['infoline1'] == 'PAGO CAPITAL INVERSION':
+                            start_amount = amount
+                            start_balance += amount #con la suma ya realizada.
+                        ############END PAGO CAPITAL INVERSION
+                        
+                        ############START INVERSION COLOCADA
+                        if records['recordid'] == '86':
+                            cad = records['infoline1']
+                            if cad.find('INVERSION COLOCADA') > 0:
+                                inversion_colocada = amount
+                                
+                        if records['recordid'] == '62F':                                         
+                            ending_balance = (inversion_colocada + float(records['endingbalance']))
+    
+                if records is not None:            
+                    """ACTUALIZACION DE DATOS """
+                    for record in statement_lines:   
+                        if record is not None:             
+                            records = parser.parse_record(record)    
+                    
+                            if (records['recordid'] == '60F'):
+                                dic = {'startingbalance':start_balance}
+                                records.update(dic)
+                            
+                            if (records['recordid'] == '62F'):
+                                dic = {'endingbalance': ending_balance}
+                                records.update(dic)
+    
+                            if (records['recordid'] == '64'):
+                                dic = {'endingbalance': ending_balance}
+                                records.update(dic)
+                                
+                            #SI LA LINEA NO ES INVERSION COLOCADA O PAGO CAPITAL INVERSION, SE AGREGA A LA LISTA
+                            #PAGO_CAPITAL
+                            if (records['recordid'] == '86'):
+                                cad = records['infoline1']
+                                
+                                if (cad != "PAGO CAPITAL INVERSION") and (cad.find("INVERSION COLOCADA") < 0): 
+                                    list_record.append(records)
+                                    
+                            if (records['recordid'] == '61'):
+                                try:
+                                    if float(records['amount']) != start_amount and float(records['amount']) != inversion_colocada:
+                                        list_record.append(records)
+                                except:
+                                    list_record.append(records)
+                            #####################################################################
+                            
+                            if (records['recordid'] != '61' and records['recordid'] != '86' ):
+                                list_record.append(records)                
+                    
+                    [stmnt.import_record(r) for r in list_record if r is not None]
+                    
+                    if stmnt.is_valid():
+                        result.append(stmnt)
+                        list_record = []
+                        inversion_colocada = 0
+                        start_balance = 0
+                    else:
+                        logger.info("Invalid Statement:")
+                        logger.info(records[0])
+                        logger.info(records[1])
+                        logger.info(records[2])
+                        logger.info(records[3])
+                        logger.info(records[4])
+                        list_record = []
+            return result
+        
+        else:
+            raise osv.except_osv(_('Error'),
+                        _('Error en la importación! La cuenta especificada en el archivo no coincide con la seleccionada en el asistente de importacion'))
+        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_banking_cr_bac/mt940_parser.py'
--- l10n_cr_account_banking_cr_bac/mt940_parser.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bac/mt940_parser.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+"""
+Parser for BAC CR MT940 format files
+Based on fi_patu's parser
+"""
+import re
+from datetime import datetime
+
+class BACParser(object):
+
+    def __init__( self ):
+        recparse = dict()
+        patterns = {'ebcdic': "\w/\?:\(\).,'+{} -"}
+
+        # MT940 header
+        recparse["20"] = ":(?P<recordid>20):(?P<transref>.{1,16})"
+        recparse["25"] = ":(?P<recordid>25):(?P<sortcode>\d{6})(?P<accnum>\d{1,29})"
+        recparse["28"] = ":(?P<recordid>28C?):(?P<statementnr>.{1,8})"
+
+        # Opening balance 60F
+        recparse["60F"] = ":(?P<recordid>60F):(?P<creditmarker>[CD])" \
+                + "(?P<prevstmtdate>\d{6})(?P<currencycode>.{3})" \
+                + "(?P<startingbalance>[\d,]{1,15})"
+
+        # Transaction
+        recparse["61"] = ":(?P<recordid>61):" \
+                + "(?P<valuedate>\d{6})(?P<bookingdate>\d{4})?" \
+                + "(?P<creditmarker>R?[CD])" \
+                + "(?P<amount>[\d,]{1,15})" \
+                + "(?P<bookingcode>[A-Z]{4})" \
+                + "(?P<custrefno>[\d,]{1,16})" \
+                + "(?P<bankref>[%(ebcdic)s]{1,16})?" \
+                + "(?:\n(?P<furtherinfo>[%(ebcdic)s]))?" \
+        % (patterns)
+
+        # Further info
+        recparse["86"] = ":(?P<recordid>86):" \
+                + "(?P<infoline1>.{1,80})?" \
+                + "(?:\n(?P<infoline2>.{1,80}))?" \
+                + "(?:\n(?P<infoline3>.{1,80}))?" \
+                + "(?:\n(?P<infoline4>.{1,80}))?" \
+                + "(?:\n(?P<infoline5>.{1,80}))?"
+
+        # Forward available balance (64) /  Closing balance (62F) / Interim balance (62M)
+        recparse["64"] = ":(?P<recordid>64|62[FM]):" \
+                + "(?P<creditmarker>[CD])" \
+                + "(?P<bookingdate>\d{6})(?P<currencycode>.{3})" \
+                + "(?P<endingbalance>[\d,]{1,15})"
+
+        for record in recparse:
+            recparse[record] = re.compile(recparse[record])
+        self.recparse = recparse
+
+
+    def parse_record(self, line,**kwargs):
+        """
+        Parse record using regexps and apply post processing
+        """
+        for matcher in self.recparse:
+            matchobj = self.recparse[matcher].match(line)
+            if matchobj:
+                break
+        if not matchobj:
+            print " **** failed to match line '%s'" % (line)
+            return
+        # Strip strings
+        matchdict = matchobj.groupdict()
+
+        # Remove members set to None
+        matchdict=dict([(k,v) for k,v in matchdict.iteritems() if v])
+
+        matchkeys = set(matchdict.keys())
+        needstrip = set(["transref", "accnum", "statementnr", "custrefno",
+            "bankref", "furtherinfo", "infoline1", "infoline2", "infoline3",
+            "infoline4", "infoline5", "startingbalance", "endingbalance"])
+        for field in matchkeys & needstrip:
+            matchdict[field] = matchdict[field].strip()
+
+        # Convert to float. Comma is decimal separator
+        needsfloat = set(["startingbalance", "endingbalance", "amount"])
+        for field in matchkeys & needsfloat:
+            matchdict[field] = float(matchdict[field].replace(',','.'))
+
+        # Convert date fields
+        needdate = set(["prevstmtdate", "valuedate", "bookingdate"])
+        for field in matchkeys & needdate:
+            datestring = matchdict[field]
+
+            post_check = False
+            if len(datestring) == 4 and field=="bookingdate" and matchdict.has_key("valuedate"):
+                # Get year from valuedate
+                datestring = matchdict['valuedate'].strftime('%y') + datestring
+                post_check = True
+            try:
+                matchdict[field] = datetime.strptime(datestring,'%y%m%d')
+                if post_check and matchdict[field] > matchdict["valuedate"]:
+                    matchdict[field]=matchdict[field].replace(year=matchdict[field].year-1)
+            except ValueError:
+                matchdict[field] = None
+
+        return matchdict
+
+    def parse(self, cr, data):
+        records = []
+        # Some records are multiline
+        for line in data:
+            if len(line) <= 1:
+                continue
+            if line[0] == ':' and len(line) > 1:
+                records.append(line)
+            else:
+                records[-1] = '\n'.join([records[-1], line])
+
+        output = []
+        for rec in records:
+            output.append(self.parse_record(rec))
+
+        return output
+
+def parse_file(filename):
+    bacfile = open(filename, "r")
+    p = BACParser().parse(bacfile.readlines())
+
+def main():
+    """The main function, currently just calls a dummy filename
+
+    :returns: description
+    """
+    parse_file("testfile")
+
+if __name__ == '__main__':
+    main()

=== removed file 'l10n_cr_account_banking_cr_bac/mt940_parser.py'
--- l10n_cr_account_banking_cr_bac/mt940_parser.py	2013-02-22 22:35:48 +0000
+++ l10n_cr_account_banking_cr_bac/mt940_parser.py	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-"""
-Parser for BAC CR MT940 format files
-Based on fi_patu's parser
-"""
-import re
-from datetime import datetime
-
-class BACParser(object):
-
-    def __init__( self ):
-        recparse = dict()
-        patterns = {'ebcdic': "\w/\?:\(\).,'+{} -"}
-
-        # MT940 header
-        recparse["20"] = ":(?P<recordid>20):(?P<transref>.{1,16})"
-        recparse["25"] = ":(?P<recordid>25):(?P<sortcode>\d{6})(?P<accnum>\d{1,29})"
-        recparse["28"] = ":(?P<recordid>28C?):(?P<statementnr>.{1,8})"
-
-        # Opening balance 60F
-        recparse["60F"] = ":(?P<recordid>60F):(?P<creditmarker>[CD])" \
-                + "(?P<prevstmtdate>\d{6})(?P<currencycode>.{3})" \
-                + "(?P<startingbalance>[\d,]{1,15})"
-
-        # Transaction
-        recparse["61"] = ":(?P<recordid>61):" \
-                + "(?P<valuedate>\d{6})(?P<bookingdate>\d{4})?" \
-                + "(?P<creditmarker>R?[CD])" \
-                + "(?P<amount>[\d,]{1,15})" \
-                + "(?P<bookingcode>[A-Z]{4})" \
-                + "(?P<custrefno>[\d,]{1,16})" \
-                + "(?P<bankref>[%(ebcdic)s]{1,16})?" \
-                + "(?:\n(?P<furtherinfo>[%(ebcdic)s]))?" \
-        % (patterns)
-
-        # Further info
-        recparse["86"] = ":(?P<recordid>86):" \
-                + "(?P<infoline1>.{1,80})?" \
-                + "(?:\n(?P<infoline2>.{1,80}))?" \
-                + "(?:\n(?P<infoline3>.{1,80}))?" \
-                + "(?:\n(?P<infoline4>.{1,80}))?" \
-                + "(?:\n(?P<infoline5>.{1,80}))?"
-
-        # Forward available balance (64) /  Closing balance (62F) / Interim balance (62M)
-        recparse["64"] = ":(?P<recordid>64|62[FM]):" \
-                + "(?P<creditmarker>[CD])" \
-                + "(?P<bookingdate>\d{6})(?P<currencycode>.{3})" \
-                + "(?P<endingbalance>[\d,]{1,15})"
-
-        for record in recparse:
-            recparse[record] = re.compile(recparse[record])
-        self.recparse = recparse
-
-
-    def parse_record(self, line,**kwargs):
-        """
-        Parse record using regexps and apply post processing
-        """
-        for matcher in self.recparse:
-            matchobj = self.recparse[matcher].match(line)
-            if matchobj:
-                break
-        if not matchobj:
-            print " **** failed to match line '%s'" % (line)
-            return
-        # Strip strings
-        matchdict = matchobj.groupdict()
-
-        # Remove members set to None
-        matchdict=dict([(k,v) for k,v in matchdict.iteritems() if v])
-
-        matchkeys = set(matchdict.keys())
-        needstrip = set(["transref", "accnum", "statementnr", "custrefno",
-            "bankref", "furtherinfo", "infoline1", "infoline2", "infoline3",
-            "infoline4", "infoline5", "startingbalance", "endingbalance"])
-        for field in matchkeys & needstrip:
-            matchdict[field] = matchdict[field].strip()
-
-        # Convert to float. Comma is decimal separator
-        needsfloat = set(["startingbalance", "endingbalance", "amount"])
-        for field in matchkeys & needsfloat:
-            matchdict[field] = float(matchdict[field].replace(',','.'))
-
-        # Convert date fields
-        needdate = set(["prevstmtdate", "valuedate", "bookingdate"])
-        for field in matchkeys & needdate:
-            datestring = matchdict[field]
-
-            post_check = False
-            if len(datestring) == 4 and field=="bookingdate" and matchdict.has_key("valuedate"):
-                # Get year from valuedate
-                datestring = matchdict['valuedate'].strftime('%y') + datestring
-                post_check = True
-            try:
-                matchdict[field] = datetime.strptime(datestring,'%y%m%d')
-                if post_check and matchdict[field] > matchdict["valuedate"]:
-                    matchdict[field]=matchdict[field].replace(year=matchdict[field].year-1)
-            except ValueError:
-                matchdict[field] = None
-
-        return matchdict
-
-    def parse(self, cr, data):
-        records = []
-        # Some records are multiline
-        for line in data:
-            if len(line) <= 1:
-                continue
-            if line[0] == ':' and len(line) > 1:
-                records.append(line)
-            else:
-                records[-1] = '\n'.join([records[-1], line])
-
-        output = []
-        for rec in records:
-            output.append(self.parse_record(rec))
-
-        return output
-
-def parse_file(filename):
-    bacfile = open(filename, "r")
-    p = BACParser().parse(bacfile.readlines())
-
-def main():
-    """The main function, currently just calls a dummy filename
-
-    :returns: description
-    """
-    parse_file("testfile")
-
-if __name__ == '__main__':
-    main()

=== added directory 'l10n_cr_account_banking_cr_bcr'
=== renamed directory 'l10n_cr_account_banking_cr_bcr' => 'l10n_cr_account_banking_cr_bcr.moved'
=== added file 'l10n_cr_account_banking_cr_bcr/__init__.py'
--- l10n_cr_account_banking_cr_bcr/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bcr/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import bcr_format
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'l10n_cr_account_banking_cr_bcr/__init__.py'
--- l10n_cr_account_banking_cr_bcr/__init__.py	2013-03-14 15:57:05 +0000
+++ l10n_cr_account_banking_cr_bcr/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import bcr_format
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_banking_cr_bcr/__openerp__.py'
--- l10n_cr_account_banking_cr_bcr/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bcr/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'BCR Account Banking',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'CLEARCORP S.A.',
+    'website': 'http://www.clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'depends': [
+                'account_banking_ccorp',
+                ],
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'description': '',
+    'active': False,
+    'installable': True,
+}

=== added file 'l10n_cr_account_banking_cr_bcr/bcr_format.py'
--- l10n_cr_account_banking_cr_bcr/bcr_format.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bcr/bcr_format.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,181 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from account_banking_ccorp.parsers import models
+from openerp.tools.translate import _
+from bcr_parser import BCRParser
+import re
+from openerp.osv import osv, fields
+import logging
+import pprint
+from datetime import datetime
+import base64
+
+bt = models.mem_bank_transaction
+logger = logging.getLogger( 'bcr_mt940' )
+
+def record2float(record, value):
+    if record == 'C':
+        return float (value)
+    else:
+        return -float(value)
+
+class transaction(models.mem_bank_transaction):
+
+    mapping = {
+        'execution_date' : '',
+        'effective_date' : '',
+        'local_currency' : '',
+        'transfer_type' : '',
+        'reference' : '',
+        'message' : '',
+        'name' : '',
+        'amount': '',
+        'creditmarker': '',
+    }
+
+    def __init__(self, record, *args, **kwargs):
+        
+        '''
+        Transaction creation
+        '''
+        super(transaction, self).__init__(*args, **kwargs)
+        #for r in record:
+        for key, value in record.iteritems():
+            if record.has_key(key):
+                setattr(self, key, record[key])
+
+        if not self.is_valid():
+            logger.info("Invalid: %s", record)
+    
+    def is_valid(self):
+        '''
+        We don't have remote_account so override base
+        '''
+        return (self.execution_date
+                and self.transferred_amount and True) or False
+
+class statement(models.mem_bank_statement):
+    '''
+    Bank statement imported data    '''
+      
+    def _transmission_number(self, record):
+        self.id = record['transref']
+        
+    def _account_number(self, record):
+        self.local_account = record['account_number']
+        
+    def _statement_number(self, record):
+        self.id = record['id']
+        
+    def _opening_balance(self, record):
+        self.start_balance = float(record['startingbalance'])
+        self.local_currency = record['currencycode']
+    
+    def _closing_balance(self, record):
+        self.end_balance = float(record['endingbalance'])
+        self.date = record['bookingdate']
+     
+    def _transaction_new(self, record):
+        parser = BCRParser()
+        sub_record = parser.statement_lines(record) #dictionary
+        for sub in sub_record:
+            self.transactions.append(transaction(sub))
+
+    def _not_used():
+        logger.info("Didn't use record: %s", record)
+        
+    def _forward_available(self, record):
+        self.end_balance =  float(record['endingbalance'])
+        self.date = record['bookingdate'] 
+    
+    def _execution_date_transferred_amount (self, record):        
+        self.execution_date = record['bookingdate']       
+        self.transferred_amount = float(record['ammount'])
+
+    def transaction_info(self, record):
+        '''
+        Add extra information to transaction
+        '''
+        # Additional information for previous transaction
+        if len(self.transactions) < 1:
+            logger.info("Received additional information for non existent transaction:")
+            logger.info(record)
+        else:
+            transaction = self.transactions[-1]
+            transaction.id = ','.join([record[k] for k in ['infoline{0}'.format(i) for i in range(2,5)] if record.has_key(k)])
+
+def raise_error(message, line):
+    raise osv.osv.except_osv(_('Import error'),
+        'Error in import:%s\n\n%s' % (message, line))
+
+class parser_bcr_mt940( models.parser ):
+    code = 'BCR-MT940'
+    name = _( 'BCR statement import' )
+    country_code = 'CR'
+    doc = _('''\
+            This format is available through
+            the BCR  web interface.
+            ''')
+    
+    def parse(self, cr, statements_file, **kwargs):
+        
+        '''
+            ** Kwargs parameter is used for a dynamic list of parameters. 
+            The wizard imported extracts used in all parsers and not all parsers have all the necessary information in your file, 
+            so get information from the wizard and passed by the ** kwargs. 
+            Then in the parses that are needed, are extracted from the ** kwargs and if needed, 
+            the parser still works the same way without this parameter.
+            
+            The rest of the methods must receive this parameter. (As the method that parse the header and the lines).
+        '''
+        
+        result = []
+        parser = BCRParser()
+        stmnt = statement()
+        
+        """
+            **kwargs have all the parameters that have the wizard and 
+            has all the parameters passed from the wizard before calling 
+            the method that parses the file.            
+        """        
+
+        #pass to encoding with the correct type of file.
+        data = base64.decodestring(statements_file)
+    
+        records = parser.parse_stamenent_record(data,**kwargs)        
+        
+        stmnt._transmission_number(records)
+        stmnt._account_number(records)
+        stmnt._statement_number(records)
+        stmnt._opening_balance(records)
+        stmnt._closing_balance(records)
+        stmnt._forward_available(records)
+        stmnt._execution_date_transferred_amount (records)
+        stmnt._transaction_new(data)
+                  
+        if stmnt.is_valid():
+            result.append(stmnt)
+            
+        return result
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_banking_cr_bcr/bcr_parser.py'
--- l10n_cr_account_banking_cr_bcr/bcr_parser.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bcr/bcr_parser.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,572 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+"""
+Parser for BCR format files
+"""
+import re
+from datetime import datetime
+from dateutil import parser
+from pprint import PrettyPrinter
+from copy import copy
+from openerp.tools.translate import _
+from openerp.osv import osv, fields
+
+class BCRParser( object ):
+    """
+    Para noviembre de 2012 se cambia el formato del archivo del BCR. Se cambia el encabezado del archivo
+    así como el final del mismo. Además en la parte de abajo cambia el formato y visualización de los
+    saldos finales. 
+    
+    El cambio más evidente es el formato de la cuenta de banco, pasa de 1-246447-0 a 001-0246447-0
+    Revisión # 1                                                                         Revisión#2
+    Encabezado anterior:                                                                 Encabezado nuevo
+        BANCO DE COSTA RICA                                                              BANCO DE COSTA RICA
+        Movimiento de Cuenta Corriente 1-246447-0 Colones (puede ser Dólares o Dolares)  MOVIMIENTO DE LA CUENTA  CORRIENTE No. 001-0246447-0  COLONES (DOLARES)
+        Dueño: COMPA IA INMOBILIARIA CENTROA                                             DUENO: COMPA IA INMOBILIARIA CENTROAMERICANA CICCR S                            
+        Movimiento realizado el periodo del 01-10-2012 al 31-10-2012                     MOVIMIENTO REALIZADO                           DEL 01-11-2012 AL 30-11-2012
+    
+    Final de archivo
+    Revisión # 1                                                        Revisión #2
+    TOTALES DEL MOVIMIENTO CONTABILIZADO                                TOTALES DEL MOVIMIENTO CONTABILIZADO 
+          Cantidad  -------Monto--------                                CANTIDAD    -------MONTO-------- 
+    Débitos       239       81,876,681.22                               DEBITOS       209        67,553,414.30                                                                                                                                
+    Créditos       27       92,636,599.01                               CREDITOS        8        66,086,326.53
+
+    Saldo Inicial            21,682,799.04                              -------- SALDOS --------                            
+    Saldo Final              33,992,829.43                              INICIAL             33,992,829.43
+                                                                        FINAL               32,525,741.66
+    Solicitado el 01/11/2012 20:03:34                                   SOLICITADO EL 01-12-2012 A LAS 15:36:15:17                                       
+    """
+    def statement_record ( self, rec, **kwargs):
+        lines = []
+        line_dict = {}
+
+        line_dict = {
+            'transref': 0.0, # _transmission_number
+            'account_number': '', #_account_number
+            'statementnr':'', # statement_number
+            'startingbalance': 0.0, #_opening_balance
+            'currencycode': 'CRC', #currencycode
+            'endingbalance': 0.0, #_closing_balance
+            'bookingdate': '', #moving_date
+            'ammount': 0.0,
+            'id': '',
+        }
+
+        cad = ''
+        list_split = rec.split('\r\n')
+        account_number_wizard = kwargs['account_number']
+
+        #If return True, the account are the same.
+        if self.match_account(list_split, account_number_wizard):        
+            for l in list_split:                
+                #_account_number -> FIRST REVISION
+                if l.find('Movimiento de Cuenta Corriente', 0, len('Movimiento de Cuenta Corriente')) > -1:
+                    line_dict['account_number'] = self.extract_number(l)                
+                    
+                    if (l.find('D',0,len(l)) > -1):
+                        line_dict['currencycode'] = 'USD'
+                    else:
+                        line_dict['currencycode'] = 'CRC'
+                        
+                #_account_number -> SECOND REVISION        
+                elif (l.find('MOVIMIENTO DE LA CUENTA  CORRIENTE No.', 0, len('MOVIMIENTO DE LA CUENTA  CORRIENTE No.')) > -1):
+                    #account_str = self.extract_number(l)   
+                    #001-0246447-0
+                    #account_1 = account_str[2:3] #1
+                    #account_2 = account_str[4:]  #246447-0
+                    #account_complete = account_1+self.extract_number(account_2)#12464470
+                    #line_dict['account_number'] = self.extract_number(account_complete)
+                    line_dict['account_number'] = self.extract_accnumber(l)
+                    if (l.find('DOLARES',0,len(l)) > -1):
+                        line_dict['currencycode'] = 'USD'
+                    else:
+                        line_dict['currencycode'] = 'CRC'
+                
+                # _transmission_number -> FIRST REVISION
+                if (l.find('Movimiento realizado el periodo', 0, len('Movimiento realizado el periodo')) > -1):
+                    line_dict['statementnr'] = self.extract_number(l)
+                    date_1 = self.extract_date_regular_expresion_line_format_2(l,0)
+                    date_2 = self.extract_date_regular_expresion_line_format_2(l,1)
+                
+                # _transmission_number -> SECOND REVISION
+                elif (l.find('MOVIMIENTO REALIZADO', 0, len('MOVIMIENTO REALIZADO')) > -1):
+                    line_dict['statementnr'] = self.extract_number(l)
+                    date_1 = self.extract_date_regular_expresion_line_format_2(l,0)
+                    date_2 = self.extract_date_regular_expresion_line_format_2(l,1)
+                       
+                #date and hour -> FIRST REVISION 
+                if (l.find('Solicitado el', 0, len('Solicitado el'))  > -1):
+                    date =  hour = cad = ''
+                    date = self.extract_date_regular_expresion(l)
+                    if len(date) > 0:                   
+                        hour = self.extract_hour_regular_expresion(l)
+                    cad = date + ' ' + hour                
+                    line_dict['transref'] = cad
+                    line_dict['bookingdate'] = cad
+                
+                #date and hour -> SECOND REVISION                 
+                elif (l.find('SOLICITADO EL', 0, len('SOLICITADO EL'))  > -1):
+                    date =  hour = cad = ''
+                    date = self.extract_date_regular_expresion(l)
+                    if len(date) > 0:                   
+                        hour = self.extract_hour_regular_expresion(l)
+                    cad = date + ' ' + hour                
+                    line_dict['transref'] = cad
+                    line_dict['bookingdate'] = cad        
+                                   
+                #_opening_balance -> FIRST REVISION
+                if l.find('Saldo Inicial', 0, len('Saldo Inicial'))  > -1:
+                    line_dict['startingbalance'] = self.extract_float(l)
+                #_opening_balance -> SECOND REVISION   
+                elif l.find('INICIAL', 0, len('INICIAL'))  > -1:
+                    line_dict['startingbalance'] = self.extract_float(l)
+                        
+                #_closing_balance -> FIRST REVISION
+                if l.find('DISPONIBLE', 0, len('DISPONIBLE'))  > -1:
+                    line_dict['endingbalance'] = self.extract_float(l)
+              
+                #_closing_balance -> SECOND REVISION    
+                elif l.find('Saldo Final', 0, len('Saldo Final'))  > -1:
+                    line_dict['endingbalance'] = self.extract_float(l)
+                        
+            line_dict['ammount'] = float( line_dict['startingbalance'] ) + float( line_dict['endingbalance'] )
+            line_dict['id'] = date_1 + ' - ' + date_2 + ' Extracto BCR ' + line_dict['account_number']
+            self.line_dict = line_dict
+          
+            return line_dict
+        
+        else:
+            raise osv.except_osv(_('Error'),
+                        _('Error en la importacion! La cuenta especificada en el archivo no coincide con la seleccionada en el asistente de importacion'))
+        
+    def statement_lines ( self, rec):
+        parser = BCRParser()
+        mapping = {
+            'execution_date' : '',
+            'effective_date' : '',
+            'local_currency' : '',
+            'transfer_type' : '',
+            'reference' : '',
+            'message' : '',
+            'name' : '',
+            'transferred_amount': '',
+            'creditmarker': '',
+        }
+        line_dict = {}
+        currencycode = ''
+        
+        list_split = rec.split('\r\n')
+        entrada = False
+        start = 0
+        end = 0
+        version = 'none'
+        
+        #========= Start and end of lines ======#
+        for l in list_split: 
+            if l.find('TOTALES DEL MOVIMIENTO CONTABILIZADO', 0, len('TOTALES DEL MOVIMIENTO CONTABILIZADO')) <= -1:
+                end += 1
+            else:
+                break                
+        end = end - 1
+        
+        for l in list_split:           
+            if l.find('-CONTABLE-', 0, len('-CONTABLE-')) <= -1:
+                start += 1
+            else:
+                break
+        start += 1 
+        
+        for l in list_split:           
+            if l.find('Movimiento de Cuenta Corriente', 0, len('Movimiento de Cuenta Corriente')) > -1:
+                if (l.find('D',0,len(l)) > -1):
+                    currencycode = 'USD'
+                else:
+                    currencycode = 'CRC'
+                break
+            
+            elif l.find('MOVIMIENTO DE LA CUENTA  CORRIENTE No.', 0, len('MOVIMIENTO DE LA CUENTA  CORRIENTE No.')) > -1:
+                if (l.find('DOLARES',0,len(l)) > -1):
+                    currencycode = 'USD'
+                else:
+                    currencycode = 'CRC'
+                break            
+        
+        #========= VERSION OF THREE COLUMNS FOR DEBIT AND CREDIT =============# 
+        sub_list = list_split [start:end]
+        
+        if len(sub_list) > 0:
+            sub_first = sub_list[0] #Based in first line, decide which version it is
+            
+            #1. Try separate by tab ('\t') (last version) (fields must have, at least, more than 1 of length)
+            fields = sub_first.split('\t')
+            
+            if len(fields) > 1:
+                version = 'third_version'
+            
+            #2. Find where start debit and credit columns
+            else:
+                amount = sub_first[106:]
+                debit = amount[0:16]
+                
+                debit = debit.replace(',','')
+                debit = debit.replace('.','')
+                debit = re.sub(r'\s', '', debit)
+                
+                if re.match('^[0-9,.]*$', debit):
+                    version = 'first_version'
+                
+                else:
+                    amount = sub_first[120:]            
+                    debit = amount[0:40]
+                    
+                    debit = debit.replace(',','')
+                    debit = debit.replace('.','')
+                    debit = re.sub(r'\s', '', debit)
+                    
+                    if re.match('^[0-9,.]*$', debit):
+                        version = 'second_version'
+                        
+            #=====================================================================#
+            
+            if version != 'none':
+                if version =='first_version':
+                    return self.first_version_file(sub_list,mapping,currencycode,parser)
+                
+                elif version == 'second_version':
+                    return self.second_version(sub_list,mapping,currencycode,parser)
+                
+                elif version == 'third_version':
+                    return self.third_version(sub_list,mapping,currencycode,parser)
+                        
+            else:
+                raise osv.except_osv(_('Error'),
+                                     _('There is not format implementend for this file.'))
+            
+        else:
+            return []    
+    
+    def parse_stamenent_record( self, rec, **kwargs):
+
+        matchdict = dict()
+
+        matchdict = self.statement_record( rec, **kwargs );
+
+        # Remove members set to None
+        matchdict = dict( [( k, v ) for k, v in matchdict.iteritems() if v] )
+
+        matchkeys = set( matchdict.keys() )
+        needstrip = set( [ 'transref', 'account_number', 'statementnr', 'currencycode', 'endingbalance', 'bookingdate'] )
+
+        for field in matchkeys & needstrip:
+            matchdict[field] = matchdict[field].strip()
+
+        # Convert to float. Comma is decimal separator
+        needsfloat = set( ["startingbalance", "endingbalance", "amount"] )
+        for field in matchkeys & needsfloat:
+            matchdict[field] = float( matchdict[field].replace( ',', '.' ) )
+
+        # Convert date fields
+        needdate = set( ["bookingdate"] )
+                
+        for field in matchkeys & needdate:            
+            datestring = matchdict[field]
+            date = self.extract_date_regular_expresion(datestring)
+            hour = self.extract_hour_regular_expresion(datestring)
+            
+            date_complete = date + ' ' + hour
+            try:
+                #FORMAT DATE REVISION # 1
+                date_obj= datetime.strptime(date_complete, "%d/%m/%Y %H:%M:%S")
+            except:
+                #FORMAT DATE REVISION # 2
+                date_obj= datetime.strptime(date_complete, "%d-%m-%Y %H:%M:%S")
+            matchdict[field] = date_obj
+        
+        return matchdict
+    
+    #=============================Auxiliary methods =============================#
+    
+    #=====================Versions of file
+    
+    def first_version_file(self, sub_list,mapping,currencycode,parser):
+        lines = []
+        for sub in sub_list:
+            #effective_date
+            date_str = ''
+            date_str = self.extract_date_regular_expresion_line(sub,0)
+            date= datetime.strptime(date_str, "%d-%m-%y")               
+            mapping['effective_date'] = date #fecha_contable.
+            
+            #execution_date
+            date_str = self.extract_date_regular_expresion_line(sub,1)
+            date = datetime.strptime(date_str, "%d-%m-%y")
+            mapping['execution_date'] = date #fecha_movimiento                       
+           
+            mapping['local_currency'] = currencycode
+            mapping['transfer_type'] = 'NTRF'
+            mapping['reference'] = parser.extract_number(sub[18:26])
+            mapping['message'] = sub[27:80]                
+            mapping['name'] = sub[27:80]
+            mapping['id'] = sub[27:80]
+            
+            amount = sub[106:]
+            amount.replace('\t',' ')
+            debit = amount[0:16]
+            credit = amount[16:]
+            
+            if (parser.extract_float(debit) is not ''): #debit
+                cad = parser.extract_float(debit)
+                mapping['transferred_amount'] = -float(cad)      
+                mapping['creditmarker'] = 'C'
+                                      
+            else: #credit
+                cad = parser.extract_float (credit)
+                mapping['transferred_amount'] =  float(cad)
+            
+            lines.append(copy(mapping))
+                            
+        return lines
+    
+    def second_version (self, sub_list,mapping,currencycode,parser):
+        lines = []
+        for sub in sub_list:
+            #effective_date
+            date_str = ''
+            date_str = self.extract_date_regular_expresion_line(sub,0)
+            date= datetime.strptime(date_str, "%d-%m-%y")               
+            mapping['effective_date'] = date #fecha_contable.
+            
+            #execution_date
+            date_str = self.extract_date_regular_expresion_line(sub,1)
+            date = datetime.strptime(date_str, "%d-%m-%y")
+            mapping['execution_date'] = date #fecha_movimiento                       
+           
+            mapping['local_currency'] = currencycode
+            mapping['transfer_type'] = 'NTRF'
+            mapping['reference'] = parser.extract_number(sub[18:26])
+            mapping['message'] = sub[27:80]                
+            mapping['name'] = sub[27:80]
+            mapping['id'] = sub[27:80]
+            
+            amount = sub[120:]
+            amount.replace('\t',' ')
+            debit = amount[0:40]
+            credit = amount[40:]
+            
+            if (parser.extract_float(debit) is not ''): #debit
+                cad = parser.extract_float(debit)
+                mapping['transferred_amount'] = -float(cad)      
+                mapping['creditmarker'] = 'C'
+                                      
+            else: #credit
+                cad = parser.extract_float (credit)
+                mapping['transferred_amount'] =  float(cad)
+            
+            lines.append(copy(mapping))
+                            
+        return lines    
+    
+    def third_version(self, sub_list,mapping,currencycode,parser):
+        lines = []
+        for l in sub_list:
+            fields = l.split('\t')
+            
+            #effective_date
+            date_str = fields[0]
+            date= datetime.strptime(date_str, "%d-%m-%y")               
+            mapping['effective_date'] = date #fecha_contable.
+            
+            #execution_date
+            date_str = fields[1]
+            date = datetime.strptime(date_str, "%d-%m-%y")
+            mapping['execution_date'] = date #fecha_movimiento                       
+           
+            mapping['local_currency'] = currencycode
+            mapping['transfer_type'] = 'NTRF'
+            mapping['reference'] = parser.extract_number(fields[2])
+            mapping['message'] = fields[3]                
+            mapping['name'] = fields[3]
+            mapping['id'] = fields[3]
+            
+            #Extract debit and credit
+            debit = fields[5]
+            if (parser.extract_float(debit) is not ''): #debit
+                cad = parser.extract_float(debit)
+                mapping['transferred_amount'] = -float(cad)      
+                mapping['creditmarker'] = 'C'
+                                      
+            else: #credit
+                credit = fields[6]
+                cad = parser.extract_float(credit)
+                mapping['transferred_amount'] =  float(cad)
+            
+            lines.append(copy(mapping))
+        
+        return lines
+        
+    #===============================================================                
+    def extract_number( self, account_number ):
+        cad = ''
+        result = re.findall(r'[0-9]+', account_number)
+               
+        for character in result:
+            cad = cad + character
+        return cad
+    
+    def extract_accnumber(self, line):
+        cad = ''
+        result = re.findall(r'[0-9-]+', line)
+               
+        for character in result:
+            cad = cad + character
+        return cad
+        
+
+    def extract_float ( self, amount ):
+        cad = ''
+        result = re.findall(r"[-+]?\d*\.\d+|\d+",amount)
+        
+        for character in result:
+            cad = cad + character       
+        return cad
+    
+    def extract_date_regular_expresion(self, date):
+        cad = ''
+        result = []
+        date_string = ''
+        #re.findall('[0-9]{1,2}-[0-9]{1,2}-[0-9]{4}',str)[0]+' '+re.findall('[0-9]{2}:[0-9]{2}:[0-9]{2}',str)[0]
+        #FORMAT DATE FIRST REVISION
+        result = re.findall('[0-9]{1,2}/[0-9]{1,2}/[0-9]{4}', date)
+       
+        if len(result) == 0:
+            #FORMAT DATE SECOND REVISION
+            result = re.findall('[0-9]{1,2}-[0-9]{1,2}-[0-9]{4}',date)      
+        
+        for character in result:
+            cad = cad + character       
+        return cad
+    
+    #with the pos parameter is said which of the two dates must be brought
+    #result brings a list of two elements, the post tells us to choose    
+    def extract_date_regular_expresion_line(self, date, pos):
+        cad = ''
+        result = []
+        date_string = ''
+        result = re.findall('([0-9]{2}-[0-9]{2}-[0-9]{2})[\s]*',date)      
+        date_str = result[pos]
+        
+        for character in date_str:
+            cad = cad + character       
+        return cad
+    
+    #with the pos parameter is said which of the two dates must be brought
+    #result brings a list of two elements, the post tells us to choose    
+    def extract_date_regular_expresion_line_format_2(self, date, pos):
+        cad = ''
+        result = []
+        date_string = ''
+        result = re.findall('([0-9]{2}-[0-9]{2}-[0-9]{4})[\s]*',date)      
+        date_str = result[pos]
+        
+        for character in date_str:
+            cad = cad + character       
+        return cad
+    
+    def extract_hour_regular_expresion(self, date):
+        cad = ''
+        result = []
+
+        result = re.findall('[0-9]{2}:[0-9]{2}:[0-9]{2}',date)             
+        
+        for character in result:
+            cad = cad + character       
+        return cad
+
+    def extract_currency_code_USD(self, currency):
+        cad = ''
+        result = re.findall('[D.lares]',currency)
+        for character in result:
+            cad = cad + character
+        return cad
+
+    def parse( self, cr, data ):
+        records = []
+        # Some records are multiline
+        for line in data:
+            if len(line) <= 1:
+                continue
+            if line[0] == ':' and len(line) > 1:
+                records.append(line)
+            else:
+                records[-1] = '\n'.join([records[-1], line])
+                
+        output = []
+
+        for rec in records:
+            output.append( self.parse_stamenent_record( rec ) )
+                
+        return output
+    
+    #check if the account_number in the file match with the selected in the wizard.
+    def match_account(self, list_split, account_number_wizard):
+        accnumber = ''
+        for l in list_split:            
+             #_account_number -> FIRST REVISION
+            if l.find('Movimiento de Cuenta Corriente', 0, len('Movimiento de Cuenta Corriente')) > -1:
+                accnumber = self.extract_number(l)                
+                break
+            
+             #_account_number -> SECOND REVISION        
+            elif (l.find('MOVIMIENTO DE LA CUENTA  CORRIENTE No.', 0, len('MOVIMIENTO DE LA CUENTA  CORRIENTE No.')) > -1):
+                #account_str = self.extract_number(l)
+                #001-0246447-0
+                #account_1 = account_str[2:3] #1
+                #account_2 = account_str[4:]  #246447-0
+                #account_complete = account_1+self.extract_number(account_2)#12464470
+                #accnumber = self.extract_number(account_complete)
+                #changed the account number comparison not
+                #to remove 0's from acc number
+                accnumber = self.extract_number(l)
+                break
+        
+        #If return True, the account_number in the wizard and the account in the file are the same.
+        if accnumber.find(account_number_wizard) > -1:
+            return True
+        else:
+            return False
+    
+
+def parse_file( filename ):
+    bacfile = open( filename, "r" )
+    p = BCRParser().parse(bacfile.readlines())
+
+def main():
+    """The main function, currently just calls a dummy filename
+
+    :returns: description
+    """
+    parse_file("testfile")
+
+if __name__ == '__main__':
+    main()
+

=== added directory 'l10n_cr_account_banking_cr_bncr'
=== renamed directory 'l10n_cr_account_banking_cr_bncr' => 'l10n_cr_account_banking_cr_bncr.moved'
=== added file 'l10n_cr_account_banking_cr_bncr/__init__.py'
--- l10n_cr_account_banking_cr_bncr/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bncr/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 credativ Ltd (<http://www.credativ.co.uk>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import bncr_format
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_banking_cr_bncr/__openerp__.py'
--- l10n_cr_account_banking_cr_bncr/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bncr/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'BNCR Account Banking',
+    'version': '0.1',
+    'license': 'AGPL-3',
+    'author': 'CLEARCORP S.A.',
+    'website': 'http://www.clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'depends': [
+                'account_banking_ccorp',
+                ],
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'description': '',
+    'active': False,
+    'installable': True,
+}

=== added file 'l10n_cr_account_banking_cr_bncr/bncr_format.py'
--- l10n_cr_account_banking_cr_bncr/bncr_format.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bncr/bncr_format.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from account_banking_ccorp.parsers import models
+from openerp.tools.translate import _
+from bncr_parser import BNCRParser
+import re
+from openerp.osv import osv, fields
+import logging
+import pprint
+from datetime import datetime
+import base64
+
+bt = models.mem_bank_transaction
+logger = logging.getLogger( 'bncr_logger' )
+
+class transaction(models.mem_bank_transaction):
+
+    mapping = {
+        'execution_date' : '',
+        'effective_date' : '',
+        'local_currency' : '',
+        'transfer_type' : '',
+        'reference' : '',
+        'message' : '',
+        'name' : '',
+        'amount': '',
+        'creditmarker': '',
+    }
+
+    def __init__(self, record, *args, **kwargs):
+        
+        '''
+        Transaction creation
+        '''
+        #record is a dictionary, that is the reason to use iteritems().
+        super(transaction, self).__init__(*args, **kwargs)
+        for key, value in record.iteritems():
+            if record.has_key(key):
+                setattr(self, key, record[key])
+
+        if not self.is_valid():
+            logger.info("Invalid: %s", record)
+    
+    def is_valid(self):
+        '''
+        We don't have remote_account so override base
+        '''
+        return (self.execution_date
+                and self.transferred_amount and True) or False
+
+class statement(models.mem_bank_statement):
+    '''
+    Bank statement imported data    '''
+      
+    def _transmission_number(self, record):
+        self.id = record['transref']
+    
+    def _account_number(self, record):
+        self.local_account = record['account_number']
+        self.local_currency = record['currencycode']
+
+    def _statement_number(self, record):
+        self.id = record['id']
+        
+    def _opening_balance(self, record):
+        self.start_balance = float(record['startingbalance'])
+    
+    def _closing_balance(self, record):
+        self.end_balance = float(record['endingbalance'])
+        self.date = record['bookingdate']
+     
+    def _transaction_new(self, record):
+        parser = BNCRParser()
+        sub_record = parser.statement_lines(record) #dictionary
+        for sub in sub_record:
+            self.transactions.append(transaction(sub))
+
+    def _not_used():
+        logger.info("Didn't use record: %s", record)
+        
+    def _forward_available(self, record):
+        self.end_balance =  float(record['endingbalance'])
+        self.date = record['bookingdate'] 
+    
+    def _execution_date_transferred_amount (self, record):        
+        self.execution_date = record['bookingdate']       
+        self.transferred_amount = float(record['ammount'])
+
+    def transaction_info(self, record):
+        '''
+        Add extra information to transaction
+        '''
+        # Additional information for previous transaction
+        if len(self.transactions) < 1:
+            logger.info("Received additional information for non existent transaction:")
+            logger.info(record)
+        else:
+            transaction = self.transactions[-1]
+            transaction.id = ','.join([record[k] for k in ['infoline{0}'.format(i) for i in range(2,5)] if record.has_key(k)])
+
+def raise_error(message, line):
+    raise osv.osv.except_osv(_('Import error'),
+        'Error in import:%s\n\n%s' % (message, line))
+
+class parser_bncr( models.parser ):
+    
+    '''
+        This adds a new parser in the selection options. 
+        When the account is associated to a parser, the following code makes it appear as an option
+    '''
+    code = 'BNCR-Parser'
+    name = _( 'BNCR Bank statement import' )
+    country_code = 'CR'
+    doc = _('''\
+            This format is available through
+            the National Bank  web interface.
+            ''')
+    
+    '''
+        ** Kwargs parameter is used for a dynamic list of parameters. 
+        The wizard imported extracts used in all parsers and not all parsers have all the necessary information in your file, 
+        so get information from the wizard and passed by the ** kwargs. 
+        Then in the parses that are needed, are extracted from the ** kwargs and if needed, 
+        the parser still works the same way without this parameter.
+        
+        The rest of the methods must receive this parameter. (As the method that parse the header and the lines). 
+        
+        If you need a new parameter, you specify its name and value, using the ** kwargs is a dictionary, 
+        extract its value, with the respective key
+    '''
+
+    def parse(self, cr, statements_file, **kwargs):
+        result = []
+        parser = BNCRParser()
+        stmnt = statement()
+        
+        """
+            **kwargs have all the parameters that have the wizard and 
+            has all the parameters passed from the wizard before calling 
+            the method that parses the file.            
+        """        
+        #try:            
+        #pass to encoding with the correct type of file.
+        data = base64.decodestring(statements_file)        
+    
+        records = parser.parse_stamenent_record(data,**kwargs)
+        
+        stmnt._transmission_number(records)
+        stmnt._account_number(records)
+        stmnt._statement_number(records)
+        stmnt._opening_balance(records)
+        stmnt._closing_balance(records)
+        stmnt._forward_available(records)
+        stmnt._execution_date_transferred_amount (records)
+        stmnt._transaction_new(data)#call the method statement_lines in parser to parse all the lines in file and add to stament.
+                  
+        '''
+        A stament must have a header and transacctions. The method parse_stamenent_record parse the header and the 
+        method _transaction_new parse all the line (transactions) in the file. 
+        '''
+        if stmnt.is_valid():
+            result.append(stmnt)
+                  
+        return result
+        '''
+        except:
+            raise osv.except_osv(_('Error'), _('The file have a invalid extension for this parser.\nThe valid extension are .txt or .csv'))
+        '''
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_banking_cr_bncr/bncr_parser.py'
--- l10n_cr_account_banking_cr_bncr/bncr_parser.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_banking_cr_bncr/bncr_parser.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,274 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+"""
+Parser for Davivienda format files
+"""
+import re
+from datetime import datetime
+from dateutil import parser
+from pprint import PrettyPrinter
+from copy import copy
+
+class BNCRParser( object ):
+    
+    #Define the header for the extract to import.
+    '''
+     ** Kwargs parameter is used for a dynamic list of parameters. 
+        The wizard imported extracts used in all parsers and not all parsers have all the necessary information in your file, 
+        so get information from the wizard and passed by the ** kwargs. 
+        Then in the parses that are needed, are extracted from the ** kwargs and if needed, 
+        the parser still works the same way without this parameter.
+        
+        The rest of the methods must receive this parameter. (As the method that parse the header and the lines). 
+        
+        If you need a new parameter, you specify its name and value, using the ** kwargs is a dictionary, 
+        extract its value, with the respective key
+    '''
+    def statement_record ( self, rec, **kwargs):
+        lines = []
+        line_dict = {}
+        startingbalance = 0.0
+
+        line_dict = {
+            'transref': '', # _transmission_number
+            'account_number': '', #_account_number
+            'statementnr':'', # statement_number
+            'startingbalance': 0.0, #_opening_balance
+            'currencycode': '', #currencycode
+            'endingbalance': 0.0, #_closing_balance
+            'bookingdate': '', #moving_date
+            'ammount': 0.0,
+            'id': '',
+        }
+        #Split the file in statements
+        list_split = rec.split('\n')        
+       
+        #currency_code (local_currency in the stament) extracted from account_number object from the wizard.
+        #account_number (local_account) extracted from account_number object from the wizard.
+        #date_to_str and date_from_str are the dates in wizard, both are strings
+        
+        line_dict['account_number'] = kwargs['account_number']
+        
+        line_dict['currencycode'] = kwargs['local_currency']
+        
+        line_dict['statementnr'] = kwargs['date_from_str'] + ' - '+ kwargs['date_to_str'] + ' Extracto BNCR ' + line_dict['account_number'] #Interval time of the file.
+        
+        #transmission_number (Date when done the import)
+        date_obj= datetime.now()
+        line_dict['transref'] = date_obj.strftime("%d-%m-%Y %H:%M:%S")
+        #bookingdate
+        line_dict['bookingdate'] = date_obj.strftime("%d-%m-%Y %H:%M:%S")
+        
+        '''
+            For the BNCR parser, the ending_balance comes from wizard. With total of debit and credit and the ending_balance
+            compute the initial_balance.
+        '''
+        #extract the total of debit and credit from the file. The last statements and compute the startingbalance
+        last_position = (len(list_split) - 1)
+        last_line = list_split[last_position] 
+        #last line can be blanck, find the last line with data.
+        if last_line == "":
+            while True:
+                last_position -= 1
+                last_line = list_split[last_position]
+                if last_line is not "":
+                    break       
+        
+        last_line_split = last_line.split(';')
+        
+        #For another type of format, take the character \t
+        if len(last_line_split) > 1:        
+            final_line_totals =  last_line_split        
+        else:
+            final_line_totals = last_line.split('\t')
+        
+        #######################################################
+        
+        if final_line_totals[3] != '':
+            debit = float(final_line_totals[3].replace(",",""))
+        else:
+            debit = 0.0
+        if final_line_totals[4] != '':
+            credit = float(final_line_totals[4].replace(",",""))
+        else:
+            credit = 0.0        
+        
+        startingbalance = float(kwargs['ending_balance']) + debit - credit 
+        line_dict['startingbalance'] =  str(startingbalance)
+        
+        #the ending_balance extracted from **kwargs (comes from wizard)
+        endingbalance = float(kwargs['ending_balance'])
+        line_dict['endingbalance'] =  str(kwargs['ending_balance'])
+        
+        line_dict['ammount'] = startingbalance + endingbalance
+        line_dict['id'] = kwargs['date_from_str'] + ' - '+ kwargs['date_to_str'] + ' Extracto BNCR ' + line_dict['account_number']
+        
+        return line_dict
+        
+    '''
+    Parse all the lines in the file. Once the header is parser, the next step are the lines.
+    '''     
+    def statement_lines ( self, rec ):
+        parser = BNCRParser()
+        mapping = {
+            'execution_date' : '',
+            'effective_date' : '',
+            'transfer_type' : '',
+            'reference' : '',
+            'message' : '',
+            'name' : '',
+            'transferred_amount': '',
+            'creditmarker': '',
+        }
+        
+        lines = []
+        line_dict = {}
+        currencycode = ''
+        
+        list_split = rec.split('\n')
+        entrada = False
+            
+        start = 1
+        end = (len(list_split) - 1)
+        last_line = list_split[end]
+        #last line can be blanck, find the last line with data.
+        if last_line == "":
+            while True:
+                end -= 1
+                last_line = list_split[end]
+                if last_line is not "":
+                    break
+                    
+        sub_list = list_split [start:end] #The end line is amount totals of credit and debit
+        for sub in sub_list:
+            line = sub.split(';')
+            if len(line) > 1:
+                final_line = line
+            #For another type of format, take the character \t
+            else:
+                final_line = sub.split('\t')
+                
+            #effective_date
+            date_str = final_line[1].replace("/","-")
+            date= datetime.strptime(date_str, "%Y-%m-%d")               
+            mapping['effective_date'] = date #fecha_contable.                        
+            #execution_date
+            mapping['execution_date'] = date #fecha_movimiento
+                                   
+            mapping['transfer_type'] = 'NTRF'
+            mapping['reference'] = final_line[2] #NumDocumento
+            mapping['message'] = final_line[2]+' '+final_line[5] #NumDocumento + Description         
+            mapping['name'] = final_line[2]+' '+final_line[5] #NumDocumento + Description       
+            mapping['id'] = final_line[2]+' '+final_line[5] #NumDocumento + Description     
+            
+            #the field in position 3 is debit, the position 4 is credit
+            if final_line[4] != '':
+                credit = float(final_line[4].replace(",",""))
+                mapping['transferred_amount'] = credit    
+                mapping['creditmarker'] = 'C'
+            
+            elif final_line[3] != '':
+                #In this case, the debit is negative.
+                debit = float(final_line[3].replace(",",""))
+                mapping['transferred_amount'] =  -1 * debit
+           
+            lines.append(copy(mapping))
+                            
+        return lines    
+     
+    """
+    ** Kwargs parameter is used for a dynamic list of parameters. 
+        The wizard imported extracts used in all parsers and not all parsers have all the necessary information in your file, 
+        so get information from the wizard and passed by the ** kwargs. 
+        Then in the parses that are needed, are extracted from the ** kwargs and if needed, 
+        the parser still works the same way without this parameter.
+        
+        The rest of the methods must receive this parameter. (As the method that parse the header and the lines). 
+        
+        If you need a new parameter, you specify its name and value, using the ** kwargs is a dictionary, 
+        extract its value, with the respective key
+    """
+    def parse_stamenent_record( self, rec, **kwargs):
+
+        matchdict = dict()
+        
+        #Set the header for the stament.
+        matchdict = self.statement_record(rec, **kwargs);
+
+        # Remove members set to None
+        matchdict = dict( [( k, v ) for k, v in matchdict.iteritems() if v] )
+
+        matchkeys = set( matchdict.keys() )
+        needstrip = set( [ 'transref', 'account_number', 'statementnr', 'currencycode', 'endingbalance', 'bookingdate'] )
+
+        for field in matchkeys & needstrip:
+            matchdict[field] = matchdict[field].strip()
+
+        # Convert to float. Comma is decimal separator
+        needsfloat = set( ["startingbalance", "endingbalance", "amount"] )
+        for field in matchkeys & needsfloat:
+            matchdict[field] = float( matchdict[field].replace( ',', '.' ) )
+
+        # Convert date fields
+        needdate = set( ["bookingdate"] )
+                
+        for field in matchkeys & needdate:            
+            datestring = matchdict[field]
+            date_obj= datetime.strptime(datestring, "%d-%m-%Y %H:%M:%S")
+            matchdict[field] = date_obj
+        
+        return matchdict
+        
+    def parse( self, cr, data ):
+        records = []
+        # Some records are multiline
+        for line in data:
+            if len(line) <= 1:
+                continue
+            if line[0] == ':' and len(line) > 1:
+                records.append(line)
+            else:
+                records[-1] = '\n'.join([records[-1], line])
+                
+        output = []
+
+        for rec in records:
+            #parse_stament_record call the method that parse the header and the stament of the file.
+            output.append(self.parse_stamenent_record( rec ))
+                
+        return output
+
+def parse_file( filename ):
+    bncrfile = open( filename, "r" )
+    p = BNCRParser().parse( bncrfile.readlines() )
+
+
+def main():
+    """The main function, currently just calls a dummy filename
+
+    :returns: description
+    """
+    parse_file("testfile")
+
+if __name__ == '__main__':
+    main()
+

=== modified file 'l10n_cr_account_banking_cr_davivienda/__openerp__.py'
--- l10n_cr_account_banking_cr_davivienda/__openerp__.py	2013-05-06 01:38:09 +0000
+++ l10n_cr_account_banking_cr_davivienda/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -22,12 +22,19 @@
 
 {
     'name': 'Davivienda Account Banking',
-    'version': '0.5',
+    'version': '0.1',
     'license': 'AGPL-3',
     'author': 'CLEARCORP S.A.',
     'website': 'http://www.clearcorp.co.cr',
+<<<<<<< TREE
     'category': 'Account Banking',
     'depends': ['account_banking','account_parser_type'],
+=======
+    'category': 'Accounting & Finance',
+    'depends': [
+                'account_banking_ccorp',
+                ],
+>>>>>>> MERGE-SOURCE
     'init_xml': [],
     'update_xml': [],
     'demo_xml': [],

=== modified file 'l10n_cr_account_banking_cr_davivienda/davivienda_format.py'
--- l10n_cr_account_banking_cr_davivienda/davivienda_format.py	2013-03-15 20:40:56 +0000
+++ l10n_cr_account_banking_cr_davivienda/davivienda_format.py	2013-12-06 21:45:38 +0000
@@ -20,11 +20,15 @@
 #
 ##############################################################################
 
-from account_banking.parsers import models
-from tools.translate import _
+from account_banking_ccorp.parsers import models
+from openerp.tools.translate import _
 from davivienda_parser import DaviviendaParser
 import re
+<<<<<<< TREE
 from osv import osv, fields
+=======
+from openerp.osv import osv, fields
+>>>>>>> MERGE-SOURCE
 import logging
 import pprint
 from datetime import datetime

=== modified file 'l10n_cr_account_banking_cr_davivienda/davivienda_parser.py'
--- l10n_cr_account_banking_cr_davivienda/davivienda_parser.py	2013-03-15 20:40:56 +0000
+++ l10n_cr_account_banking_cr_davivienda/davivienda_parser.py	2013-12-06 21:45:38 +0000
@@ -27,8 +27,13 @@
 from dateutil import parser
 from pprint import PrettyPrinter
 from copy import copy
+<<<<<<< TREE
 from osv import osv, fields
 from tools.translate import _
+=======
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+>>>>>>> MERGE-SOURCE
 
 class DaviviendaParser( object ):
     
@@ -148,12 +153,16 @@
         #last line can be blanck, find the last line with data.
         if last_line == "":
             while True:
-                end -= 1
                 last_line = list_split[end]
                 if last_line is not "":
                     break
+<<<<<<< TREE
                     
         sub_list = list_split [start:end]
+=======
+                end -= 1
+        sub_list = list_split [start:end+1]
+>>>>>>> MERGE-SOURCE
         for sub in sub_list:
             line = sub.split(';')
             #effective_date

=== removed file 'l10n_cr_account_banking_reports/__init__.py'
--- l10n_cr_account_banking_reports/__init__.py	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account
-from . import wizard
-from . import report

=== removed file 'l10n_cr_account_banking_reports/__openerp__.py'
--- l10n_cr_account_banking_reports/__openerp__.py	2012-11-06 00:40:55 +0000
+++ l10n_cr_account_banking_reports/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Webkit reports for Banking',
-    'description': "",
-    'version': '1.0',
-    'author': 'CLEARCORP S.A.',
-    'category': 'Finance',
-    'website': "http://clearcorp.co.cr",
-    'images': [],
-    'depends': ['account_financial_report_webkit', 'account', 'account_webkit_report_library' ],
-    'init_xml': [],
-    'demo_xml' : [],
-    'update_xml': ['report/report.xml',                   
-                   'wizard/conciliation_bank_wizard.xml',
-                   'report_menus.xml',
-                   ],
-    'test': [],
-    'active': False,
-    'installable': True,
-    'license': 'AGPL-3',
-}

=== removed directory 'l10n_cr_account_banking_reports/i18n'
=== removed file 'l10n_cr_account_banking_reports/i18n/es_CR.po'
--- l10n_cr_account_banking_reports/i18n/es_CR.po	2013-01-17 19:04:40 +0000
+++ l10n_cr_account_banking_reports/i18n/es_CR.po	1970-01-01 00:00:00 +0000
@@ -1,231 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_cr_account_banking_reports
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-11 19:33+0000\n"
-"PO-Revision-Date: 2013-01-11 19:33+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_cr_account_banking_reports
-#: model:ir.actions.report.xml,name:l10n_cr_account_banking_reports.account_report_conciliation_bank_webkit
-msgid "Conciliation Bank Webkit"
-msgstr "Conciliarión Bancaria"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:90
-msgid "- Expenditures to register"
-msgstr "- Egresos por registrar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:145
-msgid "Label"
-msgstr "Detalle"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:135
-msgid "Period"
-msgstr "Período"
-
-#. module: l10n_cr_account_banking_reports
-#: view:conciliation.bank.webkit:0
-msgid "Time Filters"
-msgstr "Filtros de Tiempo"
-
-#. module: l10n_cr_account_banking_reports
-#: help:conciliation.bank.webkit,historic_strict:0
-msgid "If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"
-msgstr "Si está seleccionado, mostrará el histórico de las líneas sin conciliar, tomando en cuenta la fecha final del período o la fecha final seleccionada"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:78
-msgid "Ledger Balance"
-msgstr "Saldo en Libros"
-
-#. module: l10n_cr_account_banking_reports
-#: field:conciliation.bank.webkit,special_period:0
-msgid "Special period"
-msgstr "Período especiales"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:124
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:197
-msgid "Incomes to register"
-msgstr "Ingresos por registrar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:137
-msgid "Journal"
-msgstr "Diario"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:38
-msgid "No Filter"
-msgstr "Sin filtro"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:167
-msgid "-- No partner --"
-msgstr "-- Sin empresa --"
-
-#. module: l10n_cr_account_banking_reports
-#: view:conciliation.bank.webkit:0
-msgid "This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account"
-msgstr "Este reporte permite imprimir o generar un pdf de una conciliación bancaria de la cuenta seleccionada."
-
-#. module: l10n_cr_account_banking_reports
-#: model:ir.model,name:l10n_cr_account_banking_reports.model_conciliation_bank_webkit
-msgid "Conciliation Bank Report"
-msgstr "Reporte de Conciliación de Bancos"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:96
-msgid "Ledger reconciled Total"
-msgstr "Total conciliado en Libros"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:133
-msgid "Date"
-msgstr "Fecha"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:20
-msgid "Chart of Account"
-msgstr "Plan Contable"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:122
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:195
-msgid "Debits to reconcile"
-msgstr "Débitos por conciliar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:41
-msgid "Target Moves"
-msgstr "Movimientos Destino"
-
-#. module: l10n_cr_account_banking_reports
-#: constraint:conciliation.bank.webkit:0
-msgid "When no Fiscal year is selected, you must choose to filter by periods or by date."
-msgstr "Cuando no se selecciona ningún año fiscal, se debe elegir para filtrar por períodos o por fecha."
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:47
-msgid "To:"
-msgstr "Hasta:"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:139
-msgid "Account"
-msgstr "Cuenta"
-
-#. module: l10n_cr_account_banking_reports
-#: view:conciliation.bank.webkit:0
-#: model:ir.actions.act_window,name:l10n_cr_account_banking_reports.action_conciliation_bank_menu_webkit
-#: model:ir.ui.menu,name:l10n_cr_account_banking_reports.menu_conciliation_bank
-msgid "Conciliation Bank"
-msgstr "Conciliación Bancaria"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:120
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:193
-msgid "Credits to reconcile"
-msgstr "Créditos por conciliar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:21
-msgid "Fiscal Year"
-msgstr "Año Fiscal"
-
-#. module: l10n_cr_account_banking_reports
-#: field:conciliation.bank.webkit,historic_strict:0
-msgid "Strict History"
-msgstr "Histórico estricto"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:80
-msgid "Bank Balance"
-msgstr "Saldo en Banco"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:68
-msgid "Balance according Bank"
-msgstr "Saldo según Banco"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:98
-msgid "Bank reconciled Total"
-msgstr "Total conciliado en Banco"
-
-#. module: l10n_cr_account_banking_reports
-#: constraint:conciliation.bank.webkit:0
-msgid "The fiscalyear, periods or chart of account chosen have to belong to the same company."
-msgstr "El año fiscal, períodos o plan contable elegidos deben pertenecer a la misma compañía."
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:126
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:199
-msgid "Expenditures to register"
-msgstr "Egresos por registrar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:143
-msgid "Reference"
-msgstr "Referencia"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:86
-msgid "+ Credits to reconcile"
-msgstr "+ Créditos por conciliar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:92
-msgid "- Debits to reconcile"
-msgstr "- Débitos por conciliar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:147
-msgid "Amount"
-msgstr "Monto"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:24
-msgid "Dates Filter"
-msgstr "Filtro por Fechas"
-
-#. module: l10n_cr_account_banking_reports
-#: help:conciliation.bank.webkit,special_period:0
-msgid "Include special period"
-msgstr "Include special period"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:84
-msgid "+ Incomes to register"
-msgstr "+ Ingresos por registrar"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:141
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:193
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:195
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:197
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:199
-msgid "Total"
-msgstr "Total"
-
-#. module: l10n_cr_account_banking_reports
-#: report:addons/l10n_cr_account_banking_reports/report/conciliation_bank.mako:31
-msgid "Periods Filter"
-msgstr "Filtro por Períodos"
-

=== removed file 'l10n_cr_account_banking_reports/report/__init__.py'
--- l10n_cr_account_banking_reports/report/__init__.py	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/report/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-import conciliation_bank

=== removed file 'l10n_cr_account_banking_reports/report/conciliation_bank.mako'
--- l10n_cr_account_banking_reports/report/conciliation_bank.mako	2013-01-17 19:04:40 +0000
+++ l10n_cr_account_banking_reports/report/conciliation_bank.mako	1970-01-01 00:00:00 +0000
@@ -1,213 +0,0 @@
-<html>
-<head>
-    <style type="text/css">${css}</style>
-</head>
-<body>
-    <%setLang(user.context_lang)%>
-    <%
-        filter_type = ''
-        filter_data = []
-        bank_account = get_bank_account(cr, uid, data)
-    %>
-
-    <div class="header">
-        <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${company.partner_id.name | entity} - ${company.currency_id.name | entity}</div>
-        <div style="font-size: 25px; font-weight: bold; text-align: center;"> Conciliación de Bancos</div>
-        <div style="font-size: 20px; font-weight: bold; text-align: center;"> ${bank_account.name} - ${(bank_account.currency_id and bank_account.currency_id.name) or bank_account.company_id.currency_id.name}</div>
-    </div>
-    <div class="act_as_table data_table" style="margin-top:10px;">
-        <div class="act_as_row labels" style = "font-size: 12px;">
-            <div class="act_as_cell">${_('Chart of Account')}</div>
-            <div class="act_as_cell">${_('Fiscal Year')}</div>
-            <div class="act_as_cell">
-                %if filter_form(data) == 'filter_date':
-                    ${_('Dates Filter')}
-                    <%
-                        filter_data.append(start_date)
-                        filter_data.append(stop_date)
-                        filter_type = 'filter_date'
-                    %>
-                %elif filter_form(data) == 'filter_period':
-                    ${_('Periods Filter')}
-                    <% 
-                        filter_data.append(start_period)
-                        filter_data.append(stop_period)
-                        filter_type = 'filter_period'
-                    %>
-                %else:
-                    ${_('No Filter')}
-                %endif
-            </div>
-            <div class="act_as_cell">${_('Target Moves')}</div>
-        </div>
-        <div class="act_as_row" style = "font-size: 12px;">
-            <div class="act_as_cell">${ chart_account.name }</div>
-            <div class="act_as_cell">${ fiscalyear.name if fiscalyear else '-' }</div>
-            <div class="act_as_cell">
-                ${_('To:')}
-                %if filter_form(data) == 'filter_date':
-                    ${ formatLang(stop_date, date=True) if stop_date else u'' }
-                %elif filter_form(data) == 'filter_period':
-                    ${stop_period.name if stop_period else u'' }
-                %else:
-                    ${''}
-                %endif
-            </div>
-            <div class="act_as_cell">${ display_target_move(data) }</div>
-        </div>
-    </div>
-    
-    <%
-        bank_balance, bank_move_lines, account_is_foreign = get_bank_data(cr, uid, bank_account.id, filter_type, filter_data, fiscalyear, target_move, data['form']['historic_strict'], data['form']['special_period'])
-    %>
-    <div align="center">
-        <div class="act_as_table data_table no_wrap results left" style="margin-top:20px; margin-bottom: 10px; width:500px">
-            <div class="act_as_row">
-                <div class="act_as_cell" style="border-left:0px; border-right:0px; border-top:0px"></div>
-                <div class="act_as_cell" style="column-span:2; -webkit-column-span:2; border-left:0px; border-top:0px"></div>
-                <div class="act_as_cell label">${_('Balance according Bank')}</div>
-                <div class="act_as_cell amount">
-                    %if bank_balance['input_bank_balance'] == bank_balance['bank_balance']:
-                        ${formatLang(input_bank_balance)}
-                    %else:
-                        <span style="color:red; font-weight:bold;">${formatLang(input_bank_balance)}</span>
-                    %endif
-                </div>
-            </div>
-            <div class="act_as_row">
-                <div class="act_as_cell label">${_('Ledger Balance')}</div>
-                <div class="act_as_cell label amount">${formatLang(bank_balance['accounting_balance'])}</div>
-                <div class="act_as_cell label">${_('Bank Balance')}</div>
-                <div class="act_as_cell label amount">${formatLang(bank_balance['bank_balance'])}</div>
-            </div>
-            <div class="act_as_row">
-                <div class="act_as_cell">${_('+ Incomes to register')}</div>
-                <div class="act_as_cell amount">${formatLang(bank_balance['incomes_to_register'])}</div>
-                <div class="act_as_cell">${_('+ Credits to reconcile')}</div>
-                <div class="act_as_cell amount">${formatLang(bank_balance['credits_to_reconcile'])}</div>
-            </div>
-            <div class="act_as_row">
-                <div class="act_as_cell">${_('- Expenditures to register')}</div>
-                <div class="act_as_cell amount">${formatLang(bank_balance['expenditures_to_register'])}</div>
-                <div class="act_as_cell">${_('- Debits to reconcile')}</div>
-                <div class="act_as_cell amount">${formatLang(bank_balance['debits_to_reconcile'])}</div>
-            </div>
-            <div class="act_as_row">
-                <div class="act_as_cell label">${_('Ledger reconciled Total')}</div>
-                <div class="act_as_cell label amount">${formatLang(bank_balance['accounting_total'])}</div>
-                <div class="act_as_cell label">${_('Bank reconciled Total')}</div>
-                <div class="act_as_cell label amount">${formatLang(bank_balance['bank_total'])}</div>
-            </div>
-        </div>
-    </div>
-
-    <%
-        def cmp (first, second):
-            list_ = [
-                'incomes_to_register',
-                'expenditures_to_register',
-                'credits_to_reconcile',
-                'debits_to_reconcile',
-            ]
-            first_index = len(first) > 0 and first[0] in list_ and list_.index(first[0]) or -1
-            second_index = len(second) > 0 and second[0] in list_ and list_.index(second[0]) or -1
-            
-            return first_index - second_index
-    %>
-    %for line_group_key, line_group in sorted(bank_move_lines.items(),cmp):
-        <div class="account_title bg" style="width: 100%; margin-top: 15px; font-size: 12px;">
-            %if line_group_key == 'credits_to_reconcile':
-                ${_('Credits to reconcile')}
-            %elif line_group_key == 'debits_to_reconcile':
-                ${_('Debits to reconcile')}
-            %elif line_group_key == 'incomes_to_register':
-                ${_('Incomes to register')}
-            %else:
-                ${_('Expenditures to register')}
-            %endif
-        </div>
-        <div class="act_as_table list_table" style="margin-top: 5px;">
-            <div class="act_as_thead">
-                <div class="act_as_row labels no_wrap">
-                    ## date
-                    <div class="act_as_cell first_column">${_('Date')}</div>
-                    ## period
-                    <div class="act_as_cell">${_('Period')}</div>
-                    ## journal
-                    <div class="act_as_cell">${_('Journal')}</div>
-                    ## Account
-                    <div class="act_as_cell">${_('Account')}</div>
-                    ## Partner
-                    <div class="act_as_cell" style="width: 40%;">${_('Partner')}</div>
-                    ## Reference
-                    <div class="act_as_cell" style="width: 20%;">${_('Reference')}</div>
-                    ## label
-                    <div class="act_as_cell" style="width: 40%;">${_('Label')}</div>
-                     ## Amount
-                    <div class="act_as_cell last_column amount">${_('Amount')}</div>
-                </div>
-            </div>
-            <div class="act_as_tbody">\
-                %for line in line_group:
-                    <div class="act_as_row lines">
-                        ## date
-                        <div class="act_as_cell first_column no_wrap">${formatLang(line.date, date=True)}</div>
-                        ## period
-                        <div class="act_as_cell no_wrap">${line.period_id.code}</div>
-                        ## journal
-                        <div class="act_as_cell no_wrap">${line.journal_id.code}</div>
-                        ## Account
-                        <div class="act_as_cell no_wrap">${line.account_id.code}</div>
-                        ## Partner
-                        <div class="act_as_cell">
-                            %if line.partner_id:
-                                ${(line.partner_id.ref and line.partner_id.ref + ' ') or ''}
-                                ${(line.partner_id.name and line.partner_id.name) or ''}
-                            %else:
-                                ${_('-- No partner --')}
-                            %endif
-                        </div>
-                        ## Reference
-                        <div class="act_as_cell">${line.ref}</div>
-                        ## label
-                        <div class="act_as_cell">${line.name}</div>
-                        ## Amount
-                        <div class="act_as_cell last_column amount">
-                            %if account_is_foreign:
-                                ${formatLang(line.amount_currency)}
-                            %elif line.debit > 0:
-                                ${formatLang(line.debit)}
-                            %else:
-                                ${formatLang(line.credit)}
-                            %endif
-                        </div>
-                    </div>
-                %endfor
-            </div>
-        </div>
-        <div class="act_as_table list_table" style="margin-top:5px;">
-            <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
-                ## label
-                <div class="act_as_cell" style="width: 880px;">
-                    %if line_group_key == 'credits_to_reconcile':
-                        ${_("Total")} ${_('Credits to reconcile')}
-                    %elif line_group_key == 'debits_to_reconcile':
-                        ${_("Total")} ${_('Debits to reconcile')}
-                    %elif line_group_key == 'incomes_to_register':
-                        ${_("Total")} ${_('Incomes to register')}
-                    %else:
-                        ${_("Total")} ${_('Expenditures to register')}
-                    %endif
-                </div>
-                <div class="act_as_cell amount" style="width: 200px;">
-                    %if account_is_foreign:
-                        ${bank_account.currency_id.symbol} ${formatLang(bank_balance[line_group_key])}
-                    %else:
-                        ${company.currency_id.symbol} ${formatLang(bank_balance[line_group_key])}
-                    %endif
-                </div>
-            </div>
-        </div>
-    %endfor
-</body>
-</html>

=== renamed file 'l10n_cr_account_banking_reports/report/conciliation_bank.py' => 'l10n_cr_account_banking_reports/report/conciliation_bank.py.THIS'
=== removed file 'l10n_cr_account_banking_reports/report/report.xml'
--- l10n_cr_account_banking_reports/report/report.xml	2012-09-05 20:46:51 +0000
+++ l10n_cr_account_banking_reports/report/report.xml	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>            
-         
-         <record id="l10n_cr_account_banking_reports.account_report_conciliation_bank_webkit" model="ir.actions.report.xml">
-             <field name="report_type">webkit</field>
-             <field name="report_name">account_financial_report_webkit.account.account_report_conciliation_bank_webkit</field>
-             <field eval="[(6,0,[])]" name="groups_id"/>
-             <field eval="0" name="multi"/>
-             <field eval="0" name="auto"/>
-             <field eval="1" name="header"/>
-             <field name="model">account.account</field>
-             <field name="type">ir.actions.report.xml</field>
-             <field name="name">Conciliation Bank Webkit</field>
-             <field name="report_rml">l10n_cr_account_banking_reports/report/conciliation_bank.mako</field>
-             <field name="report_file">l10n_cr_account_banking_reports/report/conciliation_bank.mako</field>
-         </record>
-       
-    </data>
-</openerp>

=== removed file 'l10n_cr_account_banking_reports/report_menus.xml'
--- l10n_cr_account_banking_reports/report_menus.xml	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/report_menus.xml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        
-        <menuitem icon="STOCK_PRINT" name="Conciliation Bank"
-            parent="account.next_id_22" action="action_conciliation_bank_menu_webkit"
-            groups="account.group_account_manager,account.group_account_user" id="menu_conciliation_bank"/>
-        
-    </data>
-</openerp>

=== removed file 'l10n_cr_account_banking_reports/wizard/__init__.py'
--- l10n_cr_account_banking_reports/wizard/__init__.py	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/wizard/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import conciliation_bank_wizard

=== removed file 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py'
--- l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py	2013-01-17 19:04:40 +0000
+++ l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.py	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Addons modules by CLEARCORP S.A.
-#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from osv import fields, osv
-
-class l10n_cr_ConciliationBankWizard(osv.osv_memory):
-
-    _inherit = "partners.ledger.webkit"
-    _name = "conciliation.bank.webkit"
-    _description = "Conciliation Bank Report"
-    
-    _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),
-        'historic_strict': fields.boolean('Strict History', help="If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"),
-        'special_period': fields.boolean('Special period', help="Include special period"),
-    }
-    
-    _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:
-            context = {}
-        # will be used to attach the report on the main account
-        data['ids'] = [data['form']['chart_account_id']]        
-        vals = self.read(cr, uid, ids,
-                         ['bank_account_ids', 'bank_balance','historic_strict', 'special_period'],
-                         context=context)[0]
-        data['form'].update(vals)
-        return data
-
-    def _print_report(self, cursor, uid, ids, data, context=None):
-        context = context or {}
-        # we update form with display account value
-        data = self.pre_print_report(cursor, uid, ids, data, context=context)
-        return {'type': 'ir.actions.report.xml',
-                'report_name': 'account_financial_report_webkit.account.account_report_conciliation_bank_webkit',
-                'datas': data}
\ No newline at end of file

=== renamed file 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml' => 'l10n_cr_account_banking_reports/wizard/conciliation_bank_wizard.xml.THIS'
=== removed file 'l10n_cr_account_banking_reports/wizard/wizard.xml'
--- l10n_cr_account_banking_reports/wizard/wizard.xml	2012-07-18 22:46:28 +0000
+++ l10n_cr_account_banking_reports/wizard/wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data> </data>
-</openerp>

=== added directory 'l10n_cr_account_conciliation_bank_report'
=== added file 'l10n_cr_account_conciliation_bank_report/__init__.py'
--- l10n_cr_account_conciliation_bank_report/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import l10n_cr_account_conciliation_bank_report
+import wizard
+import report

=== added file 'l10n_cr_account_conciliation_bank_report/__openerp__.py'
--- l10n_cr_account_conciliation_bank_report/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Conciliation Bank Report Webkit',
+    'description': """Install the Conciliation Bank Report.
+        Configuration:
+        1. Configure type account that it will appear in wizard. This configuration is in Accounting -> Account -> Account Types and check
+        "Include in conciliation bank report" option.
+        
+        2. With previous configuration, accounts that will appears in wizard to generate report will be parents of account that match with type selected in 
+        previous configuration.
+        
+        3. With this configuration, Conciliation Bank Report has configuration for accounts that it will be necesary, that is reconciled and transit account.
+    """,
+    'version': '1.0',
+    'author': 'CLEARCORP S.A.',
+    'category': 'Finance',
+    'website': "http://clearcorp.co.cr",
+    'images': [],
+    'depends': [
+                'account', 
+                'account_report_lib', 
+                'account_report_signatures', ],
+                
+    'init_xml': [],
+    'demo_xml' : [],
+    'update_xml': [
+                   'report/report.xml',                   
+                   'wizard/l10n_cr_account_conciliation_bank_report_wizard.xml',
+                   'l10n_cr_account_conciliation_bank_report.xml',
+                   'report_menus.xml',
+                   ],
+    'test': [],
+    'active': False,
+    'installable': True,
+    'license': 'AGPL-3',
+}

=== added directory 'l10n_cr_account_conciliation_bank_report/i18n'
=== added file 'l10n_cr_account_conciliation_bank_report/i18n/es_CR.po'
--- l10n_cr_account_conciliation_bank_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/i18n/es_CR.po	2013-12-06 21:45:38 +0000
@@ -0,0 +1,396 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_cr_account_conciliation_bank_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-12 14:35+0000\n"
+"PO-Revision-Date: 2013-08-12 14:35+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: code:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py:198
+#, python-format
+msgid "Reconciled account does not exist. Check your configuration!"
+msgstr "Cuenta de conciliación no existe. Revise su configuración!"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:85
+msgid "- Expenditures to register"
+msgstr "- Egresos por registrar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:conciliation.bank.report.wiz,amount_currency:0
+msgid "It adds the currency column on report if the currency differs from the company currency."
+msgstr "Añade una columna de moneda en el reporte si la moneda es diferente de la moneda de la compañía."
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: code:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py:201
+#, python-format
+msgid "Transit account does not exist. Check your configuration!"
+msgstr "Cuenta de tránsito de bancos no existe. Revise su configuración!"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,period_from:0
+msgid "Start Period"
+msgstr "Período Inicial"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:32
+msgid "Periods Filter"
+msgstr "Filtro por períodos"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:133
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "This report allows you to print or generate a pdf of your conciliation bank with details of all your payable/receivable account"
+msgstr "Este informe le permite imprimir o generar un pdf de su conciliación bancaria con los detalles de todas sus cuentas por pagar / por cobrar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: model:ir.model,name:l10n_cr_account_conciliation_bank_report.model_account_account_type
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:conciliation.bank.report.wiz,historic_strict:0
+msgid "If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"
+msgstr "Si se selecciona, se mostrarán las líneas sin conciliar históricas, teniendo en cuenta el final del período o la fecha seleccionada"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "{'required':[('filter', '=', 'filter_period')]}"
+msgstr "{'required':[('filter', '=', 'filter_period')]}"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: code:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py:198
+#: code:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py:201
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:73
+msgid "Ledger Balance"
+msgstr "Saldo en Libros"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:account.account.type,include_profit_statement_report:0
+msgid "Include in Profit Statement Report"
+msgstr "Incluir en el Reporte de Estados de Resultados"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:121
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:183
+msgid "Incomes to register"
+msgstr "Ingresos por registrar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,amount_currency:0
+msgid "With Currency"
+msgstr "Con moneda"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:154
+msgid "-- No partner --"
+msgstr "-- Sin empresa --"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:19
+#: model:ir.actions.act_window,name:l10n_cr_account_conciliation_bank_report.action_conciliation_bank_report_menu_webkit
+#: model:ir.actions.report.xml,name:l10n_cr_account_conciliation_bank_report.conciliation_bank_report_webkit
+msgid "Conciliation Bank Report"
+msgstr "Reporte de Conciliación Bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "{'invisible': True, 'required': False}"
+msgstr "{'invisible': True, 'required': False}"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:91
+msgid "Ledger reconciled Total"
+msgstr "Total conciliado en Libros"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:132
+#: selection:conciliation.bank.report.wiz,filter:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,chart_account_id:0
+msgid "Chart of Account"
+msgstr "Catálogo de cuentas"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:119
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:181
+msgid "Debits to reconcile"
+msgstr "Débitos por conciliar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+#: field:conciliation.bank.report.wiz,journal_ids:0
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:46
+#: field:conciliation.bank.report.wiz,target_move:0
+msgid "Target Moves"
+msgstr "Movimientos destino"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:conciliation.bank.report.wiz,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr "Seleccione el catálogo contable"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:38
+msgid "To:"
+msgstr "Hasta:"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:135
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+#: model:ir.ui.menu,name:l10n_cr_account_conciliation_bank_report.menu_conciliation_bank
+msgid "Conciliation Bank"
+msgstr "Conciliación Bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:117
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:179
+msgid "Credits to reconcile"
+msgstr "Créditos por conciliar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "{'invisible': True}"
+msgstr "{'invisible': True}"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: selection:conciliation.bank.report.wiz,target_move:0
+msgid "All Posted Entries"
+msgstr "Todos los apuntes publicados"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "{'required': [('filter', '=', 'filter_date')]}"
+msgstr "{'required': [('filter', '=', 'filter_date')]}"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,account_ids:0
+msgid "Bank Account"
+msgstr "Cuenta bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "{'required': True}"
+msgstr "{'required': True}"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:conciliation.bank.report.wiz,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr "Mantega vacío para todos los años fiscales abiertos"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,period_to:0
+msgid "End Period"
+msgstr "Período final"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:139
+msgid "Amount"
+msgstr "Monto"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "True"
+msgstr "True"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,historic_strict:0
+msgid "Strict History"
+msgstr "Histórico estricto"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:75
+#: field:conciliation.bank.report.wiz,bank_balance:0
+msgid "Bank Balance"
+msgstr "Balance en Bancos"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:215
+msgid "Authorized by: "
+msgstr "Autorizado por: "
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: model:ir.model,name:l10n_cr_account_conciliation_bank_report.model_conciliation_bank_report_wiz
+msgid "Conciliation Bank Report Wizard"
+msgstr "Asistente del repote de Conciliación Bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:138
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:61
+msgid "Balance according Bank"
+msgstr "Saldo según Banco"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:account.account.type,include_profit_statement_report:0
+msgid "If it's checked, the account that have this type is include in Profit Statement Report Wizard as Base Account to compare."
+msgstr "Si está marcado, la cuenta que tenga este tipo es incluída en el asistente del Reporte de Estado de REsultados como cuenta base para comparar."
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:account.account.type:0
+msgid "Configuration for Conciliation Bank Report"
+msgstr "Configuración para el Reporte de Conciliación Bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:27
+#: field:conciliation.bank.report.wiz,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Año fiscal"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:93
+msgid "Bank reconciled Total"
+msgstr "Total conciliado en Banco"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:account.account.type,include_conciliation_report:0
+msgid "If it's checked, the account that have this type is include in Conciliation Bank Report Wizard"
+msgstr "Si está chequeado, la cuenta que tenga este tipo es incluído en el asistente para el Reporte de Conciliación Bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:123
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:185
+msgid "Expenditures to register"
+msgstr "Egresos por registrar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,special_period:0
+msgid "Special period"
+msgstr "Período especial"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:137
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:account.account.type,include_conciliation_report:0
+msgid "Include in conciliation bank report"
+msgstr "Incluir en el reporte de conciliación bancaria"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,filter:0
+msgid "Filter by"
+msgstr "Filtrado por"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:81
+msgid "+ Credits to reconcile"
+msgstr "+ Créditos por conciliar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:87
+msgid "- Debits to reconcile"
+msgstr "- Débitos por conciliar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,account_base_report:0
+msgid "Account Base Report"
+msgstr "Cuenta Base de comparación"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:30
+msgid "Dates Filter"
+msgstr "Filtro por Fechas"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: help:conciliation.bank.report.wiz,special_period:0
+msgid "Include special period"
+msgstr "Incluir períodos especiales"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:79
+msgid "+ Incomes to register"
+msgstr "+ Ingresos por registrar"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: selection:conciliation.bank.report.wiz,filter:0
+msgid "Periods"
+msgstr "Períodos"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:34
+msgid "No filters"
+msgstr "Sin filtros"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:136
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: field:conciliation.bank.report.wiz,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:179
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:181
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:183
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:185
+msgid "Total"
+msgstr "Total"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: view:conciliation.bank.report.wiz:0
+msgid "Account Financial Report"
+msgstr "Reporte Financiero"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: report:addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako:134
+msgid "Journal"
+msgstr "Diario"
+
+#. module: l10n_cr_account_conciliation_bank_report
+#: selection:conciliation.bank.report.wiz,target_move:0
+msgid "All Entries"
+msgstr "Todos los apuntes"
+

=== added file 'l10n_cr_account_conciliation_bank_report/l10n_cr_account_conciliation_bank_report.py'
--- l10n_cr_account_conciliation_bank_report/l10n_cr_account_conciliation_bank_report.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/l10n_cr_account_conciliation_bank_report.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, orm, osv
+from tools.translate import _
+
+class acccountAccounttypeConciliationbank(orm.Model):
+    """
+        This class extend functions of account.account.type
+        
+        If include_conciliation_report is checked, all parent accounts that child account have some account type with include_conciliation_report in True,
+        they will appear in Conciliation Bank Wizard as a option account for print the report.
+        
+    """  
+    _name = "account.account.type"
+    _inherit = "account.account.type"
+    
+    _columns = {
+        'include_conciliation_report': fields.boolean('Include in conciliation bank report', help="If it's checked, the account that have this type is include in Conciliation Bank Report Wizard")
+    }
\ No newline at end of file

=== added file 'l10n_cr_account_conciliation_bank_report/l10n_cr_account_conciliation_bank_report.xml'
--- l10n_cr_account_conciliation_bank_report/l10n_cr_account_conciliation_bank_report.xml	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/l10n_cr_account_conciliation_bank_report.xml	2013-12-06 21:45:38 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Account Type -->
+        <record id="view_account_type_form_inherit" model="ir.ui.view">
+            <field name="name">account.account.type.form.inherit</field>
+            <field name="model">account.account.type</field>
+            <field name="inherit_id" ref="account.view_account_type_form"/>
+            <field name="arch" type="xml">
+                <field name="note" position="after"> 
+                    <group col="4" string="Configuration for Conciliation Bank Report">
+                        <field name="include_conciliation_report"/>                    
+                   </group>
+                </field>
+           </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'l10n_cr_account_conciliation_bank_report/report'
=== added file 'l10n_cr_account_conciliation_bank_report/report/__init__.py'
--- l10n_cr_account_conciliation_bank_report/report/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/report/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import l10n_cr_account_conciliation_bank_report

=== added file 'l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako'
--- l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako	2013-12-06 21:45:38 +0000
@@ -0,0 +1,237 @@
+<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <link rel='stylesheet' href='addons/account_webkit_report_library/webkit_headers/main.css' />
+        <style>
+            ${css}
+        </style>
+    </head>
+    <body>
+        <%setLang(user.lang)%>
+        <%
+            bank_account = get_accounts_ids(cr, uid, data)
+        %>
+        <div class="table header">
+            <div class="table-row">
+                <div class="table-cell logo">${helper.embed_logo_by_name('default_logo', height=60)|n}</div>
+                <div class="table-cell text">
+                    <p class="company">${get_fiscal_year(data).company_id.name}</p>
+                    <p class="title">${_('Conciliation Bank Report')}</p>
+                    <p class="subtitle">${bank_account.name} - ${(bank_account.currency_id and bank_account.currency_id.name) or bank_account.company_id.currency_id.name}</p>
+                </div>
+            </div>
+        </div>  
+        <div class="table list">
+            <div class="table-header">
+                <div class="table-row labels no-wrap">
+                    <div class="table-cell" style="width: 100px">${_('Fiscal Year')}<br/>${get_fiscal_year(data).name}</div>
+                    <div class="table-cell" style="width: 100px">
+                        %if get_filter(data) == 'filter_date':
+                            ${_('Dates Filter')}
+                        %elif get_filter(data) == 'filter_period':
+                            ${_('Periods Filter')}
+                        %else:
+                            ${_('No filters')}
+                        %endif
+                    <br/>
+                    %if get_filter(data) != 'filter_no':
+                        ${_('To:')}
+                        %if get_filter(data) == 'filter_date':
+                            ${ formatLang(get_date_to(data), date=True)}
+                        %else:
+                            ${get_end_period(data).name}
+                        %endif
+                    %endif
+                    </div>
+                    <div class="table-cell" style="width: 100px">${_('Target Moves')}<br/>${ display_target_move(data) }</div>
+                </div>
+            </div>          
+        </div>
+        <br/><br/>
+        <%
+            account_id = get_accounts_ids(cr, uid, data).id        
+            bank_balance, bank_move_lines, account_is_foreign = get_data(cr, uid, data, account_id)
+            input_bank_balance = get_bank_balance(data) or 0.0
+        %>
+        <div align="center">
+            <div class="table result">
+                <div class="table-row blank no-wrap">
+                   <div class="table-cell" style="width: 70px">&nbsp;</div>
+                   <div class="table-cell" style="width: 70px">&nbsp;</div>
+                   <div class="table-cell" style="width: 70px">${_('Balance according Bank')}</div>                   
+                   %if input_bank_balance == bank_balance['bank_balance']:
+                        <div class="act_as_cell amount">
+                            ${formatLang(input_bank_balance)}           
+                        </div>                     
+                    %else:
+                    <div class="act_as_cell amount alert">
+                        ${formatLang(input_bank_balance)}
+                    </div>
+                    %endif
+                </div>
+                <div class="table-row labels no-wrap">
+                    <div class="table-cell">${_('Ledger Balance')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['accounting_balance'])}</div>
+                    <div class="table-cell">${_('Bank Balance')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['bank_balance'])}</div>
+                </div>
+                <div class="table-row blank no-wrap">
+                    <div class="table-cell">${_('+ Incomes to register')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['incomes_to_register'])}</div>
+                    <div class="table-cell">${_('+ Credits to reconcile')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['credits_to_reconcile'])}</div>
+                </div>
+                <div class="table-row blank no-wrap">
+                    <div class="table-cell">${_('- Expenditures to register')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['expenditures_to_register'])}</div>
+                    <div class="table-cell">${_('- Debits to reconcile')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['debits_to_reconcile'])}</div>
+                </div>
+                <div class="table-row labels no-wrap">
+                    <div class="table-cell">${_('Ledger reconciled Total')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['accounting_total'])}</div>
+                    <div class="table-cell">${_('Bank reconciled Total')}</div>
+                    <div class="table-cell amount">${formatLang(bank_balance['bank_total'])}</div>
+                </div>
+            </div>  
+        </div>        
+        <%
+            def cmp (first, second):
+                list_ = [
+                    'incomes_to_register',
+                    'expenditures_to_register',
+                    'credits_to_reconcile',
+                    'debits_to_reconcile',
+                ]
+                first_index = len(first) > 0 and first[0] in list_ and list_.index(first[0]) or -1
+                second_index = len(second) > 0 and second[0] in list_ and list_.index(second[0]) or -1
+                
+                return first_index - second_index
+        %>        
+        %for line_group_key, line_group in sorted(bank_move_lines.items(),cmp):
+            <br/><br/>
+            <div class="table header">
+                <div class="table-row">
+                   <div class="table-cell text">                                       
+                       %if line_group_key == 'credits_to_reconcile':
+                            <p class="subtitle">${_('Credits to reconcile')}</p>
+                       %elif line_group_key == 'debits_to_reconcile':
+                            <p class="subtitle">${_('Debits to reconcile')}</p>
+                       %elif line_group_key == 'incomes_to_register':
+                            <p class="subtitle">${_('Incomes to register')}</p>
+                       %else:
+                           <p class="subtitle">${_('Expenditures to register')}</p>
+                       %endif
+                   </div>        
+                </div>
+            </div>
+            <br/><br/>
+            <div class="table list">    
+                 <div class="table-header">
+                    <div class="table-row labels no-wrap">                       
+                        <div class="table-cell first-column" style="width: 55px">${_('Date')}</div>
+                        <div class="table-cell" style="width: 70px">${_('Period')}</div>
+                        <div class="table-cell" style="width: 70px">${_('Journal')}</div>
+                        <div class="table-cell" style="width: 100px">${_('Account')}</div>                    
+                        <div class="table-cell" style="width: 100px">${_('Partner')}</div>
+                        <div class="table-cell" style="width: 70px">${_('Reference')}</div>
+                        <div class="table-cell" style="width: 100px">${_('Label')}</div>
+                        <div class="table-cell last_column" style="width: 70px">${_('Amount')}</div>
+                    </div>
+                </div> 
+                <div class="table-body"> 
+                    %for line in line_group:
+                        <div class="table-row ${row_even and 'even' or 'odd'}">
+                            <div class="table-cell first-column">${formatLang(line.date, date=True)}</div>
+                            <div class="table-cell">${line.period_id.code or ''}</div>
+                            <div class="table-cell">${line.journal_id.code or ''}</div>                                    
+                            <div class="table-cell">${line.account_id.code}</div>    
+                            <div class="table-cell">
+                                %if line.partner_id:
+                                    ${(line.partner_id.ref and line.partner_id.ref + ' ') or ''}
+                                    ${(line.partner_id.name and line.partner_id.name) or ''}
+                                %else:
+                                    ${_('-- No partner --')}
+                                %endif
+                            </div>
+                            <div class="table-cell">${line.ref or ''}</div>
+                            <div class="table-cell">${line.name}</div>    
+                            <div class="act_as_cell last_column amount">
+                                %if account_is_foreign:
+                                    ${formatLang(line.amount_currency)}
+                                %elif line.debit > 0:
+                                    ${formatLang(line.debit)}
+                                %else:
+                                    ${formatLang(line.credit)}
+                                %endif
+                            </div>
+                        </div>
+                    %endfor                 
+                </div>               
+            </div>
+            <div class="table-row spacer">
+                <div class="table-cell">&nbsp;</div>
+           </div>
+            <div class="table list">           
+               <div class="table-row subtotal">                     
+                    <div class="table-cell first-column" style="width: 300px">
+                       %if line_group_key == 'credits_to_reconcile':
+                            ${_("Total")}&nbsp;${_('Credits to reconcile')}
+                       %elif line_group_key == 'debits_to_reconcile':
+                            ${_("Total")}&nbsp;${_('Debits to reconcile')}
+                       %elif line_group_key == 'incomes_to_register':
+                            ${_("Total")}&nbsp;${_('Incomes to register')}
+                       %else:
+                            ${_("Total")}&nbsp;${_('Expenditures to register')}
+                       %endif
+                   </div>
+                   <div class="table-cell" style="width: 70px">&nbsp;</div>
+                   <div class="table-cell" style="width: 70px">&nbsp;</div>
+                   <div class="table-cell" style="width: 100px">&nbsp;</div>                    
+                   <div class="table-cell" style="width: 100px">&nbsp;</div>
+                   <div class="table-cell" style="width: 70px">&nbsp;</div>
+                   <div class="table-cell" style="width: 100px">&nbsp;</div>
+                   <div class="table-cell last_column amount" style="width: 70px">
+                        %if account_is_foreign:
+                            ${bank_account.currency_id.symbol}&nbsp;${formatLang(bank_balance[line_group_key]) or 0.0}
+                        %else:
+                            ${company.currency_id.symbol}&nbsp;${formatLang(bank_balance[line_group_key]) or 0.0}
+                        %endif                   
+                   </div>                
+                </div>
+            </div>
+         %endfor
+         <div class="table-row spacer">
+            <div class="table-cell">&nbsp;</div>
+         </div>
+         <% 
+           signatures = get_signatures_report(cr, uid, 'Conciliation Bank Report')
+           cont = 0
+         %>
+         %if len(signatures) > 0:
+            <div class="table header">
+                <div class="table-row">
+                    <div class="table-cell text">
+                        <p class="title">${_('Authorized by: ')}</p>
+                    </div>
+                </div>
+           </div>
+           <br/><br/>
+           <div class="table header">
+                <div class="table-row">
+                    <div class="table-cell text">
+                    %for user_sign in signatures:
+                        <div class="table-cell text">_________________________________________________________<br/>
+                                                        <p class="subtitle">${user_sign.name}</p>
+                                                        <p class="company"><i>${user_sign.job_id.name or ''}</i></p>
+                        </div>
+                        <br/><br/><br/>
+                    </div>
+                    %endfor                
+                </div>
+            </div>
+        %endif
+        <p style="page-break-after:always"></p>
+    </body>
+</html>
+

=== added file 'l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py'
--- l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,412 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import pooler
+from report import report_sxw
+from tools.translate import _
+from openerp.osv import fields, osv
+
+from openerp.addons.account_report_lib.account_report_base import accountReportbase
+
+class conciliationBankreport(accountReportbase):
+    
+    def __init__(self, cursor, uid, name, context):
+        #change uid by 1, because 1 is the id for the admin user
+        #problems with partner read.
+        super(conciliationBankreport, self).__init__(cursor, 1, name, context=context)
+        self.pool = pooler.get_pool(self.cr.dbname)
+        self.cursor = self.cr
+        
+        self.localcontext.update({
+            'time': time,
+            'cr' : cursor,
+            'uid': uid,
+            'get_bank_balance': self.get_bank_balance,
+            'get_amount': self.get_amount,
+            'get_data': self.get_data,
+        })
+   
+    #Extract bank_balance from wizard.
+    def get_bank_balance(self, data):
+        return self._get_form_param('bank_balance', data)
+    
+    def get_amount(self,cr, uid, account_move_line, currency):
+        account_obj = self.pool.get('account.account').browse(cr,uid,account_move_line.account_id.id)
+        
+        obj_invoice = self.pool.get('account.invoice')
+        invoice_search = obj_invoice.search(cr,uid,[('move_id','=',account_move_line.move_id.id)])
+        invoice = None
+        
+        if invoice_search != []:
+            invoice = obj_invoice.browse(cr,uid,invoice_search[0])
+        
+        obj_voucher = self.pool.get('account.voucher')
+        voucher_search = obj_voucher.search(cr,uid,[('move_id','=',account_move_line.move_id.id)])
+        
+        voucher = None
+        if voucher_search != []:
+            voucher = obj_voucher.browse(cr,uid,voucher_search[0])
+            
+        res = ('none', 0.0, 0.0)
+
+        amount = 0.0
+        
+        if currency != False:
+            amount = account_move_line.amount_currency
+        else:
+            if account_move_line.debit != 0.0 :
+                amount = account_move_line.debit
+            elif account_move_line.credit != 0.0 :
+                amount = account_move_line.credit * -1
+
+        # Invoices
+        if invoice:
+            if invoice.type == 'out_invoice': # Customer Invoice 
+                res = ('invoice', amount)
+            elif invoice.type == 'in_invoice': # Supplier Invoice
+                res = ('invoice', amount)
+            elif invoice.type == 'in_refund': # Debit Note
+                res = ('debit', amount)
+            elif invoice.type == 'out_refund': # Credit Note
+                res = ('credit', amount)
+        # Vouchers
+        elif voucher:
+            if voucher.type == 'payment': # Payment
+                res = ('payment', amount)
+            elif voucher.type == 'sale': # Invoice
+                res = ('invoice', amount)
+            elif voucher.type == 'receipt': # Payment
+                res = ('payment', amount)
+        # Debit o Credit
+        else:
+            if amount > 0.0:
+                res = ('debit', amount)
+            else:
+                res = ('credit', amount)
+                
+        
+        if res[1] == None or (currency != None and res[1] == 0.0):
+            secundary_amount = (account_move_line.debit != 0.0) and account_move_line.debit or account_move_line.credit
+            res = (res[0], 0.0, secundary_amount)
+        else:
+            res = (res[0], res[1], None)
+
+        return res
+
+    def get_data(self, cr, uid, data, parent_account_id, context=None):
+        result_bank_balance = {}
+        result_move_lines = []
+        filters = {}
+        account_foreign = False
+        filter_data = []
+        reconciled_account = None
+        transit_accounts = []
+        transit_account_ids = []
+        input_bank_balance = self.get_bank_balance(data) or 0.0 #Extract bank_balance from wizard
+        bank_balance = 0.0
+        accounting_balance = 0.0
+        incomes_to_register = 0.0
+        credits_to_reconcile = 0.0
+        expenditures_to_register = 0.0
+        debits_to_reconcile = 0.0
+        accounting_total = 0.0
+        bank_total = 0.0        
+        
+        account_obj = self.pool.get('account.account')
+        account_webkit_report_library_obj = self.pool.get('account.webkit.report.library')
+        
+        #######################Parameters
+        fiscalyear = self.get_fiscalyear(data)
+        target_move = self.get_target_move(data)
+        historic_strict = self.get_historic_strict(data)
+        special_period = self.get_special_period(data)
+        filter_type = self.get_filter(data)
+        
+        #Build fiscal_year and filter_data
+        if fiscalyear: 
+            fiscal_year_id = fiscalyear.id
+        else:
+            fiscal_year_id = False
+            
+        if filter_type == 'filter_date':
+            period_ids = False
+            end_date = self.get_date_to(data)
+            
+            #Build the filter data
+            filter_data.append(None)
+            filter_data.append(end_date)
+            
+        elif filter_type == 'filter_period':
+            period_ids = [self.get_end_period(data).id]            
+            end_date = False
+            
+            #Build the filter data
+            filter_data.append(None)
+            filter_data.append(self.get_end_period(data))
+        
+        ######################Account configuration
+        #1. Get acccount_id (parent_account) selected in wizard       
+        parent_account = account_obj.browse(cr, uid, parent_account_id)
+
+        #2. Get child of this account
+        child_account_ids = account_obj.search(cr, uid, [('parent_id','=',parent_account_id)])
+        child_accounts = child_account_ids and account_obj.browse(cr, uid, child_account_ids) or False
+
+        #Return empty values if account doesn't have children.
+        if not child_accounts:
+            return result_bank_balance, result_move_lines, account_foreign
+        
+        #Check values 
+        for child_account in child_accounts:
+            '''
+                *** NOTE: This part required previous configuration ***
+                One of child_accounts must have include_conciliation_report attribute checked as True.
+                This account is reconciled_account, other accounts are transit_accounts.
+            '''
+            #Account with include_conciliation_report checked is reconciled_account
+            if child_account.user_type.include_conciliation_report == True:
+                reconciled_account = child_account
+            else:
+                #Others accounts are transit accounts.
+                if child_account.reconcile:
+                    transit_accounts.append(child_account)
+                    transit_account_ids.append(child_account.id)
+
+        #A reconciled_account and at least one transit_account is needed
+        #Return an error if those accounts don't exist.
+        if not reconciled_account:
+            raise osv.except_osv(_('Error !'),_('Reconciled account does not exist. Check your configuration!'))
+        
+        elif not transit_accounts:
+            raise osv.except_osv(_('Error !'),_('Transit account does not exist. Check your configuration!'))
+        
+        #######################################################################################################
+        
+        #############If accounts configuration is correct, procedeed with report.
+        #3. Check currency
+        if parent_account.report_currency_id:
+            account_currency = parent_account.report_currency_id
+        elif parent_account.currency_id:
+            account_currency = parent_account.currency_id
+        else:
+            account_currency = parent_account.company_id.currency_id
+        
+        #4. Define if account currency is same that company currency
+        if account_currency.id == parent_account.company_id.currency_id.id:
+            account_is_foreign = False
+        else:
+            account_is_foreign = True
+        
+        #######################################################################
+        
+        #Compute balances.        
+        if account_is_foreign:            
+            bank_balance = account_webkit_report_library_obj.get_account_balance(cr,
+                                                1,
+                                                [reconciled_account.id],
+                                                ['balance'],
+                                                filter_type = filter_type,
+                                                end_date=end_date,
+                                                period_ids=period_ids,
+                                                fiscal_year_id=fiscal_year_id,
+                                                context=context)[reconciled_account.id]['balance']
+
+            accounting_balance = account_webkit_report_library_obj.get_account_balance(cr,
+                                                1,
+                                                [parent_account_id],
+                                                ['balance'],
+                                                filter_type = filter_type,
+                                                end_date=end_date,
+                                                period_ids=period_ids,
+                                                fiscal_year_id=fiscal_year_id,
+                                                context=context)[parent_account_id]['balance']
+        else:
+            bank_balance = account_webkit_report_library_obj.get_account_balance(cr,
+                                                1,
+                                                [reconciled_account.id],
+                                                ['balance'],
+                                                filter_type = filter_type,
+                                                end_date=end_date,
+                                                period_ids=period_ids,
+                                                fiscal_year_id=fiscal_year_id,
+                                                context=context)[reconciled_account.id]['balance']
+                                                
+            accounting_balance = account_webkit_report_library_obj.get_account_balance(cr,
+                                                1,
+                                                [parent_account_id],
+                                                ['balance'],
+                                                filter_type = filter_type,
+                                                end_date=end_date,
+                                                period_ids=period_ids,
+                                                fiscal_year_id=fiscal_year_id,
+                                                context=context)[parent_account_id]['balance']
+        
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        
+        """
+            Cambio realizado el 9 de enero de 2012
+            
+            Anteriormente, el método get_move_lines (del objeto account.webkit.report.library, librería estándar de los reportes, 
+            sólo se utilizaba en el reporte de Conciliación bancaria. El reporte de conciliación bancaria no recibe el período de inicio
+            por lo que el método de get_move_lines no contempla el período de inicio, necesario en el reporte de saldo de cuenta de bancos.
+            Se realiza el cambio tanto en el reporte de conciliación bancaria para que el período inicial no se tome en cuenta (inicializado en None)
+            y en la librería se especifica que si se encuentra en None no lo tome en cuenta y que si trae información lo utilice dentro del filtro
+            para sacar el rango de periodos que se digita en el wizard. 
+            
+            Se modifica tanto el reporte de conciliación bancaria, como la librería, para que el método funcione solamente con un período final o bien
+            con un rango de períodos, como trabaja el reporte de saldo de cuenta de bancos. 
+            
+            Para el caso de las fechas, se trabaja de la misma forma. (El saldo de cuentas de bancos si toma la fecha de inicio)
+            
+            OBSERVACIÓN -> data['form']['historic_strict'],las variables boleanas (historic_strict y special_period) se deben pasar
+            de esta forma, sino vienen como objetos y no con el valor real (True or False). Esto se hace desde el conciliation_bank.mako
+            
+        """     
+                
+        unreconciled_move_lines = account_webkit_report_library_obj.get_move_lines(cr, 1, transit_account_ids, filter_type=filter_type, filter_data=filter_data, fiscalyear=fiscalyear, target_move=target_move, unreconcile = True, historic_strict=historic_strict, special_period=special_period, context=context)
+        
+        result_move_lines = {
+            'credits_to_reconcile' :     [],
+            'debits_to_reconcile' :    [],
+            'incomes_to_register' :      [],
+            'expenditures_to_register' :     [],
+        }
+        
+        for line in unreconciled_move_lines:
+            move = line.move_id
+            if not move:
+                if account_is_foreign:
+                    if line.amount_currency > 0:
+                        result_move_lines['incomes_to_register'].append(line)
+                        incomes_to_register += line.amount_currency
+                    else:
+                        result_move_lines['expenditures_to_register'].append(line)
+                        expenditures_to_register -= line.amount_currency
+                else:
+                    if line.debit > 0:
+                        result_move_lines['incomes_to_register'].append(line)
+                        incomes_to_register += line.debit
+                    else:
+                        result_move_lines['expenditures_to_register'].append(line)
+                        expenditures_to_register += line.credit
+                print "No move"
+                continue
+
+            #Select the best contra move line (biggest amount, inverse amount from line)
+            contra_line = line
+            for other_line in move.line_id:
+                if other_line.id == line.id:
+                    continue
+                elif other_line.debit == line.credit or other_line.credit == line.debit:
+                    contra_line = other_line
+                    break
+                elif account_is_foreign and (other_line.amount_currency == -1 * line.amount_currency):
+                    contra_line = other_line
+                    break
+                if (line.debit != 0 and contra_line.credit > other_line.credit) or \
+                   (line.credit != 0 and contra_line.debit < other_line.debit):
+                    contra_line = other_line
+                elif (account_is_foreign and
+                      (
+                       (line.amount_currency > 0 and
+                        contra_line.amount_currency < other_line.amount_currency)
+                       or
+                       (line.amount_currency <= 0 and
+                        contra_line.amount_currency > other_line.amount_currency)
+                      )
+                     ):
+                    contra_line = other_line
+
+            if line.id == contra_line.id:
+                if account_is_foreign:
+                    if line.amount_currency > 0:
+                        result_move_lines['incomes_to_register'].append(line)
+                        incomes_to_register += line.amount_currency
+                    else:
+                        result_move_lines['expenditures_to_register'].append(line)
+                        expenditures_to_register -= line.amount_currency
+                else:
+                    if line.debit > 0:
+                        result_move_lines['incomes_to_register'].append(line)
+                        incomes_to_register += line.debit
+                    else:
+                        result_move_lines['expenditures_to_register'].append(line)
+                        expenditures_to_register += line.credit
+            else:
+                #Debit or credit to register: present in statement but not in other accounts
+                if contra_line.account_id.id == reconciled_account.id:
+                    if account_is_foreign:
+                        if line.amount_currency < 0:
+                            result_move_lines['incomes_to_register'].append(line)
+                            incomes_to_register -= line.amount_currency
+                        else:
+                            result_move_lines['expenditures_to_register'].append(line)
+                            expenditures_to_register += line.amount_currency
+                    else:
+                        if line.credit > 0:
+                            result_move_lines['incomes_to_register'].append(line)
+                            incomes_to_register += line.credit
+                        else:
+                            result_move_lines['expenditures_to_register'].append(line)
+                            expenditures_to_register += line.debit
+                #Debit or credit to reconcile: present in other accounts but not in statements
+                else:
+                    if account_is_foreign:
+                        if line.amount_currency > 0:
+                            result_move_lines['credits_to_reconcile'].append(line)
+                            credits_to_reconcile += line.amount_currency
+                        else:
+                            result_move_lines['debits_to_reconcile'].append(line)
+                            debits_to_reconcile -= line.amount_currency
+                    else:
+                        if line.debit > 0:
+                            result_move_lines['credits_to_reconcile'].append(line)
+                            credits_to_reconcile += line.debit
+                        else:
+                            result_move_lines['debits_to_reconcile'].append(line)
+                            debits_to_reconcile += line.credit
+
+        accounting_total = accounting_balance + incomes_to_register - expenditures_to_register
+        bank_total = bank_balance + credits_to_reconcile - debits_to_reconcile
+
+        result_bank_balance = {
+            'input_bank_balance' : input_bank_balance,
+            'bank_balance' : bank_balance,
+            'accounting_balance' : accounting_balance,
+            'incomes_to_register' : incomes_to_register,
+            'credits_to_reconcile' : credits_to_reconcile,
+            'expenditures_to_register' : expenditures_to_register,
+            'debits_to_reconcile' : debits_to_reconcile,
+            'accounting_total' : accounting_total,
+            'bank_total' : bank_total,
+        }
+        
+        return result_bank_balance, result_move_lines, account_is_foreign
+
+report_sxw.report_sxw(
+    'report.conciliation_bank_report_webkit',
+    'account.account',
+    'addons/l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako',
+    parser=conciliationBankreport)
+

=== added file 'l10n_cr_account_conciliation_bank_report/report/report.xml'
--- l10n_cr_account_conciliation_bank_report/report/report.xml	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/report/report.xml	2013-12-06 21:45:38 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>            
+         
+         <record id="conciliation_bank_report_webkit" model="ir.actions.report.xml">
+             <field name="report_type">webkit</field>
+             <field name="report_name">conciliation_bank_report_webkit</field>
+             <field eval="[(6,0,[])]" name="groups_id"/>
+             <field name="model">account.account</field>
+             <field name="type">ir.actions.report.xml</field>
+             <field name="name">Conciliation Bank Report</field>
+             <field name="report_rml">l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako</field>
+             <field name="report_file">l10n_cr_account_conciliation_bank_report/report/l10n_cr_account_conciliation_bank_report.mako</field>
+             <field name="webkit_header" ref="report_webkit_lib.webkit_header_clearcorp_official_portrait" />  
+         </record>
+       
+    </data>
+</openerp>

=== added file 'l10n_cr_account_conciliation_bank_report/report_menus.xml'
--- l10n_cr_account_conciliation_bank_report/report_menus.xml	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/report_menus.xml	2013-12-06 21:45:38 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <menuitem icon="STOCK_PRINT" 
+            name="Conciliation Bank"
+            parent="account.next_id_22" 
+            action="action_conciliation_bank_report_menu_webkit"
+            id="menu_conciliation_bank"/>        
+    </data>
+</openerp>

=== added directory 'l10n_cr_account_conciliation_bank_report/wizard'
=== added file 'l10n_cr_account_conciliation_bank_report/wizard/__init__.py'
--- l10n_cr_account_conciliation_bank_report/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/wizard/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import l10n_cr_account_conciliation_bank_report_wizard

=== added file 'l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.py'
--- l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from openerp.tools.translate import _
+
+class conciliationBankreportWizard(osv.osv_memory):
+
+    _inherit = "account.report.wiz"
+    _name = "conciliation.bank.report.wiz"
+    _description = "Conciliation Bank Report Wizard"
+
+    def _get_parent_accounts(self, cr, uid, context=None):
+        
+        if context is None:
+            context = {}
+                
+        res = []
+        account_obj = self.pool.get('account.account')
+
+        #Search accounts that have in user_type checked include_conciliation_report attribute. Then, return a tuple list with name and id for
+        #parent_id for this accounts
+        #Include accounts with type == 'view'
+        account_ids = account_obj.search(cr, uid, [('user_type.include_conciliation_report', '=', True)], context=context)
+        
+        if account_ids:
+            accounts = account_obj.browse(cr, uid, account_ids, context)
+            for account in accounts:   
+                if account.parent_id:            
+                    res.append((account.parent_id.id, account.parent_id.name)) #Append parent_id.id and parent_id.name for account.
+                
+        return res
+    
+    '''
+        account_ids is define as a selection field, because with a domain can't obtain necessary data.
+        account_ids are all accounts that their parents user_type have include_conciliation_report attribute mark as True.
+        This configuration solves the problem of searching for a specific code in accounts and makes configurable the accounts that 
+        you want in the bank reconciliation report
+    '''
+    _columns = {
+        'bank_balance': fields.float('Bank Balance'),
+        'filter': fields.selection([('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by"),
+        'account_ids': fields.selection(_get_parent_accounts, 'Bank Account'),
+    }
+                 
+    
+    _defaults = {
+        'filter': 'filter_period',
+    }
+    
+    def pre_print_report(self, cr, uid, ids, data, context=None):
+       
+        if context is None:
+            context = {}
+            
+        # read the bank_banlance, because this field don't belongs to the account.report.wiz
+        # this field is added by conciliation.bank.report.wiz and add to data['form']                
+        vals = self.read(cr, uid, ids,['bank_balance'], context=context)[0] #this method read the field and included it in the form (account.common.report has this method)
+        
+        data['form'].update(vals)
+        
+        return data
+       
+    def _print_report(self, cursor, uid, ids, data, context=None):
+
+        context = context or {}
+        # we update form with display account value
+        
+        data = self.pre_print_report(cursor, uid, ids, data, context=context)
+
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'conciliation_bank_report_webkit',
+                'datas': data
+                }
\ No newline at end of file

=== added file 'l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml'
--- l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml	2013-12-06 21:45:38 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="conciliation_bank_report_view_webkit" model="ir.ui.view">
+            <field name="name">Conciliation Bank</field>
+            <field name="model">conciliation.bank.report.wiz</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_report_lib.account_report_lib_wizard_view"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/label[@string='']" position="replace">
+                        <separator string="Conciliation Bank" colspan="4"/>
+                        <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your conciliation bank with details of all your payable/receivable account"/>
+                    </xpath>                    
+        
+                    <group string="Account Financial Report" position="attributes">                   
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </group>
+                    
+                    <field name="filter" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>
+                                 
+                   <group string="Accounts" position="replace">
+                       <group string="Accounts">
+                            <field name="account_ids" colspan="2" required="True" readonly="False"/>
+                       </group>
+                   </group>                   
+                    
+                    <field name="amount_currency" position="attributes">
+                        <attribute name="invisible">True</attribute>
+                    </field>
+                    
+                    <group string="Accounts" position="inside">                                        
+                        <field name="bank_balance" required="True"/>
+                    </group>
+                    
+                    <field name="chart_account_id" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>
+                    
+                    <field name="target_move" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>
+                    <field name="fiscalyear_id" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>
+                    <field name="period_from" position="attributes">
+                        <attribute name="attrs">{'invisible': True, 'required': False}</attribute>
+                    </field>
+                    <field name="date_from" position="attributes">
+                        <attribute name="attrs">{'invisible': True, 'required': False}</attribute>
+                    </field>
+                     <field name="period_to" position="attributes">
+                        <attribute name="attrs">{'required':[('filter', '=', 'filter_period')]}</attribute>
+                    </field>
+                    <field name="date_to" position="attributes">
+                        <attribute name="attrs">{'required': [('filter', '=', 'filter_date')]}</attribute>
+                    </field>
+                   
+                    <group string="Journals" position="attributes">
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </group>
+                    
+                </data>
+            </field>
+        </record>
+
+        <record id="action_conciliation_bank_report_menu_webkit" model="ir.actions.act_window">
+            <field name="name">Conciliation Bank Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">conciliation.bank.report.wiz</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="conciliation_bank_report_view_webkit"/>
+            <field name="target">new</field>
+        </record>
+
+        <record model="ir.values" id="action_account_conciliation_bank_report_webkit">
+            <field name="model_id" ref="account.model_account_account"/>
+            <field name="object" eval="1"/>
+            <field name="name">Conciliation Bank Report</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value"
+                eval="'ir.actions.act_window,' +str(ref('action_conciliation_bank_report_menu_webkit'))"/>
+            <field name="key">action</field>
+            <field name="model">account.account</field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'l10n_cr_account_invoice_D-151'
=== added file 'l10n_cr_account_invoice_D-151/__init__.py'
--- l10n_cr_account_invoice_D-151/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import l10n_cr_account_invoice_line
+import l10n_cr_account_invoice_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'l10n_cr_account_invoice_D-151/__openerp__.py'
--- l10n_cr_account_invoice_D-151/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'D-151 for Account Invoice',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
+    'description': """
+        Add category to account.invoice.line for apply the D-151 
+        Add category in the account.move
+    """,
+    'author': 'CLEARCORP S.A.',
+    'website': 'http://www.clearcorp.co.cr',
+    'depends': [
+        'account',
+    ],
+    'data': ['l10n_cr_account_invoice_line.xml',
+             'l10n_cr_account_invoice_report.xml' ],
+    'installable': True,
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'l10n_cr_account_invoice_D-151/i18n'
=== added file 'l10n_cr_account_invoice_D-151/i18n/es_CR.po'
--- l10n_cr_account_invoice_D-151/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/i18n/es_CR.po	2013-12-06 21:45:38 +0000
@@ -0,0 +1,91 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_cr_account_invoice_D-151
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-20 21:03+0000\n"
+"PO-Revision-Date: 2013-06-20 21:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_cr_account_invoice_D-151
+#: view:account.invoice.report:0
+msgid "Refund"
+msgstr "Factura rectificativa"
+
+#. module: l10n_cr_account_invoice_D-151
+#: selection:account.invoice.line,d_151_type:0
+#: selection:account.invoice.report,d_151_type:0
+msgid "Interest"
+msgstr "Intereses"
+
+#. module: l10n_cr_account_invoice_D-151
+#: selection:account.invoice.line,d_151_type:0
+#: selection:account.invoice.report,d_151_type:0
+msgid "Goods and services sales"
+msgstr "Ventas de bienes y servicios"
+
+#. module: l10n_cr_account_invoice_D-151
+#: selection:account.invoice.line,d_151_type:0
+#: selection:account.invoice.report,d_151_type:0
+msgid "Commissions"
+msgstr "Comisiones"
+
+#. module: l10n_cr_account_invoice_D-151
+#: selection:account.invoice.line,d_151_type:0
+#: selection:account.invoice.report,d_151_type:0
+msgid "Goods and services purchases"
+msgstr "Compras de bienes y servicios"
+
+#. module: l10n_cr_account_invoice_D-151
+#: model:ir.model,name:l10n_cr_account_invoice_D-151.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: l10n_cr_account_invoice_D-151
+#: selection:account.invoice.line,d_151_type:0
+#: selection:account.invoice.report,d_151_type:0
+msgid "Rent"
+msgstr "Renta"
+
+#. module: l10n_cr_account_invoice_D-151
+#: model:ir.model,name:l10n_cr_account_invoice_D-151.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: l10n_cr_account_invoice_D-151
+#: field:account.invoice,type_invoice:0
+#: field:account.invoice.line,type_invoice:0
+msgid "Invoice type"
+msgstr "Tipo de Factura"
+
+#. module: l10n_cr_account_invoice_D-151
+#: field:account.invoice.line,d_151_type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,d_151_type:0
+msgid "D-151 Type"
+msgstr "D-151"
+
+#. module: l10n_cr_account_invoice_D-151
+#: view:account.invoice.report:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: l10n_cr_account_invoice_D-151
+#: model:ir.model,name:l10n_cr_account_invoice_D-151.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Estadísticas de facturas"
+
+#. module: l10n_cr_account_invoice_D-151
+#: selection:account.invoice.line,d_151_type:0
+#: selection:account.invoice.report,d_151_type:0
+msgid "Profesional services"
+msgstr "Servicios profesionales"
+

=== added file 'l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_line.py'
--- l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_line.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_line.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv, orm
+
+class accountInvoiceD151(orm.Model):
+    
+    _name = 'account.invoice'
+    _inherit = 'account.invoice'
+
+    #Work arround to get the type of the invoice from context
+    def _get_type_invoice(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        return context.get('type')
+
+    #This field add category D-151 to invoice line.
+    _columns = {
+        'type_invoice': fields.char(string='Invoice type', size=64)
+    }
+    
+    #Get the type of invoice for category D-151    
+    _defaults = {
+        'type_invoice': _get_type_invoice,
+    }
+
+class accountInvoicelineD151(orm.Model):
+    
+    _name = 'account.invoice.line'
+    _inherit = 'account.invoice.line'
+
+    #Work arround to get the type of the invoice from context
+    def _get_type_invoice(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        return context.get('type')
+
+    #This field add category D-151 to invoice line.
+    _columns = {
+        'd_151_type':fields.selection([('V','Goods and services sales'),
+                                       ('C','Goods and services purchases'),
+                                       ('A','Rent'),
+                                       ('SP','Profesional services'),
+                                       ('M','Commissions'),
+                                       ('I','Interest')], string="D-151 Type"),
+       
+        'type_invoice': fields.char(string='Invoice type', size=64)
+    }
+    
+    #Get the type of invoice for category D-151    
+    _defaults = {
+        'type_invoice': _get_type_invoice,
+    }

=== added file 'l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_line.xml'
--- l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_line.xml	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_line.xml	2013-12-06 21:45:38 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+    <data> 
+        <!--Account invoice line -->
+        <record id="invoice_supplier_form_inherit_D_151" model="ir.ui.view">
+           <field name = "name">invoice.supplier.form.inherit.D151</field>
+           <field name = "model">account.invoice</field>
+           <field name = "type">form</field>
+           <field name="inherit_id" ref="account.invoice_supplier_form"/>
+           <field name = "arch" type = "xml">
+                <xpath expr="/form/sheet[@string='Supplier Invoice']/notebook/page[@string='Invoice']/field/tree/field[@name='name']" position="after">
+                    <field name="type_invoice" invisible="1"/>
+                    <field name="d_151_type" attrs="{'required':[('type_invoice', '=','in_invoice')]}"/>                            
+                </xpath>
+           </field>
+        </record>        
+               
+        <record model = "ir.ui.view" id = "account_type_D151_inherit">
+            <field name = "name">account.type.D151.inherit</field>
+            <field name = "model">account.invoice.line</field>
+            <field name = "type">tree</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form"/>
+            <field name = "arch" type = "xml">
+                <field name="price_unit" position="after">
+                    <field name="type_invoice" invisible="1"/>
+                    <field name="d_151_type" attrs="{'invisible':[('type_invoice', '!=','in_invoice')], 'required':[('type_invoice', '=','in_invoice')]}"/>                    
+                </field>
+            </field>
+        </record>      
+      
+    </data>
+</openerp>

=== added file 'l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_report.py'
--- l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_report.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_report.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, osv, orm
+    
+class accountInvoicereportInherit(osv.osv):
+
+    _name = 'account.invoice.report'
+    _inherit = 'account.invoice.report'
+
+    _columns = {
+        'd_151_type':fields.selection([('V','Goods and services sales'),
+                                       ('C','Goods and services purchases'),
+                                       ('A','Rent'),
+                                       ('SP','Profesional services'),
+                                       ('M','Commissions'),
+                                       ('I','Interest')], 'D-151 Type',readonly=True),
+    }
+    
+    #Add into query the D-151-type field
+    def _select (self):
+        select_str = super(accountInvoicereportInherit, self)._select()
+        new_str = select_str.replace('SELECT sub.id,', 'SELECT sub.id, sub.d_151_type,')
+
+        return new_str
+    
+    #Add into query the D-151-type field
+    def _sub_select(self):
+        select_str = super(accountInvoicereportInherit,self)._sub_select()
+        new_str = select_str.replace('ai.payment_term, ai.period_id,', 'ai.payment_term, ai.period_id, ail.d_151_type AS d_151_type,')
+
+        return new_str
+    
+    #Add into query the D-151-type field
+    def _group_by(self):
+        group_by_str = super(accountInvoicereportInherit,self)._group_by()
+        new_str = group_by_str.replace('GROUP BY ail.product_id,', 'GROUP BY ail.product_id, ail.d_151_type,')
+        
+        return new_str
+    
+accountInvoicereportInherit()
+    
\ No newline at end of file

=== added file 'l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_report.xml'
--- l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_report.xml	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_invoice_D-151/l10n_cr_account_invoice_report.xml	2013-12-06 21:45:38 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+    <data>
+         <!--Account invoice report -->
+        <record id="view_account_invoice_report_tree_inherit" model="ir.ui.view">
+           <field name = "name">account.invoice.report.tree.inherit</field>
+           <field name = "model">account.invoice.report</field>
+           <field name="inherit_id" ref="account.view_account_invoice_report_tree"/>
+           <field name = "arch" type = "xml">
+                <xpath expr="/tree/field[@name='account_line_id']" position="after">
+                    <field name="d_151_type" invisible="1"/>
+                </xpath>
+           </field>
+        </record>
+        
+       <record id="view_account_invoice_report_search_inherit" model="ir.ui.view">
+           <field name = "name">account.invoice.report.search.inherit</field>
+           <field name = "model">account.invoice.report</field>
+           <field name = "type">form</field>
+           <field name="inherit_id" ref="account.view_account_invoice_report_search"/>
+           <field name = "arch" type = "xml">
+                <filter string="Refund" position="after">
+                    <field name="d_151_type"/>                
+                </filter>
+                <filter string="Type" position="after">
+                    <filter string="D-151 Type" icon="terp-stock_symbol-selection" context="{'group_by':'d_151_type'}"/>
+                </filter>
+           </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'l10n_cr_account_profit_statement_report'
=== added file 'l10n_cr_account_profit_statement_report/__init__.py'
--- l10n_cr_account_profit_statement_report/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_profit_statement_report/__init__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import l10n_cr_account_profit_statement_report
+import report
+import wizard
\ No newline at end of file

=== added file 'l10n_cr_account_profit_statement_report/__openerp__.py'
--- l10n_cr_account_profit_statement_report/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_profit_statement_report/__openerp__.py	2013-12-06 21:45:38 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Profit Statement Report Webkit',
+    'description': "Create the Profit Statement report",
+    'version': '1.0',
+    'author': 'CLEARCORP S.A.',
+    'category': 'Finance',
+    'website': "http://clearcorp.co.cr",
+    'images': [],
+    'depends': ['account',
+                'account_report_lib',
+                'account_report_signatures',],
+    'init_xml': [],
+    'demo_xml' : [],
+    'update_xml': [
+                   'report/report.xml',
+                   'l10n_cr_account_profit_statement_report.xml',
+                   'wizard/l10n_cr_account_profit_statement_wizard_view.xml',
+                   'report_menus.xml'
+                   ],
+    'test': [],
+    'active': False,
+    'installable': True,
+    'license': 'AGPL-3',
+}
+

=== added directory 'l10n_cr_account_profit_statement_report/i18n'
=== added file 'l10n_cr_account_profit_statement_report/i18n/es_CR.po'
--- l10n_cr_account_profit_statement_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ l10n_cr_account_profit_statement_report/i18n/es_CR.po	2013-12-06 21:45:38 +0000
@@ -0,0 +1,285 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_cr_account_profit_statement_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-12 20:08+0000\n"
+"PO-Revision-Date: 2013-08-12 20:08+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:32
+msgid "Previous period"
+msgstr "Período anterior"
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:22
+msgid "Until Period:"
+msgstr "Período hasta:"
+
+#. module: l10n_cr_account_profit_statement_report
+#: view:profit.statement.report.wiz:0
+msgid "{'required':True}"
+msgstr "{'required':True}"
+
+#. module: l10n_cr_account_profit_statement_report
+#: view:profit.statement.report.wiz:0
+msgid "[('type', '=', 'sum'),('account_type.code','=','PROSTA')]"
+msgstr "[('type', '=', 'sum'),('account_type.code','=','PROSTA')]"
+
+#. module: l10n_cr_account_profit_statement_report
+#: help:profit.statement.report.wiz,amount_currency:0
+msgid "It adds the currency column on report if the currency differs from the company currency."
+msgstr "Añade la columna de moneda en el reporte si la moneda es diferente de la moneda de la compañía."
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:38
+msgid "Acum. Fiscal Year"
+msgstr "Acum. Año Fiscal"
+
+#. module: l10n_cr_account_profit_statement_report
+#: field:profit.statement.report.wiz,base_compare_account:0
+msgid "Base Income Account"
+msgstr "Cuenta base de Ingreso"
+
+#. module: l10n_cr_account_profit_statement_report
+#: view:account.account.type:0
+msgid "Configuration for Profit Statement Report"
+msgstr "Configuración para el reporte de Estado de Resultados"
+
+#. module: l10n_cr_account_profit_statement_report
+#: view:profit.statement.report.wiz:0
+msgid "Period"
+msgstr "Período"
+
+#. module: l10n_cr_account_profit_statement_report
+#: model:ir.model,name:l10n_cr_account_profit_statement_report.model_account_account_type
+msgid "Account Type"
+msgstr "Tipo de cuenta"
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:21
+#: view:profit.statement.report.wiz:0
+msgid "Profit Statement"
+msgstr "Estado de Resultados"
+
+#. module: l10n_cr_account_profit_statement_report
+#: help:profit.statement.report.wiz,historic_strict:0
+msgid "If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"
+msgstr "Si se selecciona, se desplegará el histórico de las líneas no conciliadas, tomando en cuenta el final del período o la fecha seleccionada"
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:31
+msgid "Account<br />Name"
+msgstr "Account<br />Name"
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:34
+msgid "Selected period"
+msgstr "Período seleccionado"
+
+#. module: l10n_cr_account_profit_statement_report
+#: field:profit.statement.report.wiz,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: l10n_cr_account_profit_statement_report
+#: field:profit.statement.report.wiz,amount_currency:0
+msgid "With Currency"
+msgstr "Con moneda"
+
+#. module: l10n_cr_account_profit_statement_report
+#: report:addons/l10n_cr_account_profit_statement_report/report/l10n_cr_account_profit_statement_report.mako:36
+msgid "Variation"