[MERGE] Forward porting of latest 7.0 bugfixes, up to rev. 9193

bzr revid: mat@openerp.com-20130604110041-yemgrfsi02uboe8m

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

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

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

diff --cc addons/report_webkit/webkit_report.py
index 82061da,8bf7331..dbc0cc6
--- 1/addons/report_webkit/webkit_report.py
--- 2/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@@ -280,7 -219,9 +280,9 @@@ class WebKitParser(report_sxw)
          template =  False
  
          if report_xml.report_file :
-             path = get_module_resource(*report_xml.report_file.split(os.path.sep))
+             # backward-compatible if path in Windows format
+             report_path = report_xml.report_file.replace("\\", "/")
 -            path = addons.get_module_resource(*report_path.split('/'))
++            path = get_module_resource(*report_path.split('/'))
              if path and os.path.exists(path) :
                  template = file(path).read()
          if not template and report_xml.report_webkit_data :