diff options
| author | qdp-launchpad@tinyerp.com <> | 2010-09-13 17:54:46 +0200 |
|---|---|---|
| committer | qdp-launchpad@tinyerp.com <> | 2010-09-13 17:54:46 +0200 |
| commit | 85d243fb445a42ca0d57362ad9804ddcf2d1a7cb (patch) | |
| tree | 4d01fd938f219506fcebc4adb70d45ea73a4f1f6 /addons/analytic | |
| parent | c42543ec5b149afd669af7cf4be87091ee7d9fe3 (diff) | |
| parent | ef819faf7e585cfecb11c203edbdd71ce6e76242 (diff) | |
[MERGE] merge with same branch
bzr revid: qdp-launchpad@tinyerp.com-20100913155446-gm9b07hb4fnd5yyo
Diffstat (limited to 'addons/analytic')
| -rw-r--r-- | addons/analytic/analytic.py | 2 | ||||
| -rw-r--r-- | addons/analytic/security/ir.model.access.csv | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index db5e554717d..26f57c984c0 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -222,7 +222,7 @@ class account_analytic_account(osv.osv): def check_recursion(self, cr, uid, ids, parent=None): return super(account_analytic_account, self).check_recursion(cr, uid, ids, parent=parent) - _order = 'parent_id desc,code' + _order = 'date_start desc,parent_id desc,code' _constraints = [ (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']) ] diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv index 0343f29f43a..73dba08900c 100644 --- a/addons/analytic/security/ir.model.access.csv +++ b/addons/analytic/security/ir.model.access.csv @@ -1 +1,8 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_account_analytic_line_analytic_accounting","account.analytic.line","analytic.model_account_analytic_line","analytic.group_analytic_accounting",1,1,1,1 +"access_account_analytic_account_analytic_accounting","account.analytic.account","analytic.model_account_analytic_account","analytic.group_analytic_accounting",1,1,1,1 +"access_account_analytic_journal_analytic_accounting","account.analytic.journal","account.model_account_analytic_journal","analytic.group_analytic_accounting",1,1,1,1 +"access_account_account_analytic_accounting","account.account","account.model_account_account","analytic.group_analytic_accounting",1,0,0,0 +"access_product_template_analytic_accounting","product.template","product.model_product_template","analytic.group_analytic_accounting",1,0,0,0 +"access_product_product_analytic_accounting","product.product","product.model_product_product","analytic.group_analytic_accounting",1,0,0,0 +"access_product_category_analytic_accounting","product.category","product.model_product_category","analytic.group_analytic_accounting",1,0,0,0 |