diff options
| author | Olivier Dony <odo@openerp.com> | 2011-10-13 19:03:27 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-10-13 19:03:27 +0200 |
| commit | 3bffe65b2ca8bc50ece644e7947ad2bbd5c9341a (patch) | |
| tree | b307874680dbdce7b2f5109b7b696ea38e679e20 /addons/subscription | |
| parent | a93ca01b5b1365f92e191e3c429ef655e751b455 (diff) | |
| parent | 8a7c61cb96a541a9aaca51ffe3ee903407b26360 (diff) | |
[MERGE] sync with latest trunk
bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb
Diffstat (limited to 'addons/subscription')
| -rw-r--r-- | addons/subscription/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/subscription/i18n/et.po | 16 | ||||
| -rw-r--r-- | addons/subscription/subscription.py | 6 |
3 files changed, 10 insertions, 16 deletions
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py index d2010c47987..581d54c9c4b 100644 --- a/addons/subscription/__openerp__.py +++ b/addons/subscription/__openerp__.py @@ -21,9 +21,9 @@ { - 'name': 'Subscription and recurring operations', + 'name': 'Recurring Documents', 'version': '1.0', - 'category': 'Tools', + 'category': 'Hidden', 'description': """ Create recurring documents. =========================== diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po index cb52a15396d..6190bcdec45 100644 --- a/addons/subscription/i18n/et.po +++ b/addons/subscription/i18n/et.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2010-10-30 14:37+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2011-10-11 18:14+0000\n" +"Last-Translator: Aare Vesi <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-12 04:39+0000\n" +"X-Generator: Launchpad (build 14124)\n" #. module: subscription #: field:subscription.subscription,doc_source:0 @@ -30,7 +30,7 @@ msgstr "Objekt" #. module: subscription #: view:subscription.subscription:0 msgid "This Week" -msgstr "" +msgstr "See nädal" #. module: subscription #: view:subscription.subscription:0 @@ -76,13 +76,13 @@ msgstr "Nädalad" #. module: subscription #: view:subscription.subscription:0 msgid "Today" -msgstr "" +msgstr "Täna" #. module: subscription #: code:addons/subscription/subscription.py:44 #, python-format msgid "Error !" -msgstr "" +msgstr "Viga !" #. module: subscription #: model:ir.actions.act_window,name:subscription.action_subscription_form @@ -265,7 +265,7 @@ msgstr "Väär" #. module: subscription #: view:subscription.subscription:0 msgid "Group By..." -msgstr "" +msgstr "Grupeeri..." #. module: subscription #: view:subscription.subscription:0 diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py index 0f2630ffbb5..466defd1fa2 100644 --- a/addons/subscription/subscription.py +++ b/addons/subscription/subscription.py @@ -38,12 +38,6 @@ class subscription_document(osv.osv): _defaults = { 'active' : lambda *a: True, } - - def write(self, cr, uid, ids, vals, context=None): - if 'model' in vals: - raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !')) - return super(subscription_document, self).write(cr, uid, ids, vals, context=context) - subscription_document() class subscription_document_fields(osv.osv): |