diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 7a66dd4f175..bb13f1a5776 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -75,6 +75,9 @@ class account_analytic_line(osv.osv): unit=False, journal_id=False, context=None): if context==None: context={} + if not journal_id: + j_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=','purchase')]) + j_id = j_ids and j_ids[0] or False if not journal_id or not prod_id: return {} product_obj = self.pool.get('product.product') @@ -86,7 +89,7 @@ class account_analytic_line(osv.osv): result = 0.0 is_purchase = False - if j_id.type == 'purchase': + if j_id.type <> 'sale': a = prod.product_tmpl_id.property_account_expense.id if not a: a = prod.categ_id.property_account_expense_categ.id diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index e1f446f64f4..13a7c72dd5d 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 08:13+0000\n" +"PO-Revision-Date: 2010-10-03 09:42+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-10-04 04:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -2116,7 +2116,7 @@ msgstr "дней" #. module: account #: selection:account.aged.trial.balance,init,direction_selection:0 msgid "Past" -msgstr "" +msgstr "Прошлые" #. module: account #: field:account.analytic.account,company_currency_id:0 @@ -2267,7 +2267,7 @@ msgstr "Создать проводки подписки" #. module: account #: wizard_field:account.fiscalyear.close,init,journal_id:0 msgid "Opening Entries Journal" -msgstr "" +msgstr "Открытие журнала проводок" #. module: account #: view:account.config.wizard:0 @@ -3839,7 +3839,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form #: view:wizard.company.setup:0 msgid "Overdue Payment Report Message" -msgstr "" +msgstr "Сообщение о просроченном платеже" #. module: account #: selection:account.tax,tax_group:0 @@ -3894,12 +3894,12 @@ msgstr "Финансовые журналы" #: selection:account.partner.balance.report,init,state:0 #: selection:account.third_party_ledger.report,init,state:0 msgid "By Period" -msgstr "" +msgstr "По периоду" #. module: account #: help:account.invoice,date_invoice:0 msgid "Keep empty to use the current date" -msgstr "" +msgstr "Оставьте пустым для текущей даты" #. module: account #: rml:account.overdue:0 @@ -3909,7 +3909,7 @@ msgstr "." #. module: account #: field:account.analytic.account,quantity_max:0 msgid "Maximum Quantity" -msgstr "" +msgstr "Максимальное количество" #. module: account #: field:account.period,name:0 @@ -3932,7 +3932,7 @@ msgstr "Группы" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Code/Date" -msgstr "" +msgstr "Код/Дата" #. module: account #: field:account.account,active:0 @@ -3953,7 +3953,7 @@ msgstr "" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "Параметры" #. module: account #: view:res.partner:0 @@ -3973,7 +3973,7 @@ msgstr "" #. module: account #: wizard_field:account.vat.declaration,init,based_on:0 msgid "Base on" -msgstr "" +msgstr "Основан на" #. module: account #: selection:account.move,type:0 @@ -4365,7 +4365,7 @@ msgstr "" #: field:account.config.wizard,date2:0 #: field:account.fiscalyear,date_stop:0 msgid "End Date" -msgstr "" +msgstr "Дата окончания" #. module: account #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear @@ -4381,7 +4381,7 @@ msgstr "" #. module: account #: field:account.payment.term.line,days2:0 msgid "Day of the Month" -msgstr "" +msgstr "День месяца" #. module: account #: field:account.analytic.journal,line_ids:0 @@ -4542,7 +4542,7 @@ msgstr "Разрегить сверку" #: selection:account.partner.balance.report,init,state:0 #: selection:account.third_party_ledger.report,init,state:0 msgid "By Date" -msgstr "" +msgstr "По дате" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree4 @@ -4558,7 +4558,7 @@ msgstr "Дата сгенерированных проводок" #. module: account #: wizard_button:account.invoice.refund,init,modify_invoice:0 msgid "Modify Invoice" -msgstr "" +msgstr "Изменить счет" #. module: account #: view:res.partner:0 @@ -4568,7 +4568,7 @@ msgstr "Настройки бухгалтерского учета для кон #. module: account #: view:account.analytic.account:0 msgid "Analytic Account Statistics" -msgstr "" +msgstr "Статистика счета аналитики" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -4598,12 +4598,12 @@ msgstr "" #. module: account #: wizard_field:account.aged.trial.balance,init,result_selection:0 msgid "Filter on Partners" -msgstr "" +msgstr "Фильтр по партнерам" #. module: account #: field:account.tax,price_include:0 msgid "Tax Included in Price" -msgstr "" +msgstr "Налог включен в цену" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2 @@ -4684,7 +4684,7 @@ msgstr "Учетные годы" #. module: account #: model:process.node,note:account.process_node_importinvoice0 msgid "Import from invoices or payments" -msgstr "" +msgstr "Импорт из счетов или платежей" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile_select @@ -4741,7 +4741,7 @@ msgstr "Адрес выставления счета" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "General Credit" -msgstr "" +msgstr "Общий кредит" #. module: account #: help:account.journal,centralisation:0 @@ -4754,7 +4754,7 @@ msgstr "" #. module: account #: selection:account.invoice,state:0 msgid "Cancelled" -msgstr "" +msgstr "Отменено" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree @@ -4765,7 +4765,7 @@ msgstr "Черновые выписки" #. module: account #: wizard_field:populate_statement_from_inv,init,date:0 msgid "Date payment" -msgstr "" +msgstr "Дата оплаты" #. module: account #: rml:account.journal.period.print:0 @@ -4782,7 +4782,7 @@ msgstr "Расходы и доходы по журналам (текущий м #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable Accounts" -msgstr "" +msgstr "Счета к получению" #. module: account #: wizard_button:account.move.line.unreconcile.select,init,open:0 @@ -4838,7 +4838,7 @@ msgstr "НДС:" #: rml:account.general.journal:0 #: rml:account.invoice:0 msgid "Total:" -msgstr "" +msgstr "Всего:" #. module: account #: model:ir.model,name:account.model_account_analytic_journal @@ -4893,7 +4893,7 @@ msgstr "" #: field:account.bank.statement.reconcile,total_amount:0 #: field:account.bank.statement.reconcile,total_second_amount:0 msgid "Payment amount" -msgstr "" +msgstr "Сумма оплаты" #. module: account #: view:account.analytic.account:0 @@ -4940,7 +4940,7 @@ msgstr "Все месяцы" #. module: account #: wizard_field:account.invoice.refund,init,date:0 msgid "Operation date" -msgstr "" +msgstr "Дата операции" #. module: account #: field:account.invoice,invoice_line:0 @@ -4950,7 +4950,7 @@ msgstr "Позиции счета" #. module: account #: field:account.period,date_start:0 msgid "Start of Period" -msgstr "" +msgstr "Начало периода" #. module: account #: wizard_field:account.fiscalyear.close,init,report_name:0 @@ -5008,12 +5008,12 @@ msgstr "" #. module: account #: rml:account.account.balance:0 msgid "Account Balance -" -msgstr "" +msgstr "Баланс по счету -" #. module: account #: field:account.journal,group_invoice_lines:0 msgid "Group invoice lines" -msgstr "" +msgstr "Группировать позиции счета" #. module: account #: model:ir.ui.menu,name:account.menu_finance_configuration @@ -5058,7 +5058,7 @@ msgstr "" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Select Date-Period" -msgstr "" +msgstr "Выбор даты-периода" #. module: account #: rml:account.analytic.account.inverted.balance:0 @@ -5069,7 +5069,7 @@ msgstr "" #: model:process.node,name:account.process_node_paidinvoice0 #: model:process.node,name:account.process_node_supplierpaidinvoice0 msgid "Paid invoice" -msgstr "" +msgstr "Оплаченный счет" #. module: account #: view:account.tax:0 @@ -5099,7 +5099,7 @@ msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv msgid "Import invoices" -msgstr "" +msgstr "Импорт счетов" #. module: account #: wizard_view:account.move.line.unreconcile,init:0 @@ -5143,7 +5143,7 @@ msgstr "Периоды подписки" #. module: account #: model:process.node,name:account.process_node_manually0 msgid "Manually" -msgstr "" +msgstr "Вручную" #. module: account #: view:account.invoice:0 @@ -5162,7 +5162,7 @@ msgstr "Счета" #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Payable Accounts" -msgstr "" +msgstr "Кредиторская задолженность" #. module: account #: view:account.invoice.line:0 @@ -5183,12 +5183,12 @@ msgstr "Полный платеж" #. module: account #: selection:account.move,type:0 msgid "Journal Purchase" -msgstr "" +msgstr "Журнал покупок" #. module: account #: selection:account.move,type:0 msgid "Cash Receipt" -msgstr "" +msgstr "Денежное поступление" #. module: account #: field:account.fiscal.position.tax,tax_dest_id:0 @@ -5254,12 +5254,12 @@ msgstr "" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Date Filter" -msgstr "" +msgstr "Фильтр дат" #. module: account #: wizard_view:populate_statement_from_inv,init:0 msgid "Choose Journal and Payment Date" -msgstr "" +msgstr "Выбрать журнал и дату платежа" #. module: account #: selection:account.analytic.account,state:0 @@ -5288,7 +5288,7 @@ msgstr "Невыплаченные возвраты клиентам" #. module: account #: help:account.invoice,residual:0 msgid "Remaining amount due." -msgstr "" +msgstr "Оставшиеся суммы" #. module: account #: wizard_view:account.period.close,init:0 @@ -5304,7 +5304,7 @@ msgstr "Проформа" #. module: account #: field:account.move.reconcile,line_partial_ids:0 msgid "Partial Entry lines" -msgstr "" +msgstr "Частичная проводка" #. module: account #: help:account.move.line,statement_id:0 @@ -5319,7 +5319,7 @@ msgstr "Отчетный год" #. module: account #: wizard_button:account.analytic.line,init,open:0 msgid "Open Entries" -msgstr "" +msgstr "Открытые проводки" #. module: account #: selection:account.analytic.account,type:0 @@ -5344,7 +5344,7 @@ msgstr "" #: rml:account.third_party_ledger_other:0 #: rml:account.vat.declaration:0 msgid "Page" -msgstr "" +msgstr "Страница" #. module: account #: view:account.move:0 @@ -5377,7 +5377,7 @@ msgstr "Сверенная сумма" #. module: account #: selection:account.account,currency_mode:0 msgid "At Date" -msgstr "" +msgstr "На дату" #. module: account #: help:account.move.line,tax_amount:0 @@ -5419,7 +5419,7 @@ msgstr "" #. module: account #: field:account.subscription,period_total:0 msgid "Number of Periods" -msgstr "" +msgstr "Количество периодов" #. module: account #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0 @@ -5488,7 +5488,7 @@ msgstr "" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Bank Accounts" -msgstr "" +msgstr "Банковские счета" #. module: account #: constraint:account.period:0 @@ -5500,7 +5500,7 @@ msgstr "" #. module: account #: help:account.journal,invoice_sequence_id:0 msgid "The sequence used for invoice numbers in this journal." -msgstr "" +msgstr "Последовательность используемая для нумерации счетов в этом журнале" #. module: account #: view:account.account:0 @@ -5549,7 +5549,7 @@ msgstr "Список счетов" #: view:product.product:0 #: view:product.template:0 msgid "Sales Properties" -msgstr "" +msgstr "Свойства продаж" #. module: account #: rml:account.general.journal:0 @@ -5565,12 +5565,12 @@ msgstr "Книга расходов (только количество)" #. module: account #: wizard_view:account.move.validate,init:0 msgid "Validate Account Entries" -msgstr "" +msgstr "Утвердить проводки" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 msgid "Reference Number" -msgstr "" +msgstr "Ссылка" #. module: account #: rml:account.overdue:0 @@ -5586,7 +5586,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form msgid "Entries of Open Analytic Journals" -msgstr "" +msgstr "Проводки открытых журналов аналитики" #. module: account #: view:account.invoice.tax:0 @@ -5601,7 +5601,7 @@ msgstr "Текущая дата" #. module: account #: selection:account.move,type:0 msgid "Journal Sale" -msgstr "" +msgstr "Журнал продаж" #. module: account #: wizard_field:account.fiscalyear.close,init,fy_id:0 @@ -5624,12 +5624,12 @@ msgstr "Начало периода" #. module: account #: model:ir.ui.menu,name:account.account_template_folder msgid "Templates" -msgstr "" +msgstr "Шаблоны" #. module: account #: wizard_button:account.vat.declaration,init,report:0 msgid "Print VAT Decl." -msgstr "" +msgstr "Печать декл. НДС" #. module: account #: model:ir.actions.report.xml,name:account.account_intracom @@ -5682,7 +5682,7 @@ msgstr "Шаблоны для плана счетов" #. module: account #: view:account.config.wizard:0 msgid "Account Configure" -msgstr "" +msgstr "Настройка счета" #. module: account #: help:res.partner,property_account_payable:0 diff --git a/addons/account/project/project.py b/addons/account/project/project.py index 431d486592b..f082672310e 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -28,8 +28,8 @@ from osv import osv class account_analytic_journal(osv.osv): _name = 'account.analytic.journal' _columns = { - 'name' : fields.char('Journal name', size=64, required=True), - 'code' : fields.char('Journal code', size=8), + 'name' : fields.char('Journal Name', size=64, required=True), + 'code' : fields.char('Journal Code', size=8), 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."), 'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."), 'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'), diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 0d335118d3b..fd52619fb10 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -172,19 +172,16 @@ tree - + + - - - - - - - - - - - + + + + + + + @@ -195,22 +192,24 @@ - - + + + - - - - - - + + + + + + - - + + + - + diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 6c3c6fc01c3..173cbd1e6c4 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -232,10 +232,10 @@ [[ formatLang(l.price_unit) ]][[ o.currency_id.symbol ]] - [[ formatLang(l.discount) ]] + [[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] - [[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]] + [[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -294,7 +294,7 @@ Taxes: - [[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -338,7 +338,7 @@ [[ t.name ]] - [[ formatLang(t.base) ]] [[ o.currency_id.symbol ]] + [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] [[ o.currency_id.symbol ]] @@ -373,4 +373,4 @@ - \ No newline at end of file + diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py index cc8299bcecf..0c7018ae290 100644 --- a/addons/account/report/rml_parse.py +++ b/addons/account/report/rml_parse.py @@ -21,12 +21,10 @@ from report import report_sxw import xml.dom.minidom -import os, time +import time import osv import re -import tools import pooler -import re import sys diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 5a393e1dd83..d9e9bf3907b 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -23,6 +23,8 @@ from osv import osv, fields from osv.orm import intersect import tools.sql from tools.translate import _ +from decimal_precision import decimal_precision as dp + class account_analytic_account(osv.osv): _name = "account.analytic.account" @@ -66,6 +68,8 @@ class account_analytic_account(osv.osv): and invoice_id is not null \ GROUP BY account_analytic_line.account_id;", (parent_ids,)) for account_id, sum in cr.fetchall(): + if account_id not in res: + res[account_id] = {} res[account_id][f] = sum for account in accounts: for child in account.child_ids: @@ -102,6 +106,8 @@ class account_analytic_account(osv.osv): and account_analytic_journal.type in ('purchase','general') \ GROUP BY account_analytic_account.id;""", (parent_ids,)) for account_id, sum in cr.fetchall(): + if account_id not in res: + res[account_id] = {} res[account_id][f] = round(sum, dp) for account in accounts: @@ -142,6 +148,8 @@ class account_analytic_account(osv.osv): and invoice_id is null \ GROUP BY account_analytic_line.account_id" ,(parent_ids,)) for account_id, lwd in cr.fetchall(): + if account_id not in res: + res[account_id] = {} res[account_id][f] = lwd for account in accounts: for child in account.child_ids: @@ -161,6 +169,8 @@ class account_analytic_account(osv.osv): AND to_invoice IS NOT NULL \ GROUP BY account_analytic_line.account_id;",(parent_ids,)) for account_id, sua in cr.fetchall(): + if account_id not in res: + res[account_id] = {} res[account_id][f] = round(sua, dp) for account in accounts: for child in account.child_ids: @@ -181,10 +191,14 @@ class account_analytic_account(osv.osv): GROUP BY account_analytic_line.account_id",(parent_ids,)) ff = cr.fetchall() for account_id, hq in ff: + if account_id not in res: + res[account_id] = {} res[account_id][f] = round(hq, dp) for account in accounts: for child in account.child_ids: if account.id != child.id: + if account.id not in res: + res[account.id] = {f: 0.0} res[account.id][f] += res.get(child.id, {}).get(f, 0.0) for id in ids: res[id][f] = round(res[id][f], dp) @@ -223,6 +237,8 @@ class account_analytic_account(osv.osv): res2.setdefault(account.id, 0.0) for child in account.child_ids: if account.id != child.id: + if account.id not in res: + res[account.id] = {f: 0.0} res[account.id][f] += res.get(child.id, {}).get(f, 0.0) res[account.id][f] += res2.get(child.id, 0.0) @@ -337,22 +353,47 @@ class account_analytic_account(osv.osv): return res _columns ={ - 'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account."), - 'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs', help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."), - 'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount', help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs."), - 'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theorical Revenue', help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."), - 'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot', help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."), - 'last_invoice_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Last Invoice Date', help="Date of the last invoice created for this analytic account."), - 'last_worked_invoiced_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost', help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."), - 'last_worked_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Cost/Work', help="Date of the latest work done on this account."), - 'hours_qtt_non_invoiced': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Hours', help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."), - 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', help="Number of hours that can be invoiced plus those that already have been invoiced."), - 'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', help="Computed using the formula: Maximum Quantity - Hours Tot."), - 'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', help="Computed using the formula: Max Invoice Price - Invoiced Amount."), - 'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)', help="Computed using the formula: Invoiced Amount / Hours Tot."), - 'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin', help="Computed using the formula: Invoiced Amount - Total Costs."), - 'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin', help="Computed using the formula: Theorial Revenue - Total Costs"), - 'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100."), + 'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', + help="Total customer invoiced amount for this account.", + digits_compute=dp.get_precision('Account')), + 'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs', + help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets.", + digits_compute=dp.get_precision('Account')), + 'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount', + help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.", + digits_compute=dp.get_precision('Account')), + 'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theorical Revenue', + help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.", + digits_compute=dp.get_precision('Account')), + 'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot', + help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."), + 'last_invoice_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Last Invoice Date', + help="Date of the last invoice created for this analytic account."), + 'last_worked_invoiced_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost', + help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."), + 'last_worked_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Cost/Work', + help="Date of the latest work done on this account."), + 'hours_qtt_non_invoiced': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Hours', + help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."), + 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', + help="Number of hours that can be invoiced plus those that already have been invoiced."), + 'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', + help="Computed using the formula: Maximum Quantity - Hours Tot."), + 'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', + help="Computed using the formula: Max Invoice Price - Invoiced Amount.", + digits_compute=dp.get_precision('Account')), + 'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)', + help="Computed using the formula: Invoiced Amount / Hours Tot.", + digits_compute=dp.get_precision('Account')), + 'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin', + help="Computed using the formula: Invoiced Amount - Total Costs.", + digits_compute=dp.get_precision('Account')), + 'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin', + help="Computed using the formula: Theorial Revenue - Total Costs", + digits_compute=dp.get_precision('Account')), + 'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', + help="Computes using the formula: (Real Margin / Total Costs) * 100.", + digits_compute=dp.get_precision('Account')), 'month_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), 'user_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'), } diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 71031dd6f1c..67640c98b99 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -343,7 +343,6 @@ class account_invoice(osv.osv): def _get_analytic_lines(self, cr, uid, id): inv = self.browse(cr, uid, [id])[0] cur_obj = self.pool.get('res.currency') - company_currency = inv.company_id.currency_id.id if inv.type in ('out_invoice', 'in_refund'): sign = 1 @@ -354,7 +353,7 @@ class account_invoice(osv.osv): acct_ins_obj = self.pool.get('account.analytic.plan.instance') for il in iml: - if il['analytics_id']: + if il.get('analytics_id', False): if inv.type in ('in_invoice', 'in_refund'): ref = inv.reference @@ -363,7 +362,7 @@ class account_invoice(osv.osv): obj_move_line = acct_ins_obj.browse(cr, uid, il['analytics_id']) amount_calc = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, il['price'], context={'date': inv.date_invoice}) * sign qty = il['quantity'] - il['analytic_lines']=[] + il['analytic_lines'] = [] for line2 in obj_move_line.account_ids: amt = amount_calc * (line2.rate/100) qtty = qty* (line2.rate/100) @@ -419,5 +418,4 @@ class sale_order_line(osv.osv): sale_order_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py index adb80d787a0..2c2a02d4b9d 100644 --- a/addons/account_invoice_layout/account_invoice_layout.py +++ b/addons/account_invoice_layout/account_invoice_layout.py @@ -130,19 +130,22 @@ class account_invoice_line(osv.osv): default['state'] = self.browse(cr, uid, id).state return super(account_invoice_line, self).copy_data(cr, uid, id, default, context) - def _fnct(self, cr, uid, id, name, args, context=None): + def _fnct(self, cr, uid, ids, name, args, context=None): res = {} - for m in self.browse(cr, uid, id): - if m.state != 'article': - if m.state == 'line': - res[m.id] = '-----------------------------------------' - elif m.state == 'break': - res[m.id] = 'PAGE BREAK' + + lines = self.browse(cr, uid, ids) + account_ids = [line.account_id.id for line in lines] + account_names = dict(self.pool.get('account.account').name_get(cr, uid, account_ids, context=context)) + for line in lines: + if line.state != 'article': + if line.state == 'line': + res[line.id] = '-----------------------------------------' + elif line.state == 'break': + res[line.id] = 'PAGE BREAK' else: - res[m.id] = ' ' + res[line.id] = ' ' else: - [(temp)] = self.pool.get('account.account').name_get(cr, uid, [m.account_id.id], context=context) - res[m.id] = temp[1] + res[line.id] = account_names.get(line.account_id.id, '') return res _name = "account.invoice.line" @@ -205,4 +208,4 @@ class account_invoice(osv.osv): account_invoice() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.py b/addons/account_invoice_layout/report/report_account_invoice_layout.py index e28d98479b1..f61a05fd5f4 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.py +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.py @@ -23,6 +23,7 @@ import time from report import report_sxw + class account_invoice_1(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(account_invoice_1, self).__init__(cr, uid, name, context=context) @@ -33,112 +34,111 @@ class account_invoice_1(report_sxw.rml_parse): self.context = context self._node = None - def invoice_lines(self,invoice): - result =[] - sub_total={} - info=[] - invoice_list=[] - res={} - list_in_seq={} + def invoice_lines(self, invoice): + result = [] + sub_total = {} + info = [] + invoice_list = [] + res = {} + list_in_seq = {} ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)]) ids.sort() - for id in range(0,len(ids)): + for id in range(0, len(ids)): info = self.pool.get('account.invoice.line').browse(self.cr, self.uid, ids[id], self.context.copy()) - list_in_seq[info]=info.sequence - i=1 - j=0 + list_in_seq[info] = info.sequence + i = 1 + j = 0 final=sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1])) - invoice_list=[x[0] for x in final] - sum_flag={} - sum_flag[j]=-1 + invoice_list = [x[0] for x in final] + sum_flag = {} + sum_flag[j] = -1 for entry in invoice_list: - res={} - if entry.state=='article': + res = {} + if entry.state == 'article': self.cr.execute('select tax_id from account_invoice_line_tax where invoice_line_id=%s', (entry.id,)) - tax_ids=self.cr.fetchall() - if tax_ids==[]: - res['tax_types']='' + tax_ids = self.cr.fetchall() + if tax_ids == []: + res['tax_types'] = '' else: - tax_names_dict={} - for item in range(0,len(tax_ids)) : + tax_names_dict = {} + for item in range(0, len(tax_ids)): self.cr.execute('select name from account_tax where id=%s', (tax_ids[item][0],)) - type=self.cr.fetchone() - tax_names_dict[item] =type[0] - tax_names = ','.join([tax_names_dict[x] for x in range(0,len(tax_names_dict))]) - res['tax_types']=tax_names - res['name']=entry.name - res['quantity']="%.2f"%(entry.quantity) - res['price_unit']="%.2f"%(entry.price_unit) - res['discount']="%.2f"%(entry.discount) - res['price_subtotal']="%.2f"%(entry.price_subtotal) - sub_total[i]=entry.price_subtotal - i=i+1 - res['note']=entry.note - res['currency']=invoice.currency_id.symbol - res['type']=entry.state + type = self.cr.fetchone() + tax_names_dict[item] = type[0] + tax_names = ','.join([tax_names_dict[x] for x in range(0, len(tax_names_dict))]) + res['tax_types'] = tax_names + res['name'] = entry.name + res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account')) + res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account')) + res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account')) + res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account')) + sub_total[i] = entry.price_subtotal + i = i + 1 + res['note'] = entry.note + res['currency'] = invoice.currency_id.symbol + res['type'] = entry.state - if entry.uos_id.id==False: - res['uos']='' + if entry.uos_id.id == False: + res['uos'] = '' else: uos_name = self.pool.get('product.uom').read(self.cr, self.uid, entry.uos_id.id, ['name'], self.context.copy()) res['uos'] = uos_name['name'] else: + res['quantity'] = '' + res['price_unit'] = '' + res['discount'] = '' + res['tax_types'] = '' + res['type'] = entry.state + res['note'] = entry.note + res['uos'] = '' - res['quantity']='' - res['price_unit']='' - res['discount']='' - res['tax_types']='' - res['type']=entry.state - res['note']=entry.note - res['uos']='' - - if entry.state=='subtotal': - res['name']=entry.name - sum=0 - sum_id=0 - if sum_flag[j]==-1: - temp=1 + if entry.state == 'subtotal': + res['name'] = entry.name + sum = 0 + sum_id = 0 + if sum_flag[j] == -1: + temp = 1 else: - temp=sum_flag[j] + temp = sum_flag[j] - for sum_id in range(temp,len(sub_total)+1): - sum+=sub_total[sum_id] - sum_flag[j+1]= sum_id +1 + for sum_id in range(temp, len(sub_total)+1): + sum += sub_total[sum_id] + sum_flag[j+1] = sum_id +1 - j=j+1 - res['price_subtotal']="%.2f"%(sum) - res['currency']=invoice.currency_id.symbol - res['quantity']='' - res['price_unit']='' - res['discount']='' - res['tax_types']='' - res['uos']='' - elif entry.state=='title': - res['name']=entry.name - res['price_subtotal']='' - res['currency']='' - elif entry.state=='text': - res['name']=entry.name - res['price_subtotal']='' - res['currency']='' - elif entry.state=='line': - res['quantity']='_______________' - res['price_unit']='______________' - res['discount']='____________' - res['tax_types']='____________________' - res['uos']='_____' - res['name']='_______________________________________________' - res['price_subtotal']='____________' - res['currency']='____' - elif entry.state=='break': - res['type']=entry.state - res['name']=entry.name - res['price_subtotal']='' - res['currency']='' + j = j + 1 + res['price_subtotal'] = "%.2f" % (sum) + res['currency'] = invoice.currency_id.symbol + res['quantity'] = '' + res['price_unit'] = '' + res['discount'] = '' + res['tax_types'] = '' + res['uos'] = '' + elif entry.state == 'title': + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = '' + elif entry.state == 'text': + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = '' + elif entry.state == 'line': + res['quantity'] = '_______________' + res['price_unit'] = '______________' + res['discount'] = '____________' + res['tax_types'] = '____________________' + res['uos'] = '_____' + res['name'] = '_______________________________________________' + res['price_subtotal'] = '____________' + res['currency'] = '____' + elif entry.state == 'break': + res['type'] = entry.state + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = '' else: - res['name']=entry.name - res['price_subtotal']='' - res['currency']=invoice.currency_id.symbol + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = invoice.currency_id.symbol result.append(res) return result diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index f92cd477f1a..3cd64a08b02 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -376,7 +376,7 @@ Net Total: - [[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -391,7 +391,7 @@ Taxes: - [[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -406,7 +406,7 @@ Total: - [[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -445,10 +445,10 @@ [[ t.name ]] - [[ formatLang(t.base) ]] + [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] - [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] @@ -485,4 +485,4 @@ - \ No newline at end of file + diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py index 7051483828b..bac4a467ae1 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.py +++ b/addons/account_invoice_layout/report/special_message_invoice.py @@ -24,6 +24,7 @@ import time from report import report_sxw import pooler + class account_invoice_with_message(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(account_invoice_with_message, self).__init__(cr, uid, name, context=context) @@ -40,115 +41,113 @@ class account_invoice_with_message(report_sxw.rml_parse): msg = account_msg_data.msg return msg - - def invoice_lines(self,invoice): - result =[] - sub_total={} - info=[] - invoice_list=[] - res={} - list_in_seq={} + def invoice_lines(self, invoice): + result = [] + sub_total = {} + info = [] + invoice_list = [] + res = {} + list_in_seq = {} ids = self.pool.get('account.invoice.line').search(self.cr, self.uid, [('invoice_id', '=', invoice.id)]) ids.sort() - for id in range(0,len(ids)): - info = self.pool.get('account.invoice.line').browse(self.cr, self.uid,ids[id], self.context.copy()) - list_in_seq[info]=info.sequence - i=1 - j=0 - final=sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1])) - invoice_list=[x[0] for x in final] - sum_flag={} - sum_flag[j]=-1 + for id in range(0, len(ids)): + info = self.pool.get('account.invoice.line').browse(self.cr, self.uid, ids[id], self.context.copy()) + list_in_seq[info] = info.sequence + i = 1 + j = 0 + final = sorted(list_in_seq.items(), lambda x, y: cmp(x[1], y[1])) + invoice_list = [x[0] for x in final] + sum_flag = {} + sum_flag[j] = -1 for entry in invoice_list: - res={} + res = {} - if entry.state=='article': + if entry.state == 'article': self.cr.execute('select tax_id from account_invoice_line_tax where invoice_line_id=%s', (entry.id,)) - tax_ids=self.cr.fetchall() + tax_ids = self.cr.fetchall() - if tax_ids==[]: - res['tax_types']='' + if tax_ids == []: + res['tax_types'] = '' else: - tax_names_dict={} - for item in range(0,len(tax_ids)) : + tax_names_dict = {} + for item in range(0, len(tax_ids)): self.cr.execute('select name from account_tax where id=%s', (tax_ids[item][0],)) - type=self.cr.fetchone() - tax_names_dict[item] =type[0] - tax_names = ','.join([tax_names_dict[x] for x in range(0,len(tax_names_dict))]) - res['tax_types']=tax_names - res['name']=entry.name - res['quantity']="%.2f"%(entry.quantity) - res['price_unit']="%.2f"%(entry.price_unit) - res['discount']="%.2f"%(entry.discount) - res['price_subtotal']="%.2f"%(entry.price_subtotal) - sub_total[i]=entry.price_subtotal - i=i+1 - res['note']=entry.note - res['currency']=invoice.currency_id.symbol - res['type']=entry.state + type = self.cr.fetchone() + tax_names_dict[item] = type[0] + tax_names = ','.join([tax_names_dict[x] for x in range(0, len(tax_names_dict))]) + res['tax_types'] = tax_names + res['name'] = entry.name + res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account')) + res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account')) + res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account')) + res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account')) + sub_total[i] = entry.price_subtotal + i = i + 1 + res['note'] = entry.note + res['currency'] = invoice.currency_id.symbol + res['type'] = entry.state - if entry.uos_id.id==False: - res['uos']='' + if entry.uos_id.id == False: + res['uos'] = '' else: uos_name = self.pool.get('product.uom').read(self.cr, self.uid, entry.uos_id.id, ['name'], self.context.copy()) - res['uos']=uos_name['name'] + res['uos'] = uos_name['name'] else: + res['quantity'] = '' + res['price_unit'] = '' + res['discount'] = '' + res['tax_types'] = '' + res['type'] = entry.state + res['note'] = entry.note + res['uos'] = '' - res['quantity']='' - res['price_unit']='' - res['discount']='' - res['tax_types']='' - res['type']=entry.state - res['note']=entry.note - res['uos']='' - - if entry.state=='subtotal': - res['name']=entry.name - sum=0 - sum_id=0 - if sum_flag[j]==-1: - temp=1 + if entry.state == 'subtotal': + res['name'] = entry.name + sum = 0 + sum_id = 0 + if sum_flag[j] == -1: + temp = 1 else: - temp=sum_flag[j] + temp = sum_flag[j] - for sum_id in range(temp,len(sub_total)+1): - sum+=sub_total[sum_id] - sum_flag[j+1]= sum_id +1 + for sum_id in range(temp, len(sub_total)+1): + sum += sub_total[sum_id] + sum_flag[j+1] = sum_id +1 - j=j+1 - res['price_subtotal']="%.2f"%(sum) - res['currency']=invoice.currency_id.symbol - res['quantity']='' - res['price_unit']='' - res['discount']='' - res['tax_types']='' - res['uos']='' - elif entry.state=='title': - res['name']=entry.name - res['price_subtotal']='' - res['currency']='' - elif entry.state=='text': - res['name']=entry.name - res['price_subtotal']='' - res['currency']='' - elif entry.state=='line': - res['quantity']='_______________' - res['price_unit']='______________' - res['discount']='____________' - res['tax_types']='____________________' - res['uos']='_____' - res['name']='_______________________________________________' - res['price_subtotal']='____________' - res['currency']='____' - elif entry.state=='break': - res['type']=entry.state - res['name']=entry.name - res['price_subtotal']='' - res['currency']='' + j = j + 1 + res['price_subtotal'] = "%.2f" % (sum) + res['currency'] = invoice.currency_id.symbol + res['quantity'] = '' + res['price_unit'] = '' + res['discount'] = '' + res['tax_types'] = '' + res['uos'] = '' + elif entry.state == 'title': + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = '' + elif entry.state == 'text': + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = '' + elif entry.state == 'line': + res['quantity'] = '_______________' + res['price_unit'] = '______________' + res['discount'] = '____________' + res['tax_types'] = '____________________' + res['uos'] = '_____' + res['name'] = '_______________________________________________' + res['price_subtotal'] = '____________' + res['currency'] = '____' + elif entry.state == 'break': + res['type'] = entry.state + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = '' else: - res['name']=entry.name - res['price_subtotal']='' - res['currency']=invoice.currency_id.symbol + res['name'] = entry.name + res['price_subtotal'] = '' + res['currency'] = invoice.currency_id.symbol result.append(res) return result diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml index 41775417161..8bea44a67f7 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.rml +++ b/addons/account_invoice_layout/report/special_message_invoice.rml @@ -380,7 +380,7 @@ Net Total: - [[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -395,7 +395,7 @@ Taxes: - [[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -410,7 +410,7 @@ Total: - [[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] @@ -449,10 +449,10 @@ [[ t.name ]] - [[ formatLang(t.base) ]] + [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] - [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] @@ -500,4 +500,4 @@ - \ No newline at end of file + diff --git a/addons/account_payment/account_payment_demo.xml b/addons/account_payment/account_payment_demo.xml index 37705a05b07..65a8d341da4 100644 --- a/addons/account_payment/account_payment_demo.xml +++ b/addons/account_payment/account_payment_demo.xml @@ -6,6 +6,7 @@ 00987654321 bank + Direct Payment diff --git a/addons/account_payment/test/account_payment.yml b/addons/account_payment/test/account_payment.yml index e65b3ba0b89..3d863686847 100644 --- a/addons/account_payment/test/account_payment.yml +++ b/addons/account_payment/test/account_payment.yml @@ -9,6 +9,7 @@ partner_id: base.res_partner_9 sequence: 0.0 state: bank + bank: base.res_bank_1 - I created a new Payment Mode diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index cf96028f01c..66c74a72bc9 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -25,6 +25,7 @@ import operator from osv import fields, osv import decimal_precision as dp + class account_analytic_account(osv.osv): _name = 'account.analytic.account' _description = 'Analytic Account' @@ -272,7 +273,7 @@ class account_analytic_line(osv.osv): _columns = { 'name' : fields.char('Description', size=256, required=True), 'date' : fields.date('Date', required=True, select=1), - 'amount' : fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.'), + 'amount' : fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')), 'unit_amount' : fields.float('Quantity', help='Specifies the amount of quantity to count.'), 'account_id' : fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True), 'user_id' : fields.many2one('res.users', 'User'), diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 0bb9afc3386..21fe0a7da29 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -99,7 +99,7 @@ class hr_analytic_timesheet(osv.osv): (r.product_id.name, r.product_id.id,)) # Compute based on pricetype amount_unit = self.on_change_unit_amount(cr, uid, ids, - r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] + r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] amount = unit_amount * amount_unit res ['value']['amount']= - round(amount, 2) @@ -134,7 +134,7 @@ class hr_analytic_timesheet(osv.osv): (r.product_id.name, r.product_id.id,)) # Compute based on pricetype amount_unit = self.on_change_unit_amount(cr, uid, ids, - r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount'] + r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] amount = unit_amount * amount_unit res ['value']['amount']= - round(amount, 2) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index b71e2daa447..7ccd07351f0 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -724,7 +724,7 @@ true, it will allow you to hide the event alarm information without removing it. if alarm_ids: alarm_obj.unlink(cr, uid, alarm_ids) cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\ - where id=%%d' % model_obj._table,(datas.id,)) + where id=%%s' % model_obj._table,(datas.id,)) return True res_alarm() diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po index 678032a17bd..75ca37ec081 100644 --- a/addons/base_calendar/i18n/nl.po +++ b/addons/base_calendar/i18n/nl.po @@ -8,32 +8,32 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-08-19 12:50+0000\n" -"PO-Revision-Date: 2010-09-16 12:31+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-03 20:01+0000\n" +"Last-Translator: Wouter Schrijvers \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n" +"X-Launchpad-Export-Date: 2010-10-04 04:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event starts" -msgstr "" +msgstr "De activiteit begint" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "Hourly" -msgstr "" +msgstr "Ieder uur" #. module: base_calendar #: view:calendar.attendee:0 msgid "Required to Join" -msgstr "" +msgstr "Deelname vereist" #. module: base_calendar #: help:calendar.event,exdate:0 @@ -42,11 +42,13 @@ msgid "" "This property defines the list of date/time exceptions for a recurring " "calendar component." msgstr "" +"Hiermee bepaalt u de datum/tijd-uitzonderingslijst voor een terugkerend " +"kalender-item" #. module: base_calendar #: field:calendar.event.edit.all,name:0 msgid "Title" -msgstr "" +msgstr "Titel" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 @@ -55,50 +57,50 @@ msgstr "" #: selection:calendar.todo,freq:0 #: selection:calendar.todo,rrule_type:0 msgid "Monthly" -msgstr "" +msgstr "Maandelijks" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invited User" -msgstr "" +msgstr "Uitgenodigde gebruikers" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm msgid "Alarms" -msgstr "" +msgstr "Herinneringen" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Sunday" -msgstr "" +msgstr "zondag" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,role:0 msgid "Role" -msgstr "" +msgstr "Functie" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Invitation details" -msgstr "" +msgstr "Details uitnodiging" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Fourth" -msgstr "" +msgstr "vierde" #. module: base_calendar #: field:calendar.event,show_as:0 #: field:calendar.todo,show_as:0 msgid "Show as" -msgstr "" +msgstr "Weergeven als" #. module: base_calendar #: field:base.calendar.set.exrule,day:0 @@ -108,52 +110,52 @@ msgstr "" #: field:calendar.todo,day:0 #: selection:calendar.todo,select1:0 msgid "Date of month" -msgstr "" +msgstr "Dag van de maand" #. module: base_calendar #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Public" -msgstr "" +msgstr "Openbaar" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 #: selection:res.alarm,trigger_interval:0 msgid "Hours" -msgstr "" +msgstr "Uren" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "March" -msgstr "" +msgstr "maart" #. module: base_calendar #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 #, python-format msgid "Warning !" -msgstr "" +msgstr "Waarschuwing !" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Friday" -msgstr "" +msgstr "vrijdag" #. module: base_calendar #: field:calendar.event,allday:0 #: field:calendar.todo,allday:0 msgid "All Day" -msgstr "" +msgstr "Hele dag" #. module: base_calendar #: field:base.calendar.set.exrule,select1:0 #: field:calendar.event,select1:0 #: field:calendar.todo,select1:0 msgid "Option" -msgstr "" +msgstr "Optie" #. module: base_calendar #: selection:calendar.attendee,availability:0 @@ -161,12 +163,12 @@ msgstr "" #: selection:calendar.todo,show_as:0 #: selection:res.users,availability:0 msgid "Free" -msgstr "" +msgstr "Vrij" #. module: base_calendar #: help:calendar.attendee,rsvp:0 msgid "Indicats whether the favor of a reply is requested" -msgstr "" +msgstr "Geeft aan of een antwoordverzoek gevraagd wordt" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_attachment @@ -176,32 +178,32 @@ msgstr "" #. module: base_calendar #: help:calendar.attendee,delegated_to:0 msgid "The users that the original request was delegated to" -msgstr "" +msgstr "De gebruikers aan wie het oorspronkelijke verzoek toegewezen was" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,delegated_to:0 msgid "Delegated To" -msgstr "" +msgstr "Toegewezen aan" #. module: base_calendar #: field:base.calendar.set.exrule,we:0 #: field:calendar.event,we:0 #: field:calendar.todo,we:0 msgid "Wed" -msgstr "" +msgstr "woe" #. module: base_calendar #: view:calendar.event:0 msgid "Show time as" -msgstr "" +msgstr "Tijd weergeven als" #. module: base_calendar #: field:base.calendar.set.exrule,tu:0 #: field:calendar.event,tu:0 #: field:calendar.todo,tu:0 msgid "Tue" -msgstr "" +msgstr "din" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 @@ -210,43 +212,43 @@ msgstr "" #: selection:calendar.todo,freq:0 #: selection:calendar.todo,rrule_type:0 msgid "Yearly" -msgstr "" +msgstr "Jaarlijks" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event ends" -msgstr "" +msgstr "De activiteit eindigt" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Last" -msgstr "" +msgstr "Laatste" #. module: base_calendar #: help:calendar.attendee,state:0 msgid "Status of the attendee's participation" -msgstr "" +msgstr "Deelnamestatus genodigde" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Room" -msgstr "" +msgstr "Zaal" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 #: selection:res.alarm,trigger_interval:0 msgid "Days" -msgstr "" +msgstr "dagen" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "No Repeat" -msgstr "" +msgstr "Niet terugkerend" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:0 @@ -254,74 +256,74 @@ msgstr "" #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 #, python-format msgid "Error!" -msgstr "" +msgstr "Fout!" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Chair Person" -msgstr "" +msgstr "Voorzitter" #. module: base_calendar #: selection:calendar.alarm,action:0 msgid "Procedure" -msgstr "" +msgstr "Werkwijze" #. module: base_calendar #: view:calendar.event:0 msgid "Select data for Custom Rule" -msgstr "" +msgstr "Selecteer gegevens voor aangepaste regel" #. module: base_calendar #: selection:calendar.event,state:0 #: selection:calendar.todo,state:0 msgid "Cancelled" -msgstr "" +msgstr "Geannuleerd" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 #: selection:res.alarm,trigger_interval:0 msgid "Minutes" -msgstr "" +msgstr "Minuten" #. module: base_calendar #: selection:calendar.alarm,action:0 msgid "Display" -msgstr "" +msgstr "Weergave" #. module: base_calendar #: view:calendar.event.edit.all:0 msgid "Edit all Occurrences" -msgstr "" +msgstr "Reeks bewerken" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation type" -msgstr "" +msgstr "Soort uitnodiging" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "Secondly" -msgstr "" +msgstr "Per seconde" #. module: base_calendar #: field:calendar.alarm,event_date:0 #: field:calendar.attendee,event_date:0 #: view:calendar.event:0 msgid "Event Date" -msgstr "" +msgstr "Datum activiteit" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Group By..." -msgstr "" +msgstr "Groepeer op.." #. module: base_calendar #: help:calendar.attendee,partner_id:0 msgid "Partner related to contact" -msgstr "" +msgstr "Relatie gekoppeld aan contactpersoon" #. module: base_calendar #: help:calendar.attendee,cutype:0 @@ -339,34 +341,34 @@ msgstr "" #: field:calendar.alarm,event_end_date:0 #: field:calendar.attendee,event_end_date:0 msgid "Event End Date" -msgstr "" +msgstr "Einddatum activiteit" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Optional Participation" -msgstr "" +msgstr "Deelname optioneel" #. module: base_calendar #: field:calendar.event,date_deadline:0 #: field:calendar.todo,date_deadline:0 msgid "Deadline" -msgstr "" +msgstr "Uiterste datum" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:0 #, python-format msgid "Warning!" -msgstr "" +msgstr "Waarschuwing!" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "_Cancel" -msgstr "" +msgstr "_Annuleren" #. module: base_calendar #: model:ir.module.module,shortdesc:base_calendar.module_meta_information msgid "Basic Calendar Functionality" -msgstr "" +msgstr "Basis kalender functionaliteit" #. module: base_calendar #: field:calendar.event,organizer:0 @@ -374,7 +376,7 @@ msgstr "" #: field:calendar.todo,organizer:0 #: field:calendar.todo,organizer_id:0 msgid "Organizer" -msgstr "" +msgstr "Organisator" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:0 @@ -382,76 +384,76 @@ msgstr "" #: model:res.request.link,name:base_calendar.request_link_meeting #, python-format msgid "Event" -msgstr "" +msgstr "Activiteit" #. module: base_calendar #: selection:calendar.alarm,trigger_occurs:0 #: selection:res.alarm,trigger_occurs:0 msgid "Before" -msgstr "" +msgstr "Vóór" #. module: base_calendar #: view:calendar.event:0 #: selection:calendar.event,state:0 #: selection:calendar.todo,state:0 msgid "Confirmed" -msgstr "" +msgstr "Bevestigd" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all msgid "Edit all events" -msgstr "" +msgstr "Reeks bewerken" #. module: base_calendar #: field:calendar.alarm,attendee_ids:0 #: field:calendar.event,attendee_ids:0 #: field:calendar.todo,attendee_ids:0 msgid "Attendees" -msgstr "" +msgstr "Deelnemers" #. module: base_calendar #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de actie-definiëring." #. module: base_calendar #: view:calendar.event:0 msgid "Confirm" -msgstr "" +msgstr "Bevestigen" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_todo msgid "Calendar Task" -msgstr "" +msgstr "Kalender-taak" #. module: base_calendar #: field:base.calendar.set.exrule,su:0 #: field:calendar.event,su:0 #: field:calendar.todo,su:0 msgid "Sun" -msgstr "" +msgstr "zon" #. module: base_calendar #: field:calendar.attendee,cutype:0 msgid "Invite Type" -msgstr "" +msgstr "Type uitnodiging" #. module: base_calendar #: view:res.alarm:0 msgid "Reminder details" -msgstr "" +msgstr "Details herinnering" #. module: base_calendar #: field:calendar.attendee,parent_ids:0 msgid "Delegrated From" -msgstr "" +msgstr "Toegewezen door" #. module: base_calendar #: selection:base.calendar.set.exrule,select1:0 #: selection:calendar.event,select1:0 #: selection:calendar.todo,select1:0 msgid "Day of month" -msgstr "" +msgstr "Dag van de maand" #. module: base_calendar #: view:calendar.event:0 @@ -459,94 +461,94 @@ msgstr "" #: field:calendar.event.edit.all,location:0 #: field:calendar.todo,location:0 msgid "Location" -msgstr "" +msgstr "Plaats" #. module: base_calendar #: field:base_calendar.invite.attendee,send_mail:0 msgid "Send mail?" -msgstr "" +msgstr "E-mail sturen?" #. module: base_calendar #: field:base_calendar.invite.attendee,email:0 #: selection:calendar.alarm,action:0 #: field:calendar.attendee,email:0 msgid "Email" -msgstr "" +msgstr "E-mail" #. module: base_calendar #: view:calendar.attendee:0 msgid "Event Detail" -msgstr "" +msgstr "Detail activiteit" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Run" -msgstr "" +msgstr "Uitvoeren" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_alarm msgid "Event alarm information" -msgstr "" +msgstr "Informatie herinnering activiteit" #. module: base_calendar #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Confidential" -msgstr "" +msgstr "Vertrouwelijk" #. module: base_calendar #: field:base.calendar.set.exrule,end_date:0 #: field:calendar.event,end_date:0 #: field:calendar.todo,end_date:0 msgid "Repeat Until" -msgstr "" +msgstr "Herhaal tot" #. module: base_calendar #: view:calendar.event:0 msgid "Visibility" -msgstr "" +msgstr "Zichtbaarheid" #. module: base_calendar #: field:calendar.attendee,rsvp:0 msgid "Required Reply?" -msgstr "" +msgstr "Antwoord vereist?" #. module: base_calendar #: field:calendar.event,base_calendar_url:0 #: field:calendar.todo,base_calendar_url:0 msgid "Caldav URL" -msgstr "" +msgstr "Caldav URL" #. module: base_calendar #: field:calendar.event,recurrent_uid:0 #: field:calendar.todo,recurrent_uid:0 msgid "Recurrent ID" -msgstr "" +msgstr "Terugkerend ID" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "July" -msgstr "" +msgstr "juli" #. module: base_calendar #: view:calendar.attendee:0 #: selection:calendar.attendee,state:0 msgid "Accepted" -msgstr "" +msgstr "Geaccepteerd" #. module: base_calendar #: field:base.calendar.set.exrule,th:0 #: field:calendar.event,th:0 #: field:calendar.todo,th:0 msgid "Thu" -msgstr "" +msgstr "don" #. module: base_calendar #: field:calendar.attendee,child_ids:0 msgid "Delegrated To" -msgstr "" +msgstr "Toegewezen aan" #. module: base_calendar #: constraint:ir.cron:0 @@ -556,29 +558,29 @@ msgstr "" #. module: base_calendar #: view:calendar.attendee:0 msgid "Required Reply" -msgstr "" +msgstr "Antwoord vereist" #. module: base_calendar #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Ongeldige XML, kan overzicht niet weergeven!" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Participation required" -msgstr "" +msgstr "Deelname vereist" #. module: base_calendar #: field:calendar.event,create_date:0 #: field:calendar.todo,create_date:0 msgid "Created" -msgstr "" +msgstr "Aangemaakt" #. module: base_calendar #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Private" -msgstr "" +msgstr "Privé" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 @@ -587,43 +589,43 @@ msgstr "" #: selection:calendar.todo,freq:0 #: selection:calendar.todo,rrule_type:0 msgid "Daily" -msgstr "" +msgstr "Dagelijks" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:0 #, python-format msgid "Can not Duplicate" -msgstr "" +msgstr "Kopiëren niet mogelijk" #. module: base_calendar #: field:calendar.event,class:0 #: field:calendar.todo,class:0 msgid "Mark as" -msgstr "" +msgstr "Markeren als" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,partner_address_id:0 msgid "Contact" -msgstr "" +msgstr "Contactpersoon" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Delegate" -msgstr "" +msgstr "Toewijzen" #. module: base_calendar #: field:base_calendar.invite.attendee,partner_id:0 #: view:calendar.attendee:0 #: field:calendar.attendee,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "Select data for ExRule" -msgstr "" +msgstr "Selecteer gegevens voor uitzondering regel" #. module: base_calendar #: view:base_calendar.invite.attendee:0 diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml index 678b798c82f..4269bb83ac6 100644 --- a/addons/base_iban/base_iban_data.xml +++ b/addons/base_iban/base_iban_data.xml @@ -8,6 +8,7 @@ IBAN Account iban + iban diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index bcc624d6a67..d22fa98f6e4 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -716,7 +716,7 @@ class basic_calendar_line(osv.osv): """ cr.execute("SELECT COUNT(id) FROM basic_calendar_lines \ - WHERE name='%s' AND calendar_id=%s", + WHERE name=%s AND calendar_id=%s", (vals.get('name'), vals.get('calendar_id'))) res = cr.fetchone() if res: diff --git a/addons/decimal_precision/i18n/nl.po b/addons/decimal_precision/i18n/nl.po index 431ea9885b1..4e1e3e4fa0c 100644 --- a/addons/decimal_precision/i18n/nl.po +++ b/addons/decimal_precision/i18n/nl.po @@ -8,46 +8,47 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-08-20 05:24+0000\n" -"PO-Revision-Date: 2010-09-12 15:18+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-03 20:06+0000\n" +"Last-Translator: Wouter Schrijvers \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n" +"X-Launchpad-Export-Date: 2010-10-04 04:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: decimal_precision #: field:decimal.precision,digits:0 msgid "Digits" -msgstr "" +msgstr "Cijfers" #. module: decimal_precision #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Ongeldige XML, kan overzicht niet weergeven!" #. module: decimal_precision #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"De Objectnaam moet starten met x_ en mag geen speciale tekens bevatten!" #. module: decimal_precision #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de actie-definiëring." #. module: decimal_precision #: view:decimal.precision:0 msgid "Decimal Precision" -msgstr "" +msgstr "Decimale precisie" #. module: decimal_precision #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form msgid "Decimal Accuracy Definitions" -msgstr "" +msgstr "Decimale nauwkeurigheid definities" #. module: decimal_precision #: model:ir.module.module,description:decimal_precision.module_meta_information @@ -63,19 +64,19 @@ msgstr "" #. module: decimal_precision #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fout ! U kunt geen recursief Menu maken." #. module: decimal_precision #: field:decimal.precision,name:0 msgid "Usage" -msgstr "" +msgstr "Gebruik" #. module: decimal_precision #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information msgid "Decimal Precision Configuration" -msgstr "" +msgstr "Decimale precisie configuratie" #. module: decimal_precision #: model:ir.model,name:decimal_precision.model_decimal_precision msgid "decimal.precision" -msgstr "" +msgstr "decimal.precision" diff --git a/addons/event/event.py b/addons/event/event.py index 7a6e904f6e3..ea4a9cf9b8b 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -28,6 +28,7 @@ import time import tools import decimal_precision as dp + class event_type(osv.osv): """ Event Type """ _name = 'event.type' @@ -225,7 +226,7 @@ class event_event(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."), 'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}), 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."), - 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to"), + 'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify for each registration a specific amount if you want to", digits_compute=dp.get_precision('Sale Price')), 'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who are giving speech on event."), 'speaker_ids':fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}), 'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}), @@ -306,8 +307,8 @@ class event_registration(osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}), "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}), "contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id - "unit_price": fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Event Price'), readonly=True, states={'draft': [('readonly', False)]}), - 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Event Price')), + "unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), + 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price')), "badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}), "event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}), "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}), diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py index 8462a812313..00f106ab8ae 100644 --- a/addons/event/wizard/partner_event_registration.py +++ b/addons/event/wizard/partner_event_registration.py @@ -24,6 +24,7 @@ import netsvc import tools from osv import fields, osv from tools.translate import _ +from decimal_precision import decimal_precision as dp class partner_event_registration(osv.osv_memory): @@ -36,7 +37,7 @@ class partner_event_registration(osv.osv_memory): _columns = { 'event_id': fields.many2one('event.event', 'Event'), 'event_type': fields.many2one('event.type', 'Type', readonly=True), - 'unit_price': fields.float('Registration Cost'), + 'unit_price': fields.float('Registration Cost', digits_compute=dp.get_precision('Sale Price')), 'start_date': fields.datetime('Start date', required=True, help="Beginning Date of Event", readonly=True), 'end_date': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True), 'nb_register': fields.integer('Number of Registration'), diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml index 705270d7c82..ca204a62241 100644 --- a/addons/hr_payroll/test/payslip.yml +++ b/addons/hr_payroll/test/payslip.yml @@ -9,6 +9,7 @@ sequence: 0.0 name: Fortis state: bank + bank: base.res_bank_1 - I create a new employee “Richard” - diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index ee4abdb35c4..75ad6101e11 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -57,14 +57,14 @@ class hr_analytic_timesheet(osv.osv): return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context=context) - def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context=None): + def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, company_id, unit=False, journal_id=False, context=None): if context is None: context = {} res = {'value':{}} if prod_id and unit_amount: # find company company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context) - res.update(self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, context=context)) + res.update(self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, journal_id, context=context)) # update unit of measurement if prod_id: uom = self.pool.get('product.product').browse(cr, uid, prod_id, context=context) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 4165f71d73f..a47fbf24685 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -12,16 +12,17 @@ tree - - + + - - - - - - + + + + + + + @@ -40,9 +41,9 @@ - - - + + + @@ -67,7 +68,7 @@ - + @@ -81,32 +82,20 @@ - - + + - - My Working Hours - ir.actions.act_window - hr.analytic.timesheet - form - tree,form - [('user_id','=',uid)] - - {"search_default_user_id":uid, "search_default_my": 1} - - - Working Hours ir.actions.act_window hr.analytic.timesheet form tree,form - {"search_default_user_id":uid} + {"search_default_user_id":uid, "search_default_today":1} This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis. diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index b308aa69cc8..8d0ed702c0a 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -81,7 +81,7 @@ class hr_so_project(osv.osv_memory): if not res['product_uom_id']: raise osv.except_osv(_('UserError'), _('No cost unit defined for this employee !')) - up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour, res['product_uom_id'])['value'] + up = timesheet_obj.on_change_unit_amount(cr, uid, False, res['product_id'], hour,False, res['product_uom_id'])['value'] res['name'] = data['info'] res['account_id'] = data['account_id'].id diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index c7435127466..4beda0999d0 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -21,17 +21,6 @@ - hr.analytic.timesheet.form hr.analytic.timesheet @@ -83,13 +72,26 @@ + + account.analytic.line.search.to_invoice + account.analytic.line + search + + + + + + + + + account.analytic.line.tree.to_invoice account.analytic.line tree - + @@ -103,18 +105,19 @@ + - Entries to invoice + Costs to Invoice account.analytic.line form tree,form - [('to_invoice','<>',False)] - {"search_default_user_id":uid} + [] + {'search_default_to_invoice': 1} OpenERP automatically group the entries to be invoiced so you can keep an eye on them on real time in one glance. - - Uninvoiced Entries - account.analytic.line - form - tree,form - [('invoice_id','=',False),('to_invoice','!=',False)] - - - - - Open Analytic Accounts - account.analytic.account - form - tree,form - [('state','<>','close'),('type','<>','view')] - - - - Unclosed Invoiceable Accounts - account.analytic.account - form - tree,form - [('state','<>','close'),('type','<>','view'),('pricelist_id','<>',False)] - - hr_timesheet_invoice.factor.form hr_timesheet_invoice.factor diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py index 0b3d1440f23..d2db7fd4027 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic.py +++ b/addons/hr_timesheet_invoice/report/report_analytic.py @@ -21,6 +21,8 @@ from osv import fields,osv import tools +from decimal_precision import decimal_precision as dp + class report_analytic_account_close(osv.osv): _name = "report.analytic.account.close" @@ -70,8 +72,8 @@ class report_account_analytic_line_to_invoice(osv.osv): 'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True), 'product_uom_id':fields.many2one('product.uom', 'UoM', readonly=True), 'unit_amount': fields.float('Units', readonly=True), - 'sale_price': fields.float('Sale price', readonly=True), - 'amount': fields.float('Amount', readonly=True), + 'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Sale Price')), + 'amount': fields.float('Amount', readonly=True, digits_compute=dp.get_precision('Account')), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), } diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index 4e1926fe069..1bb7765b372 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -38,7 +38,7 @@ class hr_timesheet_invoice_create(osv.osv_memory): 'accounts': fields.many2many('account.analytic.account', 'invoice_id', 'account_id', 'Analytic Accounts', required=True), 'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'), 'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'), - 'name': fields.boolean('Name of entry', help='The detail of each work done will be displayed on the invoice'), + 'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'), 'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'), 'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), } @@ -59,8 +59,10 @@ class hr_timesheet_invoice_create(osv.osv_memory): return [x[0] for x in account_ids] _defaults = { - 'accounts': _get_accounts - } + 'accounts': _get_accounts, + 'date': lambda *args: 1, + 'name': lambda *args: 1 + } def do_create(self, cr, uid, ids, context=None): mod_obj = self.pool.get('ir.model.data') diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml index d71b385c1f8..fc6d6da911e 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml @@ -2,37 +2,33 @@ - + hr.timesheet.invoice.create.form hr.timesheet.invoice.create form -
- - - - - - - - - - - - - - - - - - - - -