Merge remote-tracking branch 'odoo/7.0' into 7.0

Fix conflicts:
	addons/account_voucher/account_voucher.py
	addons/hr_expense/hr_expense.py
	addons/mail/mail_thread.py
	addons/web/static/src/js/views.js
	openerp/report/report_sxw.py
	openerp/tools/translate.py

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

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

diff --cc addons/account/account_invoice.py
index 6ec99a9,1e4bc7a..c7c5ae4
--- 1/addons/account/account_invoice.py
--- 2/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@@ -1023,10 -1024,10 +1024,10 @@@ class account_invoice(osv.osv)
              line = self.finalize_invoice_move_lines(cr, uid, inv, line)
  
              move = {
 -                'ref': inv.reference and inv.reference or inv.name,
 +                'ref': inv.reference or inv.supplier_invoice_number or inv.name,
                  'line_id': line,
                  'journal_id': journal_id,
-                 'date': date,
+                 'date': inv.date_invoice,
                  'narration': inv.comment,
                  'company_id': inv.company_id.id,
              }

diff --cc addons/account/account_invoice_view.xml
Simple merge

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

diff --cc addons/account_budget/account_budget.py
index 9058a0c,ac79ca1..2f13b2a
--- 1/addons/account_budget/account_budget.py
--- 2/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@@ -119,29 -118,10 +119,25 @@@ class crossovered_budget_lines(osv.osv)
              acc_ids = [x.id for x in line.general_budget_id.account_ids]
              if not acc_ids:
                  raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % ustr(line.general_budget_id.name))
 +            acc_ids = account_obj._get_children_and_consol(cr, uid, acc_ids, context=context)
              date_to = line.date_to
              date_from = line.date_from
-             if context.has_key('wizard_date_from'):
-                 date_from = context['wizard_date_from']
-             if context.has_key('wizard_date_to'):
-                 date_to = context['wizard_date_to']
              if line.analytic_account_id.id:
 -                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
 +                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id in "
 +                       """(with recursive account_analytic_account_hierarchy(id)
 +                        as 
 +                            (
 +                                select id from account_analytic_account 
 +                                    where id=%s
 +                                union all
 +                                select account_analytic_account.id from 
 +                                    account_analytic_account 
 +                                    join account_analytic_account_hierarchy
 +                                    on account_analytic_account.parent_id=
 +                                        account_analytic_account_hierarchy.id
 +                            )"""
 +                       "select id from account_analytic_account_hierarchy) "
 +                       "AND (date "
                         "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                         "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
                  result = cr.fetchone()[0]

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

diff --cc addons/hr_expense/hr_expense.py
index 5750f73,54c411a..e1b8717
--- 1/addons/hr_expense/hr_expense.py
--- 2/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@@ -301,8 -283,6 +301,7 @@@ class hr_expense_expense(osv.osv)
              if not mres:
                  continue
              res.append(mres)
 +            current_product_line_pos = len(res) - 1
-             tax_code_found= False
              
              #Calculate tax according to default tax on product
              taxes = []

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

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/sale_stock/sale_stock_view.xml
Simple merge

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

diff --cc addons/stock/stock_view.xml
Simple merge

diff --cc addons/survey/wizard/survey_answer.py
Simple merge

diff --cc addons/web/controllers/main.py
Simple merge

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/data.js
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/js/view_list.js
Simple merge

diff --cc addons/web/static/src/js/views.js
Simple merge

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc openerp/addons/base/ir/ir_attachment.py
Simple merge

diff --cc openerp/addons/base/res/res_partner.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge

diff --cc openerp/report/render/rml2pdf/trml2pdf.py
Simple merge

diff --cc openerp/tools/translate.py
Simple merge

diff --cc openerp/tools/yaml_import.py
Simple merge