diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a8d8044a6c2..e24e763ff56 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -31,9 +31,9 @@ class account_analytic_line(osv.osv):
_columns = {
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_id': fields.many2one('product.product', 'Product'),
- 'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
- 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
- 'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
+ 'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
+ 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+ 'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
'code': fields.char('Code', size=8),
'ref': fields.char('Ref.', size=64),
'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d502b1ce29c..5674567ffcf 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -308,7 +308,7 @@ class account_move_line(osv.osv):
FROM account_move_line l1, account_move_line l2
WHERE l2.account_id = l1.account_id
AND l1.id <= l2.id
- AND l2.id IN %%s AND """ + \
+ AND l2.id IN %s AND """ + \
self._query_get(cr, uid, obj='l1', context=c) + \
" GROUP BY l2.id"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d4a731fb3b7..932a8799c36 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -76,7 +76,7 @@
Fiscal Years
account.fiscalyear
form
- tree,form,search
+ tree,form
Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them.
@@ -143,7 +143,7 @@
Periods
account.period
form
- tree,form,search
+ tree,form
{'search_default_draft': 1}
Here, you can define a period, an interval of time between successive closings of the books of your company. An accounting period typically is a month or a quarter, corresponding to the tax year used by the business. Create and manage them from here and decide whether a period should be left open or closed depending on your company's activities over a specific period.
@@ -698,7 +698,7 @@
Draft statements
account.bank.statement
form
- tree,form,search
+ tree,form
[('state','=','draft')]
@@ -1737,7 +1737,7 @@
Recurring Models
account.model
form
- tree,form,search
+ tree,form