diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 77e03c23700..46867c8bf23 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -53,7 +53,7 @@
account.analytic.account.tree
account.analytic.account
tree
- child_ids
+ child_complete_ids
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index a353ca92177..bd3f3ddde0d 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -109,6 +109,20 @@ class account_analytic_account(osv.osv):
def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res = self.name_get(cr, uid, ids)
return dict(res)
+
+ def _child_compute(self, cr, uid, ids, name, arg, context=None):
+ result = {}
+ if context is None:
+ context = {}
+
+ for account in self.browse(cr, uid, ids, context=context):
+ for child in account.child_ids:
+ if child.state == 'template':
+ account.child_ids.pop(account.child_ids.index(child))
+ result[account.id] = map(lambda x: x.id, account.child_ids)
+
+ return result
+
_columns = {
'name': fields.char('Account Name', size=128, required=True),
@@ -118,6 +132,7 @@ class account_analytic_account(osv.osv):
'description': fields.text('Description'),
'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
+ 'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', method=True, string="Account Hierarchy", type='many2many'),
'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index febba654350..4568fa25193 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -19,7 +19,6 @@
#
##############################################################################
-from lxml import etree
from osv import fields, osv
class base_contact_installer(osv.osv_memory):
diff --git a/addons/base_module_doc_rst/base_module_doc_rst.py b/addons/base_module_doc_rst/base_module_doc_rst.py
index 57b26fd0d44..06393fa99ff 100644
--- a/addons/base_module_doc_rst/base_module_doc_rst.py
+++ b/addons/base_module_doc_rst/base_module_doc_rst.py
@@ -23,9 +23,7 @@ import pydot
import base64
import report
-from osv import fields, osv, orm
-import tools
-from tools.translate import _
+from osv import fields, osv
import addons
class module(osv.osv):
diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py
index f71e64cdf77..85ac6f95434 100644
--- a/addons/base_synchro/base_synchro_obj.py
+++ b/addons/base_synchro/base_synchro_obj.py
@@ -19,8 +19,6 @@
#
##############################################################################
from osv import fields,osv
-import tools
-import re
import time
class base_synchro_server(osv.osv):
diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index dfb7385931f..9e67f972216 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -176,7 +176,7 @@ configuration
_columns = {
'url' : fields.char('Caldav Server', size=264, required=True, help="Url of the caldav server, use for synchronization"),
- 'caldav_doc_file':fields.binary('Caldav Document', readonly=True, help="download full caldav Documentation."),
+ #'doc_link':fields.char('Caldav Documentation', size="264", help="The link to Caldav Online Documentation.", readonly=True),
'description':fields.text('Description', readonly=True)
}
@@ -218,7 +218,7 @@ configuration
file = open(addons.get_module_resource('caldav','doc', 'caldav_doc.pdf'),'rb')
res['caldav_doc_file'] = base64.encodestring(file.read())
-
+ #res['doc_link'] = 'http://doc.openerp.com/'
res['url'] = prefix+url
return res
@@ -237,7 +237,7 @@ class user_preference(osv.osv_memory):
'collection' :fields.many2one('document.directory', "Calendar Collection", required=True, domain = [('calendar_collection', '=', True)]),
'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
'service': fields.selection([('webdav','CalDAV')], "Services"),
- 'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices")
+ 'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
}
def _get_default_calendar(self, cr, uid, context):
@@ -260,7 +260,8 @@ class user_preference(osv.osv_memory):
'service': 'webdav',
'collection' : _get_default_collection,
'calendar' : _get_default_calendar,
- 'device' : 'other'
+ 'device' : 'other',
+
}
def open_window(self, cr, uid, ids, context=None):
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index dc3e53b0627..0a7e6269fe2 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -15,11 +15,8 @@
-
-
-
-
-
+
+
@@ -37,6 +34,7 @@
+
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index e580e6b2733..a4dbd5ac8d0 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -9,7 +9,7 @@