diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 6ddea9645b4..95b487e2bf7 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -605,10 +605,10 @@ class account_bank_statement_reconcile_line(osv.osv):
'account_id': fields.many2one('account.account', 'Account', required=True),
'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
'amount': fields.float('Amount', required=True),
- 'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
+ 'analytic_id': fields.many2one('account.analytic.account',"Analytic Account", domain=[('parent_id', '!=', False)])
}
_defaults = {
- 'name': lambda *a: 'Write-Off',
+ 'name': 'Write-Off',
}
account_bank_statement_reconcile_line()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6effce8f488..55e9230cdec 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -62,12 +62,12 @@
-
+
-
+
@@ -178,7 +178,7 @@
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 00aa49ec760..1dc871a5597 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -897,7 +897,7 @@
-
+
@@ -974,7 +974,7 @@
-
+
@@ -1019,7 +1019,7 @@
-
+
@@ -1247,7 +1247,7 @@
-
+
@@ -1266,7 +1266,7 @@
-
+
@@ -1912,7 +1912,7 @@
-
+
diff --git a/addons/account/wizard/account_pay_invoice.py b/addons/account/wizard/account_pay_invoice.py
index 49a905836b2..078929f488c 100644
--- a/addons/account/wizard/account_pay_invoice.py
+++ b/addons/account/wizard/account_pay_invoice.py
@@ -35,7 +35,7 @@ class account_invoice_pay_writeoff(osv.osv_memory):
'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', required=True),
'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', required=True),
'comment': fields.char('Comment', size=64, required=True),
- 'analytic_id': fields.many2one('account.analytic.account','Analytic Account')
+ 'analytic_id': fields.many2one('account.analytic.account','Analytic Account', domain=[('parent_id', '!=', False)])
}
_defaults = {
'comment': 'Write-Off',
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index e8db687edf7..27b7399c600 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -148,7 +148,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
'writeoff_acc_id': fields.many2one('account.account','Write-Off account', required=True),
'date_p': fields.date('Date'),
'comment': fields.char('Comment', size= 64, required=True),
- 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+ 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
}
_defaults = {
'date_p': time.strftime('%Y-%m-%d'),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f84d9600dbc..3fa024074dc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -37,7 +37,7 @@ class sale_shop(osv.osv):
'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
- 'project_id': fields.many2one('account.analytic.account', 'Analytic Account'),
+ 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4d6b41a372b..80f05e5eafc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -116,7 +116,7 @@
+ groups="base.group_extended" domain="[('parent_id','!=',False)]" />