From 50f3280aa05cbc155cbb8a402e0cdbfaeceb7a4a Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 16 Dec 2011 11:24:55 +0530 Subject: [PATCH 1/2] [FIX] account_analytic_line: add constraint for view type account and Put the domain on stock valuation account in product category form. lp bug: https://launchpad.net/bugs/902440 fixed bzr revid: jap@tinyerp.com-20111216055455-ewzx2kjhazojlzv4 --- addons/analytic/analytic.py | 11 +++++++++++ addons/stock/product_view.xml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 2ecaeee0f15..ee541e3cef1 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -301,6 +301,17 @@ class account_analytic_line(osv.osv): } _order = 'date desc' + + def _check_no_view(self, cr, uid, ids, context=None): + analytic_lines = self.browse(cr, uid, ids, context=context) + for line in analytic_lines: + if line.account_id.type == 'view': + return False + return True + + _constraints = [ + (_check_no_view, 'You can not create analytic line on view account.', ['account_id']), + ] account_analytic_line() diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index b11fe36d8d8..c65716c4637 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -27,7 +27,7 @@ - + From 90a33f9b5f70e0b632e4c136c77dc22fa025205a Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 19 Dec 2011 14:10:09 +0530 Subject: [PATCH 2/2] [FIX] Add the domain in stock valuation account bzr revid: jap@tinyerp.com-20111219084009-kahvmrnvgcyze5qg --- addons/stock/product_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index c65716c4637..a615cf327e9 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -27,7 +27,7 @@ - +