From d1016c8728778cf59ccde810f03ebcdd2bd1ffd9 Mon Sep 17 00:00:00 2001 From: Vijaykumar Baladaniya Date: Mon, 10 Dec 2012 11:13:34 +0530 Subject: [PATCH 01/19] [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 d0920dea504b0a9872586e72032caebbad0e991f Mon Sep 17 00:00:00 2001 From: "Ishwar Malvi (OpenERP Trainee)" Date: Wed, 17 Apr 2013 17:01:19 +0530 Subject: [PATCH 02/19] [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 03/19] [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 04/19] [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 dd7614e71623848d84c7f89c5416dd6dc6c0023c Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Mon, 29 Apr 2013 12:59:38 +0530 Subject: [PATCH 05/19] [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 06/19] [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 07/19] [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 08/19] [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 09/19] [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 10/19] [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 7542d8885d5ab01d7447448c707618e1f97d0928 Mon Sep 17 00:00:00 2001 From: "Dharmraj Zala (OpenERP Trainee)" Date: Thu, 9 May 2013 17:06:15 +0530 Subject: [PATCH 13/19] [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 14/19] [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 b2c84a83109a0260631e2e836cbfd39d4a08c5df Mon Sep 17 00:00:00 2001 From: "Nimesh Contractor (OpenERP)" Date: Thu, 23 May 2013 10:54:03 +0530 Subject: [PATCH 15/19] [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 dcf8b5e830152f4d92842f2371dad1b514b157a0 Mon Sep 17 00:00:00 2001 From: "Sejal Bhut (OpenERP Trainee)" Date: Mon, 3 Jun 2013 14:56:30 +0530 Subject: [PATCH 16/19] [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 17/19] [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 18/19] [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 19/19] 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