summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function.py
diff options
context:
space:
mode:
authorJosse Colpaert <jco@odoo.com>2014-07-07 14:33:01 +0200
committerJosse Colpaert <jco@odoo.com>2014-07-07 14:33:01 +0200
commitaf0e9b8aa6c2083fd483979975e81c7bf868d574 (patch)
treebb2aa28096ed18fe28f02bc17898f77df44a6614 /addons/analytic_user_function/analytic_user_function.py
parente905fdfa3a277f86948067d7dae19ea5f89576eb (diff)
parent7f9d1f42bf3ad7a734ed5f317bbb4a8a9df639c5 (diff)
[MERGE] Fix copy_data for merge
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
-rw-r--r--addons/analytic_user_function/analytic_user_function.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 5a17ac91e53..42530bfbb7b 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -59,7 +59,7 @@ class analytic_user_funct_grid(osv.osv):
class account_analytic_account(osv.osv):
_inherit = "account.analytic.account"
_columns = {
- 'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
+ 'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.', copy=True),
}