From d1016c8728778cf59ccde810f03ebcdd2bd1ffd9 Mon Sep 17 00:00:00 2001 From: Vijaykumar Baladaniya Date: Mon, 10 Dec 2012 11:13:34 +0530 Subject: [PATCH 01/35] [IMP] add a class to preference_save button. bzr revid: vba@tinyerp.com-20121210054334-8r3ohu4324aopyzu --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index b5c88e4c24b..0ff1c9d7cba 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -257,7 +257,7 @@
-
From 259054160791c25f44a4ea88b444557a3fea6850 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Fri, 18 Jan 2013 12:33:09 +0100 Subject: [PATCH 02/35] [IMP] Document the description fields on Products, and assume that invoices must get either the Purchase Description or the Sale Description. lp bug: https://launchpad.net/bugs/1101146 fixed bzr revid: ls@numerigraphe.fr-20130118113309-vpq65omrvges1th8 --- addons/account/account_invoice.py | 7 +++++-- addons/product/product.py | 11 ++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index c9cf90789cb..cb91943b66e 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1454,8 +1454,13 @@ class account_invoice_line(osv.osv): if type in ('out_invoice', 'out_refund'): taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False) + if res.description_sale: + result['name'] += '\n'+res.description_sale else: taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False) + if res.description_purchase: + result['name'] += '\n'+res.description_purchase + tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) if type in ('in_invoice', 'in_refund'): @@ -1465,8 +1470,6 @@ class account_invoice_line(osv.osv): result['name'] = res.partner_ref result['uos_id'] = uom_id or res.uom_id.id - if res.description: - result['name'] += '\n'+res.description domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]} diff --git a/addons/product/product.py b/addons/product/product.py index 1cacb58df23..fad975d3cb3 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -296,9 +296,14 @@ class product_template(osv.osv): _columns = { 'name': fields.char('Name', size=128, required=True, translate=True, select=True), 'product_manager': fields.many2one('res.users','Product Manager'), - 'description': fields.text('Description',translate=True), - 'description_purchase': fields.text('Purchase Description',translate=True), - 'description_sale': fields.text('Sale Description',translate=True), + 'description': fields.text('Description',translate=True, + help="A precise description of the Product, used only for internal information purposes."), + 'description_purchase': fields.text('Purchase Description',translate=True, + help="A description of the Product that you want to communicate to your customers. " + "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"), + 'description_sale': fields.text('Sale Description',translate=True, + help="A description of the Product that you want to communicate to your suppliers. " + "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."), 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."), 'rental': fields.boolean('Can be Rent'), From 03b7ffd0b5112baec72a7cd18fe1541ff26191f9 Mon Sep 17 00:00:00 2001 From: "Ravish(OpenERP)" <> Date: Thu, 24 Jan 2013 15:20:52 +0100 Subject: [PATCH 03/35] [FIX] borrow an additionnal fix from lp:~openerp-dev/openobject-addons/trunk-bug-1101146-rmu bzr revid: ls@numerigraphe.fr-20130124142052-ob4xxtzh88r1javw --- addons/account/account_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index cb91943b66e..fd950ad19e2 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1440,6 +1440,7 @@ class account_invoice_line(osv.osv): result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=context) + result['name'] = res.partner_ref if type in ('out_invoice','out_refund'): a = res.property_account_income.id if not a: @@ -1467,7 +1468,6 @@ class account_invoice_line(osv.osv): result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) - result['name'] = res.partner_ref result['uos_id'] = uom_id or res.uom_id.id From c4670af9d8d182685bb2b7538e86ca9cf9548672 Mon Sep 17 00:00:00 2001 From: "Ravish(OpenERP)" <> Date: Thu, 24 Jan 2013 15:41:56 +0100 Subject: [PATCH 04/35] [FIX] purchase/sale description helps are inverted - borrowed from lp:~openerp-dev/openobject-addons/trunk-bug-1101146-rmu bzr revid: ls@numerigraphe.fr-20130124144156-sguv4wtpk5c20zea --- addons/product/product.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index fad975d3cb3..fbe89490036 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -299,11 +299,11 @@ class product_template(osv.osv): 'description': fields.text('Description',translate=True, help="A precise description of the Product, used only for internal information purposes."), 'description_purchase': fields.text('Purchase Description',translate=True, - help="A description of the Product that you want to communicate to your customers. " - "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"), - 'description_sale': fields.text('Sale Description',translate=True, help="A description of the Product that you want to communicate to your suppliers. " "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."), + 'description_sale': fields.text('Sale Description',translate=True, + help="A description of the Product that you want to communicate to your customers. " + "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"), 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."), 'rental': fields.boolean('Can be Rent'), From c377140650596536bc3490dc5c11bc82cf927c34 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Thu, 7 Mar 2013 09:58:26 +0100 Subject: [PATCH 05/35] [FIX] add SQL constraints only for models stored in database (not on AbstractModel) lp bug: https://launchpad.net/bugs/1151703 fixed bzr revid: guewen.baconnier@camptocamp.com-20130307085826-omhoc3clix41zydl --- openerp/osv/orm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 96f56ee6826..7f8f671dfb0 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -3204,7 +3204,8 @@ class BaseModel(object): cr.commit() # start a new transaction - self._add_sql_constraints(cr) + if getattr(self, '_auto', True): + self._add_sql_constraints(cr) if create: self._execute_sql(cr) From 363c4ab2a955e19f09d63f3f489b4ad523165d96 Mon Sep 17 00:00:00 2001 From: "Dharmraj Zala (OpenERP Trainee)" Date: Fri, 5 Apr 2013 12:45:22 +0530 Subject: [PATCH 06/35] [FIX]Improved field int res_user_view.xml tree view lp bug: https://launchpad.net/bugs/1164561 fixed bzr revid: dizzy.zala@gmail.com-20130405071522-xmpa556spxe95i5b --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index daa25806349..ac452f495e8 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -189,7 +189,7 @@ - + From d0920dea504b0a9872586e72032caebbad0e991f Mon Sep 17 00:00:00 2001 From: "Ishwar Malvi (OpenERP Trainee)" Date: Wed, 17 Apr 2013 17:01:19 +0530 Subject: [PATCH 07/35] [IMP] when create contact of a supplier it should be supplier instead of customer. bzr revid: nco@tinyerp.com-20130417113119-ilgy4k945h31azod --- openerp/addons/base/res/res_partner.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 31e2d44b306..3085a5bfde5 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -378,6 +378,7 @@ class res_partner(osv.osv, format_address): context = {} # Update parent and siblings records if vals.get('parent_id'): + is_supplier = self.browse(cr, uid, vals.get('parent_id'), context=context).supplier if 'use_parent_address' in vals: use_parent_address = vals['use_parent_address'] else: @@ -395,6 +396,9 @@ class res_partner(osv.osv, format_address): for key, value in onchange_values.iteritems() if key in ADDRESS_FIELDS and key not in vals)) + if is_supplier: + vals.update({'supplier': 1,'customer': 0}) + return super(res_partner, self).create(cr, uid, vals, context=context) def update_address(self, cr, uid, ids, vals, context=None): From 33ae814ff6f91868465cafb5d07eaddacb02fe59 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 18 Apr 2013 17:18:27 +0200 Subject: [PATCH 08/35] [IMP] tools convert: allow to use relative delta in xml file bzr revid: chm@openerp.com-20130418151827-coda7ldtjd7hw7to --- openerp/tools/convert.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index cdcaff35b9e..409b9810fab 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -48,6 +48,7 @@ except: from datetime import datetime, timedelta +from dateutil.relativedelta import relativedelta from lxml import etree import misc from config import config @@ -86,7 +87,9 @@ def _get_idref(self, cr, uid, model_str, context, idref): idref2 = dict(idref, time=time, DateTime=datetime, + datetime=datetime, timedelta=timedelta, + relativedelta=relativedelta, version=openerp.release.major_version, ref=_ref(self, cr), pytz=pytz) From d45ee609b4dd251b8b8182cb3ee75041639e4f1b Mon Sep 17 00:00:00 2001 From: "Ishwar Malvi (OpenERP Trainee)" Date: Fri, 19 Apr 2013 14:12:18 +0530 Subject: [PATCH 09/35] [IMP] when create company from the supplier it should be set supplier. bzr revid: nco@tinyerp.com-20130419084218-e3pflb3jqq6kihfa --- openerp/addons/base/res/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 88a1266b689..8251f4f6dd6 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -138,7 +138,7 @@ From 4634dd6f8ef17098086b7769665566eb566abb5b Mon Sep 17 00:00:00 2001 From: Ronald Portier Date: Wed, 24 Apr 2013 16:29:58 +0200 Subject: [PATCH 10/35] [FIX] Add __iter__ method to browse_null to prevent server hang. lp bug: https://launchpad.net/bugs/1172292 fixed bzr revid: ronald@therp.nl-20130424142958-u5r2mxtxqj9v431h --- openerp/osv/orm.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 870efd3dd8b..b9be7d79453 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -285,6 +285,9 @@ class browse_null(object): def __unicode__(self): return u'' + def __iter__(self): + raise NotImplementedError("Iteration is not allowed on %s" % self) + # # TODO: execute an object method on browse_record_list From dd7614e71623848d84c7f89c5416dd6dc6c0023c Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Apr 2013 12:59:38 +0530 Subject: [PATCH 11/35] [IMP] Remove space before Exclamation marks [!] in Warning bzr revid: ggh@tinyerp.com-20130429072938-knas9ymmny5o2z0v --- openerp/addons/base/ir/ir_actions.py | 2 +- openerp/addons/base/ir/ir_values.py | 4 ++-- openerp/addons/base/module/wizard/base_module_import.py | 6 +++--- openerp/addons/base/module/wizard/base_module_upgrade.py | 2 +- openerp/addons/base/res/res_lang.py | 6 +++--- openerp/addons/base/res/res_partner.py | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index a130ab13a32..aaaa8513925 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -657,7 +657,7 @@ class actions_server(osv.osv): if action.state=='client_action': if not action.action_id: - raise osv.except_osv(_('Error'), _("Please specify an action to launch !")) + raise osv.except_osv(_('Error'), _("Please specify an action to launch!")) return self.pool[action.action_id.type].read(cr, uid, action.action_id.id, context=context) if action.state=='code': diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py index dd8501230ec..a21b034d1b0 100644 --- a/openerp/addons/base/ir/ir_values.py +++ b/openerp/addons/base/ir/ir_values.py @@ -411,8 +411,8 @@ class ir_values(osv.osv): (tuple(groups), uid)) if not cr.fetchone(): if action['name'] == 'Menuitem': - raise osv.except_osv('Error !', - 'You do not have the permission to perform this operation !!!') + raise osv.except_osv('Error!', + 'You do not have the permission to perform this operation!!!') continue # keep only the first action registered for each action name results[action['name']] = (action['id'], action['name'], action_def) diff --git a/openerp/addons/base/module/wizard/base_module_import.py b/openerp/addons/base/module/wizard/base_module_import.py index 67408b60669..61694d5f8c3 100644 --- a/openerp/addons/base/module/wizard/base_module_import.py +++ b/openerp/addons/base/module/wizard/base_module_import.py @@ -55,7 +55,7 @@ class base_module_import(osv.osv_memory): try: file_data = zipfile.ZipFile(fp, 'r') except zipfile.BadZipfile: - raise osv.except_osv(_('Error !'), _('File is not a zip file!')) + raise osv.except_osv(_('Error!'), _('File is not a zip file!')) init_file_name = sorted(file_data.namelist())[0] module_name = os.path.split(init_file_name)[0] @@ -63,8 +63,8 @@ class base_module_import(osv.osv_memory): try: zip_file = open(file_path, 'wb') except IOError: - raise osv.except_osv(_('Error !'), - _('Can not create the module file: %s !') % \ + raise osv.except_osv(_('Error!'), + _('Can not create the module file: %s!') % \ (file_path,) ) zip_file.write(zip_data) zip_file.close() diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py index c081663d8ed..c75058ab835 100644 --- a/openerp/addons/base/module/wizard/base_module_upgrade.py +++ b/openerp/addons/base/module/wizard/base_module_upgrade.py @@ -81,7 +81,7 @@ class base_module_upgrade(osv.osv_memory): (tuple(ids), ('uninstalled',))) unmet_packages = [x[0] for x in cr.fetchall()] if unmet_packages: - raise osv.except_osv(_('Unmet dependency !'), + raise osv.except_osv(_('Unmet Dependency!'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages))) ir_module.download(cr, uid, ids, context=context) diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py index 9abab79e46c..160e86fd8d2 100644 --- a/openerp/addons/base/res/res_lang.py +++ b/openerp/addons/base/res/res_lang.py @@ -182,11 +182,11 @@ class lang(osv.osv): for language in languages: ctx_lang = context.get('lang') if language['code']=='en_US': - raise osv.except_osv(_('User Error'), _("Base Language 'en_US' can not be deleted !")) + raise osv.except_osv(_('User Error'), _("Base Language 'en_US' can not be deleted!")) if ctx_lang and (language['code']==ctx_lang): - raise osv.except_osv(_('User Error'), _("You cannot delete the language which is User's Preferred Language !")) + raise osv.except_osv(_('User Error'), _("You cannot delete the language which is User's Preferred Language!")) if language['active']: - raise osv.except_osv(_('User Error'), _("You cannot delete the language which is Active !\nPlease de-activate the language first.")) + raise osv.except_osv(_('User Error'), _("You cannot delete the language which is Active!\nPlease de-activate the language first.")) trans_obj = self.pool.get('ir.translation') trans_ids = trans_obj.search(cr, uid, [('lang','=',language['code'])], context=context) trans_obj.unlink(cr, uid, trans_ids, context=context) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 404fe5696c7..5ac5f1212f7 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -446,7 +446,7 @@ class res_partner(osv.osv, format_address): commercial_fields = self._commercial_fields(cr, uid, context=context) sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id, commercial_fields, context=context) - return self.write(cr, uid, partner.id, sync_vals, context=context) + partner.write(sync_vals) def _commercial_sync_to_children(self, cr, uid, partner, context=None): """ Handle sync of commercial fields to descendants """ @@ -472,7 +472,7 @@ class res_partner(osv.osv, format_address): use_parent_address=partner.use_parent_address, parent_id=partner.parent_id.id, context=context).get('value', {}) - self.update_address(cr, uid, partner.id, onchange_vals, context=context) + partner.update_address(onchange_vals) # 2. To DOWNSTREAM: sync children if partner.child_ids: @@ -575,7 +575,7 @@ class res_partner(osv.osv, format_address): context = {} name, email = self._parse_partner_name(name, context=context) if context.get('force_email') and not email: - raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address !")) + raise osv.except_osv(_('Warning'), _("Couldn't create contact without email address!")) if not name and email: name = email rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context) From 058c816a8e79dcef85528f0ab418887e03007215 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Apr 2013 16:28:49 +0530 Subject: [PATCH 12/35] [IMP] Improved code bzr revid: ggh@tinyerp.com-20130429105849-2peih2y8kknt65tu --- openerp/addons/base/ir/ir_mail_server.py | 4 ++-- openerp/addons/base/ir/ir_model.py | 2 +- openerp/addons/base/ir/workflow/workflow.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 10fc5f82187..93b213461a7 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -213,14 +213,14 @@ class ir_mail_server(osv.osv): password=smtp_server.smtp_pass, encryption=smtp_server.smtp_encryption, smtp_debug=smtp_server.smtp_debug) except Exception, e: - raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e)) + raise osv.except_osv(_("Connection Test Failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e)) finally: try: if smtp: smtp.quit() except Exception: # ignored, just a consequence of the previous exception pass - raise osv.except_osv(_("Connection test succeeded!"), _("Everything seems properly set up!")) + raise osv.except_osv(_("Connection Test Succeeded!"), _("Everything seems properly set up!")) def connect(self, host, port, user=None, password=None, encryption=False, smtp_debug=False): """Returns a new SMTP connection to the give SMTP server, authenticated diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 222d8f34c9c..165fd8a4be9 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -82,7 +82,7 @@ class ir_model(osv.osv): return [] __, operator, value = domain[0] if operator not in ['=', '!=']: - raise osv.except_osv(_('Invalid search criterions'), _('The osv_memory field can only be compared with = and != operator.')) + raise osv.except_osv(_("Invalid Search Criteria"), _('The osv_memory field can only be compared with = and != operator.')) value = bool(value) if operator == '=' else not bool(value) all_model_ids = self.search(cr, uid, [], context=context) is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context) diff --git a/openerp/addons/base/ir/workflow/workflow.py b/openerp/addons/base/ir/workflow/workflow.py index 0ce951940a9..a7e792072e3 100644 --- a/openerp/addons/base/ir/workflow/workflow.py +++ b/openerp/addons/base/ir/workflow/workflow.py @@ -94,7 +94,7 @@ class wkf_activity(osv.osv): def unlink(self, cr, uid, ids, context=None): if context is None: context = {} if not context.get('_force_unlink') and self.pool.get('workflow.workitem').search(cr, uid, [('act_id', 'in', ids)]): - raise osv.except_osv(_('Operation forbidden'), + raise osv.except_osv(_('Operation Forbidden'), _('Please make sure no workitems refer to an activity before deleting it!')) super(wkf_activity, self).unlink(cr, uid, ids, context=context) From de13720f0e09c36c2a65d8bf16c88deee7db8c84 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 29 Apr 2013 14:24:23 +0200 Subject: [PATCH 13/35] [IMP] rng of field tag in data xml also fix nonsensical XML files specifying @ref and @model bzr revid: xmo@openerp.com-20130429122423-qubsy2ccwo5tb8bq --- openerp/addons/base/ir/ir_actions.xml | 2 +- openerp/addons/base/ir/ir_filters.xml | 2 +- openerp/addons/base/res/res_security.xml | 4 +- openerp/import_xml.rng | 94 ++++++++++++++++++------ 4 files changed, 75 insertions(+), 27 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml index 82514692c06..145627058ef 100644 --- a/openerp/addons/base/ir/ir_actions.xml +++ b/openerp/addons/base/ir/ir_actions.xml @@ -297,7 +297,7 @@ Property multi-company - + ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)] diff --git a/openerp/addons/base/ir/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml index 72c5dad8885..88cc4b9838a 100644 --- a/openerp/addons/base/ir/ir_filters.xml +++ b/openerp/addons/base/ir/ir_filters.xml @@ -4,7 +4,7 @@ ir.filters.owner - + [('user_id','in',[False,user.id])] diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml index 783243411ef..0c8c0202d60 100644 --- a/openerp/addons/base/res/res_security.xml +++ b/openerp/addons/base/res/res_security.xml @@ -16,7 +16,7 @@ company rule - + [('id','child_of',[user.company_id.id])] @@ -25,7 +25,7 @@ user rule - + [('company_ids','child_of',[user.company_id.id])] diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng index 5f4c40b65d3..c055009a35d 100644 --- a/openerp/import_xml.rng +++ b/openerp/import_xml.rng @@ -1,17 +1,18 @@ - + - - - - - + - - - - - + + + + + + + + + @@ -125,19 +126,66 @@ - - - - - - - - - - + + + + + char + file + + - - + + + int + + + None + + + + float + + + + + + list + tuple + + + + + + + + html + xml + + + + + + + + + + + + + + + + + + + + + + + + + From de4c781392fbf6a818e0f98605bb6277762c0fa2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 29 Apr 2013 14:38:31 +0200 Subject: [PATCH 14/35] [FIX] turns out @model is optional on field when using @search it's required on @value though. or on recursive @field calls, but let's just ignore that eldritch horror bzr revid: xmo@openerp.com-20130429123831-waj3snv8pqcfda1n --- openerp/import_xml.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng index c055009a35d..716a525b496 100644 --- a/openerp/import_xml.rng +++ b/openerp/import_xml.rng @@ -178,7 +178,7 @@ - + From 7a2d912964ee6d6f4076c31bb4e4e8213846df75 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 29 Apr 2013 14:43:33 +0200 Subject: [PATCH 15/35] [REM] bunch of nonsensical @model + @ref bzr revid: xmo@openerp.com-20130429124333-p1h11fpy04y3sljy --- .../security/account_analytic_default_security.xml | 2 +- .../account_followup/security/account_followup_security.xml | 2 +- .../account_payment/security/account_payment_security.xml | 6 +++--- .../account_voucher/security/account_voucher_security.xml | 4 ++-- addons/analytic/security/analytic_security.xml | 4 ++-- addons/hr/security/hr_security.xml | 4 ++-- addons/hr_attendance/security/ir_rule.xml | 4 ++-- addons/hr_evaluation/security/hr_evaluation_security.xml | 4 ++-- addons/hr_expense/security/ir_rule.xml | 6 +++--- addons/hr_holidays/security/ir_rule.xml | 4 ++-- addons/hr_payroll/security/hr_security.xml | 4 ++-- addons/hr_recruitment/security/hr_recruitment_security.xml | 2 +- addons/hr_timesheet/security/hr_timesheet_security.xml | 4 ++-- addons/mrp_repair/security/mrp_repair_security.xml | 2 +- addons/note/security/ir.rule.xml | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml index 63c6e30eb22..cdce2a9955e 100644 --- a/addons/account_analytic_default/security/account_analytic_default_security.xml +++ b/addons/account_analytic_default/security/account_analytic_default_security.xml @@ -4,7 +4,7 @@ Analytic Default multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml index 1586403d701..69c9a44a1b9 100644 --- a/addons/account_followup/security/account_followup_security.xml +++ b/addons/account_followup/security/account_followup_security.xml @@ -4,7 +4,7 @@ Account Follow-up multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 4bca00eaa6d..fbe29699e86 100644 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -15,21 +15,21 @@ Payment Mode company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Payment order multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Payment line multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml index 04540fd8aa0..daa5934b256 100644 --- a/addons/account_voucher/security/account_voucher_security.xml +++ b/addons/account_voucher/security/account_voucher_security.xml @@ -3,13 +3,13 @@ Voucher multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Voucher Line multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index 70688275de2..bf103ca8988 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -4,14 +4,14 @@ Analytic multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Analytic line multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 8f3697f234a..4383f2d6c74 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -25,13 +25,13 @@ Department multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Job multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml index 857fc2f54ae..0bf3b73d76e 100644 --- a/addons/hr_attendance/security/ir_rule.xml +++ b/addons/hr_attendance/security/ir_rule.xml @@ -9,13 +9,13 @@ Manager Attendance - + [(1,'=',1)] Employee Attendance - + [('employee_id.user_id','=',user.id)] diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml index 7c7d6f43ee3..209ca281396 100644 --- a/addons/hr_evaluation/security/hr_evaluation_security.xml +++ b/addons/hr_evaluation/security/hr_evaluation_security.xml @@ -31,14 +31,14 @@ Evaluation Plan multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Evaluation Plan Phase multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml index b9ad5778d1e..3c3cb018489 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -4,19 +4,19 @@ Manager Expense - + [(1,'=',1)] Employee Expense - + [('employee_id.user_id','=',user.id)] Expense multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml index ff0270026a4..e2c0ffb1a6f 100644 --- a/addons/hr_holidays/security/ir_rule.xml +++ b/addons/hr_holidays/security/ir_rule.xml @@ -3,14 +3,14 @@ Employee Holidays - + [('employee_id.user_id','=',user.id)] Holidays Officer - + [(1,'=',1)] diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml index d55f1c81cce..e410eae7250 100644 --- a/addons/hr_payroll/security/hr_security.xml +++ b/addons/hr_payroll/security/hr_security.xml @@ -8,10 +8,10 @@ Employee Payslip - + ['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)] - \ No newline at end of file + diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml index 570b0f036cd..4fccca1a791 100644 --- a/addons/hr_recruitment/security/hr_recruitment_security.xml +++ b/addons/hr_recruitment/security/hr_recruitment_security.xml @@ -4,7 +4,7 @@ Applicant multi company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml index d7cf34fa1fd..c5549d1ed27 100644 --- a/addons/hr_timesheet/security/hr_timesheet_security.xml +++ b/addons/hr_timesheet/security/hr_timesheet_security.xml @@ -4,14 +4,14 @@ Manager HR Analytic Timesheet - + [(1,'=',1)] Employee HR Analytic Timesheet - + [('user_id', '=', user.id)] diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml index 0b34310fc4e..e94b675b57f 100644 --- a/addons/mrp_repair/security/mrp_repair_security.xml +++ b/addons/mrp_repair/security/mrp_repair_security.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml index b0c79561355..2c6e9f3bc7f 100644 --- a/addons/note/security/ir.rule.xml +++ b/addons/note/security/ir.rule.xml @@ -3,7 +3,7 @@ Only followers can access a sticky notes - + [('message_follower_ids','=',user.partner_id.id)] @@ -14,7 +14,7 @@ Each user have his stage name - + ['|',('user_id','=',False),('user_id','=',user.id)] From 07607f054bc8f3b427a98f479f0b3d3cb92224c1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 29 Apr 2013 14:52:17 +0200 Subject: [PATCH 16/35] [REM] more nonsensical @model + @ref bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6 --- .../process/customer_invoice_process.xml | 32 ++++++------- addons/account/process/statement_process.xml | 14 +++--- .../process/supplier_invoice_process.xml | 28 +++++------ .../crm/process/crm_configuration_process.xml | 12 ++--- addons/hr/process/hr_process.xml | 10 ++-- .../hr_expense/process/hr_expense_process.xml | 26 +++++----- .../process/hr_holidays_process.xml | 26 +++++----- .../process/hr_timesheet_sheet_process.xml | 24 +++++----- .../membership/process/membership_process.xml | 22 ++++----- addons/mrp/process/procurement_process.xml | 48 +++++++++---------- .../mrp/process/service_product_process.xml | 6 +-- .../mrp/process/stockable_product_process.xml | 8 ++-- .../process/mrp_operation_process.xml | 16 +++---- addons/product/process/product_process.xml | 4 +- addons/project/process/task_process.xml | 12 ++--- .../process/project_mrp_process.xml | 12 ++--- .../process/project_timesheet_process.xml | 12 ++--- addons/purchase/process/purchase_process.xml | 36 +++++++------- addons/sale/process/sale_process.xml | 12 ++--- addons/sale_crm/process/sale_crm_process.xml | 16 +++---- .../sale_stock/process/sale_stock_process.xml | 20 ++++---- 21 files changed, 198 insertions(+), 198 deletions(-) diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index 8971235c1f7..e45f8080518 100644 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -123,24 +123,24 @@ - - + + - - + + - - + + @@ -148,40 +148,40 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml index c10b34c8866..1ebebec7809 100644 --- a/addons/sale_stock/process/sale_stock_process.xml +++ b/addons/sale_stock/process/sale_stock_process.xml @@ -72,40 +72,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -403,8 +403,8 @@ TOEJ situation - - + + @@ -413,8 +413,8 @@ USD Bank Journal - (test) TUBK bank - - + + SJ - San José - + San José + A Alajuela - + H Heredia - + C Cartago - + P Puntarenas - + G Guanacaste - + L - Limón - + Limón + @@ -66,13 +65,13 @@ - - + + - - + + @@ -85,9 +84,9 @@ OpenERP Partner create_date - + - + \ No newline at end of file diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml index 141981a21d6..f6eb8a1d905 100644 --- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml +++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml @@ -1,11 +1,10 @@ - Dummy Action dummy - + @@ -40,10 +39,10 @@ - Hello,

