From 8041b935d8aad8c9f25ddef7a7681b7a2e6d1570 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Wed, 9 Dec 2009 18:42:54 +0100 Subject: [PATCH 01/16] [FIX] #494620 missing company_id in domain that return the bad company when there is a multiple rules for teh same object lp bug: https://launchpad.net/bugs/494620 fixed bzr revid: christophe.chauvet@syleam.fr-20091209174254-pu5oxg8e4saqd48p --- bin/addons/base/res/res_company.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index acd1e85a184..7ec19a971ff 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -94,13 +94,14 @@ class res_company(osv.osv): """ if not context: context = {} + user_company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id proxy = self.pool.get('multi_company.default') - ids = proxy.search(cr, uid, [('object_id.model', '=', object)]) + ids = proxy.search(cr, uid, [('object_id.model', '=', object), ('company_id','=',user_company_id)]) for rule in proxy.browse(cr, uid, ids, context): user = self.pool.get('res.users').browse(cr, uid, uid) if eval(rule.expression, {'context': context, 'user': user}): return rule.company_dest_id.id - return self.pool.get('res.users').browse(cr, uid, uid).company_id.id + return user_company_id def _get_child_ids(self, cr, uid, uid2, context={}): company = self.pool.get('res.users').company_get(cr, uid, uid2) From 74d49f77e36394f0cec0fd57b06463ba00d38a21 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Wed, 9 Dec 2009 21:27:33 +0100 Subject: [PATCH 02/16] [IMP] Name field in default company is too small, extend to 256 bzr revid: christophe.chauvet@syleam.fr-20091209202733-n8m5z275ms49r9jq --- bin/addons/base/res/res_company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index 7ec19a971ff..d40894968e1 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -36,7 +36,7 @@ class multi_company_default(osv.osv): _columns = { 'sequence': fields.integer('Sequence'), - 'name': fields.char('Name', size=32, required=True, help='Name it to easily find a record'), + 'name': fields.char('Name', size=256, required=True, help='Name it to easily find a record'), 'company_id': fields.many2one('res.company', 'Main Company', required=True, help='Company where the user is connected'), 'company_dest_id': fields.many2one('res.company', 'Default Company', required=True, From 5d15a496b1daf1312526b8b0a7d3cc4eb14f465c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Dec 2009 20:21:39 +0100 Subject: [PATCH 03/16] [fix] mixed inheritance between osv and osv_memory, add direct osv_base holding redundancies between osv and osv_memory and forcing resolution of its __init__ before going higher the class tree bzr revid: xmo@tinyerp.com-20091217192139-z9pnlw7d0438u89q --- bin/osv/orm.py | 2 +- bin/osv/osv.py | 35 +++++++---------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 0d8e36031f7..a326b6b23e3 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1531,7 +1531,7 @@ class orm_memory(orm_template): _check_time = 20 def __init__(self, cr): - orm_template.__init__(self, cr) + super(orm_memory, self).__init__(cr) self.datas = {} self.next_id = 0 self.check_id = 0 diff --git a/bin/osv/osv.py b/bin/osv/osv.py index 6f795fe3ee9..5b2e4ee8da8 100644 --- a/bin/osv/osv.py +++ b/bin/osv/osv.py @@ -171,9 +171,12 @@ class osv_pool(netsvc.Service): res.append(klass.createInstance(self, module, cr)) return res +class osv_base(object): + def __init__(self, pool, cr): + pool.add(self._name, self) + self.pool = pool + super(osv_base, self).__init__(cr) -class osv_memory(orm.orm_memory): - #__metaclass__ = inheritor def __new__(cls): module = str(cls)[6:] module = module[:len(module)-1] @@ -186,6 +189,7 @@ class osv_memory(orm.orm_memory): module_list.append(cls._module) return None +class osv_memory(osv_base, orm.orm_memory): # # Goal: try to apply inheritancy at the instanciation level and # put objects in the pool var @@ -213,27 +217,7 @@ class osv_memory(orm.orm_memory): return obj createInstance = classmethod(createInstance) - def __init__(self, pool, cr): - pool.add(self._name, self) - self.pool = pool - orm.orm_memory.__init__(self, cr) - - - -class osv(orm.orm): - #__metaclass__ = inheritor - def __new__(cls): - module = str(cls)[6:] - module = module[:len(module)-1] - module = module.split('.')[0][2:] - if not hasattr(cls, '_module'): - cls._module = module - module_class_list.setdefault(cls._module, []).append(cls) - class_pool[cls._name] = cls - if module not in module_list: - module_list.append(cls._module) - return None - +class osv(osv_base, orm.orm): # # Goal: try to apply inheritancy at the instanciation level and # put objects in the pool var @@ -270,10 +254,5 @@ class osv(orm.orm): return obj createInstance = classmethod(createInstance) - def __init__(self, pool, cr): - pool.add(self._name, self) - self.pool = pool - orm.orm.__init__(self, cr) - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 121d3c2222f3f2ef872d13557331fd140dd14b10 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Thu, 17 Dec 2009 22:37:00 +0100 Subject: [PATCH 04/16] [FIX] change size for multi company default from 32 to 256 [IMP] Prepare _company_default_get to support rules on object's field lp bug: https://launchpad.net/bugs/497685 fixed bzr revid: christophe.chauvet@syleam.fr-20091217213700-k1i6fdgojhn0uccs --- bin/addons/base/res/res_company.py | 11 ++++++++--- bin/addons/base/res/res_company_view.xml | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index acd1e85a184..70af44da6a4 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -36,7 +36,7 @@ class multi_company_default(osv.osv): _columns = { 'sequence': fields.integer('Sequence'), - 'name': fields.char('Name', size=32, required=True, help='Name it to easily find a record'), + 'name': fields.char('Name', size=256, required=True, help='Name it to easily find a record'), 'company_id': fields.many2one('res.company', 'Main Company', required=True, help='Company where the user is connected'), 'company_dest_id': fields.many2one('res.company', 'Default Company', required=True, @@ -45,6 +45,7 @@ class multi_company_default(osv.osv): help='Object affect by this rules'), 'expression': fields.char('Expression', size=32, required=True, help='Expression, must be True to match'), + 'field_id': fields.many2one('ir.model.fields', 'Field', help='Select field property'), } _defaults = { @@ -88,14 +89,18 @@ class res_company(osv.osv): } - def _company_default_get(self, cr, uid, object=False, context=None): + def _company_default_get(self, cr, uid, object=False, field=False, context=None): """ Check if the object for this company have a default value """ if not context: context = {} proxy = self.pool.get('multi_company.default') - ids = proxy.search(cr, uid, [('object_id.model', '=', object)]) + args = [ + ('object_id.model', '=', object), + ('field_id.name','=',field), + ] + ids = proxy.search(cr, uid, args) for rule in proxy.browse(cr, uid, ids, context): user = self.pool.get('res.users').browse(cr, uid, uid) if eval(rule.expression, {'context': context, 'user': user}): diff --git a/bin/addons/base/res/res_company_view.xml b/bin/addons/base/res/res_company_view.xml index cfaab5abd38..34e58b75b6c 100644 --- a/bin/addons/base/res/res_company_view.xml +++ b/bin/addons/base/res/res_company_view.xml @@ -11,6 +11,7 @@ + @@ -30,10 +31,12 @@ - + + + From 981e7408bd583ded90afbdc236e5cd895c1bd89a Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Thu, 17 Dec 2009 22:38:28 +0100 Subject: [PATCH 05/16] [IMP] Extended the field.property to new type field (char, integer, float, date, ...) By default, when there are no multi company default, we keep the compatibility with 5.0 else we match to find the company_id for this fields. bzr revid: christophe.chauvet@syleam.fr-20091217213828-f8edggbqnhzw41h2 --- bin/addons/base/res/ir_property.py | 13 +------- bin/osv/fields.py | 53 +++++++++++++++++------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py index e14e365dce3..b02ba593a02 100644 --- a/bin/addons/base/res/ir_property.py +++ b/bin/addons/base/res/ir_property.py @@ -25,17 +25,6 @@ from osv import osv,fields # Properties # ------------------------------------------------------------------------- -def _models_get2(self, cr, uid, context={}): - obj = self.pool.get('ir.model.fields') - ids = obj.search(cr, uid, [('view_load','=',1)]) - res = [] - done = {} - for o in obj.browse(cr, uid, ids, context=context): - if o.relation not in done: - res.append( [o.relation, o.relation]) - done[o.relation] = True - return res - def _models_get(self, cr, uid, context={}): obj = self.pool.get('ir.model.fields') ids = obj.search(cr, uid, [('view_load','=',1)]) @@ -51,7 +40,7 @@ class ir_property(osv.osv): _name = 'ir.property' _columns = { 'name': fields.char('Name', size=128), - 'value': fields.reference('Value', selection=_models_get2, size=128), + 'value': fields.char('Value', size=128), 'res_id': fields.reference('Resource', selection=_models_get, size=128), 'company_id': fields.many2one('res.company', 'Company'), 'fields_id': fields.many2one('ir.model.fields', 'Fields', ondelete='cascade', required=True) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index 09d51e6bd82..50b7a233b3b 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -856,9 +856,12 @@ class property(function): if nid: default_val = property.browse(cr, uid, nid[0], context).value - company_id = obj.pool.get('res.users').company_get(cr, uid, uid) + company_id = obj.pool.get('res.company')._company_default_get(cr, uid, obj._name, prop, context=context) res = False - newval = (id_val and obj_dest+','+str(id_val)) or False + if val[0]: + newval = (id_val and obj_dest+','+str(id_val)) or False + else: + newval = id_val or False if (newval != default_val) and newval: propdef = obj.pool.get('ir.model.fields').browse(cr, uid, definition_id, context=context) @@ -892,27 +895,33 @@ class property(function): for id in ids: res[id] = default_val for prop in property.browse(cr, uid, nids): - res[int(prop.res_id.split(',')[1])] = (prop.value and \ - int(prop.value.split(',')[1])) or False - - obj = obj.pool.get(self._obj) - - to_check = res.values() - if default_val and default_val not in to_check: - to_check += [default_val] - existing_ids = obj.search(cr, uid, [('id', 'in', to_check)]) - - for id, res_id in res.items(): - if res_id not in existing_ids: - cr.execute('DELETE FROM ir_property WHERE value=%s', ((obj._name+','+str(res_id)),)) - res[id] = default_val - - names = dict(obj.name_get(cr, uid, existing_ids, context)) - for r in res.keys(): - if res[r] and res[r] in names: - res[r] = (res[r], names[res[r]]) + if prop.value.find(',') >= 0: + res[int(prop.res_id.split(',')[1])] = (prop.value and \ + int(prop.value.split(',')[1])) or False else: - res[r] = False + res[int(prop.res_id.split(',')[1])] = prop.value or '' + + try: + obj = obj.pool.get(self._obj) + + to_check = res.values() + if default_val and default_val not in to_check: + to_check += [default_val] + existing_ids = obj.search(cr, uid, [('id', 'in', to_check)]) + + for id, res_id in res.items(): + if res_id not in existing_ids: + cr.execute('DELETE FROM ir_property WHERE value=%s', ((obj._name+','+str(res_id)),)) + res[id] = default_val + + names = dict(obj.name_get(cr, uid, existing_ids, context)) + for r in res.keys(): + if res[r] and res[r] in names: + res[r] = (res[r], names[res[r]]) + else: + res[r] = False + except: + pass return res def _field_get(self, cr, uid, model_name, prop): From d5b63d3e712b8e111844790699f373e61845e05b Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Fri, 18 Dec 2009 04:32:11 +0000 Subject: [PATCH 06/16] Launchpad automatic translations update. bzr revid: codehost@crowberry-20091218043211-a33bhc5qr5dxomlh --- bin/addons/base/i18n/he.po | 6 +++--- bin/addons/base/i18n/lv.po | 8 ++++---- debian/po/nl.po | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po index 69b016efba9..5a07918b3fa 100644 --- a/bin/addons/base/i18n/he.po +++ b/bin/addons/base/i18n/he.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-16 06:38+0000\n" +"PO-Revision-Date: 2009-12-17 09:51+0000\n" "Last-Translator: Ddorda \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-17 04:43+0000\n" +"X-Launchpad-Export-Date: 2009-12-18 04:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -7105,7 +7105,7 @@ msgstr "גבוה" #. module: base #: field:ir.exports.line,export_id:0 msgid "Export" -msgstr "יצוא" +msgstr "ייצוא" #. module: base #: help:res.bank,bic:0 diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po index 7b88c983472..f202c0b1a13 100644 --- a/bin/addons/base/i18n/lv.po +++ b/bin/addons/base/i18n/lv.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-15 06:30+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2009-12-17 07:02+0000\n" +"Last-Translator: Normunds \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-16 05:01+0000\n" +"X-Launchpad-Export-Date: 2009-12-18 04:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -3196,7 +3196,7 @@ msgstr "Montserrata" #. module: base #: model:ir.ui.menu,name:base.menu_translation_app msgid "Application Terms" -msgstr "Izmantotie nosacījumi" +msgstr "Izmantotie Termini" #. module: base #: selection:ir.report.custom.fields,operation:0 diff --git a/debian/po/nl.po b/debian/po/nl.po index fa3715b3451..6ce8ed61821 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-24 22:41+0300\n" -"PO-Revision-Date: 2009-12-16 08:28+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2009-12-17 06:04+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-17 04:43+0000\n" +"X-Launchpad-Export-Date: 2009-12-18 04:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Type: string From 0700f9286fa400e36f16a3503d0efe1048b13de0 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Fri, 18 Dec 2009 09:41:26 +0100 Subject: [PATCH 07/16] [IMP] Update the template for translation bzr revid: christophe.chauvet@syleam.fr-20091218084126-fwa0yt6cg0x160qj --- bin/addons/base/i18n/base.pot | 168 +++++++++++++++++----------------- 1 file changed, 86 insertions(+), 82 deletions(-) diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot index ad77b86e94f..79662043441 100644 --- a/bin/addons/base/i18n/base.pot +++ b/bin/addons/base/i18n/base.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-12-09 10:13:57+0000\n" -"PO-Revision-Date: 2009-12-10 07:54+0000\n" +"POT-Creation-Date: 2009-12-18 08:39:22+0000\n" +"PO-Revision-Date: 2009-12-18 08:39:22+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -189,11 +189,6 @@ msgstr "" msgid "Number of Modules" msgstr "" -#. module: base -#: help:multi_company.default,company_dest_id:0 -msgid "Company to store the current record" -msgstr "" - #. module: base #: field:res.partner.bank.type.field,size:0 msgid "Max. Size" @@ -718,6 +713,12 @@ msgstr "" msgid "Iran" msgstr "" +#. module: base +#: model:ir.actions.act_window,name:base.res_request-act +#: model:ir.ui.menu,name:base.menu_res_request_act +msgid "My Requests" +msgstr "" + #. module: base #: field:ir.sequence,name:0 #: field:ir.sequence.type,name:0 @@ -1077,6 +1078,11 @@ msgstr "" msgid "Fixed Width" msgstr "" +#. module: base +#: model:res.company,overdue_msg:base.main_company +msgid "Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).81.81.37.00." +msgstr "" + #. module: base #: selection:ir.ui.menu,icon:0 msgid "terp-calendar" @@ -1112,13 +1118,8 @@ msgid "7. %H:%M:%S ==> 18:25:20" msgstr "" #. module: base -#: model:ir.actions.act_window,name:base.action_partner_form -#: model:ir.ui.menu,name:base.menu_base_partner -#: model:ir.ui.menu,name:base.menu_partner_form -#: view:res.partner:0 -#: view:res.partner.category:0 -#: field:res.partner.category,partner_ids:0 -msgid "Partners" +#: help:res.users,company_id:0 +msgid "The company this user is currently working on." msgstr "" #. module: base @@ -1317,6 +1318,11 @@ msgstr "" msgid "Groups" msgstr "" +#. module: base +#: constraint:res.users:0 +msgid "This user can not connect using this company !" +msgstr "" + #. module: base #: model:res.country,name:base.bz msgid "Belize" @@ -1529,6 +1535,12 @@ msgstr "" msgid "Field Mappings" msgstr "" +#. module: base +#: model:ir.actions.act_window,name:base.res_request-closed +#: model:ir.ui.menu,name:base.next_id_12_close +msgid "My Closed Requests" +msgstr "" + #. module: base #: model:ir.ui.menu,name:base.menu_custom msgid "Customization" @@ -1585,11 +1597,6 @@ msgstr "" msgid "Iteration Actions" msgstr "" -#. module: base -#: help:multi_company.default,company_id:0 -msgid "Company where the user is connected" -msgstr "" - #. module: base #: field:maintenance.contract,date_stop:0 msgid "Ending Date" @@ -1792,11 +1799,6 @@ msgstr "" msgid "Dependencies" msgstr "" -#. module: base -#: field:multi_company.default,company_id:0 -msgid "Main Company" -msgstr "" - #. module: base #: field:ir.report.custom.fields,bgcolor:0 msgid "Background Color" @@ -1912,6 +1914,12 @@ msgstr "" msgid "Module" msgstr "" +#. module: base +#: model:ir.actions.act_window,name:base.action_res_bank_form +#: model:ir.ui.menu,name:base.menu_action_res_bank_form +msgid "Bank List" +msgstr "" + #. module: base #: field:ir.attachment,description:0 #: field:ir.module.module,description:0 @@ -2275,11 +2283,6 @@ msgstr "" msgid "6. %d, %m ==> 05, 12" msgstr "" -#. module: base -#: help:multi_company.default,expression:0 -msgid "Expression, must be True to match" -msgstr "" - #. module: base #: help:res.partner,customer:0 msgid "Check this box if the partner is a customer." @@ -2384,11 +2387,6 @@ msgstr "" msgid "Summary" msgstr "" -#. module: base -#: field:multi_company.default,expression:0 -msgid "Expression" -msgstr "" - #. module: base #: help:ir.actions.server,subject:0 msgid "Specify the subject. You can use fields from the object, e.g. `Hello [[ object.partner_id.name ]]`" @@ -2974,6 +2972,7 @@ msgstr "" #. module: base #: field:ir.rule,field_id:0 #: selection:ir.translation,type:0 +#: field:multi_company.default,field_id:0 msgid "Field" msgstr "" @@ -3039,7 +3038,6 @@ msgstr "" #: field:ir.rule.group,name:0 #: field:ir.values,name:0 #: field:maintenance.contract.module,name:0 -#: field:multi_company.default,name:0 #: field:res.bank,name:0 #: field:res.config.view,name:0 #: field:res.lang,name:0 @@ -3560,8 +3558,6 @@ msgid "Signal (button Name)" msgstr "" #. module: base -#: model:ir.actions.act_window,name:base.action_res_bank_form -#: model:ir.ui.menu,name:base.menu_action_res_bank_form #: view:res.bank:0 #: field:res.partner,bank_ids:0 msgid "Banks" @@ -3820,6 +3816,7 @@ msgid "On Multiple Doc." msgstr "" #. module: base +#: model:ir.ui.menu,name:base.menu_base_config_contact #: field:res.partner,address:0 #: view:res.partner.address:0 msgid "Contacts" @@ -3830,11 +3827,6 @@ msgstr "" msgid "Faroe Islands" msgstr "" -#. module: base -#: help:multi_company.default,object_id:0 -msgid "Object affect by this rules" -msgstr "" - #. module: base #: model:ir.actions.wizard,name:base.wizard_upgrade #: model:ir.ui.menu,name:base.menu_wizard_upgrade @@ -4218,11 +4210,6 @@ msgstr "" msgid "French (CH) / Français (CH)" msgstr "" -#. module: base -#: model:ir.model,name:base.model_res_company -msgid "List of Company" -msgstr "" - #. module: base #: selection:ir.ui.menu,icon:0 msgid "STOCK_NEW" @@ -4333,6 +4320,11 @@ msgstr "" msgid "res.partner.event" msgstr "" +#. module: base +#: field:res.company,user_ids:0 +msgid "Accepted Users" +msgstr "" + #. module: base #: selection:ir.ui.menu,icon:0 msgid "STOCK_UNDERLINE" @@ -4450,13 +4442,6 @@ msgstr "" msgid "iCal id" msgstr "" -#. module: base -#: model:ir.actions.act_window,name:base.action_partner_function_form -#: model:ir.ui.menu,name:base.menu_partner_function_form -#: view:res.partner.function:0 -msgid "Partner Functions" -msgstr "" - #. module: base #: wizard_view:res.partner.sms_send,init:0 msgid "Bulk SMS send" @@ -4589,11 +4574,6 @@ msgstr "" msgid "Full" msgstr "" -#. module: base -#: field:multi_company.default,company_dest_id:0 -msgid "Default Company" -msgstr "" - #. module: base #: model:res.country,name:base.as msgid "American Samoa" @@ -4831,6 +4811,7 @@ msgstr "" #. module: base #: model:ir.actions.act_window,name:base.action_res_company_form #: model:ir.ui.menu,name:base.menu_action_res_company_form +#: model:ir.ui.menu,name:base.menu_res_company_global #: view:res.company:0 msgid "Companies" msgstr "" @@ -5256,9 +5237,10 @@ msgid "Active Partner Events" msgstr "" #. module: base -#: model:ir.actions.act_window,name:base.action_rule -#: model:ir.ui.menu,name:base.menu_action_rule -msgid "Record Rules" +#: model:ir.actions.act_window,name:base.action_partner_function_form +#: model:ir.ui.menu,name:base.menu_partner_function_form +#: view:res.partner.function:0 +msgid "Contact Functions" msgstr "" #. module: base @@ -5551,8 +5533,6 @@ msgid "Martinique (French)" msgstr "" #. module: base -#: model:ir.actions.act_window,name:base.res_request-act -#: model:ir.ui.menu,name:base.menu_res_request_act #: model:ir.ui.menu,name:base.next_id_12 #: view:res.request:0 msgid "Requests" @@ -5809,6 +5789,11 @@ msgstr "" msgid "Rounding factor" msgstr "" +#. module: base +#: model:ir.model,name:base.model_res_company +msgid "res.company" +msgstr "" + #. module: base #: wizard_view:module.upgrade,end:0 #: wizard_view:module.upgrade,start:0 @@ -5889,6 +5874,11 @@ msgstr "" msgid "Hour 00->24: %(h24)s" msgstr "" +#. module: base +#: help:multi_company.default,field_id:0 +msgid "Select field property" +msgstr "" + #. module: base #: field:res.request.history,date_sent:0 msgid "Date sent" @@ -5908,7 +5898,6 @@ msgstr "" #: view:ir.sequence:0 #: field:ir.ui.menu,sequence:0 #: field:ir.ui.view_sc,sequence:0 -#: field:multi_company.default,sequence:0 #: field:res.partner.bank,sequence:0 #: field:wizard.ir.model.menu.create.line,sequence:0 msgid "Sequence" @@ -5973,6 +5962,11 @@ msgstr "" msgid "Parent" msgstr "" +#. module: base +#: view:multi_company.default:0 +msgid "Returning" +msgstr "" + #. module: base #: field:ir.actions.act_window,res_model:0 #: field:ir.actions.report.custom,model:0 @@ -5991,7 +5985,6 @@ msgstr "" #: selection:ir.translation,type:0 #: field:ir.ui.view,model:0 #: field:ir.values,model_id:0 -#: field:multi_company.default,object_id:0 #: field:res.request.link,object:0 #: field:wizard.ir.model.menu.create,model_id:0 #: field:workflow.triggers,model:0 @@ -6688,6 +6681,17 @@ msgstr "" msgid "Landscape" msgstr "" +#. module: base +#: model:ir.actions.act_window,name:base.action_partner_form +#: model:ir.ui.menu,name:base.menu_base_config_partner +#: model:ir.ui.menu,name:base.menu_base_partner +#: model:ir.ui.menu,name:base.menu_partner_form +#: view:res.partner:0 +#: view:res.partner.category:0 +#: field:res.partner.category,partner_ids:0 +msgid "Partners" +msgstr "" + #. module: base #: model:ir.ui.menu,name:base.menu_administration msgid "Administration" @@ -6902,11 +6906,6 @@ msgstr "" msgid "Second field should be figures" msgstr "" -#. module: base -#: help:multi_company.default,name:0 -msgid "Name it to easily find a record" -msgstr "" - #. module: base #: model:ir.actions.act_window,name:base.action_model_grid_security #: model:ir.ui.menu,name:base.menu_ir_access_grid @@ -7029,11 +7028,6 @@ msgstr "" msgid "Bank Accounts" msgstr "" -#. module: base -#: model:ir.model,name:base.model_multi_company_default -msgid "Default multi company" -msgstr "" - #. module: base #: view:res.request:0 msgid "Send" @@ -7122,12 +7116,6 @@ msgstr "" msgid "https://translations.launchpad.net/openobject" msgstr "" -#. module: base -#: model:ir.actions.act_window,name:base.action_partner_title -#: model:ir.ui.menu,name:base.menu_partner_title -msgid "Titles" -msgstr "" - #. module: base #: field:ir.actions.todo,start_date:0 msgid "Start Date" @@ -7199,6 +7187,11 @@ msgstr "" msgid "Delete Permission" msgstr "" +#. module: base +#: model:ir.model,name:base.model_multi_company_default +msgid "multi_company.default" +msgstr "" + #. module: base #: selection:workflow.activity,join_mode:0 #: selection:workflow.activity,split_mode:0 @@ -7455,6 +7448,11 @@ msgstr "" msgid "Rwanda" msgstr "" +#. module: base +#: constraint:res.partner:0 +msgid "The VAT doesn't seem to be correct." +msgstr "" + #. module: base #: selection:ir.report.custom.fields,operation:0 msgid "Calculate Sum" @@ -7592,6 +7590,12 @@ msgstr "" msgid "ir.actions.server" msgstr "" +#. module: base +#: model:ir.actions.act_window,name:base.action_rule +#: model:ir.ui.menu,name:base.menu_action_rule +msgid "Record Rules" +msgstr "" + #. module: base #: view:ir.actions.report.custom:0 msgid "Report custom" From d41f2ec159e003d338ca2cf0f00f00ba657aa26d Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Fri, 18 Dec 2009 15:09:34 +0530 Subject: [PATCH 08/16] [FIX] base/i18n: remove python code strings on translation files lp bug: https://launchpad.net/bugs/484298 fixed bzr revid: mra@tinyerp.com-20091218093934-tzp9x6gzqcnwxt4d --- bin/addons/base/i18n/ar.po | 16 +-------------- bin/addons/base/i18n/bg.po | 16 +-------------- bin/addons/base/i18n/bs.po | 16 +-------------- bin/addons/base/i18n/ca.po | 16 +-------------- bin/addons/base/i18n/cs.po | 16 +-------------- bin/addons/base/i18n/da.po | 16 +-------------- bin/addons/base/i18n/de.po | 16 +-------------- bin/addons/base/i18n/el.po | 16 +-------------- bin/addons/base/i18n/es.po | 16 +-------------- bin/addons/base/i18n/es_AR.po | 16 +-------------- bin/addons/base/i18n/es_EC.po | 16 +-------------- bin/addons/base/i18n/et.po | 16 +-------------- bin/addons/base/i18n/fi.po | 16 +-------------- bin/addons/base/i18n/fr.po | 16 +-------------- bin/addons/base/i18n/gl.po | 16 +-------------- bin/addons/base/i18n/he.po | 16 +-------------- bin/addons/base/i18n/hr.po | 16 +-------------- bin/addons/base/i18n/hu.po | 16 +-------------- bin/addons/base/i18n/id.po | 16 +-------------- bin/addons/base/i18n/is.po | 16 +-------------- bin/addons/base/i18n/it.po | 16 +-------------- bin/addons/base/i18n/ja.po | 16 +-------------- bin/addons/base/i18n/ko.po | 16 +-------------- bin/addons/base/i18n/lt.po | 16 +-------------- bin/addons/base/i18n/lt_LT.po | 16 +-------------- bin/addons/base/i18n/lv.po | 16 +-------------- bin/addons/base/i18n/mn.po | 16 +-------------- bin/addons/base/i18n/nl.po | 32 ++--------------------------- bin/addons/base/i18n/nl_BE.po | 16 +-------------- bin/addons/base/i18n/nl_NL.po | 16 +-------------- bin/addons/base/i18n/pl.po | 16 +-------------- bin/addons/base/i18n/pt.po | 32 ++--------------------------- bin/addons/base/i18n/pt_BR.po | 16 +-------------- bin/addons/base/i18n/ro.po | 16 +-------------- bin/addons/base/i18n/ru.po | 16 +-------------- bin/addons/base/i18n/sk.po | 16 +-------------- bin/addons/base/i18n/sl.po | 16 +-------------- bin/addons/base/i18n/sq.po | 16 +-------------- bin/addons/base/i18n/sr.po | 16 +-------------- bin/addons/base/i18n/sv.po | 16 +-------------- bin/addons/base/i18n/th.po | 16 +-------------- bin/addons/base/i18n/tlh.po | 16 +-------------- bin/addons/base/i18n/tr.po | 16 +-------------- bin/addons/base/i18n/uk.po | 16 +-------------- bin/addons/base/i18n/uk_UA.po | 16 +-------------- bin/addons/base/i18n/vi.po | 16 +-------------- bin/addons/base/i18n/zh_CN.po | 38 +---------------------------------- bin/addons/base/i18n/zh_TW.po | 16 +-------------- 48 files changed, 50 insertions(+), 772 deletions(-) diff --git a/bin/addons/base/i18n/ar.po b/bin/addons/base/i18n/ar.po index eedfffc7a37..ccc0b253f29 100644 --- a/bin/addons/base/i18n/ar.po +++ b/bin/addons/base/i18n/ar.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po index ec1db214ed7..b1bbc3cd59d 100644 --- a/bin/addons/base/i18n/bg.po +++ b/bin/addons/base/i18n/bg.po @@ -996,21 +996,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/bs.po b/bin/addons/base/i18n/bs.po index 3c9f28cb276..afcf55fca17 100644 --- a/bin/addons/base/i18n/bs.po +++ b/bin/addons/base/i18n/bs.po @@ -986,21 +986,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po index ff630734c97..051d6ddc618 100644 --- a/bin/addons/base/i18n/ca.po +++ b/bin/addons/base/i18n/ca.po @@ -1008,21 +1008,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/cs.po b/bin/addons/base/i18n/cs.po index 2e3d0e3bbcb..190016ce8da 100644 --- a/bin/addons/base/i18n/cs.po +++ b/bin/addons/base/i18n/cs.po @@ -984,21 +984,7 @@ msgstr "STOCK_KOPÍROVAT" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/da.po b/bin/addons/base/i18n/da.po index e28ec968125..e12c4a5db1e 100644 --- a/bin/addons/base/i18n/da.po +++ b/bin/addons/base/i18n/da.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/de.po b/bin/addons/base/i18n/de.po index e74916ab978..47e33938728 100644 --- a/bin/addons/base/i18n/de.po +++ b/bin/addons/base/i18n/de.po @@ -1006,21 +1006,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/el.po b/bin/addons/base/i18n/el.po index c4eb8c94c29..bdb2fe69ee2 100644 --- a/bin/addons/base/i18n/el.po +++ b/bin/addons/base/i18n/el.po @@ -1011,21 +1011,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po index ca266b534e9..ef6d3721dd7 100644 --- a/bin/addons/base/i18n/es.po +++ b/bin/addons/base/i18n/es.po @@ -1011,21 +1011,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/es_AR.po b/bin/addons/base/i18n/es_AR.po index bfd786a50ee..78c0061c090 100644 --- a/bin/addons/base/i18n/es_AR.po +++ b/bin/addons/base/i18n/es_AR.po @@ -1020,21 +1020,7 @@ msgstr "STOCK_COPY" #: code:addons/addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/es_EC.po b/bin/addons/base/i18n/es_EC.po index cdc7b705060..292fecf1d42 100644 --- a/bin/addons/base/i18n/es_EC.po +++ b/bin/addons/base/i18n/es_EC.po @@ -1032,21 +1032,7 @@ msgstr "STOCK_COPY" #: code:addons/addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/et.po b/bin/addons/base/i18n/et.po index 0f8bfdcc1a3..6bec88e69bc 100644 --- a/bin/addons/base/i18n/et.po +++ b/bin/addons/base/i18n/et.po @@ -996,21 +996,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po index 2a72521da63..d08c66c9de0 100644 --- a/bin/addons/base/i18n/fi.po +++ b/bin/addons/base/i18n/fi.po @@ -1007,21 +1007,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po index a9bfe113b54..6d117fc2799 100644 --- a/bin/addons/base/i18n/fr.po +++ b/bin/addons/base/i18n/fr.po @@ -1013,21 +1013,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/gl.po b/bin/addons/base/i18n/gl.po index 22d5221e728..ec17267b817 100644 --- a/bin/addons/base/i18n/gl.po +++ b/bin/addons/base/i18n/gl.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po index 5a07918b3fa..a320a211ae1 100644 --- a/bin/addons/base/i18n/he.po +++ b/bin/addons/base/i18n/he.po @@ -1002,21 +1002,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po index 7922b2d3362..2baa827c81d 100644 --- a/bin/addons/base/i18n/hr.po +++ b/bin/addons/base/i18n/hr.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/hu.po b/bin/addons/base/i18n/hu.po index 58b6d5beeab..985a83f663c 100644 --- a/bin/addons/base/i18n/hu.po +++ b/bin/addons/base/i18n/hu.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/id.po b/bin/addons/base/i18n/id.po index 9e6ca6e7b78..f1a0ec4e7fb 100644 --- a/bin/addons/base/i18n/id.po +++ b/bin/addons/base/i18n/id.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/is.po b/bin/addons/base/i18n/is.po index 2da0c73e9d0..66a9f734a2f 100644 --- a/bin/addons/base/i18n/is.po +++ b/bin/addons/base/i18n/is.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po index 20c61df95ab..17981e3c925 100644 --- a/bin/addons/base/i18n/it.po +++ b/bin/addons/base/i18n/it.po @@ -1001,21 +1001,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po index 95bbfb2d8f3..144ebdb1473 100644 --- a/bin/addons/base/i18n/ja.po +++ b/bin/addons/base/i18n/ja.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/ko.po b/bin/addons/base/i18n/ko.po index 6c8337017f6..a597ca00b3f 100644 --- a/bin/addons/base/i18n/ko.po +++ b/bin/addons/base/i18n/ko.po @@ -993,21 +993,7 @@ msgstr "재고_복사" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/lt.po b/bin/addons/base/i18n/lt.po index d56336d7fac..b01b8a2d46f 100644 --- a/bin/addons/base/i18n/lt.po +++ b/bin/addons/base/i18n/lt.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/lt_LT.po b/bin/addons/base/i18n/lt_LT.po index e78fb6a9fba..aaeb0ca628f 100644 --- a/bin/addons/base/i18n/lt_LT.po +++ b/bin/addons/base/i18n/lt_LT.po @@ -972,21 +972,7 @@ msgstr "" #. module: base #: code:addons/addons/base/ir/ir_model.py:0 #, python-format -msgid "Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +msgid "Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po index f202c0b1a13..62d942d51ba 100644 --- a/bin/addons/base/i18n/lv.po +++ b/bin/addons/base/i18n/lv.po @@ -1008,21 +1008,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/mn.po b/bin/addons/base/i18n/mn.po index 75c614400f7..1c7d3d7b51e 100644 --- a/bin/addons/base/i18n/mn.po +++ b/bin/addons/base/i18n/mn.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po index 1a25187f9ba..b89949b0067 100644 --- a/bin/addons/base/i18n/nl.po +++ b/bin/addons/base/i18n/nl.po @@ -1011,37 +1011,9 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" -"Model %s bestaat niet !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s bestaat niet !" #. module: base #: code:addons/base/module/module.py:0 diff --git a/bin/addons/base/i18n/nl_BE.po b/bin/addons/base/i18n/nl_BE.po index eb3fb17cf89..7875ffe4c9a 100644 --- a/bin/addons/base/i18n/nl_BE.po +++ b/bin/addons/base/i18n/nl_BE.po @@ -1018,21 +1018,7 @@ msgstr "STOCK_COPY" #: code:addons/addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/nl_NL.po b/bin/addons/base/i18n/nl_NL.po index 62e7de86a37..7923932bf59 100644 --- a/bin/addons/base/i18n/nl_NL.po +++ b/bin/addons/base/i18n/nl_NL.po @@ -1029,21 +1029,7 @@ msgstr "STOCK_COPY" #: code:addons/addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/pl.po b/bin/addons/base/i18n/pl.po index ae01c45f2b7..41758632d74 100644 --- a/bin/addons/base/i18n/pl.po +++ b/bin/addons/base/i18n/pl.po @@ -1006,21 +1006,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po index a7252582700..537e8197a29 100644 --- a/bin/addons/base/i18n/pt.po +++ b/bin/addons/base/i18n/pt.po @@ -1007,37 +1007,9 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" -"O modelo %s não existe!\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"O modelo %s não existe!" #. module: base #: code:addons/base/module/module.py:0 diff --git a/bin/addons/base/i18n/pt_BR.po b/bin/addons/base/i18n/pt_BR.po index 7380b787054..3e8f7e495d3 100644 --- a/bin/addons/base/i18n/pt_BR.po +++ b/bin/addons/base/i18n/pt_BR.po @@ -1005,21 +1005,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po index 7e8fb00b756..309fecbb1a6 100644 --- a/bin/addons/base/i18n/ro.po +++ b/bin/addons/base/i18n/ro.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po index 47980c35df6..6d027fdda5d 100644 --- a/bin/addons/base/i18n/ru.po +++ b/bin/addons/base/i18n/ru.po @@ -992,21 +992,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po index aaa3b85cc45..823310eade0 100644 --- a/bin/addons/base/i18n/sk.po +++ b/bin/addons/base/i18n/sk.po @@ -992,21 +992,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/sl.po b/bin/addons/base/i18n/sl.po index 021d4b9698c..705a61afba9 100644 --- a/bin/addons/base/i18n/sl.po +++ b/bin/addons/base/i18n/sl.po @@ -990,21 +990,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/sq.po b/bin/addons/base/i18n/sq.po index dcc34f74e80..07a5105dad7 100644 --- a/bin/addons/base/i18n/sq.po +++ b/bin/addons/base/i18n/sq.po @@ -990,21 +990,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/sr.po b/bin/addons/base/i18n/sr.po index 41d4a6eff86..f8618b3a933 100644 --- a/bin/addons/base/i18n/sr.po +++ b/bin/addons/base/i18n/sr.po @@ -1008,21 +1008,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po index 97b6ea42897..c61ff39fbe6 100644 --- a/bin/addons/base/i18n/sv.po +++ b/bin/addons/base/i18n/sv.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/th.po b/bin/addons/base/i18n/th.po index 7422cf1592d..ff67a9f0ece 100644 --- a/bin/addons/base/i18n/th.po +++ b/bin/addons/base/i18n/th.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/tlh.po b/bin/addons/base/i18n/tlh.po index 9591b4c08df..fe8213253d0 100644 --- a/bin/addons/base/i18n/tlh.po +++ b/bin/addons/base/i18n/tlh.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po index b3f1de1fd69..43b045b5c45 100644 --- a/bin/addons/base/i18n/tr.po +++ b/bin/addons/base/i18n/tr.po @@ -989,21 +989,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po index 16349b20d9f..eff183eebd2 100644 --- a/bin/addons/base/i18n/uk.po +++ b/bin/addons/base/i18n/uk.po @@ -1001,21 +1001,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/uk_UA.po b/bin/addons/base/i18n/uk_UA.po index 7b4bd684de2..fe1776abd64 100644 --- a/bin/addons/base/i18n/uk_UA.po +++ b/bin/addons/base/i18n/uk_UA.po @@ -989,21 +989,7 @@ msgstr "STOCK_COPY" #. module: base #: code:addons/addons/base/ir/ir_model.py:0 #, python-format -msgid "Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +msgid "Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/vi.po b/bin/addons/base/i18n/vi.po index c477d6cb878..d6b923cfc13 100644 --- a/bin/addons/base/i18n/vi.po +++ b/bin/addons/base/i18n/vi.po @@ -985,21 +985,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po index f441f698c14..d860132b646 100644 --- a/bin/addons/base/i18n/zh_CN.po +++ b/bin/addons/base/i18n/zh_CN.po @@ -990,21 +990,6 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" msgstr "" #. module: base @@ -8208,29 +8193,8 @@ msgstr "俄语 / русский язык" #, python-format #~ msgid "" -#~ "Cannot delete Purchase Order(s) which are in %s State!' % s['state']))\n" -#~ " return super(purchase_order, self).unlink(cr, uid, unlink_ids, " -#~ "context=context)\n" -#~ "\n" -#~ " def button_dummy(self, cr, uid, ids, context={}):\n" -#~ " return True\n" -#~ "\n" -#~ " def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n" -#~ " if not adr_id:\n" -#~ " return {}\n" -#~ " part_id = self.pool.get('res.partner.address" #~ msgstr "" -#~ "无法删除在%s状态的采购订单！' % s['state']))\n" -#~ " return super(purchase_order, self).unlink(cr, uid, unlink_ids, \n" -#~ "context=context)\n" -#~ "\n" -#~ " def button_dummy(self, cr, uid, ids, context={}):\n" -#~ " return True\\n\n" -#~ "\n" -#~ " def onchange_dest_address_id(self, cr, uid, ids, adr_id):\n" -#~ " if not adr_id:\n" -#~ " return {}\n" -#~ " part_id = self.pool.get('res.partner.address" +#~ "无法删除在%s状态的采购订单！" #, python-format #~ msgid "" diff --git a/bin/addons/base/i18n/zh_TW.po b/bin/addons/base/i18n/zh_TW.po index 7dbb6804f87..ac66f2dfe29 100644 --- a/bin/addons/base/i18n/zh_TW.po +++ b/bin/addons/base/i18n/zh_TW.po @@ -984,21 +984,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base From 1e4d933cbc36503a6caec7119a512201024d10c3 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Fri, 18 Dec 2009 18:09:27 +0100 Subject: [PATCH 09/16] [FIX] Regression on global object bzr revid: christophe.chauvet@syleam.fr-20091218170927-5m05rgb8rp09o21s --- bin/addons/base/res/res_company.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index 70af44da6a4..b514e40b9fe 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -98,8 +98,11 @@ class res_company(osv.osv): proxy = self.pool.get('multi_company.default') args = [ ('object_id.model', '=', object), - ('field_id.name','=',field), ] + if field: + args.append(('field_id.name','=',field)) + else: + args.append(('field_id','=',False)) ids = proxy.search(cr, uid, args) for rule in proxy.browse(cr, uid, ids, context): user = self.pool.get('res.users').browse(cr, uid, uid) From 82d5e1c2dff76a32d4a7d0abbac605a5a1567c8f Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Mon, 21 Dec 2009 04:43:09 +0000 Subject: [PATCH 10/16] Launchpad automatic translations update. bzr revid: codehost@crowberry-20091219043315-nxro2ufs7qwa3ldl bzr revid: codehost@crowberry-20091220043549-tedq3hfaca2elaka bzr revid: codehost@crowberry-20091221044309-jdhl84asvzyjjuw2 --- bin/addons/base/i18n/he.po | 20 +++++- bin/addons/base/i18n/lv.po | 22 +++++-- bin/addons/base/i18n/nl.po | 41 +++++++++++-- bin/addons/base/i18n/pt.po | 39 ++++++++++-- bin/addons/base/i18n/ro.po | 123 ++++++++++++++++++++++--------------- debian/po/ro.po | 42 +++++++++++++ 6 files changed, 222 insertions(+), 65 deletions(-) create mode 100644 debian/po/ro.po diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po index a320a211ae1..27cfa03c14e 100644 --- a/bin/addons/base/i18n/he.po +++ b/bin/addons/base/i18n/he.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-17 09:51+0000\n" +"PO-Revision-Date: 2009-12-18 17:51+0000\n" "Last-Translator: Ddorda \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-18 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-12-19 04:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -1002,7 +1002,21 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !" +"Model %s Does not Exist !\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po index 62d942d51ba..bacf9e66fb4 100644 --- a/bin/addons/base/i18n/lv.po +++ b/bin/addons/base/i18n/lv.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-17 07:02+0000\n" -"Last-Translator: Normunds \n" +"PO-Revision-Date: 2009-12-18 17:53+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-18 04:32+0000\n" +"X-Launchpad-Export-Date: 2009-12-19 04:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -1008,7 +1008,21 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !" +"Model %s Does not Exist !\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po index b89949b0067..bef8dede540 100644 --- a/bin/addons/base/i18n/nl.po +++ b/bin/addons/base/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-16 08:24+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2009-12-19 06:26+0000\n" +"Last-Translator: mra (Open ERP) \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: 2009-12-17 04:43+0000\n" +"X-Launchpad-Export-Date: 2009-12-20 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -1011,9 +1011,37 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !" +"Model %s Does not Exist !\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" msgstr "" -"Model %s bestaat niet !" +"Model %s bestaat niet !\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" #. module: base #: code:addons/base/module/module.py:0 @@ -8103,3 +8131,6 @@ msgstr "Sri Lanka" #: selection:module.lang.install,init,lang:0 msgid "Russian / русский язык" msgstr "Russisch / русский язык" + +#~ msgid "Model %s Does not Exist !" +#~ msgstr "Model %s bestaat niet !" diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po index 537e8197a29..bafef8ae13e 100644 --- a/bin/addons/base/i18n/pt.po +++ b/bin/addons/base/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-13 06:37+0000\n" +"PO-Revision-Date: 2009-12-19 06:22+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2009-12-15 05:02+0000\n" +"X-Launchpad-Export-Date: 2009-12-20 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -1007,9 +1007,37 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !" +"Model %s Does not Exist !\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" msgstr "" -"O modelo %s não existe!" +"O modelo %s não existe!\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" #. module: base #: code:addons/base/module/module.py:0 @@ -8119,3 +8147,6 @@ msgstr "Russo / русский язык" #, python-format #~ msgid "The unlink method is not implemented on this object !" #~ msgstr "O método remover (unlink) não está implementado neste objecto!" + +#~ msgid "Model %s Does not Exist !" +#~ msgstr "O modelo %s não existe!" diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po index 309fecbb1a6..77c39d2300d 100644 --- a/bin/addons/base/i18n/ro.po +++ b/bin/addons/base/i18n/ro.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-11-30 08:49+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2009-12-20 16:39+0000\n" +"Last-Translator: Valentin Caragea \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: 2009-12-15 05:02+0000\n" +"X-Launchpad-Export-Date: 2009-12-21 04:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base #: model:res.country,name:base.sh msgid "Saint Helena" -msgstr "" +msgstr "Sfanta Elena" #. module: base #: wizard_view:res.partner.sms_send,init:0 @@ -29,71 +29,72 @@ msgstr "SMS - Gateway: clickatell" #. module: base #: view:res.lang:0 msgid "%j - Day of the year as a decimal number [001,366]." -msgstr "" +msgstr "%j - Ziua anului ca numar zecimal [001,366]" #. module: base #: field:ir.values,meta_unpickle:0 msgid "Metadata" -msgstr "" +msgstr "Metadata" #. module: base #: field:ir.ui.view,arch:0 #: field:ir.ui.view.custom,arch:0 msgid "View Architecture" -msgstr "Architectura vederii (view)" +msgstr "Alcatuirea afisarii" #. module: base #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "You can not create this kind of document! (%s)" -msgstr "" +msgstr "Nu puteti crea acest tip de document! (%s)" #. module: base #: wizard_field:module.lang.import,init,code:0 msgid "Code (eg:en__US)" -msgstr "" +msgstr "Cod (eg:en__US)" #. module: base #: view:workflow:0 #: field:workflow.activity,wkf_id:0 #: field:workflow.instance,wkf_id:0 msgid "Workflow" -msgstr "Workflow" +msgstr "Flux" #. module: base #: view:wizard.module.lang.export:0 msgid "To browse official translations, you can visit this link: " msgstr "" +"Pentru a naviga printre traducerile oficiale, puteti vizita acest link: " #. module: base #: selection:module.lang.install,init,lang:0 msgid "Hungarian / Magyar" -msgstr "" +msgstr "Maghiara / Magyar" #. module: base #: field:ir.actions.server,wkf_model_id:0 msgid "Workflow On" -msgstr "" +msgstr "Activare Flux" #. module: base #: view:ir.module.module:0 msgid "Created Views" -msgstr "" +msgstr "Afisari Create" #. module: base #: view:workflow.activity:0 msgid "Outgoing transitions" -msgstr "" +msgstr "Tranzitii iesire" #. module: base #: selection:ir.report.custom,frequency:0 msgid "Yearly" -msgstr "" +msgstr "Anual" #. module: base #: field:ir.actions.act_window,target:0 msgid "Target Window" -msgstr "" +msgstr "Fereastra tinta" #. module: base #: model:ir.actions.todo,note:base.config_wizard_simple_view @@ -106,102 +107,108 @@ msgid "" "understand. You will be able to switch to the extended view later.\n" " " msgstr "" +"Alegeti intre \"Interfata Simplificata\" sau cea extinsa.\n" +"Daca utilizati pentru prima data, sau doriti sa testati OpenERP\n" +"pentru prima data, va sugeram sa folositi Interfata Simplificata,\n" +"care are mai putine optiuni si campuri, dar este mult mai usor de inteles.\n" +"Puteti sa schimbati mai tarziu in cea extinsa.\n" +" " #. module: base #: field:ir.rule,operand:0 msgid "Operand" -msgstr "" +msgstr "Operand" #. module: base #: model:res.country,name:base.kr msgid "South Korea" -msgstr "" +msgstr "Coreea de Sud" #. module: base #: model:ir.actions.act_window,name:base.action_workflow_transition_form #: model:ir.ui.menu,name:base.menu_workflow_transition #: view:workflow.activity:0 msgid "Transitions" -msgstr "" +msgstr "Tranzitii" #. module: base #: model:ir.model,name:base.model_ir_ui_view_custom msgid "ir.ui.view.custom" -msgstr "" +msgstr "ir.ui.view.custom" #. module: base #: model:res.country,name:base.sz msgid "Swaziland" -msgstr "" +msgstr "Elvetia" #. module: base #: model:ir.model,name:base.model_ir_actions_report_custom #: selection:ir.ui.menu,action:0 msgid "ir.actions.report.custom" -msgstr "" +msgstr "ir.actions.report.custom" #. module: base #: selection:ir.ui.menu,icon:0 msgid "STOCK_CANCEL" -msgstr "" +msgstr "STOCK_CANCEL" #. module: base #: field:ir.report.custom,sortby:0 msgid "Sorted By" -msgstr "Sorteaza" +msgstr "Sortat dupa" #. module: base #: field:ir.sequence,number_increment:0 msgid "Increment Number" -msgstr "Incrementare numar" +msgstr "Increment" #. module: base #: model:ir.actions.act_window,name:base.action_res_company_tree #: model:ir.ui.menu,name:base.menu_action_res_company_tree msgid "Company's Structure" -msgstr "" +msgstr "Structura Companiei" #. module: base #: model:ir.model,name:base.model_ir_report_custom_fields msgid "ir.report.custom.fields" -msgstr "" +msgstr "ir.report.custom.fields" #. module: base #: view:res.partner:0 msgid "Search Partner" -msgstr "" +msgstr "Cautare Partener" #. module: base #: code:addons/base/module/wizard/wizard_export_lang.py:0 #, python-format msgid "new" -msgstr "" +msgstr "nou" #. module: base #: selection:ir.ui.menu,icon:0 msgid "STOCK_GOTO_TOP" -msgstr "" +msgstr "STOCK_GOTO_TOP" #. module: base #: field:ir.actions.report.custom,multi:0 #: field:ir.actions.report.xml,multi:0 msgid "On multiple doc." -msgstr "" +msgstr "In documente multiple" #. module: base #: field:ir.module.category,module_nr:0 msgid "Number of Modules" -msgstr "" +msgstr "Numar de Module" #. module: base #: help:multi_company.default,company_dest_id:0 msgid "Company to store the current record" -msgstr "" +msgstr "Compania unde se face inregistrarea" #. module: base #: field:res.partner.bank.type.field,size:0 msgid "Max. Size" -msgstr "" +msgstr "Dimensiunea Maxima" #. module: base #: field:res.partner.address,name:0 @@ -215,86 +222,90 @@ msgid "" "Save this document to a %s file and edit it with a specific software or a " "text editor. The file encoding is UTF-8." msgstr "" +"Salvati acest document intr-un fisier %s si editati-l cu un soft adecvat sau " +"un editor de text. Folositi codarea UTF-8." #. module: base #: selection:ir.ui.menu,icon:0 msgid "STOCK_DELETE" -msgstr "" +msgstr "STOCK_DELETE" #. module: base #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "Password mismatch !" -msgstr "" +msgstr "Parola este gresita!" #. module: base #: code:addons/base/module/module.py:0 #, python-format msgid "This url '%s' must provide an html file with links to zip modules" msgstr "" +"Acest url '%s' trebuie sa duca la un fisier html cu legaturi catre module in " +"format zip" #. module: base #: selection:res.request,state:0 msgid "active" -msgstr "" +msgstr "activ" #. module: base #: field:ir.actions.wizard,wiz_name:0 msgid "Wizard Name" -msgstr "" +msgstr "Nume Asistent" #. module: base #: view:res.lang:0 msgid "%y - Year without century as a decimal number [00,99]." -msgstr "" +msgstr "%y - An fara secol ca numar zecimal [00,99]." #. module: base #: selection:ir.ui.menu,icon:0 msgid "STOCK_GOTO_FIRST" -msgstr "" +msgstr "STOCK_GOTO_FIRST" #. module: base #: help:ir.rule.group,rules:0 msgid "The rule is satisfied if at least one test is True" -msgstr "" +msgstr "Regula este satisfacuta daca cel putin un test este Adevarat" #. module: base #: selection:ir.report.custom.fields,operation:0 msgid "Get Max" -msgstr "" +msgstr "Incarca Max" #. module: base #: help:ir.actions.act_window,limit:0 msgid "Default limit for the list view" -msgstr "" +msgstr "Limita implicita pentru Vizualizare Lista" #. module: base #: field:ir.model.data,date_update:0 msgid "Update Date" -msgstr "" +msgstr "Data Actualizare" #. module: base #: field:ir.actions.act_window,src_model:0 msgid "Source Object" -msgstr "" +msgstr "Obiect Sursa" #. module: base #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form #: view:ir.actions.todo:0 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form msgid "Config Wizard Steps" -msgstr "" +msgstr "Configurare Pasi Asistare" #. module: base #: model:ir.model,name:base.model_ir_ui_view_sc msgid "ir.ui.view_sc" -msgstr "" +msgstr "ir.ui.view_sc" #. module: base #: field:ir.model.access,group_id:0 #: field:ir.rule,rule_group:0 msgid "Group" -msgstr "" +msgstr "Grup" #. module: base #: field:ir.exports.line,name:0 @@ -984,7 +995,21 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !" +"Model %s Does not Exist !\" % vals['relation']))\n" +" \n" +" if self.pool.get(vals['model']):\n" +" self.pool.get(vals['model']).__init__(self.pool, cr)\n" +" self.pool.get(vals['model'])._auto_init(cr, {})\n" +" \n" +" return res\n" +"ir_model_fields()\n" +"\n" +"class ir_model_access(osv.osv):\n" +" _name = 'ir.model.access'\n" +" _columns = {\n" +" 'name': fields.char('Name', size=64, required=True),\n" +" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" +" 'group_id': fields.many2one('res.groups', 'Group" msgstr "" #. module: base diff --git a/debian/po/ro.po b/debian/po/ro.po new file mode 100644 index 00000000000..e24cc887fd6 --- /dev/null +++ b/debian/po/ro.po @@ -0,0 +1,42 @@ +# Romanian translation for openobject-server +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the openobject-server package. +# FIRST AUTHOR , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-server\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-24 22:41+0300\n" +"PO-Revision-Date: 2009-12-20 09:24+0000\n" +"Last-Translator: Valentin Caragea \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2009-12-21 04:43+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "Dedicated system account for the Open ERP server:" +msgstr "Contul sistem dedicat serverului Open ERP" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "" +"The Open ERP server must use a dedicated account for its operation so that " +"the system's security is not compromised by running it with superuser " +"privileges." +msgstr "" +"Serverul Open ERP trebuie sa utilizeze un cont dedicat operatiilor sale " +"astfel incat sa nu fie compromisa securitatea sistemului prin rularea cu " +"privilegii de root" + +#. Type: string +#. Description +#: ../openerp-server.templates:1001 +msgid "Please choose that account's username." +msgstr "Alege numele utilizatorului (username)" From 9b2de76cab27591b02722aafa5343ccc9f420fc7 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 21 Dec 2009 11:53:44 +0530 Subject: [PATCH 11/16] [IMP] base po files bzr revid: mra@tinyerp.com-20091221062344-iaxb17z3xuk1uhi0 --- bin/addons/base/i18n/base.pot | 18 ++---------------- bin/addons/base/i18n/he.po | 16 +--------------- bin/addons/base/i18n/lv.po | 16 +--------------- bin/addons/base/i18n/nl.po | 32 ++------------------------------ bin/addons/base/i18n/pt.po | 32 ++------------------------------ bin/addons/base/i18n/ro.po | 16 +--------------- 6 files changed, 9 insertions(+), 121 deletions(-) diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot index ad77b86e94f..a5b23229161 100644 --- a/bin/addons/base/i18n/base.pot +++ b/bin/addons/base/i18n/base.pot @@ -393,7 +393,7 @@ msgid "Country Name" msgstr "" #. module: base -#: model:res.country,name:base.co +#: model:res.country,name:base.coreturn msgid "Colombia" msgstr "" @@ -966,21 +966,7 @@ msgstr "" #. module: base #: code:addons/base/ir/ir_model.py:0 #, python-format -msgid "Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +msgid "Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/he.po b/bin/addons/base/i18n/he.po index 27cfa03c14e..8022091b977 100644 --- a/bin/addons/base/i18n/he.po +++ b/bin/addons/base/i18n/he.po @@ -1002,21 +1002,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/lv.po b/bin/addons/base/i18n/lv.po index bacf9e66fb4..848ae75a916 100644 --- a/bin/addons/base/i18n/lv.po +++ b/bin/addons/base/i18n/lv.po @@ -1008,21 +1008,7 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po index bef8dede540..02e88c61b58 100644 --- a/bin/addons/base/i18n/nl.po +++ b/bin/addons/base/i18n/nl.po @@ -1011,37 +1011,9 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" -"Model %s bestaat niet !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s bestaat niet !" #. module: base #: code:addons/base/module/module.py:0 diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po index bafef8ae13e..35d0b6b5279 100644 --- a/bin/addons/base/i18n/pt.po +++ b/bin/addons/base/i18n/pt.po @@ -1007,37 +1007,9 @@ msgstr "STOCK_COPY" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" -"O modelo %s não existe!\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"O modelo %s não existe!" #. module: base #: code:addons/base/module/module.py:0 diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po index 77c39d2300d..4065135be01 100644 --- a/bin/addons/base/i18n/ro.po +++ b/bin/addons/base/i18n/ro.po @@ -995,21 +995,7 @@ msgstr "" #: code:addons/base/ir/ir_model.py:0 #, python-format msgid "" -"Model %s Does not Exist !\" % vals['relation']))\n" -" \n" -" if self.pool.get(vals['model']):\n" -" self.pool.get(vals['model']).__init__(self.pool, cr)\n" -" self.pool.get(vals['model'])._auto_init(cr, {})\n" -" \n" -" return res\n" -"ir_model_fields()\n" -"\n" -"class ir_model_access(osv.osv):\n" -" _name = 'ir.model.access'\n" -" _columns = {\n" -" 'name': fields.char('Name', size=64, required=True),\n" -" 'model_id': fields.many2one('ir.model', 'Object', required=True),\n" -" 'group_id': fields.many2one('res.groups', 'Group" +"Model %s Does not Exist !" msgstr "" #. module: base From a9145eb71477901e176ed212e1b2ea494af337b2 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 21 Dec 2009 14:17:54 +0530 Subject: [PATCH 12/16] [FIX] base/i18n: nl and pt files error solved (duplicate msgid ending) bzr revid: mra@tinyerp.com-20091221084754-jh8b5wasbfcwzgiq --- bin/addons/base/i18n/nl.po | 3 --- bin/addons/base/i18n/pt.po | 3 --- 2 files changed, 6 deletions(-) diff --git a/bin/addons/base/i18n/nl.po b/bin/addons/base/i18n/nl.po index 02e88c61b58..5acf7c65e19 100644 --- a/bin/addons/base/i18n/nl.po +++ b/bin/addons/base/i18n/nl.po @@ -8103,6 +8103,3 @@ msgstr "Sri Lanka" #: selection:module.lang.install,init,lang:0 msgid "Russian / русский язык" msgstr "Russisch / русский язык" - -#~ msgid "Model %s Does not Exist !" -#~ msgstr "Model %s bestaat niet !" diff --git a/bin/addons/base/i18n/pt.po b/bin/addons/base/i18n/pt.po index 35d0b6b5279..97565aac2f3 100644 --- a/bin/addons/base/i18n/pt.po +++ b/bin/addons/base/i18n/pt.po @@ -8119,6 +8119,3 @@ msgstr "Russo / русский язык" #, python-format #~ msgid "The unlink method is not implemented on this object !" #~ msgstr "O método remover (unlink) não está implementado neste objecto!" - -#~ msgid "Model %s Does not Exist !" -#~ msgstr "O modelo %s não existe!" From cb304bf0c8f58ad2a0b539b73d63d0ac594510e7 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Tue, 22 Dec 2009 04:35:45 +0000 Subject: [PATCH 13/16] Launchpad automatic translations update. bzr revid: codehost@crowberry-20091222043545-p615u32x9nsnpzoq --- bin/addons/base/i18n/ro.po | 9 ++++----- debian/po/ro.po | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po index 4065135be01..86a03652760 100644 --- a/bin/addons/base/i18n/ro.po +++ b/bin/addons/base/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-09 10:13+0000\n" -"PO-Revision-Date: 2009-12-20 16:39+0000\n" +"PO-Revision-Date: 2009-12-21 06:09+0000\n" "Last-Translator: Valentin Caragea \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: 2009-12-21 04:43+0000\n" +"X-Launchpad-Export-Date: 2009-12-22 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -414,7 +414,7 @@ msgid "Country Name" msgstr "Nume tara" #. module: base -#: model:res.country,name:base.co +#: model:res.country,name:base.coreturn msgid "Colombia" msgstr "" @@ -994,8 +994,7 @@ msgstr "" #. module: base #: code:addons/base/ir/ir_model.py:0 #, python-format -msgid "" -"Model %s Does not Exist !" +msgid "Model %s Does not Exist !" msgstr "" #. module: base diff --git a/debian/po/ro.po b/debian/po/ro.po index e24cc887fd6..ce52d54d6f7 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-24 22:41+0300\n" -"PO-Revision-Date: 2009-12-20 09:24+0000\n" +"PO-Revision-Date: 2009-12-21 06:11+0000\n" "Last-Translator: Valentin Caragea \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-21 04:43+0000\n" +"X-Launchpad-Export-Date: 2009-12-22 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Type: string From 6eb9fc83e08350d69e19f63ebabdb3184f116e2a Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 22 Dec 2009 17:08:41 +0530 Subject: [PATCH 14/16] [REV/FIX] Reverted bad commit for report_task module lp bug: https://launchpad.net/bugs/499060 fixed bzr revid: jvo@tinyerp.com-20091222113841-8yoa0d9iemw5no8e --- addons/report_task/report_task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py index 110226f627e..15dfab6b1ea 100644 --- a/addons/report_task/report_task.py +++ b/addons/report_task/report_task.py @@ -154,7 +154,7 @@ class report_timesheet_task_user(osv.osv): union select to_char(h.name,'YYYY-MM-01') as name, to_char(h.name,'MM') as m_id - from hr_timesheet_sheet_sheet_day h) as month) """) + from hr_timesheet_sheet_sheet_day h) as months) """) report_timesheet_task_user() From 18f41e53a78d420de8a7af1890633b9b96ddf23b Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Tue, 22 Dec 2009 12:43:50 +0100 Subject: [PATCH 15/16] [IMP] Change try/except by if to test when field is not a relation bzr revid: christophe.chauvet@syleam.fr-20091222114350-x94m7ts7uwcadsnc --- bin/osv/fields.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index 50b7a233b3b..2cbba931a47 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -901,27 +901,25 @@ class property(function): else: res[int(prop.res_id.split(',')[1])] = prop.value or '' - try: + if self._obj: obj = obj.pool.get(self._obj) - + to_check = res.values() if default_val and default_val not in to_check: to_check += [default_val] existing_ids = obj.search(cr, uid, [('id', 'in', to_check)]) - + for id, res_id in res.items(): if res_id not in existing_ids: cr.execute('DELETE FROM ir_property WHERE value=%s', ((obj._name+','+str(res_id)),)) res[id] = default_val - + names = dict(obj.name_get(cr, uid, existing_ids, context)) for r in res.keys(): if res[r] and res[r] in names: res[r] = (res[r], names[res[r]]) else: res[r] = False - except: - pass return res def _field_get(self, cr, uid, model_name, prop): From 312ce4d690cb19938ec91345b2ae60f97dcb0456 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 22 Dec 2009 18:44:25 +0530 Subject: [PATCH 16/16] [IMP]: Caldav+crm+project_calendar , Implemented exdates for Event and tasks bzr revid: rpa@tinyerp.com-20091222131425-8wxl8xv01wznl56v --- addons/caldav/calendar.py | 22 +++++++--- addons/crm/crm_caldav_view.xml | 23 +++++++--- addons/crm/crm_calendar.py | 43 +++++++++---------- addons/project_calendar/project_calendar.py | 31 +++++++------ .../project_calendar_view.xml | 18 ++++++-- 5 files changed, 86 insertions(+), 51 deletions(-) diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index 7800c773112..2e671ddedf1 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -69,14 +69,17 @@ class CalDAV(object): __attribute__ = { } def get_recurrent_dates(self, rrulestring, exdate, startdate=None): - todate = parser.parse + def todate(date): + val = parser.parse(''.join((re.compile('\d')).findall(date)) + 'Z') + return val + if not startdate: startdate = datetime.now() else: - startdate = todate(''.join((re.compile('\d')).findall(startdate)) + 'Z') + startdate = todate(startdate) rset1 = rrulestr(rrulestring, dtstart=startdate, forceset=True) for date in exdate: - datetime_obj = datetime.strptime(date, "%Y-%m-%d %H:%M:%S") + datetime_obj = todate(date) rset1._exdate.append(datetime_obj) re_dates = rset1._iter() recurrent_dates = map(lambda x:x.strftime('%Y-%m-%d %H:%M:%S'), re_dates) @@ -93,9 +96,12 @@ class CalDAV(object): valtype = self.__attribute__.get(name).get('type', None) if type == 'value': if valtype and valtype=='datetime' and val: - val = val.strftime('%Y-%m-%d %H:%M:%S') + if isinstance(val, list): + val = ','.join(map(lambda x: x.strftime('%Y-%m-%d %H:%M:%S'), val)) + else: + val = val.strftime('%Y-%m-%d %H:%M:%S') if valtype and valtype=='integer' and val: - val = int(val) + val = int(val) return val else: return self.__attribute__.get(name, None) @@ -124,8 +130,10 @@ class CalDAV(object): if map_type == "text": vevent.add(field).value = str(data[map_field]) elif map_type == 'datetime' and data[map_field]: - vevent.add(field).value = datetime.strptime(data[map_field], \ - "%Y-%m-%d %H:%M:%S") + if field in ('exdate'): + vevent.add(field).value = [parser.parse(data[map_field])] + else: + vevent.add(field).value = parser.parse(data[map_field]) elif map_type == "timedelta": vevent.add(field).value = timedelta(hours=data[map_field]) if self.__attribute__.get(field).has_key('mapping'): diff --git a/addons/crm/crm_caldav_view.xml b/addons/crm/crm_caldav_view.xml index eefa9cd280f..a68970c3bf5 100644 --- a/addons/crm/crm_caldav_view.xml +++ b/addons/crm/crm_caldav_view.xml @@ -98,12 +98,23 @@ - - - - - - + + + + + + + + + + + + + + + + + diff --git a/addons/crm/crm_calendar.py b/addons/crm/crm_calendar.py index 4ce6b6038e5..98fef31c6e9 100644 --- a/addons/crm/crm_calendar.py +++ b/addons/crm/crm_calendar.py @@ -19,18 +19,13 @@ # ############################################################################## -from osv import fields, osv -from time import strftime -import time -import base64 -import vobject from dateutil.rrule import * -from dateutil import parser +from osv import fields, osv import datetime -from time import strftime -from pytz import timezone +import base64 +import re +import time import tools -from service import web_services def caldevIDs2readIDs(caldev_ID = None): if caldev_ID: @@ -68,8 +63,8 @@ class crm_case(osv.osv): # 'categories' : {'field':None , 'sub-field':'name', 'type':'text'}, # keep none for now 'comment' : None, 'contact' : None, - 'exdate' : None, - 'exrule' : None, + 'exdate' : {'field':'exdate', 'type':'datetime'}, + 'exrule' : {'field':'exrule', 'type':'text'}, 'rstatus' : None, 'related' : None, 'resources' : None, @@ -100,10 +95,10 @@ class crm_case(osv.osv): def _get_rdates(self, cr, uid, ids, name, arg, context=None): res = {} context.update({'read':True}) - for case in self.read(cr, uid, ids, ['date', 'rrule'], context=context): + for case in self.read(cr, uid, ids, ['date', 'rrule', 'exdate', 'exrule'], context=context): if case['rrule']: - rule = case['rrule'].split('\n')[0] - exdate = case['rrule'].split('\n')[1:] + rule = case['rrule'] + exdate = case['exdate'] and case['exdate'].split(',') or [] event_obj = self.pool.get('caldav.event') res[case['id']] = str(event_obj.get_recurrent_dates(str(rule), exdate, case['date'])) return res @@ -116,6 +111,10 @@ class crm_case(osv.osv): 'freebusy' : fields.text('FreeBusy'), 'transparent' : fields.selection([('OPAQUE', 'OPAQUE'), ('TRANSPARENT', 'TRANSPARENT')], 'Trensparent'), 'caldav_url' : fields.char('Caldav URL', size=34), + 'exdate' : fields.text('Exception Date/Times', help="This property defines the list\ + of date/time exceptions for arecurring calendar component."), + 'exrule' : fields.text('Exception Rule', help="defines a rule or repeating pattern\ + for anexception to a recurrence set"), 'rrule' : fields.text('Recurrent Rule'), 'rdates' : fields.function(_get_rdates, method=True, string='Recurrent Dates', \ store=True, type='text'), @@ -134,7 +133,7 @@ class crm_case(osv.osv): def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \ context=None): if not context: - context={} + context = {} cr.execute('select c.id as id, c.date as date, alarm.id as alarm_id, alarm.name as name,\ alarm.trigger_interval, alarm.trigger_duration, alarm.trigger_related, \ alarm.trigger_occurs from crm_case c \ @@ -196,7 +195,7 @@ class crm_case(osv.osv): file_content = base64.decodestring(data['form']['file_path']) event_obj = self.pool.get('caldav.event') event_obj.__attribute__.update(self.__attribute__) - + attendee_obj = self.pool.get('caldav.attendee') crm_attendee = self.pool.get('crm.caldav.attendee') attendee_obj.__attribute__.update(crm_attendee.__attribute__) @@ -236,8 +235,7 @@ class crm_case(osv.osv): select = map(lambda x:caldevIDs2readIDs(x), select) return super(crm_case, self).browse(cr, uid, select, context, list_class, fields_process) - def read(self, cr, uid, ids, fields=None, context={}, - load='_classic_read'): + def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'): """ logic for recurrent event example : 123-20091111170822""" if context and context.has_key('read'): @@ -269,7 +267,6 @@ class crm_case(osv.osv): result.remove(val) for rdate in rdates: - import re idval = (re.compile('\d')).findall(rdate) val['date'] = rdate id = str(val['id']).split('-')[0] @@ -287,10 +284,12 @@ class crm_case(osv.osv): if len(str(id).split('-')) > 1: date_new = time.strftime("%Y-%m-%d %H:%M:%S", \ time.strptime(str(str(id).split('-')[1]), "%Y%m%d%H%M%S")) - for record in self.read(cr, uid, [caldevIDs2readIDs(id)], ['date', 'rdates', 'rrule']): + for record in self.read(cr, uid, [caldevIDs2readIDs(id)], \ + ['date', 'rdates', 'rrule', 'exdate']): + exdate = (record['exdate'] and (record['exdate'] + ',' ) or '') + \ + ''.join((re.compile('\d')).findall(date_new)) + 'Z' if record['date'] == date_new: - self.write(cr, uid, [caldevIDs2readIDs(id)], \ - {'rrule' : record['rrule'] +"\n" + str(date_new)}) + self.write(cr, uid, [caldevIDs2readIDs(id)], {'exdate' : exdate}) else: return super(crm_case, self).unlink(cr, uid, ids) diff --git a/addons/project_calendar/project_calendar.py b/addons/project_calendar/project_calendar.py index 82ae10ff4f7..8e7b3852bec 100644 --- a/addons/project_calendar/project_calendar.py +++ b/addons/project_calendar/project_calendar.py @@ -23,6 +23,8 @@ from datetime import datetime from osv import fields, osv from service import web_services import base64 +import time +import re def caldevIDs2readIDs(caldev_ID = None): if caldev_ID: @@ -36,12 +38,12 @@ class project_task(osv.osv): def _get_rdates(self, cr, uid, ids, name, arg, context=None): res = {} context.update({'read':True}) - for task in self.read(cr, uid, ids, ['date_start', 'rrule'], context=context): + for task in self.read(cr, uid, ids, ['date_start', 'rrule', 'exdate', 'exrule'], context=context): if task['rrule']: - rule = task['rrule'].split('\n')[0] + rule = task['rrule'] if rule.upper().find('COUNT') < 0: # Temp fix, needs review rule += ';COUNT=5' - exdate = task['rrule'].split('\n')[1:] + exdate = task['exdate'] and task['exdate'].split(',') or [] todo_obj = self.pool.get('caldav.todo') res[task['id']] = str(todo_obj.get_recurrent_dates(str(rule), exdate, task['date_start'])) return res @@ -51,9 +53,13 @@ class project_task(osv.osv): ('CONFIDENTIAL', 'CONFIDENTIAL')], 'Class'), 'location': fields.text('Location'), 'rrule': fields.text('Recurrent Rule'), + 'exdate' : fields.text('Exception Date/Times', help="This property defines the list\ + of date/time exceptions for arecurring calendar component."), + 'exrule' : fields.text('Exception Rule', help="defines a rule or repeating pattern\ + for anexception to a recurrence set"), 'rdates': fields.function(_get_rdates, method=True, string='Recurrent Dates', \ store=True, type='text'), - 'attendee_ids': fields.many2many('crm.caldav.attendee', 'crm_attendee_rel', 'case_id', \ + 'attendee_ids': fields.many2many('crm.caldav.attendee', 'task_attendee_rel', 'case_id', \ 'attendee_id', 'Attendees'), 'alarm_id': fields.many2one('crm.caldav.alarm', 'Alarm'), 'caldav_url': fields.char('Caldav URL', size=34), @@ -87,8 +93,8 @@ class project_task(osv.osv): # 'categories': {'field': 'type', 'type': 'text'}, # Needs review 'comment': {'field': 'notes', 'type': 'text'}, # 'contact': {'field': 'field', 'type': 'text'}, -# 'exdate': {'field': 'field', 'type': 'text'}, -# 'exrule': {'field': 'field', 'type': 'text'}, + 'exdate' : {'field':'exdate', 'type':'datetime'}, + 'exrule' : {'field':'exrule', 'type':'text'}, # 'rstatus': {'field': 'field', 'type': 'text'}, # 'related': {'field': 'field', 'type': 'text'}, # 'resources': {'field': 'field', 'type': 'text'}, @@ -143,8 +149,8 @@ class project_task(osv.osv): return caendar_val def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'): - """ logic for recurrent task - example : 123-20091111170822""", ids, fields, context + """ Logic for recurrent task + example : 123-20091111170822""" if context and context.has_key('read'): return super(project_task, self).read(cr, uid, ids, fields, context, load) if not type(ids) == list : @@ -173,7 +179,6 @@ class project_task(osv.osv): result.remove(val) for rdate in rdates: - import re idval = (re.compile('\d')).findall(rdate) val['date_start'] = rdate id = str(val['id']).split('-')[0] @@ -210,10 +215,12 @@ class project_task(osv.osv): if len(str(id).split('-')) > 1: date_new = time.strftime("%Y-%m-%d %H:%M:%S", \ time.strptime(str(str(id).split('-')[1]), "%Y%m%d%H%M%S")) - for record in self.read(cr, uid, [caldevIDs2readIDs(id)], ['date_start', 'rdates', 'rrule']): + for record in self.read(cr, uid, [caldevIDs2readIDs(id)], \ + ['date', 'rdates', 'rrule', 'exdate']): + exdate = (record['exdate'] and (record['exdate'] + ',' ) or '') + \ + ''.join((re.compile('\d')).findall(date_new)) + 'Z' if record['date_start'] == date_new: - self.write(cr, uid, [caldevIDs2readIDs(id)], \ - {'rrule' : record['rrule'] +"\n" + str(date_new)}) + self.write(cr, uid, [caldevIDs2readIDs(id)], {'exdate' : exdate}) else: return super(project_task, self).unlink(cr, uid, ids) diff --git a/addons/project_calendar/project_calendar_view.xml b/addons/project_calendar/project_calendar_view.xml index 826d0788b04..6ed99321b13 100644 --- a/addons/project_calendar/project_calendar_view.xml +++ b/addons/project_calendar/project_calendar_view.xml @@ -109,10 +109,20 @@ - - - - + + + + + + + + + + + + + +