From 2405f334e2e39f06e2de569b86042b2693400d8b Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Wed, 7 Jul 2010 17:29:09 +0200 Subject: [PATCH 01/30] [FIX] account: wrong invoice number sequence for fiscal year in a certain case [FIX] account: context not initialized correctly in sequence lp bug: https://launchpad.net/bugs/602188 fixed bzr revid: ls@numerigraphe.fr-20100707152909-ocjbj6c784oqeg54 --- addons/account/invoice.py | 8 ++++++-- addons/account/sequence.py | 11 ++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 62f998fa751..6e2ff2a7baa 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -923,12 +923,16 @@ class account_invoice(osv.osv): obj_inv = self.browse(cr, uid, ids)[0] for (id, invtype, number, move_id, reference) in cr.fetchall(): if not number: + tmp_context = { + 'fiscalyear_id': inv.period_id.fiscalyear_id.id + } if obj_inv.journal_id.invoice_sequence_id: sid = obj_inv.journal_id.invoice_sequence_id.id number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id}) else: - number = self.pool.get('ir.sequence').get(cr, uid, - 'account.invoice.' + invtype) + number = obj_seq.get_id(cr, uid, + 'account.invoice.%s' % invtype, + 'code=%s', context=tmp_context) if invtype in ('in_invoice', 'in_refund'): ref = reference else: diff --git a/addons/account/sequence.py b/addons/account/sequence.py index c90e9ef93c7..1186d4b8c7f 100644 --- a/addons/account/sequence.py +++ b/addons/account/sequence.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields,osv +from osv import fields, osv class ir_sequence_fiscalyear(osv.osv): _name = 'account.sequence.fiscalyear' @@ -31,7 +31,7 @@ class ir_sequence_fiscalyear(osv.osv): } _sql_constraints = [ - ('main_id', 'CHECK (sequence_main_id != sequence_id)', 'Main Sequence must be different from current !'), + ('main_id', 'CHECK (sequence_main_id != sequence_id)', 'Main Sequence must be different from current !'), ] ir_sequence_fiscalyear() @@ -41,15 +41,16 @@ class ir_sequence(osv.osv): _columns = { 'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences') } - def get_id(self, cr, uid, sequence_id, test='id', context={}): + def get_id(self, cr, uid, sequence_id, test='id', context=None): + if context is None: + context = {} cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,)) res = cr.dictfetchone() if res: for line in self.browse(cr, uid, res['id'], context=context).fiscal_ids: if line.fiscalyear_id.id==context.get('fiscalyear_id', False): return super(ir_sequence, self).get_id(cr, uid, line.sequence_id.id, test="id", context=context) - return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context) + return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context=context) ir_sequence() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From dbf34fd87eed009dfecf0c15c42430d1c42a0231 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Wed, 7 Jul 2010 17:33:14 +0200 Subject: [PATCH 02/30] [REF] account: code formating in sequence bzr revid: ls@numerigraphe.fr-20100707153314-thxkmi5k9my09eq4 --- addons/account/sequence.py | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/addons/account/sequence.py b/addons/account/sequence.py index 1186d4b8c7f..b75e7f3e34e 100644 --- a/addons/account/sequence.py +++ b/addons/account/sequence.py @@ -25,13 +25,17 @@ class ir_sequence_fiscalyear(osv.osv): _name = 'account.sequence.fiscalyear' _rec_name = "sequence_main_id" _columns = { - "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True, ondelete='cascade'), - "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence', required=True, ondelete='cascade'), - "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, ondelete='cascade') + "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True, + ondelete='cascade'), + "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence', + required=True, ondelete='cascade'), + "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year', + required=True, ondelete='cascade') } _sql_constraints = [ - ('main_id', 'CHECK (sequence_main_id != sequence_id)', 'Main Sequence must be different from current !'), + ('main_id', 'CHECK (sequence_main_id != sequence_id)', + 'Main Sequence must be different from current !'), ] ir_sequence_fiscalyear() @@ -39,18 +43,25 @@ ir_sequence_fiscalyear() class ir_sequence(osv.osv): _inherit = 'ir.sequence' _columns = { - 'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences') + 'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', + 'sequence_main_id', 'Sequences') } def get_id(self, cr, uid, sequence_id, test='id', context=None): if context is None: context = {} - cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,)) + cr.execute('select id from ir_sequence where ' + + test + '=%s and active=%s', (sequence_id, True,)) res = cr.dictfetchone() if res: - for line in self.browse(cr, uid, res['id'], context=context).fiscal_ids: - if line.fiscalyear_id.id==context.get('fiscalyear_id', False): - return super(ir_sequence, self).get_id(cr, uid, line.sequence_id.id, test="id", context=context) - return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context=context) + for line in self.browse(cr, uid, res['id'], + context=context).fiscal_ids: + if line.fiscalyear_id.id == context.get('fiscalyear_id', False): + return super(ir_sequence, self).get_id(cr, uid, + line.sequence_id.id, + test="id", + context=context) + return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, + context=context) ir_sequence() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 4dc7691b1a6840b26d13350edeed29ed78c55dc8 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Mon, 12 Jul 2010 12:12:41 +0200 Subject: [PATCH 03/30] [FIX] account: wrong variable name bzr revid: ls@numerigraphe.fr-20100712101241-cn1unvdzds3dy2ol --- addons/account/invoice.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 6e2ff2a7baa..05ca7d5d36e 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -920,15 +920,15 @@ class account_invoice(osv.osv): 'FROM account_invoice ' \ 'WHERE id IN %s', (tuple(ids),)) - obj_inv = self.browse(cr, uid, ids)[0] + inv = self.browse(cr, uid, ids)[0] for (id, invtype, number, move_id, reference) in cr.fetchall(): if not number: tmp_context = { 'fiscalyear_id': inv.period_id.fiscalyear_id.id } - if obj_inv.journal_id.invoice_sequence_id: - sid = obj_inv.journal_id.invoice_sequence_id.id - number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id}) + if inv.journal_id.invoice_sequence_id: + sid = inv.journal_id.invoice_sequence_id.id + number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': inv.period_id.fiscalyear_id.id}) else: number = obj_seq.get_id(cr, uid, 'account.invoice.%s' % invtype, @@ -1578,4 +1578,4 @@ class res_partner(osv.osv): res_partner() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 3dec5629c96aab45601f8277e2c1264fcca32d3b Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Mon, 12 Jul 2010 12:40:05 +0200 Subject: [PATCH 04/30] [FIX] account: wrong variable name [IMP] account: sequence view [REF] account: small cleanup lp bug: https://launchpad.net/bugs/602188 fixed bzr revid: ls@numerigraphe.fr-20100712104005-4vkqdu4lcsqgzt21 --- addons/account/invoice.py | 14 +++++++++----- addons/account/sequence_view.xml | 4 ++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 05ca7d5d36e..d475a2e19b4 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -927,12 +927,16 @@ class account_invoice(osv.osv): 'fiscalyear_id': inv.period_id.fiscalyear_id.id } if inv.journal_id.invoice_sequence_id: - sid = inv.journal_id.invoice_sequence_id.id - number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': inv.period_id.fiscalyear_id.id}) + sequence_id = inv.journal_id.invoice_sequence_id.id + number = self.pool.get('ir.sequence').get_id(cr, uid, + sequence_id, + 'id', + context=tmp_context) else: - number = obj_seq.get_id(cr, uid, - 'account.invoice.%s' % invtype, - 'code=%s', context=tmp_context) + number = self.pool.get('ir.sequence').get_id(cr, uid, + 'account.invoice.%s' % invtype, + 'code', + context=tmp_context) if invtype in ('in_invoice', 'in_refund'): ref = reference else: diff --git a/addons/account/sequence_view.xml b/addons/account/sequence_view.xml index 2d4d159cb41..565725d5d71 100644 --- a/addons/account/sequence_view.xml +++ b/addons/account/sequence_view.xml @@ -14,6 +14,10 @@ +
+ + + From 0b510c279838bd48f26bed5d80a7bc5c1f20fcf0 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Tue, 13 Jul 2010 10:58:52 +0200 Subject: [PATCH 05/30] [ADD] test for bug 602188: wrong invoice number sequence for fiscal year in a certain case bzr revid: ls@numerigraphe.fr-20100713085852-mkvywgcdmx2ule58 --- addons/account/__openerp__.py | 1 + .../account/test/sequence_bug602188_test.xml | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 addons/account/test/sequence_bug602188_test.xml diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index d3a58272b89..c663ed29e06 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -124,6 +124,7 @@ module named account_vouchers 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', 'account_unit_test.xml', + 'test/sequence_bug602188_test.xml', 'board_account_demo.xml', ], 'test': [ diff --git a/addons/account/test/sequence_bug602188_test.xml b/addons/account/test/sequence_bug602188_test.xml new file mode 100644 index 00000000000..3a9200b98e6 --- /dev/null +++ b/addons/account/test/sequence_bug602188_test.xml @@ -0,0 +1,53 @@ + + + + + + + + + + account.invoice.out_invoice + + TEST- + -bug602188 + + + + + + + + + + + + + + + + + draft + out_invoice + + lp:602188 + + + + + + open + TEST-042-bug602188 + + + + + + + + From a9a8c13e68a3a8d75a61d625cc783e523de054db Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Tue, 13 Jul 2010 17:53:13 +0200 Subject: [PATCH 06/30] [REF] account: rewrite the sequence test in YAML bzr revid: ls@numerigraphe.fr-20100713155313-cw7e9l5gjhfkba70 --- addons/account/__openerp__.py | 2 +- addons/account/test/account_sequence_test.yml | 45 ++++++++++++++++ .../account/test/sequence_bug602188_test.xml | 53 ------------------- 3 files changed, 46 insertions(+), 54 deletions(-) create mode 100644 addons/account/test/account_sequence_test.yml delete mode 100644 addons/account/test/sequence_bug602188_test.xml diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index c663ed29e06..09e51486ad2 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -124,10 +124,10 @@ module named account_vouchers 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', 'account_unit_test.xml', - 'test/sequence_bug602188_test.xml', 'board_account_demo.xml', ], 'test': [ + 'test/account_sequence_test.yml', 'test/account_customer_invoice.yml', 'test/account_supplier_invoice.yml', 'test/account_change_currency.yml', diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml new file mode 100644 index 00000000000..3be824d2ca0 --- /dev/null +++ b/addons/account/test/account_sequence_test.yml @@ -0,0 +1,45 @@ +- In order to test the invoice numbering, I create a sequence for out invoices. +- !record {model: ir.sequence, id: seq_out_invoice_test}: + name: Account Invoice Out for the demonstration Fiscal Year # XXX indicate the name of the fiscal year + code: account.invoice.out_invoice + padding: 3 + prefix: FY- + suffix: -TEST + number_next: 42 + +- I link the new sequence to the demo sequence and the demo fiscal years. +- !record {model: account.sequence.fiscalyear, id: seq_out_invoice_test_fy}: + sequence_id: seq_out_invoice_test + sequence_main_id: seq_out_invoice + fiscalyear_id: data_fiscalyear + +- I create a draft customer invoice in a period of the demo fiscal year +- !record {model: account.invoice, id: invoice_seq_test}: + account_id: account.a_recv + address_contact_id: base.res_partner_address_zen + address_invoice_id: base.res_partner_address_zen + company_id: base.main_company + currency_id: base.EUR + invoice_line: + - account_id: account.a_sale + name: '[PC3] Medium PC' + price_unit: 900.0 + quantity: 10.0 + product_id: product.product_product_pc3 + uos_id: product.product_uom_unit + journal_id: account.sales_journal + partner_id: base.res_partner_3 + reference_type: none + period_id: period_1 + +- I create the invoice, as is I clicked on the "Create" button +- !workflow {model: account.invoice, action: invoice_open, ref: invoice_seq_test} + +- I check that the invoice state is "Open" +- !assert {model: account.invoice, id: invoice_seq_test}: + - state == 'open' + +- I check that the invoice got the right number using our sequence + # This used to fail because of bug #602188 +- !assert {model: account.invoice, id: invoice_seq_test}: + - number == 'FY-042-TEST' diff --git a/addons/account/test/sequence_bug602188_test.xml b/addons/account/test/sequence_bug602188_test.xml deleted file mode 100644 index 3a9200b98e6..00000000000 --- a/addons/account/test/sequence_bug602188_test.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - account.invoice.out_invoice - - TEST- - -bug602188 - - - - - - - - - - - - - - - - - draft - out_invoice - - lp:602188 - - - - - - open - TEST-042-bug602188 - - - - - - - - From 21335ab5907d4969bed6734e137ead3c5b3965e0 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Thu, 15 Jul 2010 04:36:52 +0100 Subject: [PATCH 07/30] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100715033652-f115ljt9h9h4cwx6 --- addons/account_voucher/i18n/zh_CN.po | 2 +- addons/account_voucher_payment/i18n/zh_CN.po | 2 +- .../i18n/zh_CN.po | 20 +- addons/analytic_user_function/i18n/zh_CN.po | 12 +- addons/auction/i18n/zh_CN.po | 505 ++++++++++-------- addons/base_contact/i18n/ru.po | 18 +- addons/base_module_record/i18n/ru.po | 6 +- addons/hr_contract/i18n/ru.po | 12 +- addons/multi_company/i18n/ru.po | 11 +- 9 files changed, 328 insertions(+), 260 deletions(-) diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po index 8ba6cb29fa0..37bfbcda4d8 100644 --- a/addons/account_voucher/i18n/zh_CN.po +++ b/addons/account_voucher/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher_payment/i18n/zh_CN.po b/addons/account_voucher_payment/i18n/zh_CN.po index 362481f0a53..377a1926046 100644 --- a/addons/account_voucher_payment/i18n/zh_CN.po +++ b/addons/account_voucher_payment/i18n/zh_CN.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: 2010-07-14 03:37+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher_payment diff --git a/addons/analytic_journal_billing_rate/i18n/zh_CN.po b/addons/analytic_journal_billing_rate/i18n/zh_CN.po index 4b85391f013..765982cfc04 100644 --- a/addons/analytic_journal_billing_rate/i18n/zh_CN.po +++ b/addons/analytic_journal_billing_rate/i18n/zh_CN.po @@ -7,55 +7,55 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 07:31+0000\n" +"PO-Revision-Date: 2010-07-14 03:49+0000\n" "Last-Translator: Black Jack \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: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "无效的视图结构XML文件!" +msgstr "无效XML视图结构!" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 msgid "Analytic Journal" -msgstr "辅助核算分类帐" +msgstr "辅助核算记录集合" #. module: analytic_journal_billing_rate #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "对象名必须要以X_开头并且不能含有特殊字符!" +msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！" #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 msgid "Billing Rate per Journal for this Analytic Account" -msgstr "辅助核算分类帐中每个分类帐的记帐标准" +msgstr "辅助核算记录集合中每个记录集合的开单税率" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,account_id:0 msgid "Analytic Account" -msgstr "辅助核算分类帐" +msgstr "辅助核算项" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid msgid "Relation table between journals and billing rates" -msgstr "分类帐和记帐标准的关系表" +msgstr "记录集合和开票税率的关系表" #. module: analytic_journal_billing_rate #: field:account.analytic.account,journal_rate_ids:0 msgid "Invoicing Rate per Journal" -msgstr "分类帐的开票税率" +msgstr "每个记录集合的的开票税率" #. module: analytic_journal_billing_rate #: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information msgid "Analytic Journal Billing Rate" -msgstr "辅助核算分类帐的记帐标准" +msgstr "辅助核算集合的开票税率" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,rate_id:0 diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po index 034ad99e623..e20db0149f5 100644 --- a/addons/analytic_user_function/i18n/zh_CN.po +++ b/addons/analytic_user_function/i18n/zh_CN.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 07:31+0000\n" +"PO-Revision-Date: 2010-07-14 03:52+0000\n" "Last-Translator: Black Jack \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: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "无效的视图结构XML文件!" +msgstr "无效XML视图结构!" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid @@ -51,7 +51,7 @@ msgstr "用户" #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "对象名必须要以X_开头并且不能含有特殊字符!" +msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information @@ -63,6 +63,10 @@ msgstr "辅助核算用的函数" msgid "User's Product for this Analytic Account" msgstr "用户的产品辅助核算项" +#, python-format +#~ msgid "Error !" +#~ msgstr "错误！" + #~ msgid "" #~ "\n" #~ "\n" diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po index cdd945f6eef..03e5ffa4234 100644 --- a/addons/auction/i18n/zh_CN.po +++ b/addons/auction/i18n/zh_CN.po @@ -1,19 +1,19 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * auction +# * auction # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-04 12:37+0000\n" -"Last-Translator: Eleanor Chen \n" +"PO-Revision-Date: 2010-07-15 03:34+0000\n" +"Last-Translator: Black Jack \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: 2010-06-22 04:13+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction @@ -24,7 +24,7 @@ msgstr "总利润" #. module: auction #: wizard_view:auction.lots.sms_send,init:0 msgid "SMS - Gateway: clickatell" -msgstr "SMS网关" +msgstr "短信网关：clickatell" #. module: auction #: view:auction.lots:0 @@ -32,22 +32,24 @@ msgid "Set to draft" msgstr "设为草稿" #. module: auction -#: field:auction.deposit,partner_id:0 view:auction.lots:0 -#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0 -#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0 +#: field:auction.deposit,partner_id:0 +#: view:auction.lots:0 +#: field:report.deposit.border,seller:0 +#: field:report.seller.auction,seller:0 +#: field:report.seller.auction2,seller:0 msgid "Seller" msgstr "卖方" #. module: auction #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "在这动作定义中无效的模块名" +msgstr "在动作定义使用了无效的模块名。" #. module: auction #: selection:auction.lots.send.aie,date_ask,numerotation:0 #: selection:auction.lots.send.aie,init,numerotation:0 msgid "Provisoire" -msgstr "" +msgstr "暂时的" #. module: auction #: selection:auction.lots.send.aie,date_ask,numerotation:0 @@ -58,7 +60,7 @@ msgstr "确定的(订单目录)" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my msgid "My Encoded Objects Per Day" -msgstr "每天我编码的物品" +msgstr "我每天编号的物品" #. module: auction #: model:ir.model,name:auction.model_auction_lot_history @@ -79,26 +81,31 @@ msgstr "物品#" #. module: auction #: model:ir.ui.menu,name:auction.menu_action_bids_form msgid "Bids line" -msgstr "出价线" +msgstr "投标线" #. module: auction #: xsl:report.auction.deposit:0 msgid "Deposit Form" -msgstr "押金方式" +msgstr "押金单" #. module: auction -#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0 +#: rml:auction.bids:0 +#: view:auction.lots:0 +#: field:auction.lots,ach_uid:0 #: wizard_field:auction.lots.buyer_map,check,ach_uid:0 #: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0 -#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0 +#: wizard_field:auction.pay.buy,init,buyer_id:0 +#: rml:buyer.list:0 #: model:ir.ui.menu,name:auction.auction_report_buyer_menu -#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0 +#: rml:report.auction.buyer.result:0 +#: field:report.buyer.auction,buyer:0 #: field:report.buyer.auction2,buyer:0 msgid "Buyer" msgstr "买家" #. module: auction -#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0 +#: field:report.auction.view,nobjects:0 +#: field:report.buyer.auction,object:0 msgid "No of objects" msgstr "没有物品" @@ -110,7 +117,7 @@ msgstr "拍卖最终结果" #. module: auction #: rml:auction.total.rml:0 msgid "# of paid items (based on invoices):" -msgstr "(根据发票)支付项目:" +msgstr "支付项目(根据发票):" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot @@ -123,7 +130,8 @@ msgid "Antique/Books, manuscripts, eso." msgstr "古董/书籍/手稿" #. module: auction -#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit +#: view:auction.deposit:0 +#: model:ir.model,name:auction.model_auction_deposit msgid "Deposit Border" msgstr "押金最少" @@ -131,7 +139,7 @@ msgstr "押金最少" #: wizard_field:auction.lots.make_invoice,init,amount:0 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0 msgid "Invoiced Amount" -msgstr "发票金额" +msgstr "已开票金额" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -141,7 +149,7 @@ msgstr "古董/锡/铜制品" #. module: auction #: field:auction.lots,paid_ach:0 msgid "Buyer invoice reconciled" -msgstr "买家发票对账" +msgstr "买家发票已核销" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken @@ -151,7 +159,7 @@ msgstr "标记为带走" #. module: auction #: xsl:report.auction.seller.list:0 msgid "Inv." -msgstr "" +msgstr "发票" #. module: auction #: field:auction.deposit.cost,amount:0 @@ -195,7 +203,8 @@ msgid "Objects by Auction" msgstr "拍卖物品" #. module: auction -#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0 +#: field:auction.lots,lot_num:0 +#: field:report.unclassified.objects,lot_num:0 msgid "List Number" msgstr "表编号" @@ -230,7 +239,8 @@ msgid "Contemporary Art" msgstr "当代艺术" #. module: auction -#: view:auction.lots:0 view:report.unclassified.objects:0 +#: view:auction.lots:0 +#: view:report.unclassified.objects:0 msgid "Ref" msgstr "参考" @@ -250,9 +260,10 @@ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" msgstr "错误:登入必须要先登出" #. module: auction -#: view:auction.lots:0 field:report.buyer.auction,total_price:0 +#: view:auction.lots:0 +#: field:report.buyer.auction,total_price:0 msgid "Total Adj." -msgstr "" +msgstr "合计" #. module: auction #: field:report.auction.view2,obj_margin_procent:0 @@ -260,7 +271,8 @@ msgid "Net margin (%)" msgstr "净利润(%)" #. module: auction -#: selection:auction.lots,state:0 selection:report.object.encoded,state:0 +#: selection:auction.lots,state:0 +#: selection:report.object.encoded,state:0 #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Unsold" @@ -274,7 +286,7 @@ msgstr "日期" #. module: auction #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" -msgstr "错误:销售单位必须要和计量单位不同类型" +msgstr "错误:销售单位必须和计量单位在不同的分类." #. module: auction #: rml:auction.total.rml:0 @@ -288,7 +300,9 @@ msgid "Seller Costs" msgstr "卖家费用" #. module: auction -#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0 +#: view:auction.bid:0 +#: view:auction.bid_line:0 +#: view:auction.lots:0 #: field:auction.lots,bid_lines:0 #: model:ir.actions.report.xml,name:auction.bid_auction #: model:ir.ui.menu,name:auction.menu_action_bid_open @@ -311,7 +325,8 @@ msgid "Contact" msgstr "联系" #. module: auction -#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0 +#: field:report.auction.view,obj_ret:0 +#: field:report.object.encoded,obj_ret:0 #: field:report.object.encoded.manager,obj_ret:0 msgid "# obj ret" msgstr "物品#" @@ -339,7 +354,7 @@ msgstr "佣金" #. module: auction #: wizard_button:auction.lots.numerotate,search,init:0 msgid "Back" -msgstr "后面" +msgstr "后退" #. module: auction #: model:ir.actions.act_window,name:auction.action_all_objects_unsold @@ -352,17 +367,20 @@ msgid "Sold Objects" msgstr "已卖出的物品" #. module: auction -#: view:report.buyer.auction2:0 view:report.seller.auction2:0 +#: view:report.buyer.auction2:0 +#: view:report.seller.auction2:0 msgid "Sum net margin" msgstr "合计净利润" #. module: auction #: view:auction.deposit:0 msgid "Deposit Border Form" -msgstr "押金最少方式" +msgstr "最少押金单" #. module: auction -#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0 +#: field:auction.bid,bid_lines:0 +#: rml:auction.bids:0 +#: rml:bids.lots:0 #: model:ir.model,name:auction.model_auction_bid_line msgid "Bid" msgstr "出价" @@ -373,15 +391,17 @@ msgid "Langage" msgstr "" #. module: auction -#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0 -#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots +#: field:auction.bid_line,lot_id:0 +#: field:auction.lot.history,lot_id:0 +#: view:auction.lots:0 +#: model:ir.model,name:auction.model_auction_lots msgid "Object" msgstr "物品" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_map_user msgid "Map buyer username to Partners" -msgstr "从买家用户到业务伙伴" +msgstr "从买家到业务伙伴" #. module: auction #: wizard_field:auction.lots.numerotate,search,lot_num:0 @@ -407,9 +427,11 @@ msgid "Auction buyer reporting form view" msgstr "拍卖买方报表" #. module: auction -#: field:auction.dates,state:0 field:auction.lots,state:0 +#: field:auction.dates,state:0 +#: field:auction.lots,state:0 #: field:report.auction.adjudication,state:0 -#: field:report.object.encoded,state:0 field:report.seller.auction,state:0 +#: field:report.object.encoded,state:0 +#: field:report.seller.auction,state:0 #: field:report.unclassified.objects,state:0 msgid "Status" msgstr "状态" @@ -425,7 +447,8 @@ msgid "Antique/Cartoons" msgstr "古董/卡通" #. module: auction -#: view:auction.lots:0 selection:auction.lots,state:0 +#: view:auction.lots:0 +#: selection:auction.lots,state:0 #: selection:report.seller.auction,state:0 #: selection:report.unclassified.objects,state:0 msgid "Sold" @@ -449,7 +472,7 @@ msgstr "费用科目" #. module: auction #: model:ir.ui.menu,name:auction.menu_wizard_emporte msgid "Deliveries Management" -msgstr "发货管理" +msgstr "交付管理" #. module: auction #: field:auction.lots,obj_desc:0 @@ -482,47 +505,48 @@ msgstr "" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_pay msgid "Pay objects of the buyer" -msgstr "" +msgstr "买家支付的物品" #. module: auction #: view:report.deposit.border:0 msgid "Depositer's statistics" -msgstr "" +msgstr "押金统计" #. module: auction #: view:auction.lots:0 msgid "Buyer information" -msgstr "" +msgstr "买家信息" #. module: auction #: model:ir.model,name:auction.model_report_seller_auction msgid "Auction Reporting on seller view" -msgstr "" +msgstr "拍卖报表卖家视图" #. module: auction #: field:auction.lots,name2:0 msgid "Short Description (2)" -msgstr "" +msgstr "简短描述(2)" #. module: auction #: model:ir.model,name:auction.model_auction_dates msgid "auction.dates" -msgstr "" +msgstr "拍卖.日期" #. module: auction -#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu +#: rml:auction.total.rml:0 +#: model:ir.ui.menu,name:auction.auction_buyers_menu msgid "Buyers" -msgstr "" +msgstr "买家" #. module: auction #: wizard_field:auction.pay.buy,init,amount:0 #: wizard_field:auction.pay.buy,init,amount2:0 #: wizard_field:auction.pay.buy,init,amount3:0 msgid "Amount paid" -msgstr "" +msgstr "已付款金额" #. module: auction -#: view:board.board:0 +#: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree msgid "My Latest Deposits" msgstr "我最近的押金" @@ -533,27 +557,27 @@ msgstr "我最近的押金" #: field:report.auction.view,min_est:0 #: field:report.unclassified.objects,lot_est1:0 msgid "Minimum Estimation" -msgstr "" +msgstr "最低估价" #. module: auction #: view:auction.dates:0 msgid "Accounting" -msgstr "" +msgstr "会计" #. module: auction #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2 msgid "Buyer's Revenues" -msgstr "" +msgstr "买家收入" #. module: auction #: model:ir.model,name:auction.model_report_auction_adjudication msgid "report_auction_adjudication" -msgstr "" +msgstr "拍卖最终结果报表" #. module: auction #: field:auction.bid_line,price:0 msgid "Maximum Price" -msgstr "" +msgstr "最高价格" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 @@ -563,22 +587,22 @@ msgstr "" #. module: auction #: view:report.buyer.auction2:0 msgid "Auction buyer reporting tree view2" -msgstr "" +msgstr "拍卖买家报表树视图2" #. module: auction #: wizard_view:auction.lots.sms_send,init:0 msgid "Bulk SMS send" -msgstr "" +msgstr "批量发送SMS" #. module: auction #: wizard_view:auction.taken,init:0 msgid "Select lots which are Sold" -msgstr "" +msgstr "选择已售出的批" #. module: auction #: field:auction.lots,statement_id:0 msgid "Payment" -msgstr "" +msgstr "付款" #. module: auction #: selection:auction.lots.send.aie,date_ask,lang:0 @@ -588,50 +612,50 @@ msgstr "" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Old weapons and militaria" -msgstr "" +msgstr "古董/旧武器和军备" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Oriental Arts/Chineese furnitures" -msgstr "" +msgstr "古董/东方艺术品/中国家具" #. module: auction #: selection:auction.deposit,method:0 msgid "Keep until sold" -msgstr "" +msgstr "保留直到售出" #. module: auction #: wizard_button:auction.lots.numerotate,init,choice:0 #: wizard_button:auction.lots.send.aie,init,date_ask:0 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0 msgid "Continue" -msgstr "" +msgstr "继续" #. module: auction #: field:report.object.encoded,obj_num:0 #: field:report.object.encoded.manager,obj_num:0 msgid "# of Encoded obj." -msgstr "" +msgstr "# 物品编码" #. module: auction #: xsl:report.auction.vnd_bordereau:0 msgid "List N." -msgstr "" +msgstr "列表 N" #. module: auction #: field:report.deposit.border,moy_est:0 msgid "Avg. Est" -msgstr "" +msgstr "平均值" #. module: auction #: rml:auction.total.rml:0 msgid "# of sellers:" -msgstr "" +msgstr "# 卖家" #. module: auction #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "错误:无效EAN编码" #. module: auction #: model:ir.module.module,description:auction.module_meta_information @@ -642,26 +666,31 @@ msgid "" " Delivery Management. \n" " " msgstr "" +"这模块提供以下功能\n" +" 管理艺术家, 作品, 买家, 卖家和拍卖\n" +" 管理出价, 售出跟踪, 支付和未售出物品\n" +" 交付管理 \n" +" " #. module: auction #: rml:auction.total.rml:0 msgid "# of items taken away:" -msgstr "" +msgstr "# 带走的物品:" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_allmonth_view1 msgid "Auction's Summary" -msgstr "" +msgstr "拍卖合计:" #. module: auction #: rml:buyer.list:0 msgid "%)" -msgstr "" +msgstr "%)" #. module: auction #: wizard_view:auction.lots.able,init:0 msgid "Confirmation set taken away" -msgstr "" +msgstr "确认设为带走" #. module: auction #: wizard_field:auction.lots.make_invoice,init,objects:0 @@ -670,7 +699,7 @@ msgstr "" #: wizard_field:auction.lots.send.aie.results,date_ask,objects:0 #: field:report.deposit.border,nb_obj:0 msgid "# of objects" -msgstr "" +msgstr "# 物品" #. module: auction #: field:auction.lots,lot_est2:0 @@ -679,82 +708,83 @@ msgstr "" #: field:report.auction.view,max_est:0 #: field:report.unclassified.objects,lot_est2:0 msgid "Maximum Estimation" -msgstr "" +msgstr "最高估价" #. module: auction #: field:auction.lots,buyer_price:0 msgid "Buyer price" -msgstr "" +msgstr "买家价格" #. module: auction #: model:ir.actions.wizard,name:auction.auction_wizard_payer_sel msgid "Mark as paid for seller" -msgstr "" +msgstr "标记为卖家支付" #. module: auction #: model:ir.actions.report.xml,name:auction.seller_form_id msgid "Seller List" -msgstr "" +msgstr "卖家列表" #. module: auction #: field:auction.lots,is_ok:0 msgid "Buyer's payment" -msgstr "" +msgstr "买家付款" #. module: auction #: view:auction.dates:0 msgid "Close + Create all invoices" -msgstr "" +msgstr "费用 + 创建所有发票" #. module: auction #: model:ir.actions.wizard,name:auction.auction_catalog_flagy msgid "Auction Catalog Flagey" -msgstr "" +msgstr "拍卖目录Flagey" #. module: auction #: field:auction.lot.history,price:0 msgid "Withdrawn price" -msgstr "" +msgstr "撤销价格" #. module: auction #: model:account.tax,name:auction.auction_tax4 msgid "Seller Costs1" -msgstr "" +msgstr "卖家成本1" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Verreries" -msgstr "" +msgstr "古董/玻璃器皿" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Toys" -msgstr "" +msgstr "古董/玩具" #. module: auction -#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0 +#: field:auction.deposit,create_uid:0 +#: field:auction.lots,create_uid:0 msgid "Created by" -msgstr "" +msgstr "创建者" #. module: auction #: xsl:report.auction.ach_bordereau:0 msgid "Buyer form" -msgstr "" +msgstr "买家" #. module: auction #: xsl:report.auction.deposit:0 msgid "Estimate" -msgstr "" +msgstr "预计" #. module: auction #: rml:auction.total.rml:0 msgid "# of buyers:" -msgstr "" +msgstr "# 买家:" #. module: auction #: field:auction.lots,costs:0 msgid "Indirect costs" -msgstr "" +msgstr "间接成本" #. module: auction #: xsl:report.auction.ach_bordereau:0 @@ -764,53 +794,53 @@ msgstr "" #. module: auction #: constraint:account.tax.code:0 msgid "Error ! You can not create recursive accounts." -msgstr "" +msgstr "错误!你不能创建递归的科目" #. module: auction #: model:ir.ui.menu,name:auction.auction_menu_root msgid "Auction Management" -msgstr "" +msgstr "拍卖管理" #. module: auction #: field:auction.dates,journal_seller_id:0 msgid "Seller Journal" -msgstr "" +msgstr "卖家记录集合" #. module: auction #: view:report.buyer.auction:0 msgid "Auction buyer reporting tree view" -msgstr "" +msgstr "拍卖买家报表树视图" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_artist msgid "Define Artists" -msgstr "" +msgstr "定义艺术家" #. module: auction #: field:auction.lot.category,name:0 msgid "Category Name" -msgstr "" +msgstr "类别名称" #. module: auction #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_manager #: model:ir.ui.menu,name:auction.menu_report_auction_estimation_adj_category_member msgid "Comparison of estimations" -msgstr "" +msgstr "估价比较" #. module: auction #: model:ir.actions.report.xml,name:auction.v_report_barcode_lot msgid "Code barres du lot" -msgstr "" +msgstr "条码批" #. module: auction #: wizard_button:auction.lots.numerotate,not_exist,init:0 msgid "Retry" -msgstr "" +msgstr "重试" #. module: auction #: field:auction.artists,birth_death_dates:0 msgid "Birth / Death dates" -msgstr "" +msgstr "出生/ 死亡日期" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -820,7 +850,7 @@ msgstr "" #. module: auction #: model:ir.model,name:auction.model_report_unclassified_objects msgid "Unclassified objects " -msgstr "" +msgstr "无类别物品 " #. module: auction #: wizard_button:auction.lots.numerotate_cont,init,set_number:0 @@ -837,22 +867,22 @@ msgstr "" #. module: auction #: xsl:report.auction.deposit:0 msgid "Document type" -msgstr "" +msgstr "文档类型" #. module: auction #: model:ir.model,name:auction.model_report_auction_estimation_adj_category msgid "comparaison estimate/adjudication " -msgstr "" +msgstr "估价比价/ 最终结果 " #. module: auction #: rml:buyer.list:0 msgid "Adj(EUR)" -msgstr "" +msgstr "最终结果(EUR)" #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Cont. Art/Other Media" -msgstr "" +msgstr "艺术品/ 其它媒体" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_emporte @@ -860,42 +890,44 @@ msgid "Gestion emporte" msgstr "" #. module: auction -#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0 +#: xsl:report.auction.lots.list.landscape:0 +#: xsl:report.auction.vnd_bordereau:0 msgid "Cat. N." msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_object_cat msgid "Object Categories" -msgstr "" +msgstr "物品类别" #. module: auction #: wizard_field:auction.lots.send.aie,date_ask,img_send:0 msgid "Send Image also ?" -msgstr "" +msgstr "也传送图像?" #. module: auction #: view:auction.deposit:0 msgid "General Informations" -msgstr "" +msgstr "一般信息" #. module: auction #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "在这动作定义中无效的模块名" +msgstr "无效XML视图结构!" #. module: auction #: view:report.auction.view:0 msgid "Auctions results" -msgstr "" +msgstr "拍卖结果" #. module: auction #: wizard_field:auction.lots.sms_send,init,app_id:0 msgid "API ID" -msgstr "" +msgstr "API ID" #. module: auction -#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0 +#: field:auction.bid,name:0 +#: field:auction.bid_line,bid_id:0 msgid "Bid ID" msgstr "" @@ -907,40 +939,40 @@ msgstr "" #. module: auction #: field:report.buyer.auction2,net_margin:0 msgid "Net Margin" -msgstr "" +msgstr "净利润" #. module: auction #: field:auction.lots,vnd_lim_net:0 msgid "Net limit ?" -msgstr "" +msgstr "净限额?" #. module: auction #: rml:auction.total.rml:0 msgid "# of commissions:" -msgstr "" +msgstr "# 佣金:" #. module: auction #: model:ir.actions.act_window,name:auction.action_unclassified_objects #: model:ir.ui.menu,name:auction.menu_all_objects_unclassified #: view:report.unclassified.objects:0 msgid "Unclassified objects" -msgstr "" +msgstr "无类别物品" #. module: auction #: wizard_view:auction.lots.make_invoice_buyer,init:0 msgid "(Keep empty for automatic number)" -msgstr "" +msgstr "(空为自动编号)" #. module: auction #: model:ir.model,name:auction.model_report_auction_object_date #: view:report.auction.object.date:0 msgid "Objects per day" -msgstr "" +msgstr "每天物品" #. module: auction #: model:product.template,name:auction.monproduit_product_template msgid "Oeuvres a 21%" -msgstr "" +msgstr "全部 21%" #. module: auction #: selection:auction.lot.category,aie_categ:0 @@ -948,97 +980,99 @@ msgid "Antique/Carpet and textilles" msgstr "" #. module: auction -#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0 +#: field:report.object.encoded.manager,adj:0 msgid "Adj." -msgstr "" +msgstr "最终结果" #. module: auction -#: field:auction.lot.history,name:0 field:report.attendance,name:0 -#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0 +#: field:auction.lot.history,name:0 +#: field:report.attendance,name:0 +#: field:report.auction.adjudication,date:0 #: field:report.auction.estimation.adj.category,date:0 msgid "Date" -msgstr "" +msgstr "日期" #. module: auction #: field:auction.lots,obj_ret:0 msgid "Price retired" -msgstr "" +msgstr "价格撤回" #. module: auction #: view:auction.deposit:0 msgid "Extra Costs" -msgstr "" +msgstr "额外费用" #. module: auction #: model:ir.ui.menu,name:auction.menu_auction_dates_new msgid "New Auction Dates" -msgstr "" +msgstr "新拍卖日期" #. module: auction #: field:auction.lots,paid_vnd:0 msgid "Seller Paid" -msgstr "" +msgstr "卖家支付" #. module: auction #: field:auction.deposit,date_dep:0 msgid "Deposit date" -msgstr "" +msgstr "押金日期" #. module: auction #: model:ir.actions.report.xml,name:auction.id_deposit msgid "Deposits" -msgstr "" +msgstr "押金" #. module: auction #: field:auction.deposit,specific_cost_ids:0 msgid "Specific Costs" -msgstr "" +msgstr "特别费用" #. module: auction -#: view:report.buyer.auction2:0 view:report.seller.auction2:0 +#: view:report.buyer.auction2:0 +#: view:report.seller.auction2:0 msgid "Sum adj" -msgstr "" +msgstr "最终结果合计" #. module: auction -#: view:auction.dates:0 view:report.auction.view2:0 +#: view:auction.dates:0 +#: view:report.auction.view2:0 msgid "Auctions" -msgstr "" +msgstr "拍卖" #. module: auction #: field:report.seller.auction,object_number:0 msgid "No of Objects" -msgstr "" +msgstr "没物品" #. module: auction #: view:auction.lots:0 msgid "History" -msgstr "" +msgstr "日志" #. module: auction #: field:auction.lot.category,priority:0 msgid "Priority" -msgstr "" +msgstr "优先级" #. module: auction #: rml:auction.code_bar_lot:0 msgid "Nr." -msgstr "" +msgstr "Nr." #. module: auction #: selection:auction.lot.category,aie_categ:0 msgid "Antique/Painting" -msgstr "" +msgstr "古董/ 绘画" #. module: auction #: field:auction.lot.category,aie_categ:0 msgid "Aie Category" -msgstr "" +msgstr "Aie类别" #. module: auction -#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0 -#: xsl:report.auction.deposit:0 +#: rml:report.auction.buyer.result:0 msgid "Num" -msgstr "" +msgstr "编号" #. module: auction #: wizard_button:auction.lots.able,init,end:0 @@ -1055,94 +1089,97 @@ msgstr "" #: wizard_button:auction.pay.buy,init,end:0 #: wizard_button:auction.payer.sel,init,end:0 msgid "Cancel" -msgstr "" +msgstr "取消" #. module: auction #: view:auction.dates:0 msgid "Beginning of the auction" -msgstr "" +msgstr "开始拍卖" #. module: auction #: field:auction.artists,biography:0 msgid "Biography" -msgstr "" +msgstr "传记" #. module: auction #: field:auction.lots,lot_local:0 msgid "Location" -msgstr "" +msgstr "位置" #. module: auction #: wizard_view:auction.payer.sel,init:0 msgid "Check payment for seller" -msgstr "" +msgstr "检查卖家付款" #. module: auction #: model:ir.actions.act_window,name:auction.view_report_object_by_auction msgid "Detailed lots" -msgstr "" +msgstr "详细" #. module: auction -#: view:board.board:0 +#: view:report.object.encoded:0 +#: view:report.object.encoded.manager:0 msgid "Objects statistics" msgstr "物品统计" #. module: auction #: view:auction.dates:0 msgid "Analytic" -msgstr "" +msgstr "分析" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_results msgid "Send results to Auction-in-europe.com" -msgstr "" +msgstr "发送结果到europe.com" #. module: auction -#: rml:bids.lots:0 rml:bids.phones.details:0 +#: rml:bids.lots:0 +#: rml:bids.phones.details:0 msgid "Cat.N" msgstr "" #. module: auction #: selection:auction.deposit,method:0 msgid "Decrease limit of 10%" -msgstr "" +msgstr "减少10%限制" #. module: auction #: field:auction.dates,adj_total:0 #: field:report.auction.adjudication,adj_total:0 #: field:report.auction.estimation.adj.category,adj_total:0 msgid "Total Adjudication" -msgstr "" +msgstr "最终结果合计" #. module: auction #: model:ir.actions.act_window,name:auction.action_auction_reporting1 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all1 #: model:ir.actions.act_window,name:auction.action_auction_reporting_all2 msgid "Seller's auction" -msgstr "" +msgstr "卖家拍卖" #. module: auction #: model:ir.actions.wizard,name:auction.wizard_invoice_buyer1 msgid "Invoice Buyer objects" -msgstr "" +msgstr "买家物品发票" #. module: auction #: model:ir.ui.menu,name:auction.menu_seller_allmonth_view2 msgid "Seller's Revenues" -msgstr "" +msgstr "卖家收入" #. module: auction #: xsl:flagey.huissier:0 msgid "Price" -msgstr "" +msgstr "价格" #. module: auction #: rml:bids.phones.details:0 msgid "-" -msgstr "" +msgstr "-" #. module: auction -#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0 +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.vnd_bordereau:0 msgid "Subtotal:" msgstr "" @@ -1158,7 +1195,8 @@ msgid "Invoice Number" msgstr "" #. module: auction -#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0 +#: field:report.buyer.auction,date:0 +#: field:report.buyer.auction2,date:0 #: field:report.object.encoded,date:0 #: field:report.object.encoded.manager,date:0 #: field:report.seller.auction,date:0 @@ -1181,7 +1219,8 @@ msgid "Name" msgstr "" #. module: auction -#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0 +#: field:auction.deposit,name:0 +#: field:auction.lots,bord_vnd_id:0 #: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0 #: field:report.deposit.border,bord:0 #: field:report.unclassified.objects,bord_vnd_id:0 @@ -1209,7 +1248,7 @@ msgid "Login" msgstr "" #. module: auction -#: rml:buyer.list:0 xsl:report.auction.seller.list:0 +#: rml:buyer.list:0 msgid "To pay" msgstr "" @@ -1229,7 +1268,8 @@ msgid "Seller Form" msgstr "" #. module: auction -#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0 +#: field:auction.lots,lot_type:0 +#: field:report.unclassified.objects,lot_type:0 msgid "Object category" msgstr "" @@ -1298,7 +1338,8 @@ msgid "Payment's history" msgstr "" #. module: auction -#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0 +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.vnd_bordereau:0 msgid "Document" msgstr "" @@ -1370,7 +1411,8 @@ msgid "Cont. Art/Curiosa" msgstr "" #. module: auction -#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0 +#: field:auction.bid,auction_id:0 +#: field:auction.lots,auction_id:0 #: wizard_field:auction.lots.auction_move,init,auction_id:0 #: wizard_field:auction.lots.send.aie,date_ask,dates:0 #: wizard_field:auction.lots.send.aie,init,dates:0 @@ -1418,7 +1460,8 @@ msgid "Cont. Art/Jewelry" msgstr "" #. module: auction -#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0 +#: xsl:report.auction.deposit:0 +#: xsl:report.auction.vnd_bordereau:0 msgid "Inventory" msgstr "" @@ -1428,7 +1471,7 @@ msgid "Next Auctions" msgstr "" #. module: auction -#: rml:buyer.list:0 xsl:report.auction.seller.list:0 +#: rml:buyer.list:0 msgid "#" msgstr "" @@ -1530,7 +1573,7 @@ msgstr "" #: constraint:product.template:0 msgid "" "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "" +msgstr "错误:默认的计量单位和这货物的计量单位必须是同一类型." #. module: auction #: xsl:report.auction.vnd_bordereau:0 @@ -1558,14 +1601,15 @@ msgid "Buyer Journal" msgstr "" #. module: auction -#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0 +#: selection:auction.lots,state:0 #: selection:report.object.encoded,state:0 #: selection:report.unclassified.objects,state:0 msgid "Paid" msgstr "" #. module: auction -#: rml:bids.lots:0 rml:bids.phones.details:0 +#: rml:bids.lots:0 +#: rml:bids.phones.details:0 msgid "Phone" msgstr "" @@ -1596,8 +1640,7 @@ msgid "Antique/Sculpture, bronze, eso." msgstr "" #. module: auction -#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0 -#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0 +#: rml:buyer.list:0 msgid "Total:" msgstr "" @@ -1661,7 +1704,7 @@ msgstr "" #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "" +msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！" #. module: auction #: field:auction.deposit,transfer:0 @@ -1741,7 +1784,8 @@ msgid "Plate Number:" msgstr "" #. module: auction -#: view:auction.deposit:0 field:auction.deposit,lot_id:0 +#: view:auction.deposit:0 +#: field:auction.deposit,lot_id:0 #: model:ir.ui.menu,name:auction.auction_objects_menu msgid "Objects" msgstr "对象" @@ -1763,9 +1807,10 @@ msgid "Allow Negative Amount" msgstr "" #. module: auction -#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0 +#: rml:auction.bids:0 +#: view:auction.lots:0 +#: rml:auction.total.rml:0 #: model:ir.ui.menu,name:auction.auction_report_auction_menu -#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0 msgid "Auction" msgstr "" @@ -1775,12 +1820,17 @@ msgid "Cont. Art/Shows" msgstr "" #. module: auction -#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0 +#: field:auction.dates,name:0 +#: field:auction.lot.history,auction_id:0 #: field:report.auction.adjudication,name:0 -#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0 -#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0 -#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0 -#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0 +#: field:report.auction.view,auction_id:0 +#: field:report.auction.view2,auction:0 +#: field:report.auction.view2,date:0 +#: field:report.buyer.auction,auction:0 +#: field:report.buyer.auction2,auction:0 +#: field:report.seller.auction,auction:0 +#: field:report.seller.auction2,auction:0 +#: field:report.seller.auction2,date:0 #: field:report.unclassified.objects,auction:0 msgid "Auction date" msgstr "" @@ -1842,7 +1892,6 @@ msgstr "" #. module: auction #: field:report.attendance,total_attendance:0 -#: xsl:report.auction.ach_bordereau:0 msgid "Total" msgstr "" @@ -1932,7 +1981,8 @@ msgstr "" #. module: auction #: wizard_view:auction.lots.auction_move,init:0 -msgid "Warning, this will erase the object adjudication price and its buyer !" +msgid "" +"Warning, this will erase the object adjudication price and its buyer !" msgstr "" #. module: auction @@ -1956,14 +2006,16 @@ msgid "Income Account" msgstr "" #. module: auction -#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0 +#: field:auction.lots,net_revenue:0 +#: field:report.auction.view2,net_revenue:0 #: field:report.object.encoded.manager,net_revenue:0 #: field:report.seller.auction2,net_revenue:0 msgid "Net revenue" msgstr "" #. module: auction -#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0 +#: xsl:report.auction.deposit:0 +#: xsl:report.auction.lots.list.landscape:0 msgid "Limit" msgstr "" @@ -2035,7 +2087,8 @@ msgid "Closed" msgstr "" #. module: auction -#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0 +#: field:auction.lots,obj_comm:0 +#: field:report.unclassified.objects,obj_comm:0 msgid "Commission" msgstr "" @@ -2047,7 +2100,7 @@ msgstr "" #. module: auction #: constraint:res.partner:0 msgid "The VAT doesn't seem to be correct." -msgstr "" +msgstr "这增值税似乎不正确" #. module: auction #: field:report.attendance,employee_id:0 @@ -2055,7 +2108,8 @@ msgid "Employee" msgstr "" #. module: auction -#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0 +#: xsl:report.auction.ach_bordereau:0 +#: xsl:report.auction.vnd_bordereau:0 msgid "Adj.(EUR)" msgstr "" @@ -2067,7 +2121,7 @@ msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.auction_report_menu msgid "Reporting" -msgstr "报表" +msgstr "内部报表" #. module: auction #: view:auction.lots:0 @@ -2132,7 +2186,8 @@ msgid "Invoiced" msgstr "" #. module: auction -#: view:auction.lots:0 selection:auction.lots,state:0 +#: view:auction.lots:0 +#: selection:auction.lots,state:0 msgid "Taken away" msgstr "" @@ -2166,10 +2221,11 @@ msgstr "" #. module: auction #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "错误！您不能创建递归的相关成员。" #. module: auction -#: selection:auction.dates,state:0 selection:auction.lots,state:0 +#: selection:auction.dates,state:0 +#: selection:auction.lots,state:0 #: selection:report.auction.adjudication,state:0 #: selection:report.object.encoded,state:0 #: selection:report.seller.auction,state:0 @@ -2198,7 +2254,8 @@ msgid "Adj" msgstr "" #. module: auction -#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu +#: view:auction.dates:0 +#: model:ir.ui.menu,name:auction.auction_date_menu msgid "Auction Dates" msgstr "" @@ -2344,11 +2401,11 @@ msgid "Report Sign In/Out" msgstr "" #. module: auction -#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0 +#: view:auction.deposit:0 +#: field:auction.deposit,info:0 +#: view:auction.lots:0 #: wizard_field:auction.lots.numerotate,search,obj_desc:0 -#: rml:bids.phones.details:0 xsl:flagey.huissier:0 -#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0 -#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0 +#: rml:bids.phones.details:0 msgid "Description" msgstr "" @@ -2358,7 +2415,8 @@ msgid "Cont. Art/Arts" msgstr "" #. module: auction -#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0 +#: field:auction.lots,obj_price:0 +#: field:report.auction.view,adj_price:0 #: field:report.unclassified.objects,obj_price:0 msgid "Adjudication price" msgstr "" @@ -2420,7 +2478,8 @@ msgid "Pay objects" msgstr "" #. module: auction -#: view:report.object.encoded:0 view:report.object.encoded.manager:0 +#: view:report.object.encoded:0 +#: view:report.object.encoded.manager:0 msgid "# objects" msgstr "" @@ -2488,84 +2547,88 @@ msgstr "" #. module: auction #: view:board.board:0 msgid "Objects by day" -msgstr "天物品" +msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.menu_board_auction_manager msgid "Auction Manager" -msgstr "拍卖管理" +msgstr "" #. module: auction #: view:board.board:0 msgid "Summary pointing by user" -msgstr "每用户摘要指示" +msgstr "" #. module: auction #: model:ir.ui.menu,name:auction.menu_board_auction msgid "Auction Member" -msgstr "拍卖会员" +msgstr "" #. module: auction #: model:ir.actions.act_window,name:auction.open_board_auction msgid "Auction member board" -msgstr "拍卖会员控制台" +msgstr "" #. module: auction #: view:board.board:0 msgid "Auction manager " -msgstr "拍卖管理 " +msgstr "" #. module: auction #: model:ir.module.module,shortdesc:auction.module_meta_information msgid "Board for Auction" -msgstr "拍卖控制台" +msgstr "" #. module: auction #: view:board.board:0 msgid "Estimations/Adjudication" -msgstr "评价/最终结果" +msgstr "" #. module: auction #: view:board.board:0 msgid "Total Adjudications" -msgstr "最终结果合计" +msgstr "" #. module: auction #: view:board.board:0 msgid "Latest objects" -msgstr "最新的物品" +msgstr "" #. module: auction #: view:board.board:0 msgid "Latest deposits" -msgstr "最近的押金" +msgstr "" #. module: auction #: view:board.board:0 msgid "Menu" -msgstr "菜单" +msgstr "" #. module: auction #: view:board.board:0 msgid "My objects By Day" -msgstr "每天我的物品" +msgstr "" #. module: auction #: view:board.board:0 msgid "My board" -msgstr "我的控制台" +msgstr "" #. module: auction #: model:ir.actions.act_window,name:auction.open_board_auction_manager msgid "Auction manager board" -msgstr "拍卖管理控制台" +msgstr "" #. module: auction #: view:board.board:0 msgid "Min/Adj/Max" -msgstr "最少/邻近/最大" +msgstr "" #. module: auction #: view:board.board:0 msgid "My Latest Objects" -msgstr "我最后的物品" +msgstr "" + +#, python-format +#~ msgid "The Buyer \"%s\" has no Invoice Address." +#~ msgstr "نىڭ رۇخسەت ئادېرىسى يوق \"%s\" ساتقۇچى تەرەپ" diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po index 426fb570629..5f5320fbf33 100644 --- a/addons/base_contact/i18n/ru.po +++ b/addons/base_contact/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-07-08 15:37+0000\n" -"Last-Translator: Pomazan Bogdan \n" +"PO-Revision-Date: 2010-07-14 08:08+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2010-07-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact @@ -67,7 +67,7 @@ msgstr "Имя" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_job msgid "Contact Partner Function" -msgstr "" +msgstr "Функции сотрудника партнера" #. module: base_contact #: field:res.partner.job,other:0 @@ -122,7 +122,7 @@ msgstr "Телефон" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_contacttofunction0 msgid "Defines contacts and functions." -msgstr "" +msgstr "Определить контакты и функции" #. module: base_contact #: field:res.partner.contact,title:0 @@ -196,7 +196,7 @@ msgstr "Категории" #. module: base_contact #: field:res.partner.contact,function_id:0 msgid "Main Function" -msgstr "" +msgstr "Личная функция" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 @@ -211,12 +211,12 @@ msgstr "Неправильный XML для просмотра архитект #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 msgid "Base Contact Process" -msgstr "" +msgstr "Основной контакт" #. module: base_contact #: view:res.partner.contact:0 msgid "Seq." -msgstr "" +msgstr "Посл-ть" #. module: base_contact #: field:res.partner.job,extension:0 @@ -272,7 +272,7 @@ msgstr "Основной работодатель" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_functiontoaddress0 msgid "Function to address" -msgstr "" +msgstr "Адрес функции" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po index 06bf1c04a8e..b191fa95feb 100644 --- a/addons/base_module_record/i18n/ru.po +++ b/addons/base_module_record/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-16 13:36+0000\n" +"PO-Revision-Date: 2010-07-14 08:10+0000\n" "Last-Translator: Nikolay Chesnokov \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: 2010-06-22 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record @@ -32,7 +32,7 @@ msgstr "Информация" #. module: base_module_record #: model:ir.model,name:base_module_record.model_ir_module_record msgid "ir.module.record" -msgstr "" +msgstr "Системный модуль записи" #. module: base_module_record #: constraint:ir.model:0 diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po index 7c5d4087cc2..4c7ab9930f4 100644 --- a/addons/hr_contract/i18n/ru.po +++ b/addons/hr_contract/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-08 19:44+0000\n" -"Last-Translator: Vadim Peretokin \n" +"PO-Revision-Date: 2010-07-14 08:14+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2010-06-22 04:13+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_contract @@ -38,7 +38,7 @@ msgstr "" #: view:hr.contract:0 #: view:hr.employee:0 msgid "Generalities" -msgstr "" +msgstr "Общее положение" #. module: hr_contract #: field:hr.employee,children:0 @@ -73,7 +73,7 @@ msgstr "Сумма на руки" #. module: hr_contract #: model:ir.module.module,shortdesc:hr_contract.module_meta_information msgid "Human Resources Contracts" -msgstr "" +msgstr "Договор с содрудником" #. module: hr_contract #: field:hr.contract.wage.type.period,factor_days:0 @@ -189,7 +189,7 @@ msgstr "Зарплатный период" #. module: hr_contract #: field:hr.employee,audiens_num:0 msgid "AUDIENS Number" -msgstr "" +msgstr "Номер посещения" #. module: hr_contract #: view:hr.contract:0 diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po index 8b9ce974399..82fb3aa107c 100644 --- a/addons/multi_company/i18n/ru.po +++ b/addons/multi_company/i18n/ru.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-08 11:46+0000\n" -"PO-Revision-Date: 2010-07-07 22:52+0000\n" -"Last-Translator: Pomazan Bogdan \n" +"PO-Revision-Date: 2010-07-14 08:17+0000\n" +"Last-Translator: Nikolay Chesnokov \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: 2010-07-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-15 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: multi_company @@ -35,6 +35,7 @@ msgstr "" msgid "" "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Ошибка. ЕИМ по умолчанию и закупочная ЕИМ должны иметь одинаковую категорию." #. module: multi_company #: constraint:res.partner:0 @@ -115,7 +116,7 @@ msgstr "Ошибка. UOS и UOM должны принадлежать к раз #. module: multi_company #: model:product.category,name:multi_company.Odoo1 msgid "Odoo Offers" -msgstr "" +msgstr "Предложения Odoo" #. module: multi_company #: constraint:res.company:0 @@ -155,7 +156,7 @@ msgstr "Выражение" #. module: multi_company #: model:product.template,name:multi_company.product_product_odoo1_product_template msgid "Odoo Offer" -msgstr "" +msgstr "Предложение Odoo" #. module: multi_company #: field:multi_company.default,sequence:0 From 27a3dc94188534ee7034d53b4e0f9c9b08f90ceb Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 15 Jul 2010 11:17:56 +0530 Subject: [PATCH 08/30] [IMP] scrum: Rename scrum to project_scrum and rename all the object accordinglly bzr revid: psi@tinyerp.co.in-20100715054756-loyjd9bhda0xq125 --- addons/{scrum => project_scrum}/__init__.py | 6 +- .../{scrum => project_scrum}/__openerp__.py | 16 ++--- .../board_project_scrum_view.xml} | 10 ++-- addons/{scrum => project_scrum}/i18n/ar.po | 0 addons/{scrum => project_scrum}/i18n/bg.po | 0 addons/{scrum => project_scrum}/i18n/bs.po | 0 addons/{scrum => project_scrum}/i18n/ca.po | 0 addons/{scrum => project_scrum}/i18n/cs.po | 0 addons/{scrum => project_scrum}/i18n/de.po | 0 addons/{scrum => project_scrum}/i18n/es.po | 0 addons/{scrum => project_scrum}/i18n/es_AR.po | 0 addons/{scrum => project_scrum}/i18n/et.po | 0 addons/{scrum => project_scrum}/i18n/fr.po | 0 addons/{scrum => project_scrum}/i18n/hr.po | 0 addons/{scrum => project_scrum}/i18n/hu.po | 0 addons/{scrum => project_scrum}/i18n/id.po | 0 addons/{scrum => project_scrum}/i18n/it.po | 0 addons/{scrum => project_scrum}/i18n/ko.po | 0 addons/{scrum => project_scrum}/i18n/lt.po | 0 addons/{scrum => project_scrum}/i18n/nl.po | 0 addons/{scrum => project_scrum}/i18n/nl_BE.po | 0 addons/{scrum => project_scrum}/i18n/pl.po | 0 addons/{scrum => project_scrum}/i18n/pt.po | 0 addons/{scrum => project_scrum}/i18n/pt_BR.po | 0 addons/{scrum => project_scrum}/i18n/ro.po | 0 addons/{scrum => project_scrum}/i18n/ru.po | 0 .../{scrum => project_scrum}/i18n/scrum.pot | 0 addons/{scrum => project_scrum}/i18n/sl.po | 0 addons/{scrum => project_scrum}/i18n/sq.po | 0 addons/{scrum => project_scrum}/i18n/sv.po | 0 addons/{scrum => project_scrum}/i18n/tlh.po | 0 addons/{scrum => project_scrum}/i18n/tr.po | 0 addons/{scrum => project_scrum}/i18n/uk.po | 0 addons/{scrum => project_scrum}/i18n/vi.po | 0 addons/{scrum => project_scrum}/i18n/zh_CN.po | 0 addons/{scrum => project_scrum}/i18n/zh_TW.po | 0 .../process/project_scrum_process.xml} | 20 +++---- .../project_scrum.py} | 52 ++++++++-------- .../project_scrum_demo.xml} | 58 +++++++++--------- .../project_scrum_report.xml} | 2 +- .../project_scrum_view.xml} | 59 ++++++++++--------- .../report/__init__.py | 0 .../report/_burndown.py | 0 .../report/sprint_burndown.py | 4 +- .../report/task_burndown.py | 0 .../security/ir.model.access.csv | 9 +++ .../wizard/__init__.py | 6 +- .../project_scrum_backlog_create_task.py} | 4 +- ...roject_scrum_backlog_create_task_view.xml} | 12 ++-- .../wizard/project_scrum_backlog_merger.py} | 12 ++-- .../project_scrum_backlog_merger_view.xml} | 10 ++-- .../wizard/project_scrum_backlog_sprint.py} | 8 +-- .../project_scrum_backlog_sprint_view.xml} | 10 ++-- addons/scrum/security/ir.model.access.csv | 9 --- 54 files changed, 155 insertions(+), 152 deletions(-) rename addons/{scrum => project_scrum}/__init__.py (96%) rename addons/{scrum => project_scrum}/__openerp__.py (85%) rename addons/{scrum/board_scrum_view.xml => project_scrum/board_project_scrum_view.xml} (87%) rename addons/{scrum => project_scrum}/i18n/ar.po (100%) rename addons/{scrum => project_scrum}/i18n/bg.po (100%) rename addons/{scrum => project_scrum}/i18n/bs.po (100%) rename addons/{scrum => project_scrum}/i18n/ca.po (100%) rename addons/{scrum => project_scrum}/i18n/cs.po (100%) rename addons/{scrum => project_scrum}/i18n/de.po (100%) rename addons/{scrum => project_scrum}/i18n/es.po (100%) rename addons/{scrum => project_scrum}/i18n/es_AR.po (100%) rename addons/{scrum => project_scrum}/i18n/et.po (100%) rename addons/{scrum => project_scrum}/i18n/fr.po (100%) rename addons/{scrum => project_scrum}/i18n/hr.po (100%) rename addons/{scrum => project_scrum}/i18n/hu.po (100%) rename addons/{scrum => project_scrum}/i18n/id.po (100%) rename addons/{scrum => project_scrum}/i18n/it.po (100%) rename addons/{scrum => project_scrum}/i18n/ko.po (100%) rename addons/{scrum => project_scrum}/i18n/lt.po (100%) rename addons/{scrum => project_scrum}/i18n/nl.po (100%) rename addons/{scrum => project_scrum}/i18n/nl_BE.po (100%) rename addons/{scrum => project_scrum}/i18n/pl.po (100%) rename addons/{scrum => project_scrum}/i18n/pt.po (100%) rename addons/{scrum => project_scrum}/i18n/pt_BR.po (100%) rename addons/{scrum => project_scrum}/i18n/ro.po (100%) rename addons/{scrum => project_scrum}/i18n/ru.po (100%) rename addons/{scrum => project_scrum}/i18n/scrum.pot (100%) rename addons/{scrum => project_scrum}/i18n/sl.po (100%) rename addons/{scrum => project_scrum}/i18n/sq.po (100%) rename addons/{scrum => project_scrum}/i18n/sv.po (100%) rename addons/{scrum => project_scrum}/i18n/tlh.po (100%) rename addons/{scrum => project_scrum}/i18n/tr.po (100%) rename addons/{scrum => project_scrum}/i18n/uk.po (100%) rename addons/{scrum => project_scrum}/i18n/vi.po (100%) rename addons/{scrum => project_scrum}/i18n/zh_CN.po (100%) rename addons/{scrum => project_scrum}/i18n/zh_TW.po (100%) rename addons/{scrum/process/scrum_process.xml => project_scrum/process/project_scrum_process.xml} (84%) rename addons/{scrum/scrum.py => project_scrum/project_scrum.py} (90%) rename addons/{scrum/scrum_demo.xml => project_scrum/project_scrum_demo.xml} (90%) rename addons/{scrum/scrum_report.xml => project_scrum/project_scrum_report.xml} (62%) rename addons/{scrum/scrum_view.xml => project_scrum/project_scrum_view.xml} (93%) rename addons/{scrum => project_scrum}/report/__init__.py (100%) rename addons/{scrum => project_scrum}/report/_burndown.py (100%) rename addons/{scrum => project_scrum}/report/sprint_burndown.py (94%) rename addons/{scrum => project_scrum}/report/task_burndown.py (100%) create mode 100644 addons/project_scrum/security/ir.model.access.csv rename addons/{scrum => project_scrum}/wizard/__init__.py (90%) rename addons/{scrum/wizard/scrum_backlog_create_task.py => project_scrum/wizard/project_scrum_backlog_create_task.py} (95%) rename addons/{scrum/wizard/scrum_backlog_create_task_view.xml => project_scrum/wizard/project_scrum_backlog_create_task_view.xml} (77%) rename addons/{scrum/wizard/scrum_backlog_merger.py => project_scrum/wizard/project_scrum_backlog_merger.py} (93%) rename addons/{scrum/wizard/scrum_backlog_merger_view.xml => project_scrum/wizard/project_scrum_backlog_merger_view.xml} (86%) rename addons/{scrum/wizard/scrum_backlog_sprint.py => project_scrum/wizard/project_scrum_backlog_sprint.py} (92%) rename addons/{scrum/wizard/scrum_backlog_sprint_view.xml => project_scrum/wizard/project_scrum_backlog_sprint_view.xml} (80%) delete mode 100644 addons/scrum/security/ir.model.access.csv diff --git a/addons/scrum/__init__.py b/addons/project_scrum/__init__.py similarity index 96% rename from addons/scrum/__init__.py rename to addons/project_scrum/__init__.py index 204f3abd3f8..ab85f618822 100644 --- a/addons/scrum/__init__.py +++ b/addons/project_scrum/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,11 +15,11 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## -import scrum +import project_scrum import report import wizard diff --git a/addons/scrum/__openerp__.py b/addons/project_scrum/__openerp__.py similarity index 85% rename from addons/scrum/__openerp__.py rename to addons/project_scrum/__openerp__.py index ef552090c67..c42908ff50a 100644 --- a/addons/scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -51,15 +51,15 @@ 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', - 'scrum_report.xml', - 'wizard/scrum_backlog_create_task_view.xml', - 'scrum_view.xml', - 'process/scrum_process.xml', - 'wizard/scrum_backlog_sprint_view.xml', - 'wizard/scrum_backlog_merger_view.xml', - "board_scrum_view.xml", + 'project_scrum_report.xml', + 'wizard/project_scrum_backlog_create_task_view.xml', + 'project_scrum_view.xml', + 'process/project_scrum_process.xml', + 'wizard/project_scrum_backlog_sprint_view.xml', + 'wizard/project_scrum_backlog_merger_view.xml', + "board_project_scrum_view.xml", ], - 'demo_xml': ['scrum_demo.xml'], + 'demo_xml': ['project_scrum_demo.xml'], 'installable': True, 'active': False, 'certificate': '0084121063261', diff --git a/addons/scrum/board_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml similarity index 87% rename from addons/scrum/board_scrum_view.xml rename to addons/project_scrum/board_project_scrum_view.xml index 5184aefa79c..3889e8f7af3 100644 --- a/addons/scrum/board_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -2,8 +2,8 @@ - scrum.sprint.dashboard.tree - scrum.sprint + project.scrum.sprint.dashboard.tree + project.scrum.sprint tree @@ -14,21 +14,21 @@ - + + + Forward to Partner crm.lead.forward.to.partner form form + new diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index bc2b5357c15..02acee1c1d2 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -49,7 +49,7 @@ class crm_send_new_email(osv.osv_memory): 'email_cc' : fields.char('CC', size=512, help="Carbon Copy: list of recipients that will receive"\ " a copy of this mail, and future communication related to this case"), 'subject': fields.char('Subject', size=512, required=True), - 'text': fields.text('Message', required=True), + 'body': fields.text('Message Body', required=True), 'state': fields.selection(crm.AVAILABLE_STATES, string='Set New State To', required=True), 'attachment_ids' : fields.one2many('crm.send.mail.attachment', 'wizard_id'), } @@ -68,10 +68,10 @@ class crm_send_new_email(osv.osv_memory): if not context: context = {} - if not context.get('model'): + if not context.get('active_model'): raise osv.except_osv(_('Error'), _('Can not send mail!')) - model = context.get('model') + model = context.get('active_model') case_pool = self.pool.get(model) res_id = context and context.get('active_id', False) or False @@ -91,16 +91,16 @@ class crm_send_new_email(osv.osv_memory): hist = hist_obj.browse(cr, uid, res_id) message_id = hist.message_id model = hist.model - model_pool = self.pool.get(model) + case_pool = self.pool.get(model) res_id = hist.res_id ref_id = hist.ref_id - case = model_pool.browse(cr, uid, res_id) + case = case_pool.browse(cr, uid, res_id) emails = [obj.email_to] email_cc = obj.email_cc and obj.email_cc.split(',') or '' emails = filter(None, emails) - body = obj.text + body = obj.body - body = case_pool.format_body(body) + body = body and tools.ustr(body) or '' email_from = getattr(obj, 'email_from', False) x_headers = {} if message_id: @@ -124,7 +124,7 @@ class crm_send_new_email(osv.osv_memory): case_pool.history(cr, uid, [case], _('Send'), history=True, \ email=obj.email_to, details=body, \ subject=obj.subject, email_from=email_from, \ - email_cc=email_cc, message_id=message_id, \ + email_cc=', '.join(email_cc), message_id=message_id, \ references=ref_id or message_id, attach=attach) if obj.state == 'unchanged': pass @@ -145,7 +145,7 @@ class crm_send_new_email(osv.osv_memory): if not context: context = {} - if not context.get('model'): + if not context.get('active_model'): raise osv.except_osv(_('Error'), _('Can not send mail!')) res = super(crm_send_new_email, self).default_get(cr, uid, fields, context=context) @@ -154,7 +154,7 @@ class crm_send_new_email(osv.osv_memory): res.update(self.get_reply_defaults(cr, uid, fields, context=context)) return res - model = context.get('model') + model = context.get('active_model') mod_obj = self.pool.get(model) res_id = context and context.get('active_ids', []) or [] @@ -172,8 +172,8 @@ class crm_send_new_email(osv.osv_memory): res.update({'subject': tools.ustr(context.get('subject', case.name) or '')}) if 'email_cc' in fields: res.update({'email_cc': tools.ustr(case.email_cc or '')}) - if 'text' in fields: - res.update({'text': u'\n'+(tools.ustr(case.user_id.signature or ''))}) + if 'body' in fields: + res.update({'body': u'\n'+(tools.ustr(case.user_id.signature or ''))}) if 'state' in fields: res.update({'state': u'pending'}) @@ -209,7 +209,7 @@ class crm_send_new_email(osv.osv_memory): signature = u'\n' + (tools.ustr(case.user_id.signature or '')) + u'\n' original = [signature] - if include_original == True and 'text' in fields: + if include_original == True and 'body' in fields: header = u'-------- Original Message --------' sender = u'From: %s' %(tools.ustr(hist.email_from or '')) to = u'To: %s' % (tools.ustr(hist.email_to or '')) @@ -218,10 +218,14 @@ class crm_send_new_email(osv.osv_memory): original = [signature, header, sender, to, sentdate, desc] - res['text']= u'\n' + u'\n'.join(original) + res['body']= u'\n' + u'\n'.join(original) if 'subject' in fields: res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))}) + if 'email_cc' in fields: + res.update({'email_cc': case.email_cc and tools.ustr(case.email_cc) or False}) + if 'reply_to' in fields: + res.update({'reply_to': case.section_id.reply_to}) if 'state' in fields: res['state'] = u'pending' return res @@ -239,7 +243,7 @@ class crm_send_new_email(osv.osv_memory): if not context: context = {} - if not context.get('model'): + if not context.get('active_model'): raise osv.except_osv(_('Error'), _('Can not send mail!')) return True diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml index df7218cbc02..aac7d854b88 100644 --- a/addons/crm/wizard/crm_send_email_view.xml +++ b/addons/crm/wizard/crm_send_email_view.xml @@ -9,7 +9,7 @@ crm.send.mail form -
+ @@ -19,7 +19,7 @@ - + @@ -46,7 +46,7 @@ - Send New Mail + Send Mail crm.send.mail form form @@ -77,7 +77,7 @@ - +