diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 3a0f889d931..01a7b60aedd 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -797,7 +797,7 @@ class account_move_line(osv.osv): title = self.view_header_get(cr, uid, view_id, view_type, context) xml = '''\n\n\t''' % (title) journal_pool = self.pool.get('account.journal') - + ids = journal_pool.search(cr, uid, []) journals = journal_pool.browse(cr, uid, ids) all_journal = [None] @@ -814,14 +814,14 @@ class account_move_line(osv.osv): else: fields.get(field.field).append(journal.id) common_fields[field.field] = common_fields[field.field] + 1 - + fld.append(('period_id', 3)) fld.append(('journal_id', 10)) flds.append('period_id') flds.append('journal_id') fields['period_id'] = all_journal fields['journal_id'] = all_journal - + from operator import itemgetter fld = sorted(fld, key=itemgetter(1)) @@ -835,13 +835,13 @@ class account_move_line(osv.osv): for field_it in fld: field = field_it[0] - + if common_fields.get(field) == total: fields.get(field).append(None) - + if field=='state': state = 'colors="red:state==\'draft\'"' - + attrs = [] if field == 'debit': attrs.append('sum="Total debit"') @@ -864,7 +864,7 @@ class account_move_line(osv.osv): if field in widths: attrs.append('width="'+str(widths[field])+'"') - + attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field))) xml += '''\n''' % (field,' '.join(attrs)) @@ -914,7 +914,7 @@ class account_move_line(osv.osv): journal = self.pool.get('account.journal').browse(cr, uid, [journal_id])[0] if journal.allow_date and period_id: period = self.pool.get('account.period').browse(cr, uid, [period_id])[0] - if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'): + if not time.strptime(vals['date'][:10],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'][:10],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'): raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !')) else: return True diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 6f1cac05102..b14f3d2ed68 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -127,10 +127,10 @@ - + - + - + - + - - - - - - - - - - - - - - + - + + + + + - - - - - - - + + + + + + + - - - + + @@ -227,25 +213,32 @@ - + + + - [[ repeatIn(objects,'o') ]] - [[ setLang(o.partner_id.lang) ]] + [[ setLang(o.partner_id.lang) ]] - - [[ o.partner_id.name ]] [[ o.partner_id.title or '' ]] + + + + + + [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] [[ o.address_invoice_id.street ]] [[ o.address_invoice_id.street2 or '' ]] [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]] [[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]] [[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]] - + + + Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]] Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]] VAT : [[ o.partner_id.vat or removeParentNode('para') ]] @@ -255,168 +248,278 @@ Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]] PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]] Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] + Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]] Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]] Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]] Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]] - + + + - Document - Invoice Date - Partner Ref. + + Document + + + Invoice Date + + + Partner Ref. + - [[ o.name ]] - [[ formatLang(o.date_invoice,date=True) ]] - [[ o.address_invoice_id.partner_id.ref or '' ]] + + [[ o.name ]] + + + [[ formatLang(o.date_invoice,date=True) ]] + + + [[ o.address_invoice_id.partner_id.ref or '' ]] + - - - + + + + - Description - Taxes - Quantity - Unit Price - Disc.(%) - Price + + Description + + + Taxes + + + Quantity + + + Unit Price + + + Disc.(%) + + + Price +
[[ repeatIn(o.invoice_line,'l') ]] - + - [[ l.name ]] - [[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]] - [[ formatLang(l.quantity)]] - [[ (l.uos_id and l.uos_id.name) or '' ]] - [[ formatLang(l.price_unit) ]] - [[ formatLang(l.discount) ]] - [[ formatLang(l.price_subtotal) ]] - [[ o.currency_id.code ]] + + [[ l.name ]] + + + [[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]] + + + [[ formatLang(l.quantity)]] + + + [[ (l.uos_id and l.uos_id.name) or '' ]] + + + [[ formatLang(l.price_unit) ]] + + + [[ formatLang(l.discount) ]] + + + [[ formatLang(l.price_subtotal) ]] + + + [[ o.currency_id.code ]] + - [[ format(l.note) or removeParentNode('tr') ]] - - - - - - - + + [[ format(l.note or '') or removeParentNode('tr') ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + - - + + + + + + + + + + - + - Net Total: - [[ formatLang(o.amount_untaxed) ]] - [[ o.currency_id.code ]] + + Net Total: + + + [[ formatLang(o.amount_untaxed) ]] + + + [[ o.currency_id.code ]] + - + + + + - Taxes: - [[ formatLang(o.amount_tax) ]] - [[ o.currency_id.code ]] + + Taxes: + + + [[ formatLang(o.amount_tax) ]] + + + [[ o.currency_id.code ]] + - + + + + - Total: - [[ formatLang(o.amount_total) ]] - [[ o.currency_id.code ]] + + Total: + + + [[ formatLang(o.amount_total) ]] + + + [[ o.currency_id.code ]] + - + - + - Tax - Base - Amount + + Tax + + + Base + + + Amount + + + + + + + + + + + [[ repeatIn(o.tax_line,'t') ]] + + + + [[ t.name ]] + + + [[ formatLang(t.base) ]] + + + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] + - [[ repeatIn(o.tax_line,'t') ]] - - - [[ t.name ]] - [[ formatLang(t.base) ]] - [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]] - - + + + + + - - - - - - - + [[ format(o.comment or '') or removeParentNode('blockTable') ]] - + - - + + [[ format((o.payment_term and o.payment_term.note) or '') or removeParentNode('blockTable') ]] + - - - [[ format(o.comment or removeParentNode('blockTable')) ]] - - - - - - - - [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]] - - - - - - + Fiscal Position Remark : - [[ format(o.fiscal_position and o.fiscal_position.note or removeParentNode('blockTable')) ]] + [[ format((o.fiscal_position and o.fiscal_position.note) or '') or removeParentNode('blockTable') ]] - - - - - - + + + + + diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index 5aefa0abc96..7d47d46f926 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -53,6 +53,7 @@ 'account_followup_data.xml' ], 'demo_xml': ['account_followup_demo.xml'], + 'test': ['test/account_followup.yml'], 'installable': True, 'active': False, 'certificate': '0072481076453', diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po index 743bf14ab02..71790c25bb9 100644 --- a/addons/account_invoice_layout/i18n/ru.po +++ b/addons/account_invoice_layout/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: 2008-11-03 17:56+0000\n" -"Last-Translator: Sergei Kostigoff \n" +"PO-Revision-Date: 2010-07-11 09:01+0000\n" +"Last-Translator: Pomazan Bogdan \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:11+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout @@ -48,7 +48,7 @@ msgstr "Название" #. module: account_invoice_layout #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message msgid "Invoices with Layout and Message" -msgstr "" +msgstr "Счет-фактура с макетом и сообщением" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -119,7 +119,7 @@ msgstr "Ссылка на клиента:" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid ")" -msgstr "" +msgstr ")" #. module: account_invoice_layout #: field:account.invoice.line,state:0 @@ -209,7 +209,7 @@ msgstr "Продукт" #. module: account_invoice_layout #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1 msgid "Invoices with Layout" -msgstr "" +msgstr "Счет-фактура с макетом" #. module: account_invoice_layout #: rml:account.invoice.layout:0 diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po index 448159269a0..bf83119b853 100644 --- a/addons/account_payment/i18n/ru.po +++ b/addons/account_payment/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: 2008-11-03 18:51+0000\n" -"Last-Translator: Sergei Kostigoff \n" +"PO-Revision-Date: 2010-07-11 09:03+0000\n" +"Last-Translator: Pomazan Bogdan \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:10+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -39,7 +39,7 @@ msgstr "" #. module: account_payment #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_payment #: view:payment.line:0 @@ -283,7 +283,7 @@ msgstr "" #. module: account_payment #: field:payment.line,communication:0 msgid "Communication" -msgstr "" +msgstr "Связь" #. module: account_payment #: selection:payment.order,date_prefered:0 @@ -309,7 +309,7 @@ msgstr "" #: view:payment.type:0 #: help:payment.type,name:0 msgid "Payment Type" -msgstr "" +msgstr "Способ оплаты" #. module: account_payment #: help:payment.line,amount_currency:0 @@ -526,7 +526,7 @@ msgstr "" #. module: account_payment #: field:payment.line,company_currency:0 msgid "Company Currency" -msgstr "" +msgstr "Валюта компании" #. module: account_payment #: model:ir.ui.menu,name:account_payment.menu_main diff --git a/addons/account_payment/test/account_payment.yml b/addons/account_payment/test/account_payment.yml index f24ad4dc443..3379ebe9003 100644 --- a/addons/account_payment/test/account_payment.yml +++ b/addons/account_payment/test/account_payment.yml @@ -1,8 +1,5 @@ - - In order to test account_payment in OpenERP I create a new record Type -- -- - Creating a payment.type record + In order to test account_payment in OpenERP I create a new record Type. - !record {model: payment.type, id: payment_type_t0}: code: T0 @@ -127,19 +124,3 @@ - state == 'done' - - - - - - - - - - - - - - - - diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po index 83ba2a80dea..35c3707987d 100644 --- a/addons/account_voucher/i18n/ru.po +++ b/addons/account_voucher/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-11-09 16:29+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-07-11 09:15+0000\n" +"Last-Translator: Pomazan Bogdan \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:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher @@ -36,12 +36,12 @@ msgstr "" #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "State :" -msgstr "" +msgstr "Статус:" #. module: account_voucher #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -61,7 +61,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,company_id:0 msgid "Company" -msgstr "" +msgstr "Компания" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -69,17 +69,17 @@ msgstr "" #: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form msgid "Journal Voucher" -msgstr "" +msgstr "Журнальный ваучер" #. module: account_voucher #: rml:voucher.cash_receipt.drcr:0 msgid "," -msgstr "" +msgstr "," #. module: account_voucher #: view:account.voucher:0 msgid "Set to Draft" -msgstr "" +msgstr "Установить в 'Черновик'" #. module: account_voucher #: wizard_button:account.voucher.open,init,open:0 @@ -94,13 +94,13 @@ msgstr "" #. module: account_voucher #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "Всего кредит" #. module: account_voucher #: field:account.voucher,account_id:0 #: field:account.voucher.line,account_id:0 msgid "Account" -msgstr "" +msgstr "Счет" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -110,7 +110,7 @@ msgstr "" #. module: account_voucher #: field:account.account,level:0 msgid "Level" -msgstr "" +msgstr "Уровень" #. module: account_voucher #: view:account.move:0 @@ -120,14 +120,14 @@ msgstr "Проводка по счету" #. module: account_voucher #: view:account.move:0 msgid "Total Debit" -msgstr "" +msgstr "Всего дебет" #. module: account_voucher #: field:account.voucher,amount:0 #: field:account.voucher.line,amount:0 #: rml:voucher.cash_amount:0 msgid "Amount" -msgstr "" +msgstr "Количество" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -150,7 +150,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher.line,account_analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Счет аналитического учета" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -189,18 +189,18 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Create" -msgstr "" +msgstr "Создать" #. module: account_voucher #: selection:account.account,type1:0 #: selection:account.account.template,type1:0 msgid "None" -msgstr "" +msgstr "Отсутствует" #. module: account_voucher #: field:account.voucher,number:0 msgid "Number" -msgstr "" +msgstr "Номер" #. module: account_voucher #: view:account.move:0 @@ -215,13 +215,13 @@ msgstr "Состояние" #: selection:account.voucher.line,type:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Debit" -msgstr "" +msgstr "Дебет" #. module: account_voucher #: field:account.voucher,type:0 #: field:account.voucher.line,type:0 msgid "Type" -msgstr "" +msgstr "Тип" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list @@ -245,7 +245,7 @@ msgstr "" #: field:account.voucher.line,voucher_id:0 #: model:res.request.link,name:account_voucher.req_link_voucher msgid "Voucher" -msgstr "" +msgstr "Товарный чек" #. module: account_voucher #: wizard_view:account.voucher.open,init:0 @@ -273,7 +273,7 @@ msgstr "" #: field:account.voucher,partner_id:0 #: field:account.voucher.line,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Партнер" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form @@ -289,7 +289,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Валюта" #. module: account_voucher #: view:account.move:0 @@ -317,7 +317,7 @@ msgstr "" #. module: account_voucher #: field:account.account,open_bal:0 msgid "Opening Balance" -msgstr "" +msgstr "Начальное сальдо" #. module: account_voucher #: selection:account.voucher,state:0 @@ -325,13 +325,13 @@ msgstr "" #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Draft" -msgstr "" +msgstr "Черновик" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "PRO-FORMA" -msgstr "" +msgstr "Проформа" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list @@ -356,13 +356,13 @@ msgstr "" #. module: account_voucher #: field:account.voucher,date:0 msgid "Date" -msgstr "" +msgstr "Дата" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid ":" -msgstr "" +msgstr ":" #. module: account_voucher #: field:account.account,type1:0 @@ -387,7 +387,7 @@ msgstr "" #: selection:account.voucher.line,type:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Credit" -msgstr "" +msgstr "Кредит" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -398,7 +398,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,reference_type:0 msgid "Reference Type" -msgstr "" +msgstr "Тип ссылки" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_voucher @@ -408,7 +408,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,period_id:0 msgid "Period" -msgstr "" +msgstr "Период" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list @@ -423,7 +423,7 @@ msgstr "Общая информация" #. module: account_voucher #: wizard_field:account.voucher.open,init,period_ids:0 msgid "Periods" -msgstr "" +msgstr "Периоды" #. module: account_voucher #: view:account.voucher:0 @@ -431,14 +431,14 @@ msgstr "" #: wizard_button:account.voucher.open,init,end:0 #: selection:account.voucher.open,init,state:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: account_voucher #: view:account.voucher:0 #: selection:account.voucher,state:0 #: selection:account.voucher.open,init,state:0 msgid "Pro-forma" -msgstr "" +msgstr "Проформа" #. module: account_voucher #: constraint:ir.model:0 @@ -451,7 +451,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Other Info" -msgstr "" +msgstr "Прочая информация" #. module: account_voucher #: model:ir.module.module,shortdesc:account_voucher.module_meta_information @@ -472,13 +472,13 @@ msgstr "" #. module: account_voucher #: field:account.voucher.line,name:0 msgid "Description" -msgstr "" +msgstr "Описание" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Canceled" -msgstr "" +msgstr "Отменено" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -493,13 +493,13 @@ msgstr "" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list msgid "Bank Receipt" -msgstr "" +msgstr "Квитанция банка" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "-" -msgstr "" +msgstr "-" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -518,7 +518,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher.line,ref:0 msgid "Ref." -msgstr "" +msgstr "Ссылка" #. module: account_voucher #: selection:account.voucher,state:0 @@ -526,12 +526,12 @@ msgstr "" #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Posted" -msgstr "" +msgstr "Проведено" #. module: account_voucher #: field:account.voucher,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: account_voucher #: field:account.voucher,move_ids:0 @@ -546,12 +546,12 @@ msgstr "" #. module: account_voucher #: field:account.voucher,move_id:0 msgid "Account Entry" -msgstr "" +msgstr "Проводка по счету" #. module: account_voucher #: view:account.voucher:0 msgid "Entry Lines" -msgstr "" +msgstr "Строки проводок" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form @@ -597,4 +597,4 @@ msgstr "" #: field:account.account,journal_id:0 #: field:account.voucher,journal_id:0 msgid "Journal" -msgstr "" +msgstr "Журнал" diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po index 1b8c3fac862..8ed33f027b8 100644 --- a/addons/analytic_journal_billing_rate/i18n/ru.po +++ b/addons/analytic_journal_billing_rate/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-02-03 08:33+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-07-11 09:18+0000\n" +"Last-Translator: Pomazan Bogdan \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-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate @@ -24,7 +24,7 @@ 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 @@ -42,7 +42,7 @@ 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 diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po index 88479f08b1a..b1e9cebc14a 100644 --- a/addons/audittrail/i18n/ru.po +++ b/addons/audittrail/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-02-03 12:33+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-07-11 09:27+0000\n" +"Last-Translator: Pomazan Bogdan \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:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail @@ -32,12 +32,12 @@ msgstr "" #. module: audittrail #: field:audittrail.log.line,log_id:0 msgid "Log" -msgstr "" +msgstr "Журнал" #. module: audittrail #: selection:audittrail.rule,state:0 msgid "Subscribed" -msgstr "" +msgstr "Подписка" #. module: audittrail #: view:audittrail.log:0 @@ -47,7 +47,7 @@ msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Create" -msgstr "" +msgstr "Создать" #. module: audittrail #: wizard_view:audittrail.view.log,init:0 @@ -57,27 +57,27 @@ msgstr "" #. module: audittrail #: field:audittrail.rule,state:0 msgid "State" -msgstr "" +msgstr "Состояние" #. module: audittrail #: selection:audittrail.rule,state:0 msgid "Draft" -msgstr "" +msgstr "Черновик" #. module: audittrail #: field:audittrail.log.line,old_value:0 msgid "Old Value" -msgstr "" +msgstr "Старое значение" #. module: audittrail #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: audittrail #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log msgid "View log" -msgstr "" +msgstr "Просмотреть журнал" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log_line @@ -87,7 +87,7 @@ msgstr "" #. module: audittrail #: field:audittrail.log,method:0 msgid "Method" -msgstr "" +msgstr "Метод" #. module: audittrail #: wizard_field:audittrail.view.log,init,from:0 @@ -107,7 +107,7 @@ msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Write" -msgstr "" +msgstr "Написать" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail @@ -122,18 +122,18 @@ msgstr "" #. module: audittrail #: view:audittrail.rule:0 msgid "Subscribe" -msgstr "" +msgstr "Подписаться" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Read" -msgstr "" +msgstr "Читать" #. module: audittrail #: field:audittrail.log,object_id:0 #: field:audittrail.rule,object_id:0 msgid "Object" -msgstr "" +msgstr "Объект" #. module: audittrail #: view:audittrail.rule:0 @@ -162,12 +162,12 @@ msgstr "" #. module: audittrail #: field:audittrail.log,timestamp:0 msgid "Date" -msgstr "" +msgstr "Дата" #. module: audittrail #: field:audittrail.log,user_id:0 msgid "User" -msgstr "" +msgstr "Пользователь" #. module: audittrail #: view:audittrail.log:0 @@ -182,7 +182,7 @@ msgstr "Неправильный XML для просмотра архитект #. module: audittrail #: field:audittrail.log,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: audittrail #: field:audittrail.log,line_ids:0 @@ -197,7 +197,7 @@ msgstr "" #. module: audittrail #: field:audittrail.log.line,field_id:0 msgid "Fields" -msgstr "" +msgstr "Поля" #. module: audittrail #: view:audittrail.rule:0 @@ -212,7 +212,7 @@ msgstr "" #. module: audittrail #: view:audittrail.rule:0 msgid "UnSubscribe" -msgstr "" +msgstr "Отписаться" #. module: audittrail #: field:audittrail.rule,log_write:0 @@ -232,7 +232,7 @@ msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Delete" -msgstr "" +msgstr "Удалить" #. module: audittrail #: wizard_button:audittrail.view.log,init,open:0 @@ -247,7 +247,7 @@ msgstr "" #. module: audittrail #: field:audittrail.rule,name:0 msgid "Rule Name" -msgstr "" +msgstr "Название правила" #. module: audittrail #: field:audittrail.rule,log_read:0 @@ -257,7 +257,7 @@ msgstr "" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree msgid "Logs" -msgstr "" +msgstr "Журналы" #. module: audittrail #: field:audittrail.log.line,new_value:0 @@ -292,7 +292,7 @@ msgstr "" #. module: audittrail #: field:audittrail.rule,user_id:0 msgid "Users" -msgstr "" +msgstr "Пользователи" #. module: audittrail #: field:audittrail.log.line,old_value_text:0 @@ -302,7 +302,7 @@ msgstr "" #. module: audittrail #: wizard_button:audittrail.view.log,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: audittrail #: field:audittrail.rule,log_unlink:0 diff --git a/addons/base_contact/test/base_contact00.yml b/addons/base_contact/test/base_contact00.yml index 335f525f92f..c6a4ed9e057 100644 --- a/addons/base_contact/test/base_contact00.yml +++ b/addons/base_contact/test/base_contact00.yml @@ -55,7 +55,7 @@ Now I will check that the new job is assigned properly to contact or not - !assert {model: res.partner.contact, id: res_partner_contact_williams0}: - - len(job_ids) > 2 + - len(job_ids) >= 2 - | In order to check contacts working at several addresses for different partners I will create contact with 2 different addresses diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index 3b78c6cb557..efdcfe16135 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -48,7 +48,7 @@ class base_setup_config_choice(osv.osv_memory): user_ids = user_obj.search(cr, uid, []) users = user_obj.browse(cr, uid, user_ids) user_str = '\n'.join(map(lambda x: ' - %s: %s / %s' % (x.name, x.login, x.password), users)) - return _('The following users have been installed on your database: \n')+ user_str + return _('The following users have been installed : \n')+ user_str _columns = { 'installed_users':fields.text('Installed Users', readonly=True), diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml index 024accc77ce..2f53f2c322d 100644 --- a/addons/base_setup/base_setup_data.xml +++ b/addons/base_setup/base_setup_data.xml @@ -16,7 +16,7 @@ - diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index ae7ae7f23c7..5db25283777 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -11,7 +11,7 @@ Main Company Setup - Information of your company will be used to custiomise your documents like Invoices, Sale Orders,... + Information of your company will be used to custiomise your documents like Invoices, Sale Orders and many more. Configure Your Company @@ -24,16 +24,16 @@ - - - - + + - - + + - + + + diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po index 73a7999b29e..a20fea0d577 100644 --- a/addons/base_setup/i18n/pl.po +++ b/addons/base_setup/i18n/pl.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: 2009-11-17 08:51+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-07-11 21:40+0000\n" +"Last-Translator: Maciej Jędrusik \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:03+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup @@ -254,7 +254,7 @@ msgstr "Ulica" #. module: base_setup #: wizard_button:base_setup.base_setup,finish,menu:0 msgid "Use Directly" -msgstr "" +msgstr "Użyj bezpośrednio" #. module: base_setup #: wizard_button:base_setup.base_setup,init,menu:0 diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index c7e1a37b8fa..f34c0ce5917 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -4,9 +4,28 @@ - - + name="Dashboard" sequence="30" /> + + + board.note.search + board.note + search + + + + + + + + + + + + + + + + board.note.tree @@ -15,10 +34,11 @@ + - + @@ -31,7 +51,8 @@ - + + @@ -43,6 +64,7 @@ board.note form form,tree + @@ -72,7 +94,7 @@ name="%(action_board_menu_create)d" string="Create Menu" type="action" icon="gtk-justify-fill" /> - + diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index ada4f7d29fe..7a614a16211 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -309,7 +309,7 @@ context="{'invisible_section': False}"> diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index e13a428138a..db5aa168bbb 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -70,6 +70,20 @@ class crm_opportunity(osv.osv): self.log(cr, uid, id, message) return res + def case_mark_lost(self, cr, uid, ids, *args): + """Mark the case as lost: state = done and probability = 0% + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of case Ids + @param *args: Tuple Value for additional Params + """ + res = self.write(cr, uid, ids, {'probability' : 0.0, 'state': 'done'}) + for (id, name) in self.name_get(cr, uid, ids): + message = _('Opportunity ') + " '" + name + "' "+ _("is Lost.") + self.log(cr, uid, id, message) + return res + def case_cancel(self, cr, uid, ids, *args): """Overrides cancel for crm_case for setting probability @param self: The object pointer @@ -80,9 +94,6 @@ class crm_opportunity(osv.osv): """ res = super(crm_opportunity, self).case_cancel(cr, uid, ids, args) self.write(cr, uid, ids, {'probability' : 0.0}) - for (id, name) in self.name_get(cr, uid, ids): - message = _('Opportunity ') + " '" + name + "' "+ _("is Lost.") - self.log(cr, uid, id, message) return res def case_open(self, cr, uid, ids, *args): diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index b08ceaf898e..5c3f3ffa8e1 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -65,8 +65,11 @@ - + +