Merge from trunk

bzr revid: joel.grandguillaume@camptocamp.com-20091223073733-jpekbt4hhjklgbfk

diff --cc addons/account/account_analytic_line.py
index e3332d1,7c87266..335cdd7
--- 1/addons/account/account_analytic_line.py
--- 2/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@@ -78,19 -42,7 +78,18 @@@ class account_analytic_line(osv.osv)
          'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
          'code' : fields.char('Code', size=8),
          'user_id' : fields.many2one('res.users', 'User',),
-         'ref': fields.char('Ref.', size=32),
 +        'currency_id': fields.function(_get_account_currency, method=True, type='many2one', relation='res.currency', string='Account currency',
 +                store={
 +                    'account.analytic.account': (_get_account_line, ['company_id'], 50),
 +                },
 +                 help="The related account currency if not equal to the company one."),
 +        'company_id': fields.many2one('res.company','Company',required=True),
 +        'amount_currency': fields.function(_amount_currency, method=True, digits=(16, int(config['price_accuracy'])), string='Amount currency',
 +                    store={
 +                        'account.analytic.account': (_get_account_line, ['company_id'], 50),
 +                    },
-                     help="The amount expressed in the related account currency if not equal to the company one.",),
-         
++                    help="The amount expressed in the related account currency if not equal to the company one.",)
+         'ref': fields.char('Reference', size=32),
      }
      _defaults = {
          'date': lambda *a: time.strftime('%Y-%m-%d'),

diff --cc addons/account/project/project.py
Simple merge

diff --cc addons/account/project/project_view.xml
Simple merge

diff --cc addons/hr_timesheet/hr_timesheet.py
Simple merge

diff --cc addons/hr_timesheet/hr_timesheet_view.xml
Simple merge

diff --cc addons/hr_timesheet_invoice/hr_timesheet_invoice.py
Simple merge

diff --cc addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
Simple merge

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge

diff --cc addons/stock/stock.py
Simple merge