Merge lp:~gs.clearcorp/openerp-costa-rica/7.0_l10n_cr_account_banking_cr_davivienda into lp:openerp-costa-rica

[Glen Sojo]

[FIX] Fixed davivienda_parser import error from credits and empty transactions

[lp:~gs.clearcorp/openerp-costa-rica/7.0_l10n_cr_account_banking_cr_davivienda]

268. By Ronald Rubi on 2014-01-23

[MRG] Fixed davivienda_parser import error from credits and empty transactions

=== modified file 'l10n_cr_account_banking_cr_davivienda/davivienda_format.py'
--- l10n_cr_account_banking_cr_davivienda/davivienda_format.py	2013-12-09 18:32:13 +0000
+++ l10n_cr_account_banking_cr_davivienda/davivienda_format.py	2014-01-23 17:57:54 +0000
@@ -65,8 +65,7 @@
         '''
         We don't have remote_account so override base
         '''
-        return (self.execution_date
-                and self.transferred_amount and True) or False
+        return (self.execution_date and True) or False
 
 class statement(models.mem_bank_statement):
     '''

=== modified file 'l10n_cr_account_banking_cr_davivienda/davivienda_parser.py'
--- l10n_cr_account_banking_cr_davivienda/davivienda_parser.py	2014-01-14 16:52:15 +0000
+++ l10n_cr_account_banking_cr_davivienda/davivienda_parser.py	2014-01-23 17:57:54 +0000
@@ -48,6 +48,8 @@
         using the ** kwargs is a dictionary, 
         extract its value, with the respective key
     '''
+    from_card = False
+    
     def statement_record ( self, rec, **kwargs):
         lines = []
         line_dict = {}
@@ -63,7 +65,7 @@
             'amount': 0.0,
             'id': '',
         }
-        
+        rec = rec.replace('ABONO A SU CUENTA .... GRACIA;','ABONO A SU CUENTA .... GRACIAS')
         #Split the file in statements
         list_split = rec.split('\n')
         #Obtain the first line to know the account number
@@ -71,11 +73,11 @@
         first_line_split = fist_line.split(';')
         
         account_number_wizard = kwargs['account_number']#from wizard
-        from_card = False
+        self.from_card = False
         try:
             account_number_file = first_line_split[11]#from account file.
         except:
-            from_card = True
+            self.from_card = True
             account_number_file = first_line_split[10]#from credit or debit card file
         
         #if the account_number in the file match with the account
@@ -110,7 +112,7 @@
             first_line_split = fist_line.split(';')
             #If it comes from credit/debit card account we don't have access to starting
             #balance assuming 0.0
-            if not from_card:
+            if not self.from_card:
                 startingbalance = float(first_line_split[5].replace(",","")) + \
                 float(first_line_split[3].replace(",","")) - \
                 float(first_line_split[4].replace(",",""))
@@ -127,7 +129,7 @@
                     if len(last_line) > 0 and last_line != "" and last_line != '\r':
                         break       
             last_line_split = last_line.split(';')
-            if not from_card:
+            if not self.from_card:
                 endingbalance += float(last_line_split[5].replace(",",""))
             #Calculating ending_balance assuming starting balance as 0.0
             else:
@@ -172,6 +174,7 @@
         line_dict = {}
         currencycode = ''
         
+        rec = rec.replace('ABONO A SU CUENTA .... GRACIA;','ABONO A SU CUENTA .... GRACIAS')
         list_split = rec.split('\n')
         entrada = False
         
@@ -186,6 +189,11 @@
                     break
                 end -= 1
         sub_list = list_split [start:end+1]
+        self.from_card = False
+        try:
+            sub_list[0].split(';')[11]
+        except:
+            self.from_card = True
         for sub in sub_list:
             line = sub.split(';')
             #effective_date
@@ -201,16 +209,27 @@
             mapping['name'] = line[1] #Description     
             mapping['id'] = line[1] #Description     
             
-            if line[10] == 'C':
+            if not self.from_card:
+                if line[10] == 'C':
+                    credit = float(line[4].replace(",",""))
+                    mapping['transferred_amount'] = credit    
+                    mapping['creditmarker'] = 'C'
+                
+                else:
+                    #In this case, the debit is negative.
+                    debit = float(line[3].replace(",",""))
+                    mapping['transferred_amount'] =  -1 * debit
+            else:
                 credit = float(line[4].replace(",",""))
-                mapping['transferred_amount'] = credit    
-                mapping['creditmarker'] = 'C'
-            
-            else:
-                #In this case, the debit is negative.
                 debit = float(line[3].replace(",",""))
-                mapping['transferred_amount'] =  -1 * debit
-           
+                if credit:
+                    mapping['transferred_amount'] = credit    
+                    mapping['creditmarker'] = 'C'
+                
+                else:
+                    #In this case, the debit is negative.
+                    mapping['transferred_amount'] =  -1 * debit
+                    
             lines.append(copy(mapping))
                             
         return lines