[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
parent eb04af83f3 5350ab0c19
commit b1cf433ecc
1269 changed files with 191593 additions and 69530 deletions
@@ -67,7 +67,7 @@ class subscription_subscription(osv.osv):
    _description = "Subscription"
    _columns = {
        'name': fields.char('Name', size=60, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the subscription without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the subscription without removing it."),
        'partner_id': fields.many2one('res.partner', 'Partner'),
        'notes': fields.text('Notes'),
        'user_id': fields.many2one('res.users', 'User', required=True),