Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-import-hook-vmt into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import-hook-vmt/+merge/88666
See the similarly named server branch for a description (there is also a
openerp-web branch).
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import-hook-vmt/+merge/88666
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-import-hook-vmt.
=== modified file 'base_calendar/wizard/base_calendar_invite_attendee.py'
--- base_calendar/wizard/base_calendar_invite_attendee.py 2011-07-28 06:11:56 +0000
+++ base_calendar/wizard/base_calendar_invite_attendee.py 2012-01-16 11:46:09 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from base_calendar import base_calendar
+from .. import base_calendar
from osv import fields, osv
from tools.translate import _
import tools
=== modified file 'base_module_doc_rst/wizard/wizard_tech_guide_rst.py'
--- base_module_doc_rst/wizard/wizard_tech_guide_rst.py 2011-12-19 16:54:40 +0000
+++ base_module_doc_rst/wizard/wizard_tech_guide_rst.py 2012-01-16 11:46:09 +0000
@@ -30,9 +30,6 @@
import os
import tools
-import base_module_doc_rst
-
-
choose_file_form = '''<?xml version="1.0"?>
<form string="Create Technical Guide in rst format">
<separator string="Technical Guide in rst format" colspan="4"/>
=== modified file 'crm/report/crm_lead_report.py'
--- crm/report/crm_lead_report.py 2011-12-19 16:54:40 +0000
+++ crm/report/crm_lead_report.py 2012-01-16 11:46:09 +0000
@@ -21,7 +21,7 @@
from osv import fields,osv
import tools
-from crm import crm
+from .. import crm
AVAILABLE_STATES = [
('draft','Draft'),
=== modified file 'crm/report/crm_phonecall_report.py'
--- crm/report/crm_phonecall_report.py 2011-12-19 16:54:40 +0000
+++ crm/report/crm_phonecall_report.py 2012-01-16 11:46:09 +0000
@@ -21,7 +21,7 @@
from osv import fields,osv
import tools
-from crm import crm
+from .. import crm
AVAILABLE_STATES = [
('draft','Draft'),
=== modified file 'crm/wizard/crm_add_note.py'
--- crm/wizard/crm_add_note.py 2011-12-19 16:54:40 +0000
+++ crm/wizard/crm_add_note.py 2012-01-16 11:46:09 +0000
@@ -1,4 +1,4 @@
-from crm import crm
+from .. import crm
from osv import fields, osv
from tools.translate import _
from mail.mail_message import truncate_text
=== modified file 'hr_recruitment/report/hr_recruitment_report.py'
--- hr_recruitment/report/hr_recruitment_report.py 2011-12-19 16:54:40 +0000
+++ hr_recruitment/report/hr_recruitment_report.py 2012-01-16 11:46:09 +0000
@@ -20,7 +20,7 @@
##############################################################################
import tools
from osv import fields,osv
-from hr_recruitment import hr_recruitment
+from .. import hr_recruitment
from decimal_precision import decimal_precision as dp
=== modified file 'mail/wizard/mail_compose_message.py'
--- mail/wizard/mail_compose_message.py 2011-12-19 16:54:40 +0000
+++ mail/wizard/mail_compose_message.py 2012-01-16 11:46:09 +0000
@@ -22,13 +22,14 @@
import re
import tools
-from mail.mail_message import to_email
from osv import osv
from osv import fields
from tools.safe_eval import safe_eval as eval
from tools.safe_eval import literal_eval
from tools.translate import _
+from ..mail_message import to_email
+
# main mako-like expression pattern
EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
=== modified file 'project/project.py'
--- project/project.py 2012-01-09 10:25:01 +0000
+++ project/project.py 2012-01-16 11:46:09 +0000
@@ -25,7 +25,7 @@
from tools.translate import _
from osv import fields, osv
-from resource.faces import task as Task
+from openerp.addons.resource.faces import task as Task
# I think we can remove this in v6.1 since VMT's improvements in the framework ?
#class project_project(osv.osv):
@@ -316,7 +316,7 @@
resource_pool = self.pool.get('resource.resource')
- result = "from resource.faces import *\n"
+ result = "from openerp.addons.resource.faces import *\n"
result += "import datetime\n"
for project in self.browse(cr, uid, ids, context=context):
u_ids = [i.id for i in project.members]
=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py 2011-12-21 22:15:04 +0000
+++ project_long_term/project_long_term.py 2012-01-16 11:46:09 +0000
@@ -22,7 +22,7 @@
from datetime import datetime
from tools.translate import _
from osv import fields, osv
-from resource.faces import task as Task
+from openerp.addons.resource.faces import task as Task
class project_phase(osv.osv):
_name = "project.phase"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
