diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-18 10:32:41 +0100 |
| commit | 2dbe4a696ecd7330b16d10ec38462fe6c8fa37ca (patch) | |
| tree | e7f1103c8b839aa1bffee9dfb961e08b3bc82e26 /addons/project_issue | |
| parent | 6d2a0d270f0f0b9eb7d66eb384a8803a186db374 (diff) | |
| parent | 73980eba5f64c674b0bc366c714a9a38d3bb915a (diff) | |
[MERGE] Sync wirth trunk.
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 12 | ||||
| -rw-r--r-- | addons/project_issue/report/project_issue_report.py | 6 | ||||
| -rw-r--r-- | addons/project_issue/res_config.py | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ced3ac748b6..e256f263caf 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -19,15 +19,15 @@ # ############################################################################## -from base_status.base_stage import base_stage -from crm import crm +from openerp.addons.base_status.base_stage import base_stage +from openerp.addons.crm import crm from datetime import datetime -from osv import fields,osv -from tools.translate import _ +from openerp.osv import fields,osv +from openerp.tools.translate import _ import binascii import time -import tools -from tools import html2plaintext +from openerp import tools +from openerp.tools import html2plaintext class project_issue_version(osv.osv): _name = "project.issue.version" diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 75bb2c07ef1..a5eb903a742 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -20,9 +20,9 @@ # ############################################################################## -from osv import fields,osv -import tools -from crm import crm +from openerp.osv import fields,osv +from openerp import tools +from openerp.addons.crm import crm AVAILABLE_STATES = [ ('draft','Draft'), diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py index f286f9cac25..cc3b16504a7 100644 --- a/addons/project_issue/res_config.py +++ b/addons/project_issue/res_config.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import osv, fields +from openerp.osv import fields, osv class project_issue_settings(osv.osv_memory): _name = 'project.config.settings' |