-

Thanks for the genuine interest you have shown in OpenERP.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>Thanks for the genuine interest you have shown in OpenERP.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> For OpenERP OnDemand Free Trial 2010 @@ -53,11 +52,11 @@ - Hello,

-

We have very good offer that might suit you. - We suggest you subscribe to the OpenERP Discovery Day on May 2010.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> For OpenERP Discovery Day on May 2010 @@ -68,10 +67,10 @@ - Hello,

-

Thanks for showing interest and for subscribing to the OpenERP Discovery Day.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> For OpenERP Discovery Day @@ -82,10 +81,10 @@ - Hello,

-

Thanks for showing interest and buying the OpenERP book.

+ <p>Hello,</p> + <p>Thanks for showing interest and buying the OpenERP book.</p> If any further information required kindly revert back. -

Regards,OpenERP Team,

]]> + <p>Regards,OpenERP Team,</p> For OpenERP book @@ -95,11 +94,11 @@ - Hello,

-

We have very good offer that might suit you. - For our gold partners,We are arranging free technical training on june,2010.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + For our gold partners,We are arranging free technical training on june,2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> technical training to gold partners @@ -110,11 +109,11 @@ - Hello,

-

We have very good offer that might suit you. - For our silver partners,We are paid technical training on june,2010.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + For our silver partners,We are paid technical training on june,2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> training to silver partners @@ -125,11 +124,11 @@ - Hello,

-

We have very good offer that might suit you. - For our silver partners, we are offering Gold partnership.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + For our silver partners, we are offering Gold partnership.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> gold partnership to silver partners @@ -140,11 +139,11 @@ - Hello,

-

Thanks for showing interest and for subscribing to technical training.

- If any further information required kindly revert back.I really appreciate your co-operation on this.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>Thanks for showing interest and for subscribing to technical training.</p> + If any further information required kindly revert back.I really appreciate your co-operation on this.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> subscribing to technical training @@ -171,7 +170,7 @@ Propose a 1 month free trial for an OnDemand offer - + report @@ -180,27 +179,27 @@ Thanks for showing interest - + Propose to subscribe to the OpenERP Discovery Day on May 2010 - + Thanks for subscribing to the OpenERP Discovery Day - + Propose to buy the OpenERP Book - + report @@ -209,81 +208,81 @@ Thanks for buying the OpenERP book - + Propose a free technical training to Gold partners - + Propose paid training to Silver partners - + Propose gold partnership to silver partners - + Thanks for subscribing to technical training - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -296,4 +295,4 @@ - + \ No newline at end of file diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml index 31c48046d64..67d610c65c9 100644 --- a/addons/procurement/stock_orderpoint.xml +++ b/addons/procurement/stock_orderpoint.xml @@ -1,4 +1,3 @@ - @@ -7,50 +6,50 @@ 25.0 5.0 - + - + 10.0 5.0 - + - + 12.0 5.0 - + - + 50.0 10.0 - + - + 15.0 5.0 - + - + 5.0 3.0 - + - + - + \ No newline at end of file diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index 11936db0bed..68a6cd12733 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -57,7 +57,7 @@ invoice subflow - + action_invoice_create() diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml index 6578a961ff3..d9a220daef6 100644 --- a/addons/stock_location/stock_location_demo_cpu1.xml +++ b/addons/stock_location/stock_location_demo_cpu1.xml @@ -1,4 +1,3 @@ - @@ -73,7 +72,7 @@ - + @@ -89,4 +88,4 @@ - + \ No newline at end of file From cc77560f4378b8984d50d9a7946793ba3d532dd3 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 6 May 2013 14:25:38 +0200 Subject: [PATCH 19/35] [IMP] crm: base_partner_merge: The 'Automatic Merge' button open the wizard. Add field to choice the partner destination bzr revid: chm@openerp.com-20130506122538-8hi7znmq4pjooasf --- addons/crm/base_partner_merge.py | 73 ++++++++++++++++++++------ addons/crm/base_partner_merge_view.xml | 5 +- 2 files changed, 60 insertions(+), 18 deletions(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index b2645e7fb79..b40016b2635 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -101,6 +101,7 @@ class MergePartnerAutomatic(osv.TransientModel): 'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'), 'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'), 'partner_ids': fields.many2many('res.partner', string='Contacts'), + 'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'), 'exclude_contact': fields.boolean('A user associated to the contact'), 'exclude_journal_item': fields.boolean('Journal Items associated to the contact'), @@ -111,6 +112,13 @@ class MergePartnerAutomatic(osv.TransientModel): 'state': 'option', } + def onchange_partner_ids(self, cr, uid, ids, partner_ids=[], context=None): + if partner_ids and isinstance(partner_ids[0], (list, tuple)): + partner_ids = partner_ids[0][2] + else: + partner_ids = [] + return {'domain': {'dst_partner_id': [('id', 'in', partner_ids)]}} + def get_fk_on(self, cr, table): q = """ SELECT cl1.relname as table, att1.attname as column @@ -254,6 +262,7 @@ class MergePartnerAutomatic(osv.TransientModel): if field._type not in ('many2many', 'one2many', 'function'): for item in itertools.chain(src_partners, [dst_partner]): if item[column]: + print column, item[column] values[column] = write_serializer(column, item[column]) values.pop('id', None) @@ -266,20 +275,23 @@ class MergePartnerAutomatic(osv.TransientModel): _logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id) @mute_logger('openerp.osv.expression', 'openerp.osv.orm') - def _merge(self, cr, uid, partner_ids, context=None): + def _merge(self, cr, uid, partner_ids, dst_partner_id=None, context=None): proxy = self.pool.get('res.partner') partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context) if len(partner_ids) < 2: return - partners = proxy.browse(cr, uid, list(partner_ids), context=context) - ordered_partners = sorted(sorted(partners, - key=operator.attrgetter('create_date'), reverse=True), - key=operator.attrgetter('active'), reverse=True) - - dst_partner = ordered_partners[-1] - src_partners = ordered_partners[:-1] + if dst_partner_id and dst_partner_id in partner_ids: + partner_obj = self.pool.get('res.partner') + def f(x): + return x != dst_partner_id + src_partners = partner_obj.browse(cr, uid, list(filter(f, partner_ids)), context=context) + dst_partner = partner_obj.browse(cr, uid, list(partner_ids), context=context) + else: + ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context) + dst_partner = ordered_partners[-1] + src_partners = ordered_partners[:-1] _logger.info("dst_partner: %s", dst_partner.id) call_it = lambda function: function(cr, uid, src_partners, dst_partner, @@ -414,9 +426,16 @@ class MergePartnerAutomatic(osv.TransientModel): this = self.browse(cr, uid, ids[0], context=context) if this.current_line_id: this.current_line_id.unlink() - return self._next_screen(this) + return self._next_screen(cr, uid, this) - def _next_screen(self, this): + def _get_ordered_partner(self, cr, uid, partner_ids, context=None): + partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context) + ordered_partners = sorted(sorted(partners, + key=operator.attrgetter('create_date'), reverse=True), + key=operator.attrgetter('active'), reverse=True) + return ordered_partners + + def _next_screen(self, cr, uid, this): this.refresh() values = {} if this.line_ids: @@ -426,6 +445,7 @@ class MergePartnerAutomatic(osv.TransientModel): values.update({ 'current_line_id': current_line.id, 'partner_ids': [(6, 0, current_partner_ids)], + 'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id, 'state': 'selection', }) else: @@ -525,7 +545,7 @@ class MergePartnerAutomatic(osv.TransientModel): query = self._generate_query(groups, this.maximum_group) self._process_query(cr, uid, ids, query, context=context) - return self._next_screen(this) + return self._next_screen(cr, uid, this) def automatic_process_cb(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -666,7 +686,7 @@ class MergePartnerAutomatic(osv.TransientModel): # p1.parent_id = p1.id # """) - return self._next_screen(this) + return self._next_screen(cr, uid, this) def merge_cb(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -685,11 +705,11 @@ class MergePartnerAutomatic(osv.TransientModel): 'target': 'new', } - self._merge(cr, uid, partner_ids, context=context) + self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context) this.current_line_id.unlink() - return self._next_screen(this) + return self._next_screen(cr, uid, this) def merge_multi(self, cr, uid, ids, context=None): @@ -709,9 +729,29 @@ class MergePartnerAutomatic(osv.TransientModel): _("You can't use this wizard with only one Partner") ) - self._merge(cr, uid, partner_ids, context=context) + ordered_partner = self._get_ordered_partner(cr, uid, partner_ids, context) + def f(x): return x.id - return True + current_line_id = self.pool.get('base.partner.merge.line').create(cr, uid, {'min_id': ordered_partner[-1].id, 'aggr_ids': map(f, ordered_partner)}) + context.update({ + 'default_state': 'selection', + 'default_partner_ids': [(6, 0, partner_ids)], + 'default_dst_partner_id': ordered_partner[-1].id, + 'default_current_line_id': current_line_id, + 'default_number_group': 1, + 'default_maximum_group': 1, + }) + + action = { + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': self._name, + 'res_id': False, + 'type': 'ir.actions.act_window', + 'target': 'new', + 'context': context + } + return action def auto_set_parent_id(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -758,3 +798,4 @@ class MergePartnerAutomatic(osv.TransientModel): WHERE id != %s AND email LIKE '%%%s' """ % (id, id, email)) return False + diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml index 74e7a72d7a8..dd344b122bc 100644 --- a/addons/crm/base_partner_merge_view.xml +++ b/addons/crm/base_partner_merge_view.xml @@ -98,7 +98,8 @@ redirected to the aggregated contact. You can remove contacts from this list to avoid merging them.

- + + @@ -117,7 +118,7 @@ - pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context) + action = pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context) True Automatic Merge From cffffc9cd6c6d9d50183c4b1648fb6a1ef9915d6 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 8 May 2013 17:00:37 +0200 Subject: [PATCH 20/35] [FIX] crm: missing context propagation bzr revid: odo@openerp.com-20130508150037-qtdsx3gpirwr10re --- addons/crm/base_partner_merge.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index b40016b2635..704f2b03aec 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -426,7 +426,7 @@ class MergePartnerAutomatic(osv.TransientModel): this = self.browse(cr, uid, ids[0], context=context) if this.current_line_id: this.current_line_id.unlink() - return self._next_screen(cr, uid, this) + return self._next_screen(cr, uid, this, context) def _get_ordered_partner(self, cr, uid, partner_ids, context=None): partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context) @@ -435,7 +435,7 @@ class MergePartnerAutomatic(osv.TransientModel): key=operator.attrgetter('active'), reverse=True) return ordered_partners - def _next_screen(self, cr, uid, this): + def _next_screen(self, cr, uid, this, context=None): this.refresh() values = {} if this.line_ids: @@ -545,7 +545,7 @@ class MergePartnerAutomatic(osv.TransientModel): query = self._generate_query(groups, this.maximum_group) self._process_query(cr, uid, ids, query, context=context) - return self._next_screen(cr, uid, this) + return self._next_screen(cr, uid, this, context) def automatic_process_cb(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -686,7 +686,7 @@ class MergePartnerAutomatic(osv.TransientModel): # p1.parent_id = p1.id # """) - return self._next_screen(cr, uid, this) + return self._next_screen(cr, uid, this, context) def merge_cb(self, cr, uid, ids, context=None): assert is_integer_list(ids) @@ -709,7 +709,7 @@ class MergePartnerAutomatic(osv.TransientModel): this.current_line_id.unlink() - return self._next_screen(cr, uid, this) + return self._next_screen(cr, uid, this, context) def merge_multi(self, cr, uid, ids, context=None): From 4229cff81cc27596bc81e1745046a9802014fd81 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 8 May 2013 18:27:42 +0200 Subject: [PATCH 21/35] [FIX] crm: simplify + fix multiple programming errors in partner merge wizard bzr revid: odo@openerp.com-20130508162742-qxdrjg93r6md1tw5 --- addons/crm/base_partner_merge.py | 78 ++++++-------------------- addons/crm/base_partner_merge_view.xml | 32 +++-------- 2 files changed, 26 insertions(+), 84 deletions(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index 704f2b03aec..f51d6afb188 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -108,16 +108,20 @@ class MergePartnerAutomatic(osv.TransientModel): 'maximum_group': fields.integer("Maximum of Group of Contacts"), } - _defaults = { - 'state': 'option', - } + def default_get(self, cr, uid, fields, context=None): + if context is None: + context = {} + res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context) + if context.get('active_model') == 'res.partner' and context.get('active_ids'): + partner_ids = context['active_ids'] + res['state'] = 'selection' + res['partner_ids'] = partner_ids + res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id + return res - def onchange_partner_ids(self, cr, uid, ids, partner_ids=[], context=None): - if partner_ids and isinstance(partner_ids[0], (list, tuple)): - partner_ids = partner_ids[0][2] - else: - partner_ids = [] - return {'domain': {'dst_partner_id': [('id', 'in', partner_ids)]}} + _defaults = { + 'state': 'option' + } def get_fk_on(self, cr, table): q = """ SELECT cl1.relname as table, @@ -262,7 +266,6 @@ class MergePartnerAutomatic(osv.TransientModel): if field._type not in ('many2many', 'one2many', 'function'): for item in itertools.chain(src_partners, [dst_partner]): if item[column]: - print column, item[column] values[column] = write_serializer(column, item[column]) values.pop('id', None) @@ -275,19 +278,15 @@ class MergePartnerAutomatic(osv.TransientModel): _logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id) @mute_logger('openerp.osv.expression', 'openerp.osv.orm') - def _merge(self, cr, uid, partner_ids, dst_partner_id=None, context=None): + def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None): proxy = self.pool.get('res.partner') partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context) if len(partner_ids) < 2: return - if dst_partner_id and dst_partner_id in partner_ids: - partner_obj = self.pool.get('res.partner') - def f(x): - return x != dst_partner_id - src_partners = partner_obj.browse(cr, uid, list(filter(f, partner_ids)), context=context) - dst_partner = partner_obj.browse(cr, uid, list(partner_ids), context=context) + if dst_partner and dst_partner.id in partner_ids: + src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context) else: ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context) dst_partner = ordered_partners[-1] @@ -707,52 +706,11 @@ class MergePartnerAutomatic(osv.TransientModel): self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context) - this.current_line_id.unlink() + if this.current_line_id: + this.current_line_id.unlink() return self._next_screen(cr, uid, this, context) - def merge_multi(self, cr, uid, ids, context=None): - - active_model = context.get('active_model') - if active_model != 'res.partner': - raise osv.except_osv( - _('Error'), - _('This wizard can only used with the Partners') - ) - - partner_ids = context.get('active_ids', []) - - MINIMAL_NUMBER = 2 - if len(partner_ids) < MINIMAL_NUMBER: - raise osv.except_osv( - _('Error'), - _("You can't use this wizard with only one Partner") - ) - - ordered_partner = self._get_ordered_partner(cr, uid, partner_ids, context) - def f(x): return x.id - - current_line_id = self.pool.get('base.partner.merge.line').create(cr, uid, {'min_id': ordered_partner[-1].id, 'aggr_ids': map(f, ordered_partner)}) - context.update({ - 'default_state': 'selection', - 'default_partner_ids': [(6, 0, partner_ids)], - 'default_dst_partner_id': ordered_partner[-1].id, - 'default_current_line_id': current_line_id, - 'default_number_group': 1, - 'default_maximum_group': 1, - }) - - action = { - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': self._name, - 'res_id': False, - 'type': 'ir.actions.act_window', - 'target': 'new', - 'context': context - } - return action - def auto_set_parent_id(self, cr, uid, ids, context=None): assert is_integer_list(ids) diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml index dd344b122bc..8ce0b5fd99f 100644 --- a/addons/crm/base_partner_merge_view.xml +++ b/addons/crm/base_partner_merge_view.xml @@ -68,9 +68,9 @@ OpenERP will propose you to merge only those having all these fields in common. (not one of the fields).

- + - + @@ -98,16 +98,15 @@ redirected to the aggregated contact. You can remove contacts from this list to avoid merging them.

- - + + - + - @@ -115,24 +114,9 @@ - - - action = pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context) - True - - Automatic Merge - - code - ir.actions.server - - - - - res.partner - Automatic Merge - - + + From 7542d8885d5ab01d7447448c707618e1f97d0928 Mon Sep 17 00:00:00 2001 From: "Dharmraj Zala (OpenERP Trainee)" Date: Thu, 9 May 2013 17:06:15 +0530 Subject: [PATCH 22/35] [FIX] set ondelete restrict on state and country. bzr revid: nco@tinyerp.com-20130509113615-u2xedxu5ihn9lqh9 --- openerp/addons/base/res/res_partner.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 404fe5696c7..d50f38a77ee 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -259,8 +259,8 @@ class res_partner(osv.osv, format_address): 'street2': fields.char('Street2', size=128), 'zip': fields.char('Zip', change_default=True, size=24), 'city': fields.char('City', size=128), - 'state_id': fields.many2one("res.country.state", 'State'), - 'country_id': fields.many2one('res.country', 'Country'), + 'state_id': fields.many2one("res.country.state", 'State', ondelete='restrict'), + 'country_id': fields.many2one('res.country', 'Country', ondelete='restrict'), 'country': fields.related('country_id', type='many2one', relation='res.country', string='Country', deprecated="This field will be removed as of OpenERP 7.1, use country_id instead"), 'email': fields.char('Email', size=240), @@ -446,7 +446,7 @@ class res_partner(osv.osv, format_address): commercial_fields = self._commercial_fields(cr, uid, context=context) sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id, commercial_fields, context=context) - return self.write(cr, uid, partner.id, sync_vals, context=context) + partner.write(sync_vals) def _commercial_sync_to_children(self, cr, uid, partner, context=None): """ Handle sync of commercial fields to descendants """ @@ -472,7 +472,7 @@ class res_partner(osv.osv, format_address): use_parent_address=partner.use_parent_address, parent_id=partner.parent_id.id, context=context).get('value', {}) - self.update_address(cr, uid, partner.id, onchange_vals, context=context) + partner.update_address(onchange_vals) # 2. To DOWNSTREAM: sync children if partner.child_ids: From d0236bd31e0c7773d68dc3f365c2c82c0e1dbc7a Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Wed, 15 May 2013 13:21:40 +0530 Subject: [PATCH 23/35] [FIX] set defalut customer and add field customer to store value of customer. bzr revid: nco@tinyerp.com-20130515075140-dql9dhnygtgi7319 --- openerp/addons/base/res/res_partner_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 5b9d21045aa..1d196cda0ed 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -186,7 +186,7 @@ - + @@ -286,6 +286,7 @@ + From b6f6b718cad48f83d92d3f4378a2437c8e20b538 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 17 May 2013 10:50:40 +0200 Subject: [PATCH 24/35] [IMP] base_partner_merge: use SUPERUSER_ID for merged contact. Add exception when the active user is not the SUPERUSER_ID if the emails is differents or if they are more of one contact with Journal Items. bzr revid: chm@openerp.com-20130517085040-u9n1v0a22uruqhca --- addons/crm/base_partner_merge.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index f51d6afb188..743f14000a8 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -13,6 +13,7 @@ from openerp.tools import mute_logger # Validation Library https://pypi.python.org/pypi/validate_email/1.1 from .validate_email import validate_email +import openerp from openerp.osv import osv, orm from openerp.osv import fields from openerp.osv.orm import browse_record @@ -216,8 +217,8 @@ class MergePartnerAutomatic(osv.TransientModel): if proxy is None: return domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)] - ids = proxy.search(cr, uid, domain, context=context) - return proxy.write(cr, uid, ids, {field_id: dst_partner.id}, context=context) + ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context) + return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context) update_records = functools.partial(update_records, context=context) @@ -231,9 +232,9 @@ class MergePartnerAutomatic(osv.TransientModel): proxy = self.pool['ir.model.fields'] domain = [('ttype', '=', 'reference')] - record_ids = proxy.search(cr, uid, domain, context=context) + record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context) - for record in proxy.browse(cr, uid, record_ids, context=context): + for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context): proxy_model = self.pool[record.model] field_type = proxy_model._columns.get(record.name).__class__._type @@ -245,11 +246,11 @@ class MergePartnerAutomatic(osv.TransientModel): domain = [ (record.name, '=', 'res.partner,%d' % partner.id) ] - model_ids = proxy_model.search(cr, uid, domain, context=context) + model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context) values = { record.name: 'res.partner,%d' % dst_partner.id, } - proxy_model.write(cr, uid, model_ids, values, context=context) + proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context) def _update_values(self, cr, uid, src_partners, dst_partner, context=None): _logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners))) @@ -285,6 +286,9 @@ class MergePartnerAutomatic(osv.TransientModel): if len(partner_ids) < 2: return + if openerp.SUPERUSER_ID != uid and len([partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context)]) > 1: + raise osv.except_osv(_('Error'), _("All contacts must have the same email address. Only your Administrator can merge several contacts with different email address.")) + if dst_partner and dst_partner.id in partner_ids: src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context) else: @@ -293,6 +297,10 @@ class MergePartnerAutomatic(osv.TransientModel): src_partners = ordered_partners[:-1] _logger.info("dst_partner: %s", dst_partner.id) + if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \ + self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context): + raise osv.except_osv(_('Error'), _("Only one contact can have Journal Items, and this contact must be the destination contact. Only your Administrator can merge several contacts with Journal Items.")) + call_it = lambda function: function(cr, uid, src_partners, dst_partner, context=context) @@ -300,12 +308,11 @@ class MergePartnerAutomatic(osv.TransientModel): call_it(self._update_reference_fields) call_it(self._update_values) - _logger.info("---merged---") + _logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id) for partner in src_partners: partner.unlink() - def clean_emails(self, cr, uid, context=None): """ Clean the email address of the partner, if there is an email field with @@ -756,4 +763,3 @@ class MergePartnerAutomatic(osv.TransientModel): WHERE id != %s AND email LIKE '%%%s' """ % (id, id, email)) return False - From a5bf0f3181492ee4bc6014ba0da9b84c0a136772 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 22 May 2013 13:11:31 +0200 Subject: [PATCH 25/35] [FIX] crm: partner merge wizard: fix detection of duplicate emails + improve error messages bzr revid: odo@openerp.com-20130522111131-y1urx7qx280f3tdl --- addons/crm/base_partner_merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index 743f14000a8..d2d964833b3 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -286,8 +286,8 @@ class MergePartnerAutomatic(osv.TransientModel): if len(partner_ids) < 2: return - if openerp.SUPERUSER_ID != uid and len([partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context)]) > 1: - raise osv.except_osv(_('Error'), _("All contacts must have the same email address. Only your Administrator can merge several contacts with different email address.")) + if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1: + raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails.")) if dst_partner and dst_partner.id in partner_ids: src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context) @@ -299,7 +299,7 @@ class MergePartnerAutomatic(osv.TransientModel): if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \ self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context): - raise osv.except_osv(_('Error'), _("Only one contact can have Journal Items, and this contact must be the destination contact. Only your Administrator can merge several contacts with Journal Items.")) + raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items.")) call_it = lambda function: function(cr, uid, src_partners, dst_partner, context=context) From 8def4f274a64dcdcf1d397467b44ade50fbdb22f Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 22 May 2013 13:54:08 +0200 Subject: [PATCH 26/35] [IMP] crm: partner merge wizard: prevent merging more than 3 contacts together + log note in partner history bzr revid: odo@openerp.com-20130522115408-ef82getdyo2otg3q --- addons/crm/base_partner_merge.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py index d2d964833b3..0a8e37b14b7 100644 --- a/addons/crm/base_partner_merge.py +++ b/addons/crm/base_partner_merge.py @@ -286,6 +286,9 @@ class MergePartnerAutomatic(osv.TransientModel): if len(partner_ids) < 2: return + if len(partner_ids) > 3: + raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed.")) + if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1: raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails.")) @@ -309,7 +312,8 @@ class MergePartnerAutomatic(osv.TransientModel): call_it(self._update_values) _logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id) - + dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners))) + for partner in src_partners: partner.unlink() From b2c84a83109a0260631e2e836cbfd39d4a08c5df Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Thu, 23 May 2013 10:54:03 +0530 Subject: [PATCH 27/35] [IMP] when create company form supplier it should be supplier by default, same for the customer and when both the company should be both customer and supplier. bzr revid: nco@tinyerp.com-20130523052403-lk8e1ghfglwtavg5 --- openerp/addons/base/res/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 0ed26a5353a..32cb4e83e25 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -138,7 +138,7 @@ From 49b693e30bcd743531cdf4a3bfc4d3cc6cba3b93 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 30 May 2013 17:06:21 +0200 Subject: [PATCH 28/35] [IMP] event: remove unused parameter from context bzr revid: mat@openerp.com-20130530150621-z4xsss7hfx7v8ixe --- addons/event_sale/event_sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index e1fb57fb93c..8bacd37fc15 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -86,7 +86,7 @@ class sale_order_line(osv.osv): 'event_id': order_line.event_id.id, } message = _("The registration has been created for event %s from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name) - context.update({'mail_create_nolog': True, 'message': message }) + context.update({'mail_create_nolog': True}) registration_id = registration_obj.create(cr, uid, dic, context=context) registration_obj.message_post(cr, uid, [registration_id], body=message, context=context) return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context) From d9a24a551fee65030c2d458c98297363b8e16aff Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 31 May 2013 05:38:26 +0000 Subject: [PATCH 29/35] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130531053826-kecibs4xe8osg8kr --- addons/crm/i18n/ru.po | 51 ++++++++++-------- addons/crm_claim/i18n/ru.po | 70 ++++++++++++++---------- addons/crm_helpdesk/i18n/ru.po | 26 ++++----- addons/crm_partner_assign/i18n/ru.po | 81 ++++++++++++++++------------ addons/crm_profiling/i18n/ru.po | 10 ++-- addons/edi/i18n/ru.po | 23 ++++---- addons/email_template/i18n/ru.po | 12 ++--- 7 files changed, 155 insertions(+), 118 deletions(-) diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po index 6403f9e57b6..ec2a9f35ee5 100644 --- a/addons/crm/i18n/ru.po +++ b/addons/crm/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-05-27 12:19+0000\n" -"Last-Translator: leksei \n" +"PO-Revision-Date: 2013-05-30 13:52+0000\n" +"Last-Translator: Chertykov Denis \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: 2013-05-28 05:17+0000\n" -"X-Generator: Launchpad (build 16640)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: crm #: view:crm.lead.report:0 @@ -1108,7 +1108,7 @@ msgstr "Удалить" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_create msgid "Opportunity created" -msgstr "" +msgstr "Предложение создано" #. module: crm #: view:crm.lead:0 @@ -1397,7 +1397,7 @@ msgstr "Сделать" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_lost msgid "Opportunity lost" -msgstr "" +msgstr "Предложение отклонено" #. module: crm #: field:crm.lead2opportunity.partner,action:0 @@ -1446,7 +1446,7 @@ msgstr "Пользователи" #. module: crm #: model:mail.message.subtype,name:crm.mt_lead_stage msgid "Stage Changed" -msgstr "" +msgstr "Стадия изменена" #. module: crm #: field:crm.case.stage,section_ids:0 @@ -1759,7 +1759,7 @@ msgstr "Способ оплаты" #. module: crm #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass msgid "Mass Lead To Opportunity Partner" -msgstr "Массовое проведение предложений партнёру" +msgstr "Массовое преобразование кандидатов в предложения" #. module: crm #: view:sale.config.settings:0 @@ -1917,7 +1917,7 @@ msgstr "Сделать" #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity msgid "Lead to Opportunity" -msgstr "" +msgstr "Кандидат в предложение" #. module: crm #: field:crm.lead,user_email:0 @@ -2126,7 +2126,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Address" -msgstr "" +msgstr "Адрес" #. module: crm #: help:crm.case.section,alias_id:0 @@ -2134,6 +2134,8 @@ msgid "" "The email address associated with this team. New emails received will " "automatically create new leads assigned to the team." msgstr "" +"Адрес эл. почты связанный с этой командой. Новая полученная эл. почта будет " +"автоматически создавать новые кандидаты связанные с командой." #. module: crm #: view:crm.lead:0 @@ -2192,7 +2194,7 @@ msgstr "Продолжение процесса" #: selection:crm.lead2opportunity.partner.mass,name:0 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner msgid "Convert to opportunity" -msgstr "Преобразовать в возможность" +msgstr "Преобразовать в предложение" #. module: crm #: field:crm.opportunity2phonecall,user_id:0 @@ -2234,6 +2236,8 @@ msgid "" "This stage is not visible, for example in status bar or kanban view, when " "there are no records in that stage to display." msgstr "" +"Эта стадия не видима, например в статус-баре или виде канбан, когда нет " +"записей этой стадии для отображения." #. module: crm #: field:crm.lead.report,nbr:0 @@ -2249,7 +2253,7 @@ msgstr "Отдел продаж, которому принадлежит воп #. module: crm #: model:crm.case.resource.type,name:crm.type_lead6 msgid "Banner Ads" -msgstr "" +msgstr "Баннер" #. module: crm #: field:crm.merge.opportunity,opportunity_ids:0 @@ -2279,7 +2283,7 @@ msgstr "Выполняется" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity msgid "Lead converted into an opportunity" -msgstr "" +msgstr "Кандидат превращенный в предложение" #. module: crm #: view:crm.lead:0 @@ -2289,7 +2293,7 @@ msgstr "Нераспределенные кандидаты" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_won msgid "Opportunity won" -msgstr "" +msgstr "Предложение принято" #. module: crm #: field:crm.case.categ,object_id:0 @@ -2364,7 +2368,7 @@ msgstr "" #. module: crm #: field:crm.case.stage,state:0 msgid "Related Status" -msgstr "" +msgstr "Связанный статус" #. module: crm #: field:crm.phonecall,name:0 @@ -2410,7 +2414,7 @@ msgstr "Подтвердить" #. module: crm #: view:crm.lead:0 msgid "Unread messages" -msgstr "" +msgstr "Непрочитанные сообщения" #. module: crm #: field:crm.phonecall.report,section_id:0 @@ -2501,7 +2505,7 @@ msgstr "Создание предложений из кандидатов" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead3 msgid "Email Campaign - Products" -msgstr "" +msgstr "Кампания эл. почты - Продукция" #. module: crm #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0 @@ -2578,7 +2582,7 @@ msgstr "Август" #: model:mail.message.subtype,name:crm.mt_lead_lost #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost msgid "Opportunity Lost" -msgstr "" +msgstr "Предложение отклонено" #. module: crm #: field:crm.lead.report,deadline_month:0 @@ -2644,7 +2648,7 @@ msgstr "Сотрудники отдела" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule/Log a Call" -msgstr "" +msgstr "Запланировать/Описать звонок" #. module: crm #: field:crm.lead,planned_cost:0 @@ -2654,7 +2658,7 @@ msgstr "Планируемые затраты" #. module: crm #: help:crm.lead,date_deadline:0 msgid "Estimate of the date on which the opportunity will be won." -msgstr "" +msgstr "Оценка даты на которую это предложение будет принято." #. module: crm #: help:crm.lead,email_cc:0 @@ -2676,7 +2680,7 @@ msgstr "Описанные звонки" #: model:mail.message.subtype,name:crm.mt_lead_won #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won msgid "Opportunity Won" -msgstr "" +msgstr "Предложение принято" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree @@ -2895,7 +2899,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Internal Notes" -msgstr "" +msgstr "Внутренние заметки" #. module: crm #: view:crm.lead:0 @@ -2960,6 +2964,7 @@ msgstr "Проиграно" #, python-format msgid "Closed/Cancelled leads cannot be converted into opportunities." msgstr "" +"Закрытые/Отмененные кандидаты не могут быть конвертированы в возможности." #. module: crm #: view:crm.lead:0 @@ -3050,7 +3055,7 @@ msgstr "Рассылка" #. module: crm #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage msgid "Opportunity Stage Changed" -msgstr "" +msgstr "Этап предложения изменен" #. module: crm #: model:ir.actions.act_window,help:crm.crm_lead_stage_act diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po index afcf4702a67..4579b6d8557 100644 --- a/addons/crm_claim/i18n/ru.po +++ b/addons/crm_claim/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-10-24 05:01+0000\n" +"PO-Revision-Date: 2013-05-30 14:03+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:44+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: crm_claim #: help:crm.claim.stage,fold:0 @@ -23,6 +23,8 @@ msgid "" "This stage is not visible, for example in status bar or kanban view, when " "there are no records in that stage to display." msgstr "" +"Эта стадия не видима, например в статус-баре или виде канбан, когда нет " +"записей этой стадии для отображения." #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -46,11 +48,13 @@ msgid "" "Allows you to configure your incoming mail server, and create claims from " "incoming emails." msgstr "" +"Позволяет настроить сервер входящей почты и создавать претензии из входящих " +"эл. писем." #. module: crm_claim #: model:ir.model,name:crm_claim.model_crm_claim_stage msgid "Claim stages" -msgstr "" +msgstr "Этапы претензии" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -65,7 +69,7 @@ msgstr "Задержка закрытия" #. module: crm_claim #: field:crm.claim,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Непрочитанные" #. module: crm_claim #: field:crm.claim,resolution:0 @@ -100,12 +104,12 @@ msgstr "# претензий" #. module: crm_claim #: field:crm.claim.stage,name:0 msgid "Stage Name" -msgstr "" +msgstr "Название этапа" #. module: crm_claim #: view:crm.claim.report:0 msgid "Salesperson" -msgstr "" +msgstr "Продавец" #. module: crm_claim #: selection:crm.claim,priority:0 @@ -149,7 +153,7 @@ msgstr "Предупредительная мера" #. module: crm_claim #: help:crm.claim,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Если отмечено, новые сообщения требуют вашего внимания." #. module: crm_claim #: field:crm.claim.report,date_closed:0 @@ -182,6 +186,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате " +"html для возможности использования в канбан виде" #. module: crm_claim #: view:crm.claim:0 @@ -235,12 +241,12 @@ msgstr "Важность" #. module: crm_claim #: field:crm.claim.stage,fold:0 msgid "Hide in Views when Empty" -msgstr "" +msgstr "Скрыть вид, если пусто" #. module: crm_claim #: field:crm.claim,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Подписчики" #. module: crm_claim #: view:crm.claim:0 @@ -254,7 +260,7 @@ msgstr "Новый" #. module: crm_claim #: field:crm.claim.stage,section_ids:0 msgid "Sections" -msgstr "" +msgstr "Секции" #. module: crm_claim #: field:crm.claim,email_from:0 @@ -290,7 +296,7 @@ msgstr "Предмет претензии" #. module: crm_claim #: model:crm.claim.stage,name:crm_claim.stage_claim3 msgid "Rejected" -msgstr "" +msgstr "Отклонено" #. module: crm_claim #: field:crm.claim,date_action_next:0 @@ -344,7 +350,7 @@ msgstr "" #: code:addons/crm_claim/crm_claim.py:194 #, python-format msgid "No Subject" -msgstr "" +msgstr "Без темы" #. module: crm_claim #: help:crm.claim.stage,state:0 @@ -358,7 +364,7 @@ msgstr "" #. module: crm_claim #: view:crm.claim:0 msgid "Settle" -msgstr "" +msgstr "Решать" #. module: crm_claim #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view @@ -384,7 +390,7 @@ msgstr "Отчет о претензиях" #. module: crm_claim #: view:sale.config.settings:0 msgid "Configure" -msgstr "" +msgstr "Настроить" #. module: crm_claim #: model:crm.case.resource.type,name:crm_claim.type_claim1 @@ -430,6 +436,8 @@ msgid "" "If you check this field, this stage will be proposed by default on each " "sales team. It will not assign this stage to existing teams." msgstr "" +"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому " +"отделу продаж. Этот этап не будет назначен существующим отделам." #. module: crm_claim #: field:crm.claim,categ_id:0 @@ -485,7 +493,7 @@ msgstr "Закрыто" #. module: crm_claim #: view:crm.claim:0 msgid "Reject" -msgstr "" +msgstr "Отклонить" #. module: crm_claim #: view:res.partner:0 @@ -495,7 +503,7 @@ msgstr "Претензии партнера" #. module: crm_claim #: view:crm.claim.stage:0 msgid "Claim Stage" -msgstr "" +msgstr "Этап претензии" #. module: crm_claim #: view:crm.claim:0 @@ -513,7 +521,7 @@ msgstr "Отложено" #: field:crm.claim.report,state:0 #: field:crm.claim.stage,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -529,7 +537,7 @@ msgstr "Обычный" #. module: crm_claim #: help:crm.claim.stage,sequence:0 msgid "Used to order stages. Lower is better." -msgstr "" +msgstr "Используется для упорядочивания этапов. Меньше - лучше." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -549,7 +557,7 @@ msgstr "Телефон" #. module: crm_claim #: field:crm.claim,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Подписан" #. module: crm_claim #: field:crm.claim.report,user_id:0 @@ -581,6 +589,10 @@ msgid "" "the case needs to be reviewed then the status is set " "to 'Pending'." msgstr "" +"Статус устанавливается в \"Черновик\", при создании дела. Если дело в " +"процессе, то статус - «Открыт». Когда дело закончено, устанавливается статус " +"\"Готово\". Если дело должно быть пересмотрено то статус установлен в " +"'Ожидание'." #. module: crm_claim #: field:crm.claim,active:0 @@ -628,7 +640,7 @@ msgstr "Дата претензии" #. module: crm_claim #: field:crm.claim,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Итог" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action @@ -638,7 +650,7 @@ msgstr "Категории претензий" #. module: crm_claim #: field:crm.claim.stage,case_default:0 msgid "Common to All Teams" -msgstr "" +msgstr "Общее для всех отделов" #. module: crm_claim #: view:crm.claim:0 @@ -677,7 +689,7 @@ msgstr "Претензия" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Company" -msgstr "" +msgstr "Моя компания" #. module: crm_claim #: view:crm.claim.report:0 @@ -807,7 +819,7 @@ msgstr "Февраль" #. module: crm_claim #: model:ir.model,name:crm_claim.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: crm_claim #: view:crm.claim.report:0 @@ -833,22 +845,22 @@ msgstr "Мои дела" #. module: crm_claim #: model:crm.claim.stage,name:crm_claim.stage_claim2 msgid "Settled" -msgstr "" +msgstr "Решено" #. module: crm_claim #: help:crm.claim,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Сообщения и история общения" #. module: crm_claim #: field:sale.config.settings,fetchmail_claim:0 msgid "Create claims from incoming mails" -msgstr "" +msgstr "Создать претензии из входящей почты" #. module: crm_claim #: field:crm.claim.stage,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Нумерация" #. module: crm_claim #: view:crm.claim:0 @@ -883,6 +895,8 @@ msgid "" "Link between stages and sales teams. When set, this limitate the current " "stage to the selected sales teams." msgstr "" +"Связь между этапами и отделами продаж. При установке, ограничивает этап для " +"выбранного отдела продаж." #. module: crm_claim #: help:crm.claim.stage,case_refused:0 diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po index e8eb90af9d7..bb53c03294f 100644 --- a/addons/crm_helpdesk/i18n/ru.po +++ b/addons/crm_helpdesk/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-10-24 05:08+0000\n" +"PO-Revision-Date: 2013-05-30 14:09+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -46,7 +46,7 @@ msgstr "Март" #. module: crm_helpdesk #: field:crm.helpdesk,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Непрочитанные" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -63,7 +63,7 @@ msgstr "Адреса наблюдателей" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Salesperson" -msgstr "" +msgstr "Продавец" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 @@ -106,7 +106,7 @@ msgstr "Отменено" #. module: crm_helpdesk #: help:crm.helpdesk,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Если отмечено, новые сообщения требуют вашего внимания." #. module: crm_helpdesk #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk @@ -136,6 +136,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате " +"html для возможности использования в канбан виде" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -176,7 +178,7 @@ msgstr "Приоритет" #. module: crm_helpdesk #: field:crm.helpdesk,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Подписчики" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -400,7 +402,7 @@ msgstr "В ожидании" #: view:crm.helpdesk.report:0 #: field:crm.helpdesk.report,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: crm_helpdesk #: selection:crm.helpdesk.report,month:0 @@ -454,7 +456,7 @@ msgstr "Планируемая выручка" #. module: crm_helpdesk #: field:crm.helpdesk,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Подписан" #. module: crm_helpdesk #: field:crm.helpdesk.report,user_id:0 @@ -501,7 +503,7 @@ msgstr "Январь" #. module: crm_helpdesk #: field:crm.helpdesk,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Итог" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -517,7 +519,7 @@ msgstr "Прочее" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My Company" -msgstr "" +msgstr "Моя компания" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -666,7 +668,7 @@ msgstr "" #. module: crm_helpdesk #: help:crm.helpdesk,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Сообщения и история общения" #. module: crm_helpdesk #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po index f0a7ff509c9..53a2929be4e 100644 --- a/addons/crm_partner_assign/i18n/ru.po +++ b/addons/crm_partner_assign/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2011-03-23 13:46+0000\n" +"PO-Revision-Date: 2013-05-30 14:10+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_close:0 @@ -25,7 +25,7 @@ msgstr "Задержка закрытия" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,author_id:0 msgid "Author" -msgstr "" +msgstr "Автор" #. module: crm_partner_assign #: field:crm.lead.report.assign,planned_revenue:0 @@ -38,6 +38,9 @@ msgid "" "Message type: email for email message, notification for system message, " "comment for other messages such as user replies" msgstr "" +"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных " +"сообщений, комментарий - для остальных сообщений таких как сообщения " +"пользователя" #. module: crm_partner_assign #: field:crm.lead.report.assign,nbr:0 @@ -53,7 +56,7 @@ msgstr "Группировать по ..." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,body:0 msgid "Automatically sanitized HTML contents" -msgstr "" +msgstr "Автоматически обработанное HTML содержимое" #. module: crm_partner_assign #: view:crm.lead:0 @@ -68,7 +71,7 @@ msgstr "Геолоцировать" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,starred:0 msgid "Starred" -msgstr "" +msgstr "Отмеченные" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 @@ -81,6 +84,8 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found for incoming emails." msgstr "" +"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не " +"определен для входящих писем." #. module: crm_partner_assign #: view:crm.partner.report.assign:0 @@ -111,7 +116,7 @@ msgstr "Компания" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,notification_ids:0 msgid "Notifications" -msgstr "" +msgstr "Уведомления" #. module: crm_partner_assign #: field:crm.lead.report.assign,date_assign:0 @@ -123,7 +128,7 @@ msgstr "Дата партнера" #: view:crm.partner.report.assign:0 #: view:res.partner:0 msgid "Salesperson" -msgstr "" +msgstr "Продавец" #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -170,12 +175,12 @@ msgstr "Географическое назначение" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner msgid "Email composition wizard" -msgstr "" +msgstr "Мастер составления эл. почты" #. module: crm_partner_assign #: field:crm.partner.report.assign,turnover:0 msgid "Turnover" -msgstr "" +msgstr "Оборот" #. module: crm_partner_assign #: field:crm.lead.report.assign,date_closed:0 @@ -199,7 +204,7 @@ msgstr "" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 msgid "System notification" -msgstr "" +msgstr "Системное уведомление" #. module: crm_partner_assign #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74 @@ -271,7 +276,7 @@ msgstr "Тип" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 msgid "Email" -msgstr "" +msgstr "Эл. почта" #. module: crm_partner_assign #: help:crm.lead,partner_assigned_id:0 @@ -286,7 +291,7 @@ msgstr "Низший" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Date Invoice" -msgstr "" +msgstr "Дата счета" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,template_id:0 @@ -311,12 +316,12 @@ msgstr "Дата создания" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_res_partner_activation msgid "res.partner.activation" -msgstr "" +msgstr "res.partner.activation" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,parent_id:0 msgid "Parent Message" -msgstr "" +msgstr "Родительское сообщение" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,res_id:0 @@ -358,12 +363,12 @@ msgstr "Этап" #: view:crm.lead.report.assign:0 #: field:crm.lead.report.assign,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,to_read:0 msgid "To read" -msgstr "" +msgstr "Прочитать" #. module: crm_partner_assign #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74 @@ -418,12 +423,12 @@ msgstr "Количество дней, для закрытия вопроса" #: help:crm.lead.forward.to.partner,notified_partner_ids:0 msgid "" "Partners that have a notification pushing this message in their mailboxes" -msgstr "" +msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 msgid "Comment" -msgstr "" +msgstr "Комментарий" #. module: crm_partner_assign #: field:res.partner,partner_weight:0 @@ -451,7 +456,7 @@ msgstr "Декабрь" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,vote_user_ids:0 msgid "Users that voted for this message" -msgstr "" +msgstr "Пользователи, которые проголосовали за это сообщение" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -467,7 +472,7 @@ msgstr "Дата открытия" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,child_ids:0 msgid "Child Messages" -msgstr "" +msgstr "Связанные сообщения" #. module: crm_partner_assign #: field:crm.partner.report.assign,date_review:0 @@ -483,17 +488,17 @@ msgstr "Тема" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "or" -msgstr "" +msgstr "или" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,body:0 msgid "Contents" -msgstr "" +msgstr "Содержимое" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,vote_user_ids:0 msgid "Votes" -msgstr "" +msgstr "Голоса" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -504,6 +509,8 @@ msgstr "# Предложений" #: help:crm.lead.forward.to.partner,starred:0 msgid "Current user has a starred notification linked to this message" msgstr "" +"Текущий пользователь имеет отмеченное уведомление, связанное с этим " +"сообщением" #. module: crm_partner_assign #: field:crm.partner.report.assign,date_partnership:0 @@ -561,7 +568,7 @@ msgstr "Август" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,record_name:0 msgid "Name get of the related document." -msgstr "" +msgstr "Название связанного документа." #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -684,7 +691,7 @@ msgstr "Вложения" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,record_name:0 msgid "Message Record Name" -msgstr "" +msgstr "Название записи сообщения" #. module: crm_partner_assign #: field:res.partner.activation,sequence:0 @@ -724,7 +731,7 @@ msgstr "Открыто" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subtype_id:0 msgid "Subtype" -msgstr "" +msgstr "Подтип" #. module: crm_partner_assign #: field:res.partner,date_localization:0 @@ -739,12 +746,12 @@ msgstr "Текущий" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead msgid "Lead/Opportunity" -msgstr "" +msgstr "Кандидат/Предложение" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,notified_partner_ids:0 msgid "Notified partners" -msgstr "" +msgstr "Уведомленные партнеры" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 @@ -775,7 +782,7 @@ msgstr "Вероятная выручка" #: field:res.partner,activation:0 #: view:res.partner.activation:0 msgid "Activation" -msgstr "" +msgstr "Активация" #. module: crm_partner_assign #: view:crm.lead:0 @@ -792,6 +799,8 @@ msgstr "" #: help:crm.lead.forward.to.partner,to_read:0 msgid "Current user has an unread notification linked to this message" msgstr "" +"Текущий пользователь имеет непрочитанные уведомления, связанные с этим " +"сообщением" #. module: crm_partner_assign #: selection:crm.lead.report.assign,type:0 @@ -860,6 +869,8 @@ msgid "" "Technical field holding the message notifications. Use notified_partner_ids " "to access notified partners." msgstr "" +"Техническое поле, содержащее уведомления. Используйте notified_partner_ids " +"для доступа к оповещаемым партнерам." #. module: crm_partner_assign #: view:crm.partner.report.assign:0 @@ -874,12 +885,12 @@ msgstr "CRM - отчет по кандидатам" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,composition_mode:0 msgid "Composition mode" -msgstr "" +msgstr "Режим составления" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,model:0 msgid "Related Document Model" -msgstr "" +msgstr "Модель связанного документа" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history_mode:0 @@ -892,6 +903,8 @@ msgid "" "Author of the message. If not set, email_from may hold an email address that " "did not match any partner." msgstr "" +"Автор сообщения. Если не установлен, email_from может содержать адрес почты, " +"который не соответствует ни одному партнеру." #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign @@ -906,12 +919,12 @@ msgstr "Высокий" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,partner_ids:0 msgid "Additional contacts" -msgstr "" +msgstr "Дополнительные контакты" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,parent_id:0 msgid "Initial thread message." -msgstr "" +msgstr "Первое сообщение цепочки." #. module: crm_partner_assign #: field:crm.lead.report.assign,create_date:0 diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po index 8cbe1695e82..a7325d894c5 100644 --- a/addons/crm_profiling/i18n/ru.po +++ b/addons/crm_profiling/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-05-10 17:51+0000\n" +"PO-Revision-Date: 2013-05-30 14:05+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 05:32+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -151,7 +151,7 @@ msgstr "Используйте правила профилирования" #. module: crm_profiling #: constraint:crm.segmentation:0 msgid "Error ! You cannot create recursive profiles." -msgstr "" +msgstr "Ошибка ! Нельзя создать рекурсивный профиль." #. module: crm_profiling #: field:crm.segmentation,answer_yes:0 @@ -200,7 +200,7 @@ msgstr "Сохранить данные" #. module: crm_profiling #: view:open.questionnaire:0 msgid "or" -msgstr "" +msgstr "или" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" diff --git a/addons/edi/i18n/ru.po b/addons/edi/i18n/ru.po index dad4bf0dcda..3ac2689bc57 100644 --- a/addons/edi/i18n/ru.po +++ b/addons/edi/i18n/ru.po @@ -8,35 +8,35 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-09-10 15:12+0000\n" +"PO-Revision-Date: 2013-05-30 13:32+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: edi #. openerp-web #: code:addons/edi/static/src/js/edi.js:67 #, python-format msgid "Reason:" -msgstr "" +msgstr "Причина:" #. module: edi #. openerp-web #: code:addons/edi/static/src/js/edi.js:60 #, python-format msgid "The document has been successfully imported!" -msgstr "" +msgstr "Документ был успешно импортирован!" #. module: edi #. openerp-web #: code:addons/edi/static/src/js/edi.js:65 #, python-format msgid "Sorry, the document could not be imported." -msgstr "" +msgstr "Извините, документ не может быть импортирован." #. module: edi #: model:ir.model,name:edi.model_res_company @@ -53,13 +53,13 @@ msgstr "Валюта" #: code:addons/edi/static/src/js/edi.js:71 #, python-format msgid "Document Import Notification" -msgstr "" +msgstr "Уведомление об импорте документа" #. module: edi #: code:addons/edi/models/edi.py:130 #, python-format msgid "Missing application." -msgstr "" +msgstr "Отсутствующее приложение." #. module: edi #: code:addons/edi/models/edi.py:131 @@ -69,12 +69,15 @@ msgid "" "You can install it by connecting as the administrator and opening the " "configuration assistant." msgstr "" +"Документу, который вы пытаетесь импортировать, необходимо OpenERP приложение " +"'%s'. Вы можете установить его, выполнив вход под администратором и открыв " +"настройки." #. module: edi #: code:addons/edi/models/edi.py:47 #, python-format msgid "'%s' is an invalid external ID" -msgstr "" +msgstr "'%s' это неверный внешний идентификатор" #. module: edi #: model:ir.model,name:edi.model_res_partner @@ -84,7 +87,7 @@ msgstr "Контрагент" #. module: edi #: model:ir.model,name:edi.model_edi_edi msgid "EDI Subsystem" -msgstr "" +msgstr "Подсистема электронного документооборота" #~ msgid "The currency code must be unique per company!" #~ msgstr "Код валюты должен быть уникальным в компании!" diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po index e12ebd076cc..2e592ecea35 100644 --- a/addons/email_template/i18n/ru.po +++ b/addons/email_template/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-25 12:16+0000\n" -"Last-Translator: Olga \n" +"PO-Revision-Date: 2013-05-30 13:33+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:42+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: email_template #: field:email.template,email_from:0 @@ -37,7 +37,7 @@ msgstr "Кнопка боковой панели для открытия дей #. module: email_template #: field:res.partner,opt_out:0 msgid "Opt-Out" -msgstr "" +msgstr "Без уведомлений" #. module: email_template #: field:email.template,email_to:0 @@ -510,7 +510,7 @@ msgstr "" #. module: email_template #: view:email.template:0 msgid "Contents" -msgstr "" +msgstr "Содержимое" #. module: email_template #: field:email.template,subject:0 From 36c14f32d20e1d217d3a7231b9480a7ca426b449 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 3 Jun 2013 06:02:29 +0000 Subject: [PATCH 30/35] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130601052916-cojcbyr1k926vl9n bzr revid: launchpad_translations_on_behalf_of_openerp-20130601051656-7uhyux565iqufm24 bzr revid: launchpad_translations_on_behalf_of_openerp-20130603060229-es17t14hfn00d47h --- addons/account_analytic_analysis/i18n/ru.po | 22 +-- addons/account_analytic_plans/i18n/ru.po | 18 +-- addons/account_asset/i18n/ru.po | 56 +++---- addons/account_followup/i18n/ru.po | 44 +++--- addons/base_action_rule/i18n/ru.po | 22 +-- addons/fleet/i18n/de.po | 16 +- addons/web_diagram/i18n/zh_TW.po | 99 ++++++++++++ addons/web_kanban/i18n/zh_TW.po | 161 ++++++++++++++++++++ 8 files changed, 352 insertions(+), 86 deletions(-) create mode 100644 addons/web_diagram/i18n/zh_TW.po create mode 100644 addons/web_kanban/i18n/zh_TW.po diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po index 3944c48afb6..339d425c717 100644 --- a/addons/account_analytic_analysis/i18n/ru.po +++ b/addons/account_analytic_analysis/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2011-02-19 12:16+0000\n" +"PO-Revision-Date: 2013-05-31 07:35+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 05:25+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -73,7 +73,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "⇒ Invoice" -msgstr "" +msgstr "⇒ Счет" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -196,6 +196,8 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -335,7 +337,7 @@ msgstr "Теоретическая выручка" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Renew" -msgstr "" +msgstr "К продлению" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -431,7 +433,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,toinvoice_total:0 msgid "Total to Invoice" -msgstr "" +msgstr "Всего в счет" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -546,18 +548,18 @@ msgstr "Дата последней операции по этому счету. #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 msgid "Mandatory use of templates." -msgstr "" +msgstr "Обязательное использование шаблонов." #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action msgid "Contract Template" -msgstr "" +msgstr "Шаблон контракта" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -612,7 +614,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Total" -msgstr "" +msgstr "Итого" #~ msgid "Hours summary by user" #~ msgstr "Итого часов по пользователям" diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po index ba32246e8d6..29cb3ea910f 100644 --- a/addons/account_analytic_plans/i18n/ru.po +++ b/addons/account_analytic_plans/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-28 10:00+0000\n" +"PO-Revision-Date: 2013-05-31 07:41+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 05:26+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account4_ids:0 @@ -48,7 +48,7 @@ msgstr "Ставка (%)" #: code:addons/account_analytic_plans/account_analytic_plans.py:234 #, python-format msgid "The total should be between %s and %s." -msgstr "" +msgstr "Итог должен быть между %s и %s." #. module: account_analytic_plans #: view:account.analytic.plan:0 @@ -131,7 +131,7 @@ msgstr "Не показывать пустые строки" #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 #, python-format msgid "There are no analytic lines related to account %s." -msgstr "" +msgstr "Нет позиций аналитики относящихся к счету %s." #. module: account_analytic_plans #: field:account.analytic.plan.instance,account3_ids:0 @@ -315,7 +315,7 @@ msgstr "Журнал аналитики" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38 #, python-format msgid "Please put a name and a code before saving the model." -msgstr "" +msgstr "Пожалуйста, введите имя и код перед сохранением модели." #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -347,7 +347,7 @@ msgstr "Журнал" #: code:addons/account_analytic_plans/account_analytic_plans.py:486 #, python-format msgid "You have to define an analytic journal on the '%s' journal." -msgstr "" +msgstr "Вы должны определить журнал аналитики для журнала '%s'" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:342 @@ -375,7 +375,7 @@ msgstr "Позиция счета" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "There is no analytic plan defined." -msgstr "" +msgstr "Аналитический план счетов не определен." #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_bank_statement @@ -402,7 +402,7 @@ msgstr "Разнесение аналитики" #: code:addons/account_analytic_plans/account_analytic_plans.py:221 #, python-format msgid "A model with this name and code already exists." -msgstr "" +msgstr "Модель с таким названием и кодом уже существует." #. module: account_analytic_plans #: help:account.analytic.plan.line,root_analytic_id:0 diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po index a0950a98370..d6bc83aacb5 100644 --- a/addons/account_asset/i18n/ru.po +++ b/addons/account_asset/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2011-07-12 12:04+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-05-31 08:06+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -148,7 +148,7 @@ msgstr "" #. module: account_asset #: help:account.asset.asset,method_period:0 msgid "The amount of time between two depreciations, in months" -msgstr "" +msgstr "Количество времени между амортизациями, в месяцах" #. module: account_asset #: field:account.asset.depreciation.line,depreciation_date:0 @@ -160,7 +160,7 @@ msgstr "Дата амортизации" #. module: account_asset #: constraint:account.asset.asset:0 msgid "Error ! You cannot create recursive assets." -msgstr "" +msgstr "Ошибка! Нельзя создавать рекурсивные активы." #. module: account_asset #: field:asset.asset.report,posted_value:0 @@ -205,7 +205,7 @@ msgstr "# позиций амортизации" #. module: account_asset #: field:account.asset.asset,method_period:0 msgid "Number of Months in a Period" -msgstr "" +msgstr "Количество месяцев в периоде" #. module: account_asset #: view:asset.asset.report:0 @@ -234,7 +234,7 @@ msgstr "Счет активов" #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard msgid "Compute Assets" -msgstr "" +msgstr "Вычислить активы" #. module: account_asset #: field:account.asset.category,method_period:0 @@ -265,12 +265,12 @@ msgstr "Изменить длительность" #: help:account.asset.category,method_number:0 #: help:account.asset.history,method_number:0 msgid "The number of depreciations needed to depreciate your asset" -msgstr "" +msgstr "Количество амортизаций необходимых для обесценивания актива" #. module: account_asset #: view:account.asset.category:0 msgid "Analytic Information" -msgstr "" +msgstr "Аналитическая информация" #. module: account_asset #: field:account.asset.category,account_analytic_id:0 @@ -293,7 +293,7 @@ msgstr "" #. module: account_asset #: field:account.asset.depreciation.line,remaining_value:0 msgid "Next Period Depreciation" -msgstr "" +msgstr "Следующий период амортизации" #. module: account_asset #: help:account.asset.history,method_period:0 @@ -344,7 +344,7 @@ msgstr "Поиск категории актива" #. module: account_asset #: view:asset.modify:0 msgid "months" -msgstr "" +msgstr "месяцы" #. module: account_asset #: model:ir.model,name:account_asset.model_account_invoice_line @@ -372,7 +372,7 @@ msgstr "" #: view:asset.depreciation.confirmation.wizard:0 #: view:asset.modify:0 msgid "or" -msgstr "" +msgstr "или" #. module: account_asset #: field:account.asset.asset,note:0 @@ -406,7 +406,7 @@ msgstr "" #. module: account_asset #: view:asset.asset.report:0 msgid "Assets in running state" -msgstr "" +msgstr "Активы в рабочем состоянии" #. module: account_asset #: view:account.asset.asset:0 @@ -427,7 +427,7 @@ msgstr "" #: field:account.asset.asset,state:0 #: field:asset.asset.report,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: account_asset #: field:account.asset.asset,partner_id:0 @@ -474,12 +474,12 @@ msgstr "Вычислить" #. module: account_asset #: view:account.asset.history:0 msgid "Asset History" -msgstr "" +msgstr "История актива" #. module: account_asset #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard msgid "asset.depreciation.confirmation.wizard" -msgstr "" +msgstr "asset.depreciation.confirmation.wizard" #. module: account_asset #: field:account.asset.asset,active:0 @@ -505,7 +505,7 @@ msgstr "История" #. module: account_asset #: view:asset.depreciation.confirmation.wizard:0 msgid "Compute Asset" -msgstr "" +msgstr "Вычислить актив" #. module: account_asset #: field:asset.depreciation.confirmation.wizard,period_id:0 @@ -521,7 +521,7 @@ msgstr "Общий" #: field:account.asset.asset,prorata:0 #: field:account.asset.category,prorata:0 msgid "Prorata Temporis" -msgstr "" +msgstr "По истечении срока" #. module: account_asset #: model:ir.model,name:account_asset.model_account_invoice @@ -553,7 +553,7 @@ msgstr "Элементы журнала" #. module: account_asset #: view:asset.modify:0 msgid "Asset Durations to Modify" -msgstr "" +msgstr "Актив - интервал времени для изменения" #. module: account_asset #: field:account.asset.asset,purchase_date:0 @@ -574,6 +574,8 @@ msgid "" "Choose the period for which you want to automatically post the depreciation " "lines of running assets" msgstr "" +"Выберите период, за который вы хотите автоматически создавать записи " +"амортизации для актива" #. module: account_asset #: view:account.asset.asset:0 @@ -588,12 +590,12 @@ msgstr "Метод амортизации" #. module: account_asset #: field:account.asset.depreciation.line,amount:0 msgid "Current Depreciation" -msgstr "" +msgstr "Текущая аммортизация" #. module: account_asset #: field:account.asset.asset,name:0 msgid "Asset Name" -msgstr "" +msgstr "Название актива" #. module: account_asset #: field:account.asset.category,open_asset:0 @@ -618,7 +620,7 @@ msgstr "Журнал" #. module: account_asset #: field:account.asset.history,name:0 msgid "History name" -msgstr "" +msgstr "Название истории" #. module: account_asset #: field:account.asset.depreciation.line,depreciated_value:0 @@ -657,7 +659,7 @@ msgstr "" #. module: account_asset #: field:account.asset.asset,purchase_value:0 msgid "Gross Value" -msgstr "" +msgstr "Валовая стоимость" #. module: account_asset #: field:account.asset.category,name:0 @@ -703,12 +705,12 @@ msgstr "" #. module: account_asset #: field:account.asset.depreciation.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Нумерация" #. module: account_asset #: help:account.asset.category,method_period:0 msgid "State here the time between 2 depreciations, in months" -msgstr "" +msgstr "Время между двумя амортизациями в месяцах" #. module: account_asset #: field:account.asset.history,date:0 @@ -729,7 +731,7 @@ msgstr "Число амортизаций" #. module: account_asset #: view:account.asset.asset:0 msgid "Create Move" -msgstr "" +msgstr "Создать перемещение" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po index f6cb2cf0412..b57c8e4315e 100644 --- a/addons/account_followup/i18n/ru.po +++ b/addons/account_followup/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2011-11-11 15:21+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2013-05-31 10:28+0000\n" +"Last-Translator: Chertykov Denis \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: 2013-03-16 05:11+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_followup #: model:email.template,subject:account_followup.email_template_account_followup_default @@ -22,7 +22,7 @@ msgstr "" #: model:email.template,subject:account_followup.email_template_account_followup_level1 #: model:email.template,subject:account_followup.email_template_account_followup_level2 msgid "${user.company_id.name} Payment Reminder" -msgstr "" +msgstr "${user.company_id.name} напоминание о платеже" #. module: account_followup #: help:res.partner,latest_followup_level_id:0 @@ -43,12 +43,12 @@ msgstr "Дальнейшие действия" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(date)s" -msgstr "" +msgstr "%(date)s" #. module: account_followup #: field:res.partner,payment_next_action_date:0 msgid "Next Action Date" -msgstr "" +msgstr "Дата следующего действия" #. module: account_followup #: view:account_followup.followup.line:0 @@ -64,7 +64,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "⇾ Mark as Done" -msgstr "" +msgstr "⇾ отметить как сделанное" #. module: account_followup #: field:account_followup.followup.line,manual_action_note:0 @@ -94,7 +94,7 @@ msgstr "Тема эл.письма" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(user_signature)s" -msgstr "" +msgstr "%(user_signature)s" #. module: account_followup #: view:account_followup.followup.line:0 @@ -109,19 +109,19 @@ msgstr "" #. module: account_followup #: field:account_followup.print,email_body:0 msgid "Email Body" -msgstr "" +msgstr "Тело эл. письма" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_print msgid "Send Follow-Ups" -msgstr "" +msgstr "Послать напоминания" #. module: account_followup #: report:account_followup.followup.print:0 #: code:addons/account_followup/account_followup.py:263 #, python-format msgid "Amount" -msgstr "" +msgstr "Сумма" #. module: account_followup #: help:res.partner,payment_next_action:0 @@ -133,7 +133,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "No Responsible" -msgstr "" +msgstr "Нет ответственного" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 @@ -209,17 +209,17 @@ msgstr "Всего по дебету" #. module: account_followup #: field:res.partner,payment_next_action:0 msgid "Next Action" -msgstr "" +msgstr "Следующее действие" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Partner Name" -msgstr "" +msgstr ": Название партнера" #. module: account_followup #: field:account_followup.followup.line,manual_action_responsible_id:0 msgid "Assign a Responsible" -msgstr "" +msgstr "Назначить ответственного" #. module: account_followup #: view:account_followup.followup:0 @@ -305,7 +305,7 @@ msgstr "" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(partner_name)s" -msgstr "" +msgstr "%(partner_name)s" #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level1 @@ -377,7 +377,7 @@ msgstr "Определяет порядок вывода списка напом #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid " will be sent" -msgstr "" +msgstr " будет отправлен" #. module: account_followup #: view:account_followup.followup.line:0 @@ -388,7 +388,7 @@ msgstr "" #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_letter:0 msgid "Send a Letter" -msgstr "" +msgstr "Отправить письмо" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form @@ -466,7 +466,7 @@ msgstr "Напечатанное сообщение" #: code:addons/account_followup/wizard/account_followup_print.py:155 #, python-format msgid "Anybody" -msgstr "" +msgstr "Кто угодно" #. module: account_followup #: help:account_followup.followup.line,send_email:0 @@ -528,7 +528,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Search Partner" -msgstr "" +msgstr "Поиск партнера" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_print_menu @@ -554,7 +554,7 @@ msgstr "" #. module: account_followup #: view:account_followup.print:0 msgid "or" -msgstr "" +msgstr "или" #. module: account_followup #: view:res.partner:0 diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po index c8673c26815..3ca5b1eab04 100644 --- a/addons/base_action_rule/i18n/ru.po +++ b/addons/base_action_rule/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-05-10 18:17+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2013-05-31 10:23+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: base_action_rule #: selection:base.action.rule.lead.test,state:0 @@ -58,7 +58,7 @@ msgstr "Добавить подписчиков" #. module: base_action_rule #: field:base.action.rule,act_user_id:0 msgid "Set Responsible" -msgstr "" +msgstr "Указать ответственного" #. module: base_action_rule #: help:base.action.rule,trg_date_range:0 @@ -71,7 +71,7 @@ msgstr "" #. module: base_action_rule #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test msgid "base.action.rule.lead.test" -msgstr "" +msgstr "base.action.rule.lead.test" #. module: base_action_rule #: selection:base.action.rule.lead.test,state:0 @@ -142,7 +142,7 @@ msgstr "Часы" #. module: base_action_rule #: view:base.action.rule:0 msgid "To create a new filter:" -msgstr "" +msgstr "Для создания нового фильтра:" #. module: base_action_rule #: field:base.action.rule,active:0 @@ -167,7 +167,7 @@ msgstr "" #. module: base_action_rule #: view:base.action.rule:0 msgid "Filter Condition" -msgstr "" +msgstr "Условие фильтра" #. module: base_action_rule #: view:base.action.rule:0 @@ -216,7 +216,7 @@ msgstr "Тип задержки" #. module: base_action_rule #: view:base.action.rule:0 msgid "Server actions to run" -msgstr "" +msgstr "Действия сервера для запуска" #. module: base_action_rule #: help:base.action.rule,active:0 @@ -246,7 +246,7 @@ msgstr "Минуты" #. module: base_action_rule #: field:base.action.rule,model_id:0 msgid "Related Document Model" -msgstr "" +msgstr "Модель связанного документа" #. module: base_action_rule #: help:base.action.rule,filter_pre_id:0 @@ -310,7 +310,7 @@ msgstr "Действия сервера" #. module: base_action_rule #: field:base.action.rule.lead.test,name:0 msgid "Subject" -msgstr "" +msgstr "Тема" #~ msgid "Set State to" #~ msgstr "Уснатовить состояние в" diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po index f9f0523056e..422f5b2fe7a 100644 --- a/addons/fleet/i18n/de.po +++ b/addons/fleet/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:06+0000\n" -"PO-Revision-Date: 2013-01-06 11:09+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-06-03 05:25+0000\n" +"Last-Translator: Armin GREGOR \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-03 06:02+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 @@ -324,7 +324,7 @@ msgstr "Ersatz Luftfilter" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle_tag msgid "fleet.vehicle.tag" -msgstr "" +msgstr "fleet.vehicle.tag" #. module: fleet #: view:fleet.vehicle:0 @@ -339,7 +339,7 @@ msgstr "Bezeichnung des zu erneuernden Vertrags" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior msgid "Senior" -msgstr "" +msgstr "Senior" #. module: fleet #: help:fleet.vehicle.log.contract,state:0 @@ -490,6 +490,8 @@ msgid "" "$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { " "$(this).addClass('oe_employee_picture_wide') } });" msgstr "" +"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { " +"$(this).addClass('oe_employee_picture_wide') } });" #. module: fleet #: view:board.board:0 @@ -737,7 +739,7 @@ msgstr "Aktueller Fahrzeugzustand" #. module: fleet #: selection:fleet.vehicle,transmission:0 msgid "Manual" -msgstr "Betriebsanleitung" +msgstr "Handbuch" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_52 diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po new file mode 100644 index 00000000000..fa4ad676031 --- /dev/null +++ b/addons/web_diagram/i18n/zh_TW.po @@ -0,0 +1,99 @@ +# Chinese (Traditional) translation for openerp-web +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openerp-web package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-web\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:06+0000\n" +"PO-Revision-Date: 2013-05-31 06:39+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-06-01 05:29+0000\n" +"X-Generator: Launchpad (build 16660)\n" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:252 +#: code:addons/web_diagram/static/src/js/diagram.js:317 +#, python-format +msgid "Open: " +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:215 +#, python-format +msgid "" +"Deleting this node cannot be undone.\n" +"It will also delete all connected transitions.\n" +"\n" +"Are you sure ?" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13 +#, python-format +msgid "New Node" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:310 +#: code:addons/web_diagram/static/src/js/diagram.js:329 +#, python-format +msgid "Transition" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:11 +#, python-format +msgid "Diagram" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:244 +#: code:addons/web_diagram/static/src/js/diagram.js:278 +#, python-format +msgid "Activity" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:420 +#, python-format +msgid "%d / %d" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:283 +#: code:addons/web_diagram/static/src/js/diagram.js:335 +#, python-format +msgid "Create:" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:185 +#, python-format +msgid "Are you sure?" +msgstr "" + +#. module: web_diagram +#. openerp-web +#: code:addons/web_diagram/static/src/js/diagram.js:233 +#, python-format +msgid "" +"Deleting this transition cannot be undone.\n" +"\n" +"Are you sure ?" +msgstr "" diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po new file mode 100644 index 00000000000..2c1ca245ba6 --- /dev/null +++ b/addons/web_kanban/i18n/zh_TW.po @@ -0,0 +1,161 @@ +# Chinese (Traditional) translation for openerp-web +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openerp-web package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openerp-web\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:06+0000\n" +"PO-Revision-Date: 2013-05-31 06:43+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-06-01 05:29+0000\n" +"X-Generator: Launchpad (build 16660)\n" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:686 +#, python-format +msgid "Edit column" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:418 +#, python-format +msgid "An error has occured while moving the record to this group." +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:10 +#, python-format +msgid "Kanban" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:539 +#, python-format +msgid "Undefined" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:705 +#, python-format +msgid "Are you sure to remove this column ?" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:47 +#, python-format +msgid "Edit" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:192 +#, python-format +msgid "Add column" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:1082 +#, python-format +msgid "Create: " +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:24 +#, python-format +msgid "Add a new column" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:677 +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:45 +#, python-format +msgid "Fold" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98 +#, python-format +msgid "Add" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:35 +#, python-format +msgid "Quick create" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:918 +#, python-format +msgid "Are you sure you want to delete this record ?" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/js/kanban.js:677 +#, python-format +msgid "Unfold" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80 +#, python-format +msgid "Show more... (" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:99 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80 +#, python-format +msgid "remaining)" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:22 +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98 +#, python-format +msgid "or" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:40 +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:55 +#, python-format +msgid "99+" +msgstr "" + +#. module: web_kanban +#. openerp-web +#: code:addons/web_kanban/static/src/xml/web_kanban.xml:48 +#, python-format +msgid "Delete" +msgstr "" From dcf8b5e830152f4d92842f2371dad1b514b157a0 Mon Sep 17 00:00:00 2001 From: "Sejal Bhut (OpenERP Trainee)" Date: Mon, 3 Jun 2013 14:56:30 +0530 Subject: [PATCH 31/35] [FIX] Database Backup Problem lp bug: https://launchpad.net/bugs/1100721 fixed bzr revid: sejalpatel125@gmail.com-20130603092630-3rh4bewi3kihmub7 --- openerp/service/db.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openerp/service/db.py b/openerp/service/db.py index a480b65440a..4901ceef4d6 100644 --- a/openerp/service/db.py +++ b/openerp/service/db.py @@ -197,7 +197,7 @@ def exp_drop(db_name): return True @contextlib.contextmanager -def _set_pg_password_in_environment(self): +def _set_pg_password_in_environment(): """ On systems where pg_restore/pg_dump require an explicit password (i.e. when not connecting via unix sockets, and most importantly on Windows), it is necessary to pass the PG user @@ -213,10 +213,10 @@ def _set_pg_password_in_environment(self): SaaS (giving SaaS users the super-admin password is not a good idea anyway) """ - if os.environ.get('PGPASSWORD') or not tools.config['db_password']: + if os.environ.get('PGPASSWORD') or not openerp.tools.config['db_password']: yield else: - os.environ['PGPASSWORD'] = tools.config['db_password'] + os.environ['PGPASSWORD'] = openerp.tools.config['db_password'] try: yield finally: From a75706ea81d82ba6893a4cb82aa2a1b82c91acb7 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 3 Jun 2013 13:54:36 +0200 Subject: [PATCH 32/35] [IMP] module_data.xml: added Survey category (should replace Extra Tools soon). bzr revid: vmt@openerp.com-20130603115436-35z1rfvxtgdggryn --- openerp/addons/base/module/module_data.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml index 247c2caa145..f59de0af973 100644 --- a/openerp/addons/base/module/module_data.xml +++ b/openerp/addons/base/module/module_data.xml @@ -84,6 +84,12 @@ 11 + + Survey + Lets you create, send, share and answer to surveys. + 11 + + Marketing Helps you manage your marketing campaigns step by step. @@ -132,11 +138,11 @@ - + - + From d86f6f24c00812d73904e5e321365d127a421858 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 3 Jun 2013 17:41:58 +0200 Subject: [PATCH 33/35] [IMP] suppress button oe_demo_play bzr revid: chm@openerp.com-20130603154158-7k9tvdwmn6ukp5x3 --- addons/account/html/index.html | 1 - addons/account_voucher/html/index.html | 1 - addons/crm/html/index.html | 1 - addons/hr/html/index.html | 1 - addons/mail/html/index.html | 1 - addons/mrp/html/index.html | 1 - addons/note/html/index.html | 1 - addons/point_of_sale/html/index.html | 1 - addons/project/html/index.html | 1 - addons/purchase/html/index.html | 1 - addons/sale/html/index.html | 1 - addons/stock/html/index.html | 1 - 12 files changed, 12 deletions(-) diff --git a/addons/account/html/index.html b/addons/account/html/index.html index 9a32fb015aa..09a58fb3246 100644 --- a/addons/account/html/index.html +++ b/addons/account/html/index.html @@ -7,7 +7,6 @@ Online Demo -  
Online Demo
diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html index 84e90f63679..d59c110dde5 100644 --- a/addons/account_voucher/html/index.html +++ b/addons/account_voucher/html/index.html @@ -7,7 +7,6 @@ Online Demo -  
Online Demo
diff --git a/addons/crm/html/index.html b/addons/crm/html/index.html index 355fdb0be36..5ae542f5c91 100644 --- a/addons/crm/html/index.html +++ b/addons/crm/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/hr/html/index.html b/addons/hr/html/index.html index acfa5041a9d..0bc3db084a4 100644 --- a/addons/hr/html/index.html +++ b/addons/hr/html/index.html @@ -7,7 +7,6 @@ -  
Online Demo
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html index ad7f9daf1a9..b564cf3ab1e 100644 --- a/addons/mail/html/index.html +++ b/addons/mail/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html index d3e7a048490..5777eb5f147 100644 --- a/addons/mrp/html/index.html +++ b/addons/mrp/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/note/html/index.html b/addons/note/html/index.html index 4e7db34df58..7ef37c646e9 100644 --- a/addons/note/html/index.html +++ b/addons/note/html/index.html @@ -7,7 +7,6 @@ -  
Online Demo
diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/html/index.html index 41f935d8ad9..130806ddb11 100644 --- a/addons/point_of_sale/html/index.html +++ b/addons/point_of_sale/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/project/html/index.html b/addons/project/html/index.html index c1b6c3b966f..93f1be8a41d 100644 --- a/addons/project/html/index.html +++ b/addons/project/html/index.html @@ -7,7 +7,6 @@ -  
Online Demo
diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html index 9134c1ab9d2..67b122ac557 100644 --- a/addons/purchase/html/index.html +++ b/addons/purchase/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html index be0d9ac0f94..1eb6215db2f 100644 --- a/addons/sale/html/index.html +++ b/addons/sale/html/index.html @@ -7,7 +7,6 @@ -  
Online Demo
diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html index 21d2800e0dc..aac71e529ae 100644 --- a/addons/stock/html/index.html +++ b/addons/stock/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
From 95c9d77c9f6330c4f87da460124cc59d4bd852b2 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 4 Jun 2013 05:20:44 +0000 Subject: [PATCH 34/35] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130604052044-tc482yzk760flm6m --- addons/account_check_writing/i18n/ru.po | 32 +++---- addons/fleet/i18n/de.po | 28 +++--- addons/mrp/i18n/mn.po | 113 ++++++++++++------------ addons/sale/i18n/ru.po | 13 +-- addons/sale_analytic_plans/i18n/ru.po | 8 +- addons/sale_crm/i18n/ru.po | 32 +++---- addons/stock/i18n/ru.po | 10 ++- 7 files changed, 121 insertions(+), 115 deletions(-) diff --git a/addons/account_check_writing/i18n/ru.po b/addons/account_check_writing/i18n/ru.po index ba474c72a22..8e68dd7152a 100644 --- a/addons/account_check_writing/i18n/ru.po +++ b/addons/account_check_writing/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:05+0000\n" -"PO-Revision-Date: 2012-12-11 13:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-06-03 07:47+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:51+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: account_check_writing #: selection:res.company,check_layout:0 @@ -25,13 +25,13 @@ msgstr "" #. module: account_check_writing #: report:account.print.check.top:0 msgid "Open Balance" -msgstr "" +msgstr "Открытый баланс" #. module: account_check_writing #: view:account.check.write:0 #: view:account.voucher:0 msgid "Print Check" -msgstr "" +msgstr "Напечатать чек" #. module: account_check_writing #: selection:res.company,check_layout:0 @@ -82,7 +82,7 @@ msgstr "Описание" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_account_journal msgid "Journal" -msgstr "" +msgstr "Журнал" #. module: account_check_writing #: model:ir.actions.act_window,name:account_check_writing.action_write_check @@ -95,14 +95,14 @@ msgstr "" #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Discount" -msgstr "" +msgstr "Скидка" #. module: account_check_writing #: report:account.print.check.bottom:0 #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Original Amount" -msgstr "" +msgstr "Первоначальная сумма" #. module: account_check_writing #: field:res.company,check_layout:0 @@ -119,7 +119,7 @@ msgstr "" #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Payment" -msgstr "" +msgstr "Платеж" #. module: account_check_writing #: field:account.journal,use_preprint_check:0 @@ -153,7 +153,7 @@ msgstr "" #: report:account.print.check.middle:0 #: report:account.print.check.top:0 msgid "Due Date" -msgstr "" +msgstr "Дата исполнения" #. module: account_check_writing #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle @@ -163,13 +163,13 @@ msgstr "" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_res_company msgid "Companies" -msgstr "" +msgstr "Компании" #. module: account_check_writing #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59 #, python-format msgid "Error!" -msgstr "" +msgstr "Ошибка!" #. module: account_check_writing #: help:account.check.write,check_number:0 @@ -202,12 +202,12 @@ msgstr "" #. module: account_check_writing #: view:account.check.write:0 msgid "or" -msgstr "" +msgstr "или" #. module: account_check_writing #: field:account.voucher,amount_in_word:0 msgid "Amount in Word" -msgstr "" +msgstr "Сумма прописью" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_account_check_write @@ -217,7 +217,7 @@ msgstr "" #. module: account_check_writing #: view:account.check.write:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: account_check_writing #: field:account.check.write,check_number:0 diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po index 422f5b2fe7a..b47b8ba2074 100644 --- a/addons/fleet/i18n/de.po +++ b/addons/fleet/i18n/de.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-06-03 06:02+0000\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" "X-Generator: Launchpad (build 16660)\n" #. module: fleet @@ -35,7 +35,7 @@ msgstr "Ersatz Kälteklimakompressor" #. module: fleet #: help:fleet.vehicle,vin_sn:0 msgid "Unique number written on the vehicle motor (VIN/SN number)" -msgstr "Eindeutige Fahrzeug-Identifizierungsnummer (FIN)" +msgstr "Fahrgestellnummer" #. module: fleet #: selection:fleet.service.type,category:0 @@ -157,7 +157,7 @@ msgstr "Batterie Inspektion" #. module: fleet #: field:fleet.vehicle,company_id:0 msgid "Company" -msgstr "Unternehmen" +msgstr "Firma" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -919,7 +919,7 @@ msgstr "Kaufdatum des Fahrzeugs" #. module: fleet #: view:fleet.vehicle.model:0 msgid "Models" -msgstr "Modell" +msgstr "Modelle" #. module: fleet #: view:fleet.vehicle.log.contract:0 @@ -1057,7 +1057,7 @@ msgstr "Kraftstoffart" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_22 msgid "Fuel Injector Replacement" -msgstr "Ersatz Einfüllstutzen" +msgstr "Ersatz Einspritzdüse" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act @@ -1103,7 +1103,7 @@ msgstr "Datum Vertragsbeginn" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 msgid "Electric" -msgstr "Elektrisch" +msgstr "Elektrik" #. module: fleet #: field:fleet.vehicle,tag_ids:0 @@ -1176,7 +1176,7 @@ msgstr "Ersatz Lichtmaschine" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_3 msgid "A/C Diagnosis" -msgstr "Diagnose Batterie" +msgstr "Diagnose Klimaanlage" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_23 @@ -1201,7 +1201,7 @@ msgstr "Ersatz Wärmepumpe" #. module: fleet #: view:fleet.vehicle:0 msgid "show all the costs for this vehicle" -msgstr "gesamte Kostenübersicht der Fahrzeuge" +msgstr "gesamte Kostenübersicht des Fahrzeugs" #. module: fleet #: view:fleet.vehicle.odometer:0 @@ -1536,7 +1536,7 @@ msgstr "Achsvermessung" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased msgid "Purchased" -msgstr "Ersatzteil" +msgstr "Eingekauft" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act @@ -1749,7 +1749,7 @@ msgstr "Preis" #: field:fleet.vehicle.cost,odometer:0 #: field:fleet.vehicle.odometer,value:0 msgid "Odometer Value" -msgstr "Tachostand" +msgstr "Kilometerstand" #. module: fleet #: view:fleet.vehicle:0 @@ -1807,7 +1807,7 @@ msgstr "Schreiben Sie hier alle erforderlichen Zusatzinformationen auf." #. module: fleet #: model:fleet.service.type,name:fleet.type_service_29 msgid "Ignition Coil Replacement" -msgstr "Ersatz Zündkerzen" +msgstr "Ersatz Zündspule" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_16 @@ -1817,7 +1817,7 @@ msgstr "Optionen" #. module: fleet #: model:fleet.service.type,name:fleet.type_contract_repairing msgid "Repairing" -msgstr "Reparieren" +msgstr "Wird repariert" #. module: fleet #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs @@ -1855,7 +1855,7 @@ msgstr "Getriebe" #. module: fleet #: field:fleet.vehicle,vin_sn:0 msgid "Chassis Number" -msgstr "Fahrzeuqinformationsnummer" +msgstr "Fahrgestellnummer" #. module: fleet #: help:fleet.vehicle,color:0 @@ -2011,7 +2011,7 @@ msgstr "Reifenwechsel" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_42 msgid "Starter Replacement" -msgstr "Erstinspektion" +msgstr "Ersatz Anlasser" #. module: fleet #: view:fleet.vehicle.cost:0 diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po index 8d3c0aee785..39cc3d602cf 100644 --- a/addons/mrp/i18n/mn.po +++ b/addons/mrp/i18n/mn.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-07-21 12:33+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-06-04 04:00+0000\n" +"Last-Translator: erdenebold \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-16 05:01+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -48,7 +48,7 @@ msgstr "Дамжлагуудын Ашиглалт" #. module: mrp #: view:mrp.routing.workcenter:0 msgid "Routing Work Centers" -msgstr "Дамжлагуудын маршрут" +msgstr "Шугамын дамжлагууд" #. module: mrp #: field:mrp.production.workcenter.line,cycle:0 @@ -86,12 +86,12 @@ msgstr "" #: model:ir.actions.act_window,name:mrp.mrp_routing_action #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action msgid "Routings" -msgstr "Маршрут" +msgstr "Шугам" #. module: mrp #: view:mrp.bom:0 msgid "Search Bill Of Material" -msgstr "Жор Хайх" +msgstr "Орц Хайх" #. module: mrp #: model:process.node,note:mrp.process_node_stockproduct1 @@ -112,8 +112,8 @@ msgid "" "Number of iterations this work center has to do in the specified operation " "of the routing." msgstr "" -"Үйлдвэрлэлийн нэг маршрутын хувьд уг дамжлага өөрийн үйлдлийг давтан " -"гүйцэтгэх давтамжын тоо." +"Үйлдвэрлэлийн нэг шугамын хувьд уг дамжлага өөрийн үйлдлийг давтан гүйцэтгэх " +"давтамжын тоо." #. module: mrp #: view:product.product:0 @@ -214,7 +214,7 @@ msgstr "" #: code:addons/mrp/mrp.py:633 #, python-format msgid "Cannot cancel manufacturing order!" -msgstr "" +msgstr "Үйлдвэрийн захиалгыг цуцлах боломжгүй!" #. module: mrp #: field:mrp.workcenter,costs_cycle_account_id:0 @@ -337,7 +337,7 @@ msgstr "Бараа Үйлдвэрлэх" #. module: mrp #: constraint:mrp.bom:0 msgid "Error ! You cannot create recursive BoM." -msgstr "Алдаа ! Тойрог хамааралтай жор үүсгэж болохгүй." +msgstr "Алдаа ! Тойрог хамааралтай орц үүсгэж болохгүй." #. module: mrp #: model:ir.model,name:mrp.model_mrp_routing_workcenter @@ -423,7 +423,7 @@ msgstr "" #: field:mrp.production,product_qty:0 #: field:mrp.production.product.line,product_qty:0 msgid "Product Quantity" -msgstr "" +msgstr "Барааны тоо" #. module: mrp #: help:mrp.production,picking_id:0 @@ -491,13 +491,13 @@ msgstr "Товлогдсон огноо" #: code:addons/mrp/procurement.py:124 #, python-format msgid "Manufacturing Order %s created." -msgstr "" +msgstr "Үйлдвэрлэлийн захиалга %s үүсгэгдлээ." #. module: mrp #: view:mrp.bom:0 #: report:mrp.production.order:0 msgid "Bill Of Material" -msgstr "Жор" +msgstr "Орц" #. module: mrp #: help:mrp.routing,location_id:0 @@ -518,7 +518,7 @@ msgstr "Нөөцийн Үнийн Хазайлт" #. module: mrp #: model:ir.actions.act_window,name:mrp.action2 msgid "Bill of Materials Structure" -msgstr "Жорын Бүтэц" +msgstr "Орцын Бүтэц" #. module: mrp #: model:process.node,note:mrp.process_node_serviceproduct0 @@ -560,7 +560,7 @@ msgstr "" msgid "" "The Bill of Material is linked to a routing, i.e. the succession of work " "centers." -msgstr "Жор нь маршруттай холбогдсон, ө.х. дамжлагуудын цуваанууд" +msgstr "Орц нь шугамтай холбогдсон, ө.х. дамжлагуудын цуваанууд" #. module: mrp #: view:mrp.production:0 @@ -592,7 +592,7 @@ msgstr "Нөөцийн үнэ" #. module: mrp #: model:ir.actions.act_window,name:mrp.action_product_bom_structure msgid "Product BoM Structure" -msgstr "Барааны Жорын Бүтэц" +msgstr "Барааны Орцын Бүтэц" #. module: mrp #: view:mrp.production:0 @@ -603,12 +603,12 @@ msgstr "Үйлдвэрлэл Хайх" #: help:mrp.routing.workcenter,sequence:0 msgid "" "Gives the sequence order when displaying a list of routing Work Centers." -msgstr "Маршруутын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө." +msgstr "Шугамын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө." #. module: mrp #: field:mrp.bom,child_complete_ids:0 msgid "BoM Hierarchy" -msgstr "Жорын удамшил" +msgstr "Орцын удамшил" #. module: mrp #: model:process.transition,name:mrp.process_transition_stockproduction0 @@ -637,7 +637,7 @@ msgstr "Бэлтгэлтийн Сондгойрол" #. module: mrp #: field:mrp.bom,bom_lines:0 msgid "BoM Lines" -msgstr "Жорын мөрүүд" +msgstr "Орцын мөрүүд" #. module: mrp #: field:mrp.workcenter,time_start:0 @@ -650,13 +650,13 @@ msgid "" "If the active field is set to False, it will allow you to hide the routing " "without removing it." msgstr "" -"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал машрутыг устгалгүйгээр " +"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал шугамыг устгалгүйгээр " "нуудаг." #. module: mrp #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0 msgid "Material Routing" -msgstr "Материалын Машрут" +msgstr "Материалын Шугам" #. module: mrp #: view:mrp.production:0 @@ -676,13 +676,13 @@ msgstr "Дамжлагын Ачаалал" #: code:addons/mrp/procurement.py:50 #, python-format msgid "No BoM defined for this product !" -msgstr "Энэ бараанд жор тодорхойлогдоогүй байна !" +msgstr "Энэ бараанд орц тодорхойлогдоогүй байна !" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2 msgid "Bill of Material Components" -msgstr "Жорын бүрдэлүүд" +msgstr "Орцын бүрдэлүүд" #. module: mrp #: model:ir.model,name:mrp.model_stock_move @@ -708,7 +708,7 @@ msgid "" "operations and to plan future loads on work centers based on production " "plannification." msgstr "" -"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Машрут гэдэг нь " +"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Шугам гэдэг нь " "үндсэндээ дамжлагуудын өртөгийг тооцоолох болон ажлын ачааллыг тооцоолоход " "үйлдвэрлэлийн төлөвлөгөөн дээр суурилан бодоход хэрэглэгддэг." @@ -734,7 +734,7 @@ msgstr "" #. module: mrp #: constraint:mrp.bom:0 msgid "BoM line product should not be same as BoM product." -msgstr "Жорын мөр нь жорын бараатайгаа ижил байж болохгүй." +msgstr "Орцын мөр нь орцын бараатайгаа ижил байж болохгүй." #. module: mrp #: view:mrp.production:0 @@ -744,7 +744,7 @@ msgstr "Үйлдвэрлэгдэж буй" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_property msgid "Master Bill of Materials" -msgstr "Мастер жор" +msgstr "Мастер орц" #. module: mrp #: help:mrp.config.settings,module_product_manufacturer:0 @@ -907,7 +907,7 @@ msgid "" "All product quantities must be greater than 0.\n" "You should install the mrp_byproduct module if you want to manage extra " "products on BoMs !" -msgstr "" +msgstr "Бүх бүтээгдэхүүнийг тоог 0-оос эхэлж үүсгэнэ." #. module: mrp #: view:mrp.production:0 @@ -954,7 +954,7 @@ msgstr "" #. module: mrp #: field:mrp.bom,type:0 msgid "BoM Type" -msgstr "Жорын төрөл" +msgstr "Орцын төрөл" #. module: mrp #: code:addons/mrp/procurement.py:52 @@ -962,7 +962,7 @@ msgstr "Жорын төрөл" msgid "" "Procurement '%s' has an exception: 'No BoM defined for this product !'" msgstr "" -"'%s' татан авалтад сондгойрол байна: 'Бараанд жор тодорхойлогдоогүй !'" +"'%s' татан авалтад сондгойрол байна: 'Бараанд орц тодорхойлогдоогүй !'" #. module: mrp #: view:mrp.property:0 @@ -1077,7 +1077,7 @@ msgstr "Нөөцлүүлэх" #. module: mrp #: report:bom.structure:0 msgid "BOM Name" -msgstr "Жорын нэр" +msgstr "Орцын нэр" #. module: mrp #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open @@ -1167,7 +1167,7 @@ msgstr "Хийгдэж байгаа үйлдвэрлэлийн захиалгу #. module: mrp #: model:ir.actions.client,name:mrp.action_client_mrp_menu msgid "Open MRP Menu" -msgstr "" +msgstr "Нээлттэй MRP цэс" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_production_action4 @@ -1194,7 +1194,7 @@ msgstr "Циклийн Өртөг" #: code:addons/mrp/wizard/change_production_qty.py:88 #, python-format msgid "Cannot find bill of material for this product." -msgstr "" +msgstr "Энэ бараа материалаар хайх боломжгүй." #. module: mrp #: selection:mrp.workcenter.load,measure_unit:0 @@ -1216,8 +1216,7 @@ msgstr "Нөөцүүд" msgid "" "Time in hours for this Work Center to achieve the operation of the specified " "routing." -msgstr "" -"Заагдсан маршрутын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар." +msgstr "Заагдсан шугамын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар." #. module: mrp #: field:mrp.workcenter,costs_journal_id:0 @@ -1272,7 +1271,7 @@ msgstr "Үйлдвэрлэлийг эхлүүлэхэд бэлэн Үйлдвэ #: field:mrp.production,bom_id:0 #: model:process.node,name:mrp.process_node_billofmaterial0 msgid "Bill of Material" -msgstr "Жор" +msgstr "Орц" #. module: mrp #: view:mrp.workcenter.load:0 @@ -1304,9 +1303,9 @@ msgid "" "Routing is indicated then,the third tab of a production order (Work Centers) " "will be automatically pre-completed." msgstr "" -"Маршрут нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг " -"илэрхийлдэг. Хэрэв маршрут байгаа бол гурав дахь үйлдвэрлэлийн дарааллын " -"хавтас автоматаар бөглөгддөг." +"Шугам нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг илэрхийлдэг. " +"Хэрэв шугам байгаа бол гурав дахь үйлдвэрлэлийн дарааллын хавтас автоматаар " +"бөглөгддөг." #. module: mrp #: code:addons/mrp/mrp.py:505 @@ -1431,7 +1430,7 @@ msgstr "Үйлдвэрлэлийн дамжлагыг хайх" #. module: mrp #: view:mrp.bom:0 msgid "BoM Structure" -msgstr "Жорын бүтэц" +msgstr "Орцын бүтэц" #. module: mrp #: field:mrp.production,date_start:0 @@ -1541,7 +1540,7 @@ msgstr "БЗ Дугаар" #: code:addons/mrp/mrp.py:505 #, python-format msgid "Cannot delete a manufacturing order in state '%s'." -msgstr "" +msgstr "Үйлдвэрлэлийн захиалгын '%s' төлөвт устгах боломжгүй." #. module: mrp #: selection:mrp.production,state:0 @@ -1689,7 +1688,7 @@ msgstr "Нөөц" #: help:mrp.bom,date_stop:0 msgid "Validity of this BoM or component. Keep empty if it's always valid." msgstr "" -"Энэ жор эсвэл бүрэлдхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон " +"Орц эсвэл бүрэлдэхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон " "үлдээнэ." #. module: mrp @@ -1710,7 +1709,7 @@ msgid "" "operations and to plan future loads on work centers based on production " "planning." msgstr "" -"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Машрут нь " +"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Шугам нь " "үйлдвэрлэлийн захиалга дээр үндэслэн дамжлагуудын өртөгийг тооцох, ажлын " "ирээдүйн ачааллыг тооцоолох зэрэгт голчлон хэрэглэгддэг." @@ -1816,8 +1815,8 @@ msgid "" "are products themselves) can also have their own Bill of Material (multi-" "level)." msgstr "" -"Жор гэдэг нь барааны задаргаа юм. Бүрэлдхүүнүүд (мөн бараанууд) нь мөн " -"өөрийн жортой буюу олон түвшний жор байж болно." +"Орц гэдэг нь барааны задаргаа юм. Бүрэлдэхүүнүүд (мөн бараанууд) нь мөн " +"өөрийн орцтой буюу олон түвшний орц байж болно." #. module: mrp #: field:mrp.bom,company_id:0 @@ -1882,7 +1881,7 @@ msgstr "Бүрэлдэхүүнүүд" #: report:bom.structure:0 #: model:ir.actions.report.xml,name:mrp.report_bom_structure msgid "BOM Structure" -msgstr "Жорын бүтэц" +msgstr "Орцын бүтэц" #. module: mrp #: field:mrp.config.settings,module_mrp_jit:0 @@ -1902,7 +1901,7 @@ msgstr "Хүчинтэй байх эхлэл" #. module: mrp #: selection:mrp.bom,type:0 msgid "Normal BoM" -msgstr "Хэвийн жор" +msgstr "Хэвийн орц" #. module: mrp #: field:res.company,manufacturing_lead:0 @@ -1958,7 +1957,7 @@ msgid "" "If the active field is set to False, it will allow you to hide the bills of " "material without removing it." msgstr "" -"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол жорыг устгалгүйгээр нууна." +"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол орцыг устгалгүйгээр нууна." #. module: mrp #: field:mrp.bom,product_rounding:0 @@ -2083,7 +2082,7 @@ msgstr "" #. module: mrp #: field:procurement.order,bom_id:0 msgid "BoM" -msgstr "Жор" +msgstr "Орц" #. module: mrp #: model:ir.model,name:mrp.model_report_mrp_inout @@ -2145,12 +2144,12 @@ msgstr "Хангах болон Үйлдвэрлэх" #. module: mrp #: field:mrp.bom,bom_id:0 msgid "Parent BoM" -msgstr "Эцэг жор" +msgstr "Эцэг орц" #. module: mrp #: report:bom.structure:0 msgid "BOM Ref" -msgstr "Жорын код" +msgstr "Орцын код" #. module: mrp #: code:addons/mrp/mrp.py:765 @@ -2190,7 +2189,7 @@ msgstr "Тоо хэмжээг сонго" #: view:product.product:0 #: field:product.product,bom_ids:0 msgid "Bill of Materials" -msgstr "Жорууд" +msgstr "Орцууд" #. module: mrp #: code:addons/mrp/mrp.py:610 @@ -2322,7 +2321,7 @@ msgstr "" msgid "" "a manufacturing\n" " order" -msgstr "" +msgstr "үйлдвэрлэл" #. module: mrp #: field:mrp.config.settings,group_mrp_properties:0 @@ -2344,7 +2343,7 @@ msgstr "Үзүүлэлтийн бүлэгүүд" #: view:mrp.routing:0 #: model:process.node,name:mrp.process_node_routing0 msgid "Routing" -msgstr "Маршрут" +msgstr "Шугам" #. module: mrp #: model:process.transition,note:mrp.process_transition_procurestockableproduct0 @@ -2390,8 +2389,8 @@ msgid "" "the BOM, through a run of the schedulers (MRP)." msgstr "" "Түүхий эдийг хангахын тулд (худалдан авах эсвэл үйлдвэрлэх) үйлдвэрлэлийн " -"захиалга нь жорд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг ба " -"энэ нь товлогчийг ажиллахад үүсдэг." +"захиалга нь орцонд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг " +"ба энэ нь товлогчийг ажиллахад үүсдэг." #. module: mrp #: help:mrp.product_price,number:0 @@ -2423,7 +2422,7 @@ msgstr "Нөөцийн Амралт, Чөлөө" #. module: mrp #: help:mrp.bom,sequence:0 msgid "Gives the sequence order when displaying a list of bills of material." -msgstr "Жорын жагсаалтыг харуулах дэс дарааллыг өгдөг." +msgstr "Орцын жагсаалтыг харуулах дэс дарааллыг өгдөг." #. module: mrp #: model:ir.model,name:mrp.model_mrp_config_settings diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po index 405ac210af5..8449bd83224 100644 --- a/addons/sale/i18n/ru.po +++ b/addons/sale/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-12-28 14:12+0000\n" +"PO-Revision-Date: 2013-06-03 07:54+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 05:22+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: sale #: model:res.groups,name:sale.group_analytic_accounting @@ -89,6 +89,8 @@ msgid "" "${(object.name or '').replace('/','_')}_${object.state == 'draft' and " "'draft' or ''}" msgstr "" +"${(object.name or '').replace('/','_')}_${object.state == 'draft' and " +"'draft' or ''}" #. module: sale #: view:sale.order.line:0 @@ -558,6 +560,7 @@ msgstr "Подготовить счета основанные на распис #, python-format msgid "You cannot cancel a sales order line that has already been invoiced." msgstr "" +"Нельзя отменить позиции заказа продажи на которые был выставлен счет." #. module: sale #: view:account.invoice.report:0 @@ -1550,7 +1553,7 @@ msgstr "Искать позиции без счетов" #. module: sale #: model:ir.model,name:sale.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: sale #: sql_constraint:sale.order:0 @@ -1876,7 +1879,7 @@ msgstr "" #. module: sale #: view:res.partner:0 msgid "sale.group_delivery_invoice_address" -msgstr "" +msgstr "sale.group_delivery_invoice_address" #. module: sale #: code:addons/sale/sale.py:781 diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po index 90d9eb5c3b9..8995b7b45c0 100644 --- a/addons/sale_analytic_plans/i18n/ru.po +++ b/addons/sale_analytic_plans/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:06+0000\n" -"PO-Revision-Date: 2010-12-25 22:14+0000\n" +"PO-Revision-Date: 2013-06-03 08:05+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 05:32+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: sale_analytic_plans #: field:sale.order.line,analytics_id:0 @@ -24,7 +24,7 @@ msgstr "Разнесение аналитики" #. module: sale_analytic_plans #: model:ir.model,name:sale_analytic_plans.model_sale_order msgid "Sales Order" -msgstr "" +msgstr "Заказ продаж" #. module: sale_analytic_plans #: model:ir.model,name:sale_analytic_plans.model_sale_order_line diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po index 8ae90e42303..f6266edf8ca 100644 --- a/addons/sale_crm/i18n/ru.po +++ b/addons/sale_crm/i18n/ru.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:06+0000\n" -"PO-Revision-Date: 2011-03-23 13:50+0000\n" +"PO-Revision-Date: 2013-06-03 08:05+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 05:10+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:90 #, python-format msgid "Insufficient Data!" -msgstr "" +msgstr "Недостаточно данных!" #. module: sale_crm #: view:crm.lead:0 @@ -31,12 +31,12 @@ msgstr "Преобразовать в предложение" #. module: sale_crm #: model:ir.model,name:sale_crm.model_account_invoice_report msgid "Invoices Statistics" -msgstr "" +msgstr "Статистика по счетам" #. module: sale_crm #: field:crm.make.sale,close:0 msgid "Mark Won" -msgstr "" +msgstr "Отметить \"Выиграна\"" #. module: sale_crm #: field:res.users,default_section_id:0 @@ -51,23 +51,23 @@ msgstr "Мои отделы продаж" #. module: sale_crm #: model:ir.model,name:sale_crm.model_res_users msgid "Users" -msgstr "" +msgstr "Пользователи" #. module: sale_crm #: help:crm.make.sale,close:0 msgid "" "Check this to close the opportunity after having created the sales order." -msgstr "" +msgstr "Отметьте, для закрытия предложения после создания заказа продажи." #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent msgid "Quotation Send" -msgstr "" +msgstr "Отправить предложение" #. module: sale_crm #: field:sale.order,categ_ids:0 msgid "Categories" -msgstr "" +msgstr "Категории" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:124 @@ -94,7 +94,7 @@ msgstr "Продать" #. module: sale_crm #: model:ir.model,name:sale_crm.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Счет" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:93 @@ -106,7 +106,7 @@ msgstr "Предложение: %s" #: code:addons/sale_crm/wizard/crm_make_sale.py:110 #, python-format msgid "Opportunity has been converted to the quotation %s." -msgstr "" +msgstr "Предложение преобразовано в заявку %s." #. module: sale_crm #: field:crm.make.sale,shop_id:0 @@ -117,12 +117,12 @@ msgstr "Магазин" #: code:addons/sale_crm/wizard/crm_make_sale.py:90 #, python-format msgid "No addresse(s) defined for this customer." -msgstr "" +msgstr "Не задан адрес для этого заказчика" #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed msgid "Sales Order Confirmed" -msgstr "" +msgstr "Заказ продаж подтвержден" #. module: sale_crm #: view:account.invoice:0 @@ -136,7 +136,7 @@ msgstr "Отдел продаж" #. module: sale_crm #: view:crm.lead:0 msgid "Create Quotation" -msgstr "" +msgstr "Создать заявку" #. module: sale_crm #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale @@ -156,7 +156,7 @@ msgstr "Заказ продаж" #. module: sale_crm #: view:crm.make.sale:0 msgid "or" -msgstr "" +msgstr "или" #~ msgid "Create" #~ msgstr "Создать" diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po index 4a79cec4b89..d0d34b32191 100644 --- a/addons/stock/i18n/ru.po +++ b/addons/stock/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-01-22 08:16+0000\n" +"PO-Revision-Date: 2013-06-03 12:48+0000\n" "Last-Translator: Chertykov Denis \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: 2013-03-16 04:58+0000\n" -"X-Generator: Launchpad (build 16532)\n" +"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n" +"X-Generator: Launchpad (build 16660)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -660,6 +660,8 @@ msgid "" "Forces to specify a Serial Number for all moves containing this product and " "going to a Customer Location" msgstr "" +"Принудительно установить порядковый номер для всех перемещений этой " +"продукции в место хранения заказчика" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_products_moves @@ -845,6 +847,8 @@ msgid "" "Forces to specify a Serial Number for all moves containing this product and " "coming from a Supplier Location" msgstr "" +"Принудительно установить порядковый номер для всех перемещений этой " +"продукции из мест хранения поставщика" #. module: stock #: help:stock.config.settings,group_uos:0 From 048b365aff23066006c63007adc5eba53053c925 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 4 Jun 2013 14:40:03 +0200 Subject: [PATCH 35/35] [FIX] renamed Partner Catgories to Partner Tags. bzr revid: vmt@openerp.com-20130604124003-bpga8k6lq4s7qlvp --- openerp/addons/base/res/res_partner.py | 2 +- openerp/addons/base/res/res_partner_view.xml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 0e6350f00ba..01108939195 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -120,7 +120,7 @@ class res_partner_category(osv.osv): res = self.name_get(cr, uid, ids, context=context) return dict(res) - _description = 'Partner Categories' + _description = 'Partner Tags' _name = 'res.partner.category' _columns = { 'name': fields.char('Category Name', required=True, size=64, translate=True), diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 32cb4e83e25..b85f80e0e57 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -511,10 +511,10 @@ - Partner Categories + Partner Tags res.partner.category -
+ @@ -524,11 +524,11 @@ - Partner Categories + Partner Tags res.partner.category - + @@ -538,7 +538,7 @@ res.partner.category child_ids - + @@ -557,7 +557,7 @@ --> - Partner Categories + Partner Tags res.partner form tree,form @@ -574,11 +574,11 @@ - Partner Categories + Partner Tags ir.actions.act_window res.partner.category form - Manage the partner categories in order to better classify them for tracking and analysis purposes. A partner may belong to several categories and categories have a hierarchy structure: a partner belonging to a category also belong to his parent category. + Manage the partner tags to better classify them for tracking and analysis purposes. A partner may have several tags and tags have a hierarchical structure: a partner with a tag has also the parent tags.