Odoo Addons (MOVED TO GITHUB)

Merge lp:~bstanciu/openobject-addons/bug922526@bstanciu into lp:openobject-addons

  1. bug922526@bstanciu
  2. Merge into trunk
Proposed by Bogdan Stanciu
Status: Merged
Merged at revision: 6454
Proposed branch: lp:~bstanciu/openobject-addons/bug922526@bstanciu
Merge into: lp:openobject-addons
Diff against target: 25 lines (+2/-2)
2 files modified
crm_caldav/crm_caldav.py (+1/-1)
project_caldav/project_caldav.py (+1/-1)
To merge this branch: bzr merge lp:~bstanciu/openobject-addons/bug922526@bstanciu
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+90456@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm_caldav/crm_caldav.py'
2--- crm_caldav/crm_caldav.py 2011-01-14 09:34:28 +0000
3+++ crm_caldav/crm_caldav.py 2012-01-27 15:42:31 +0000
4@@ -21,7 +21,7 @@
5
6 from osv import osv
7 from base_calendar import base_calendar
8-from caldav import calendar
9+from openerp.addons.caldav import calendar
10 from datetime import datetime
11 import re
12
13
14=== modified file 'project_caldav/project_caldav.py'
15--- project_caldav/project_caldav.py 2011-10-27 21:11:24 +0000
16+++ project_caldav/project_caldav.py 2012-01-27 15:42:31 +0000
17@@ -20,7 +20,7 @@
18 ##############################################################################
19
20 from osv import fields, osv
21-from caldav import calendar
22+from openerp.addons.caldav import calendar
23 from datetime import datetime
24 from tools.translate import _
25 from base_calendar import base_calendar

Subscribers

People subscribed via source and target branches

to all changes: