[Merge]Merge lp:openobject-addons

bzr revid: vja@tinyerp.com-20130219113236-993nxmx84ez99w3i

addons/crm/crm_lead.py

@@ -28,7 +28,7 @@ from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-from base.res.res_partner import format_address
+from openerp.addons.base.res.res_partner import format_address
 
 CRM_LEAD_FIELDS_TO_MERGE = ['name',
     'partner_id',

addons/document_webdav/nodes.py

@@ -20,12 +20,14 @@
 ##############################################################################
 
 
-from document import document as nodes
-from openerp.tools.safe_eval import safe_eval as eval
 import time
 import urllib
 import uuid
+
 from openerp import SUPERUSER_ID
+from openerp.tools.safe_eval import safe_eval as eval
+
+from openerp.addons.document import document as nodes
 
 def dict_filter(srcdic, keys, res=None):
     ''' Return a copy of srcdic that has only keys set.

addons/l10n_in_hr_payroll/report/report_payslip_details.py

@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.report import report_sxw
-from hr_payroll import report
+from openerp.addons.hr_payroll import report
 
 class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
 
@@ -32,4 +32,4 @@ class payslip_details_report_in(report.report_payslip_details.payslip_details_re
 
 report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: