Merge pull request OCA#3 from kenvac/master

[Fix] account_multicurrency_revaluation: use company from journal instead of logged in user
oreju · Jul 24, 2014 · 299157c · 299157c
2 parents ead4541 + 937ff08
commit 299157c
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py b/account_multicurrency_revaluation/wizard/wizard_currency_revaluation.py
@@ -162,7 +162,7 @@ def _compute_unrealized_currency_gl(self, cr, uid,
         ctx_rate['date'] = form.revaluation_date
         ctx_rate['currency_rate_type_id'] = type_id
         user_obj = self.pool.get('res.users')
-        cp_currency_id = user_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
+        cp_currency_id = form.journal_id.company_id.currency_id.id
 
         currency = currency_obj.browse(cr, uid, currency_id, context=ctx_rate)
 
@@ -231,7 +231,7 @@ def create_move():
                          'journal_id': form.journal_id.id,
                          'period_id': period.id,
                          'date': form.revaluation_date,
-                         'to_be_reversed': company.reversable_revaluations}
+                         'to_be_reversed': form.journal_id.company_id.reversable_revaluations}
             return move_obj.create(cr, uid, base_move, context=context)
 
         def create_move_line(move_id, line_data, sums):
@@ -260,8 +260,7 @@ def create_move_line(move_id, line_data, sums):
         period_obj = self.pool.get('account.period')
         user_obj = self.pool.get('res.users')
 
-        company = user_obj.browse(cr, uid, uid).company_id
-
+        company = form.journal_id.company_id or user_obj.browse(cr, uid, uid).company_id
         period_ids = period_obj.search(
             cr, uid,
             [('date_start', '<=', form.revaluation_date),
@@ -368,7 +367,11 @@ def revaluate_currency(self, cr, uid, ids, context=None):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         move_obj = self.pool.get('account.move')
 
-        company = user_obj.browse(cr, uid, uid).company_id
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        form = self.browse(cr, uid, ids[0], context=context)
+
+        company = form.journal_id.company_id or user_obj.browse(cr, uid, uid).company_id
 
         if (not company.revaluation_loss_account_id and
             not company.revaluation_gain_account_id and
@@ -385,10 +388,6 @@ def revaluate_currency(self, cr, uid, ids, context=None):
 
         created_ids = []
 
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        form = self.browse(cr, uid, ids[0], context=context)
-
         # Search for accounts Balance Sheet to be eevaluated
         # on those criterions
         # - deferral method of account type is not None