Merge lp:~cv.clearcorp/openerp-ccorp-addons/7.0-fix_bug_exchange_rate into lp:openerp-ccorp-addons/7.0

[Carlos Vásquez (ClearCorp)]

[FIX] Fix bug when currency_rate object is created. Fix datetime and add a comprobation for case when second_rate doesn't exist in currency

=== modified file 'currency_rate_update_BCCR/currency_rate_update.py'
--- currency_rate_update_BCCR/currency_rate_update.py	2014-03-19 17:36:05 +0000
+++ currency_rate_update_BCCR/currency_rate_update.py	2014-03-21 17:38:37 +0000
@@ -73,8 +73,7 @@
              #get_update_currency return a dictionary with rate and name's currency 
              #receive a array with currency to update
              res_sale, res_purchase, log_info = getter.get_updated_currency(cr, uid, [currency_id.name], '') #main_currency for this method is not necessary
-             rate_name = time.strftime('%Y-%m-%d')    
-    
+                
              #In res_currency_service, name is date when the rate is updated
              for date, rate in res_sale[currency_id.name].iteritems():                
                 rate_ids = rate_obj.search(cr, uid, [('currency_id','=',currency_id.id),('name','=',date)])
@@ -83,17 +82,21 @@
                      rate = float(rate)
                      if currency_id.sequence > res_currency_base.sequence:
                          rate = 1.0/float(rate)
-                     vals = {'currency_id': currency_id.id, 'rate': rate, 'name': date} #add purchase exchange rate
+                     vals = {'currency_id': currency_id.id, 'rate': rate, 'name': datetime.strptime(date,"%Y-%m-%d")}
                      
                      #purchase rate
-                     second_rate = res_purchase[currency_id.name][date]
-                     if currency_id.sequence > res_currency_base.sequence:
-                         second_rate = 1.0/float(second_rate)
-                     vals.update({'second_rate': second_rate})                     
-                     rate_obj.create(cr, uid, vals)
-                     
-                note = "Currency sale and purchase rate " + currency_id.name + " updated at %s "\
-                    %(str(datetime.today()))
+                     if currency_id.second_rate: #check if currency has second_rate activated option
+                         second_rate = res_purchase[currency_id.name][date]
+                         if currency_id.sequence > res_currency_base.sequence:
+                             second_rate = 1.0/float(second_rate)
+                         vals.update({'second_rate': second_rate}) 
+                     else:
+                        vals.update({'second_rate': 0.0})                     
+                     
+                     x = rate_obj.create(cr, uid, vals)
+                     
+             note = "Currency sale and purchase rate " + currency_id.name + " updated at %s "\
+                %(str(datetime.today()))
              
              self.logger.notifyChannel(self.LOG_NAME, netsvc.LOG_INFO, str(note))
             
@@ -221,5 +224,4 @@
                             self.updated_currency_purchase[curr][date_str] = rate
                            
         logger2.info(self.updated_currency_sale) 
-        logger2.info(self.updated_currency_purchase)
         return self.updated_currency_sale, self.updated_currency_purchase, self.log_info

=== modified file 'currency_rate_update_BCCR/res_currency.py'
--- currency_rate_update_BCCR/res_currency.py	2014-03-16 23:42:27 +0000
+++ currency_rate_update_BCCR/res_currency.py	2014-03-21 17:38:37 +0000
@@ -92,7 +92,7 @@
         
         res.update ({
                'interval_type': 'days',
-               'nextcall': datetime.date.today() + datetime.timedelta(days=1), #Get tomorrow's date
+               'nextcall': time.strftime("%Y-%m-%d %H:%M:%S", (datetime.today() + timedelta(days=1)).timetuple() ), #tomorrow same time
                'interval_number': 1,
                'numbercall': -1,
                'doall': True,