diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 1ff58367b47..cf2dfef7f78 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -93,17 +93,16 @@ module named account_voucherss 'account_installer.xml', 'report/account_invoice_report_view.xml', 'report/account_report_view.xml', + 'report/account_analytic_report_view.xml', ], 'demo_xml': [ + #'demo/price_accuracy00.yml', 'account_demo.xml', 'project/project_demo.xml', 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', 'account_unit_test.xml', ], - 'test': [ - 'test/price_accuracy00.yml', - ], 'installable': True, 'active': False, 'certificate': '0080331923549', diff --git a/addons/account/test/price_accuracy00.yml b/addons/account/demo/price_accuracy00.yml similarity index 91% rename from addons/account/test/price_accuracy00.yml rename to addons/account/demo/price_accuracy00.yml index a3cfc154ad9..81023395141 100644 --- a/addons/account/test/price_accuracy00.yml +++ b/addons/account/demo/price_accuracy00.yml @@ -44,6 +44,7 @@ Then I should see an account entry linked to this invoice. - !assert {model: account.invoice, id: invoice1}: + test: - bool(move_id) - # This is not working, find a way to do that in YAML, *qty is not @@ -52,12 +53,14 @@ equal to *qty x *price x (1 + *tax) - !assert {model: account.invoice, id: invoice1}: - - abs(sum(x.credit for x in move_id.line_id) - 163.97) < 0.000001 + test: + - abs(sum(x.credit for x in move_id.line_id) - 163.97) < 0.000001 - And this account entry must have a credit equals to the debit - !assert {model: account.invoice, id: invoice1}: - - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001 + test: + - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001 - Then, I change the precision of numbers to 3 digits. - @@ -77,7 +80,8 @@ Then this account entry must have a credit equals to the debit - !assert {model: account.invoice, id: invoice2}: - - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001 + test: + - abs(sum(x.credit - x.debit for x in move_id.line_id)) < 0.000001 - And this account entry must have a credit equals to 163.968€ which is equal to *qty x *price x (1 + *tax) diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 9509913faa4..8d393298e01 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,17 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-08 18:06+0000\n" +"PO-Revision-Date: 2010-04-01 22:39+0000\n" "Last-Translator: mitev.dmitry \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE +"X-Launchpad-Export-Date: 2010-04-03 03:54+0000\n" +======= "X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -115,7 +119,7 @@ msgstr "Rodič" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "Rada" +msgstr "" #. module: account #: field:account.invoice,residual:0 @@ -134,7 +138,7 @@ msgstr "Základní kódová značka" #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "Nepotvrzené záznamy" +msgstr "" #. module: account #: constraint:account.period:0 @@ -159,7 +163,7 @@ msgstr "Debetní Centralizace" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm msgid "Confirm draft invoices" -msgstr "Potvrdit návrh faktury" +msgstr "" #. module: account #: help:account.payment.term.line,days2:0 @@ -182,7 +186,7 @@ msgstr "Grafy účtu" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select msgid "Move line select" -msgstr "Přesun řádku vyberte" +msgstr "" #. module: account #: rml:account.journal.period.print:0 @@ -310,7 +314,7 @@ msgstr "Původ" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "Název Pohybu" +msgstr "" #. module: account #: xsl:account.transfer:0 @@ -325,7 +329,7 @@ msgstr "Vypočítat předpaltné(Subscription Compute)" #. module: account #: rml:account.central.journal:0 msgid "Account Num." -msgstr "Číslo účtu" +msgstr "" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -337,12 +341,12 @@ msgstr "" #: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" -msgstr "Daň" +msgstr "" #. module: account #: rml:account.general.journal:0 msgid "Debit Trans." -msgstr "Debetní transakce" +msgstr "" #. module: account #: field:account.analytic.line,account_id:0 @@ -356,24 +360,24 @@ msgstr "Analytický účet" #: field:account.tax,child_depend:0 #: field:account.tax.template,child_depend:0 msgid "Tax on Children" -msgstr "Daň z dětí" +msgstr "" #. module: account #: rml:account.central.journal:0 #: rml:account.general.journal:0 #: field:account.journal,name:0 msgid "Journal Name" -msgstr "Název časopisu" +msgstr "" #. module: account #: view:account.payment.term:0 msgid "Description on invoices" -msgstr "Popis na fakturách" +msgstr "" #. module: account #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "Chyba! Nemůžete vytvářet rekurzivní analytické účty." +msgstr "" #. module: account #: field:account.bank.statement.reconcile,total_entry:0 @@ -389,13 +393,13 @@ msgstr "Zdroj účtu" #. module: account #: field:account.journal,update_posted:0 msgid "Allow Cancelling Entries" -msgstr "Povolit Zrušení Příspěvky" +msgstr "" #. module: account #: model:process.transition,name:account.process_transition_paymentorderbank0 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0 msgid "Payment Reconcilation" -msgstr "Platba usmíření" +msgstr "" #. module: account #: model:account.journal,name:account.expenses_journal @@ -425,7 +429,7 @@ msgstr "(Účet / Partner) Název" #. module: account #: selection:account.move,type:0 msgid "Contra" -msgstr "Kontraindikace" +msgstr "" #. module: account #: field:account.analytic.account,state:0 @@ -447,7 +451,7 @@ msgstr "" #: view:account.tax:0 #: view:account.tax.template:0 msgid "Special Computation" -msgstr "Speciální výpočetní" +msgstr "" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 @@ -506,7 +510,7 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "Supplier invoice" -msgstr "Dodavatele uvedený na faktuře" +msgstr "" #. module: account #: model:process.transition,name:account.process_transition_reconcilepaid0 @@ -533,7 +537,7 @@ msgstr "" #. module: account #: field:account.account.type,close_method:0 msgid "Deferral Method" -msgstr "Metoda zpoždění" +msgstr "" #. module: account #: field:account.tax.template,include_base_amount:0 @@ -560,7 +564,7 @@ msgstr "" #: selection:account.tax,applicable_type:0 #: selection:account.tax.template,applicable_type:0 msgid "True" -msgstr "Pravda" +msgstr "" #. module: account #: help:account.payment.term.line,days:0 @@ -577,7 +581,7 @@ msgstr "" #. module: account #: rml:account.central.journal:0 msgid "Printing Date" -msgstr "Datum vydání" +msgstr "" #. module: account #: rml:account.general.ledger:0 @@ -593,7 +597,7 @@ msgstr "" #. module: account #: view:account.journal:0 msgid "Entry Controls" -msgstr "Vstupní kontrolou" +msgstr "" #. module: account #: help:account.model.line,sequence:0 @@ -616,13 +620,13 @@ msgstr "" #. module: account #: field:account.analytic.account,contact_id:0 msgid "Contact" -msgstr "Kontakt" +msgstr "" #. module: account #: selection:account.model.line,date:0 #: selection:account.model.line,date_maturity:0 msgid "Partner Payment Term" -msgstr "Partner splatnosti" +msgstr "" #. module: account #: view:account.move.reconcile:0 @@ -637,13 +641,13 @@ msgstr "Otevřeno pro bankovní vyrovnání(Open for bank reconciliation)" #. module: account #: field:account.invoice.line,discount:0 msgid "Discount (%)" -msgstr "Sleva (%)" +msgstr "" #. module: account #: wizard_field:account.move.line.reconcile,init_full,writeoff:0 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0 msgid "Write-Off amount" -msgstr "Odpis části" +msgstr "" #. module: account #: help:account.fiscalyear,company_id:0 @@ -653,7 +657,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_analytic_accounting msgid "Analytic Accounting" -msgstr "Analytické účetnictví" +msgstr "" #. module: account #: rml:account.overdue:0 @@ -666,22 +670,22 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_analytic_line_form #: model:ir.ui.menu,name:account.next_id_41 msgid "Analytic Entries" -msgstr "Analytická Příspěvky" +msgstr "" #. module: account #: selection:account.subscription,period_type:0 msgid "month" -msgstr "měsíc" +msgstr "" #. module: account #: field:account.analytic.account,partner_id:0 msgid "Associated Partner" -msgstr "Přidruženého partnera" +msgstr "" #. module: account #: field:account.invoice,comment:0 msgid "Additional Information" -msgstr "Další informace" +msgstr "" #. module: account #: selection:account.invoice,type:0 @@ -719,18 +723,18 @@ msgstr "" #. module: account #: model:process.transition,name:account.process_transition_supplieranalyticcost0 msgid "Analytic Invoice" -msgstr "Analytická faktury" +msgstr "" #. module: account #: field:account.journal.column,field:0 msgid "Field Name" -msgstr "Název pole" +msgstr "" #. module: account #: field:account.tax.code,sign:0 #: field:account.tax.code.template,sign:0 msgid "Sign for parent" -msgstr "Přihlaste se na mateřské" +msgstr "" #. module: account #: field:account.fiscalyear,end_journal_period_id:0 @@ -741,7 +745,7 @@ msgstr "" #: view:product.product:0 #: view:product.template:0 msgid "Purchase Properties" -msgstr "Nákup Nemovitosti" +msgstr "" #. module: account #: model:process.node,note:account.process_node_paymententries0 @@ -751,12 +755,12 @@ msgstr "" #. module: account #: wizard_button:account.invoice.pay,init,reconcile:0 msgid "Partial Payment" -msgstr "Částečná platba" +msgstr "" #. module: account #: wizard_view:account_use_models,create:0 msgid "Move Lines Created." -msgstr "Přesun vytvořených linek." +msgstr "" #. module: account #: field:account.fiscalyear,state:0 @@ -766,18 +770,18 @@ msgstr "Přesun vytvořených linek." #: field:account.period,state:0 #: field:account.subscription,state:0 msgid "Status" -msgstr "Stav" +msgstr "" #. module: account #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Period to" -msgstr "Období do" +msgstr "" #. module: account #: field:account.account.type,partner_account:0 msgid "Partner account" -msgstr "Partner účet" +msgstr "" #. module: account #: wizard_view:account.subscription.generate,init:0 @@ -803,7 +807,7 @@ msgstr "" #. module: account #: field:account.invoice,move_lines:0 msgid "Move Lines" -msgstr "Přesun Linky" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_config_wizard @@ -831,26 +835,26 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.next_id_30 msgid "Bank Reconciliation" -msgstr "Bankovní usmíření" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_account_template msgid "Templates for Accounts" -msgstr "Šablony pro účty" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_form #: model:ir.model,name:account.model_account_analytic_account #: model:ir.ui.menu,name:account.account_analytic_def_account msgid "Analytic Accounts" -msgstr "Analytické účty" +msgstr "" #. module: account #: wizard_view:account.print.journal.report,init:0 #: model:ir.actions.wizard,name:account.wizard_print_journal #: model:ir.ui.menu,name:account.menu_print_journal msgid "Print Journal" -msgstr "Tisk věstníku" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard @@ -861,39 +865,39 @@ msgstr "" #: field:account.move.line,date_created:0 #: field:account.move.reconcile,create_date:0 msgid "Creation date" -msgstr "Datum vytvoření" +msgstr "" #. module: account #: wizard_button:account.invoice.refund,init,cancel_invoice:0 msgid "Cancel Invoice" -msgstr "Zrušit účet" +msgstr "" #. module: account #: field:account.journal.column,required:0 msgid "Required" -msgstr "Požadované" +msgstr "" #. module: account #: field:product.category,property_account_expense_categ:0 #: field:product.template,property_account_expense:0 msgid "Expense Account" -msgstr "Cestovní účet" +msgstr "" #. module: account #: wizard_field:account.move.line.reconcile,addendum,journal_id:0 msgid "Write-Off Journal" -msgstr "Odpis věstníku" +msgstr "" #. module: account #: field:account.model.line,amount_currency:0 #: field:account.move.line,amount_currency:0 msgid "Amount Currency" -msgstr "Částka měny" +msgstr "" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "Kategorie výdajů účtu" +msgstr "" #. module: account #: wizard_field:account.fiscalyear.close,init,fy2_id:0 @@ -910,7 +914,7 @@ msgstr "" #. module: account #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0 msgid "Fiscal Year to Open" -msgstr "Fiskální rok otevřena" +msgstr "" #. module: account #: view:account.config.wizard:0 @@ -928,7 +932,7 @@ msgstr "" #: field:account.model.line,quantity:0 #: field:account.move.line,quantity:0 msgid "Quantity" -msgstr "Množství" +msgstr "" #. module: account #: wizard_field:account.account.balance.report,checktype,date_to:0 @@ -936,7 +940,7 @@ msgstr "Množství" #: wizard_field:account.partner.balance.report,init,date2:0 #: wizard_field:account.third_party_ledger.report,init,date2:0 msgid "End date" -msgstr "Datum ukončení" +msgstr "" #. module: account #: field:account.invoice.tax,base_amount:0 @@ -957,12 +961,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_bank_statement_tree #: model:ir.ui.menu,name:account.menu_bank_statement_tree msgid "Entries by Statements" -msgstr "Příspěvky výroky" +msgstr "" #. module: account #: model:process.transition,name:account.process_transition_analyticinvoice0 msgid "analytic Invoice" -msgstr "analytické faktury" +msgstr "" #. module: account #: wizard_field:account.automatic.reconcile,init,period_id:0 @@ -981,22 +985,22 @@ msgstr "analytické faktury" #: wizard_field:account.print.journal.report,init,period_id:0 #: field:account.subscription,period_nbr:0 msgid "Period" -msgstr "Perioda" +msgstr "" #. module: account #: rml:account.partner.balance:0 msgid "Grand total" -msgstr "Úhrn" +msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_accounting msgid "Financial Accounting" -msgstr "Finanční účetnictví" +msgstr "" #. module: account #: rml:account.invoice:0 msgid "Net Total:" -msgstr "Čistá celkem:" +msgstr "" #. module: account #: view:account.fiscal.position:0 @@ -1010,7 +1014,7 @@ msgstr "Čistá celkem:" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Position" -msgstr "Fiskální pozice" +msgstr "" #. module: account #: field:account.analytic.line,product_uom_id:0 @@ -1027,7 +1031,7 @@ msgstr "" #: field:account.account,child_parent_ids:0 #: field:account.account.template,child_parent_ids:0 msgid "Children" -msgstr "Děti" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax @@ -1038,35 +1042,35 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_invoice_tree2_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new msgid "New Supplier Invoice" -msgstr "Nového dodavatele faktury" +msgstr "" #. module: account #: wizard_field:account.invoice.pay,init,amount:0 msgid "Amount paid" -msgstr "Zaplacené částky" +msgstr "" #. module: account #: selection:account.invoice,type:0 #: model:process.transition,name:account.process_transition_customerinvoice0 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0 msgid "Customer Invoice" -msgstr "Zákazník faktury" +msgstr "" #. module: account #: wizard_view:account.open_closed_fiscalyear,init:0 msgid "Choose Fiscal Year" -msgstr "Vyberte si fiskální rok" +msgstr "" #. module: account #: field:account.sequence.fiscalyear,sequence_main_id:0 msgid "Main Sequence" -msgstr "Hlavní posloupnosti" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree #: model:ir.ui.menu,name:account.account_analytic_journal_print msgid "Print Analytic Journals" -msgstr "Tisk Analytické Časopisy" +msgstr "" #. module: account #: rml:account.tax.code.entries:0 @@ -1083,7 +1087,7 @@ msgstr "" #. module: account #: field:account.bank.statement.reconcile,total_new:0 msgid "Total write-off" -msgstr "Celkem odpis" +msgstr "" #. module: account #: view:account.tax.template:0 @@ -1095,14 +1099,14 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_tax_code_list #: model:ir.ui.menu,name:account.menu_action_tax_code_list msgid "Tax codes" -msgstr "Daňové kódy" +msgstr "" #. module: account #: field:account.fiscal.position.template,chart_template_id:0 #: field:account.tax.template,chart_template_id:0 #: field:wizard.multi.charts.accounts,chart_template_id:0 msgid "Chart Template" -msgstr "Graf šablony" +msgstr "" #. module: account #: field:account.chart.template,property_account_income_categ:0 @@ -1113,24 +1117,24 @@ msgstr "" #: model:ir.actions.act_window,name:account.analytic_account_form #: model:ir.ui.menu,name:account.account_analytic_form msgid "New Analytic Account" -msgstr "Nový analitickiý účet" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template msgid "Fiscal Position Templates" -msgstr "Fiskální pozice Šablony" +msgstr "" #. module: account #: rml:account.invoice:0 #: field:account.invoice.line,price_unit:0 msgid "Unit Price" -msgstr "Cena za kus" +msgstr "" #. module: account #: rml:account.analytic.account.journal:0 msgid "Period from :" -msgstr "Období od:" +msgstr "" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -1140,7 +1144,7 @@ msgstr "" #. module: account #: model:account.journal,name:account.sales_journal msgid "Journal de vente" -msgstr "Prodej věstníku" +msgstr "" #. module: account #: help:account.model.line,amount_currency:0 @@ -1151,23 +1155,23 @@ msgstr "" #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Position Template" -msgstr "Fiskální pozice šablony" +msgstr "" #. module: account #: field:account.payment.term,line_ids:0 msgid "Terms" -msgstr "Podmínky" +msgstr "" #. module: account #: rml:account.vat.declaration:0 msgid "Tax Report" -msgstr "Daňové Report" +msgstr "" #. module: account #: wizard_button:account.analytic.account.chart,init,open:0 #: wizard_button:account.chart,init,open:0 msgid "Open Charts" -msgstr "Zobrazit Grafy" +msgstr "" #. module: account #: wizard_view:account.fiscalyear.close.state,init:0 @@ -1177,7 +1181,7 @@ msgstr "" #. module: account #: selection:account.move,type:0 msgid "Bank Receipt" -msgstr "Bankovní Příjem" +msgstr "" #. module: account #: view:res.partner:0 @@ -1187,17 +1191,17 @@ msgstr "Bankovní účet" #. module: account #: field:account.chart.template,tax_template_ids:0 msgid "Tax Template List" -msgstr "Daňové seznamu šablon" +msgstr "" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 msgid "Invoice import" -msgstr "Faktura import" +msgstr "" #. module: account #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select msgid "Standard entry" -msgstr "Standardní vstupní" +msgstr "" #. module: account #: help:account.account,currency_mode:0 @@ -1212,7 +1216,7 @@ msgstr "" #. module: account #: field:account.account,company_currency_id:0 msgid "Company Currency" -msgstr "Společnost měny" +msgstr "" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template @@ -1222,7 +1226,7 @@ msgstr "" #. module: account #: field:account.analytic.account,parent_id:0 msgid "Parent Analytic Account" -msgstr "Parent Analytická účtu" +msgstr "" #. module: account #: wizard_button:account.move.line.reconcile,init_partial,addendum:0 @@ -1242,22 +1246,22 @@ msgstr "" #. module: account #: field:account.bank.statement,balance_end_real:0 msgid "Ending Balance" -msgstr "Konečný zůstatek" +msgstr "" #. module: account #: view:product.product:0 msgid "Purchase Taxes" -msgstr "Nákup Daně" +msgstr "" #. module: account #: field:account.payment.term.line,name:0 msgid "Line Name" -msgstr "Název řádku" +msgstr "" #. module: account #: selection:account.payment.term.line,value:0 msgid "Fixed Amount" -msgstr "Pevná částka" +msgstr "" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -1285,24 +1289,24 @@ msgstr "" #. module: account #: view:account.config.wizard:0 msgid "Continue" -msgstr "Pokračovat" +msgstr "" #. module: account #: field:account.payment.term.line,value:0 msgid "Value" -msgstr "Hodnota" +msgstr "" #. module: account #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0 msgid "Write-Off account" -msgstr "Odpis účet" +msgstr "" #. module: account #: field:account.model.line,model_id:0 #: field:account.subscription,model_id:0 msgid "Model" -msgstr "Vzor" +msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state @@ -1313,12 +1317,12 @@ msgstr "" #. module: account #: field:account.journal,centralisation:0 msgid "Centralised counterpart" -msgstr "Centralizované protějšek" +msgstr "" #. module: account #: view:wizard.company.setup:0 msgid "Message" -msgstr "Zpráva" +msgstr "" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 @@ -1332,7 +1336,7 @@ msgstr "" #: selection:account.analytic.account,type:0 #: field:account.journal,view_id:0 msgid "View" -msgstr "Pohled" +msgstr "" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 @@ -1340,13 +1344,13 @@ msgstr "Pohled" #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "All" -msgstr "Vše" +msgstr "" #. module: account #: field:account.move.line,analytic_lines:0 #: model:ir.model,name:account.model_account_analytic_line msgid "Analytic lines" -msgstr "Analytická linky" +msgstr "" #. module: account #: help:account.tax,type:0 @@ -1370,28 +1374,28 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_electronicfile0 msgid "Electronic File" -msgstr "Elektronický soubor" +msgstr "" #. module: account #: view:res.partner:0 msgid "Customer Credit" -msgstr "Odběratelský úvěr" +msgstr "" #. module: account #: field:account.invoice,tax_line:0 msgid "Tax Lines" -msgstr "Daňové Linky" +msgstr "" #. module: account #: field:ir.sequence,fiscal_ids:0 msgid "Sequences" -msgstr "Posloupnosti" +msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_type_form #: model:ir.ui.menu,name:account.menu_action_account_type_form msgid "Account Types" -msgstr "Typy účtů" +msgstr "" #. module: account #: wizard_field:account.automatic.reconcile,init,journal_id:0 @@ -1413,18 +1417,18 @@ msgstr "Typy účtů" #: wizard_field:populate_statement_from_inv,init,journal_id:0 #: field:report.hr.timesheet.invoice.journal,journal_id:0 msgid "Journal" -msgstr "Časopis" +msgstr "" #. module: account #: field:account.account,child_id:0 #: field:account.analytic.account,child_ids:0 msgid "Child Accounts" -msgstr "Dětská konta" +msgstr "" #. module: account #: field:account.account,check_history:0 msgid "Display History" -msgstr "Zobrazení historie" +msgstr "" #. module: account #: wizard_field:account.third_party_ledger.report,init,date1:0 @@ -1454,7 +1458,7 @@ msgstr "" #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 msgid "Write-Off" -msgstr "Odpis" +msgstr "" #. module: account #: help:account.invoice,partner_bank:0 @@ -1466,12 +1470,12 @@ msgstr "" #. module: account #: field:res.partner,debit:0 msgid "Total Payable" -msgstr "Celkem za poplatek" +msgstr "" #. module: account #: wizard_button:account.fiscalyear.close.state,init,close:0 msgid "Close states" -msgstr "Zavřít státy" +msgstr "" #. module: account #: model:ir.model,name:account.model_wizard_company_setup @@ -1486,22 +1490,22 @@ msgstr "" #. module: account #: field:account.journal,refund_journal:0 msgid "Refund Journal" -msgstr "Refundace věstníku" +msgstr "" #. module: account #: model:account.account.type,name:account.account_type_income msgid "Income" -msgstr "Příjem" +msgstr "" #. module: account #: selection:account.bank.statement.line,type:0 msgid "Supplier" -msgstr "Dodavatel" +msgstr "" #. module: account #: rml:account.invoice:0 msgid "Tel. :" -msgstr "Telefonní číslo:" +msgstr "" #. module: account #: field:account.invoice.tax,tax_amount:0 diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 71f612e0329..09ff866d1a8 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -36,6 +36,7 @@ import account_balance_landscape import compare_account_balance import account_invoice_report import account_report +import account_analytic_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_analytic_report.py b/addons/account/report/account_analytic_report.py new file mode 100644 index 00000000000..45057d950bd --- /dev/null +++ b/addons/account/report/account_analytic_report.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import tools +from osv import fields,osv + +class analytic_report(osv.osv): + _name = "analytic.report" + _description = "Analytic Accounts Statistics" + _auto = False + _columns = { + 'date_start': fields.date('Date Start', readonly=True), + 'date_end': fields.date('Date End',readonly=True), + 'name' : fields.char('Analytic Account', size=128, readonly=True), + 'partner_id' : fields.many2one('res.partner', 'Associated Partner',readonly=True), + 'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', readonly=True), + 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', readonly=True), + 'user_id' : fields.many2one('res.users', 'Account Manager',readonly=True), + 'product_id' : fields.many2one('product.product', 'Product',readonly=True), + 'quantity': fields.float('Quantity',readonly=True), + 'debit' : fields.float('Debit',readonly=True), + 'credit' : fields.float('Credit',readonly=True), + 'balance' : fields.float('Balance',readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + '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), + 'state': fields.selection([('draft','Draft'), + ('open','Open'), + ('pending','Pending'), + ('cancelled', 'Cancelled'), + ('close','Close'), + ('template', 'Template')], + 'State', readonly=True), + } + _order = 'date_start desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'analytic_report') + cr.execute(""" + create or replace view analytic_report as ( + select + min(s.id) as id, + to_char(s.create_date, 'YYYY') as year, + to_char(s.create_date, 'MM') as month, + l.journal_id, + l.product_id, + s.parent_id, + s.date_start, + s.date as date_end, + s.user_id, + s.name, + s.partner_id, + s.quantity, + s.debit, + s.credit, + s.balance, + count(*) as nbr, + s.state + from account_analytic_account s + left join account_analytic_line l on (s.id=l.account_id) + GROUP BY s.create_date,s.state,l.journal_id,s.name, + s.partner_id,s.date_start,s.date,s.user_id,s.quantity, + s.debit,s.credit,s.balance,s.parent_id,l.product_id + ) + """) +analytic_report() diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml new file mode 100644 index 00000000000..de97bfcb798 --- /dev/null +++ b/addons/account/report/account_analytic_report_view.xml @@ -0,0 +1,109 @@ + + + + + analytic.report.tree + analytic.report + tree + + + + + + + + + + + + + + + + + + + + + + + analytic.report.search + analytic.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Analytic Accounts + analytic.report + form + tree + {'search_default_User':1,'search_default_user_id':uid} + + + + + + + diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 0d4ac30323d..36fa5a0d132 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -30,11 +30,17 @@ class account_invoice_report(osv.osv): _columns = { 'date': fields.date('Date', readonly=True), 'year': fields.char('Year', size=4, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), '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), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), + 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True), + 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')],readonly=True), + 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True), + 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), + 'journal_id': fields.many2one('account.journal', 'Journal',readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Salesman', readonly=True), @@ -66,9 +72,15 @@ class account_invoice_report(osv.osv): s.date_invoice as date, to_char(s.date_invoice, 'YYYY') as year, to_char(s.date_invoice, 'MM') as month, + to_char(s.date_invoice, 'YYYY-MM-DD') as day, l.product_id as product_id, sum(l.quantity * u.factor) as product_qty, s.partner_id as partner_id, + s.payment_term as payment_term, + s.period_id as period_id, + s.currency_id as currency_id, + s.journal_id as journal_id, + s.fiscal_position as fiscal_position, s.user_id as user_id, s.company_id as company_id, sum(l.quantity*l.price_unit) as price_total, @@ -82,9 +94,19 @@ class account_invoice_report(osv.osv): account_invoice s on (s.id=l.invoice_id) left join product_uom u on (u.id=l.uos_id) group by - s.type,s.date_invoice, s.partner_id, l.product_id, - l.uos_id, s.user_id, s.state, - s.company_id + s.type, + s.date_invoice, + s.partner_id, + l.product_id, + l.uos_id, + s.user_id, + s.state, + s.company_id, + s.payment_term, + s.period_id, + s.fiscal_position, + s.currency_id, + s.journal_id ) """) account_invoice_report() diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 5976a4fb5fc..5a833e454fb 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -7,20 +7,26 @@ tree - - + + + - - - + + + + + + + + @@ -44,60 +50,85 @@ - - + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -110,6 +141,7 @@ account.invoice.report form tree,graph + {'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/account/test/test_parent_structure.py b/addons/account/test/test_parent_structure.py new file mode 100644 index 00000000000..ba27d91c87c --- /dev/null +++ b/addons/account/test/test_parent_structure.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +# +# TODO: move this in a YAML test with !python tag +# + +import xmlrpclib + +DB = 'training3' +USERID = 1 +USERPASS = 'admin' + + +sock = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/object' % ('localhost',8069)) + +ids = sock.execute(DB, USERID, USERPASS, 'account.account', 'search', [], {}) +account_lists = sock.execute(DB, USERID, USERPASS, 'account.account', 'read', ids, ['parent_id','parent_left','parent_right']) + +accounts = dict(map(lambda x: (x['id'],x), account_lists)) +for a in account_lists: + if a['parent_id']: + assert a['parent_left'] > accounts[a['parent_id'][0]]['parent_left'] + assert a['parent_right'] < accounts[a['parent_id'][0]]['parent_right'] + assert a['parent_left'] < a['parent_right'] + for a2 in account_lists: + assert not ((a2['parent_right']>a['parent_left']) and + (a2['parent_left']a['parent_left']) and (a2['parent_right'] parent_right of all childs - . if an account is a child it is included in parent_left-parent_right - . if an account is not a child it is not included in parent_left-parent_right +- + We retrieve all accounts and test they are in a tree data structure. - !python {model: account.account}: | ids = self.search(cr, uid, []) diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po index 7139ac0c822..1b10c28c59e 100644 --- a/addons/account_payment/i18n/cs.po +++ b/addons/account_payment/i18n/cs.po @@ -7,13 +7,17 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-07 22:24+0000\n" -"Last-Translator: mitev.dmitry \n" +"PO-Revision-Date: 2009-02-03 06:24+0000\n" +"Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE +"X-Launchpad-Export-Date: 2010-03-30 04:07+0000\n" +======= "X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -46,7 +50,7 @@ msgstr "" #: field:payment.line,info_owner:0 #: view:payment.order:0 msgid "Owner Account" -msgstr "Majitel účtu" +msgstr "" #. module: account_payment #: help:account.invoice,amount_to_pay:0 @@ -65,17 +69,17 @@ msgstr "" #. module: account_payment #: field:payment.order,date_prefered:0 msgid "Preferred date" -msgstr "Preferované datum" +msgstr "" #. module: account_payment #: selection:payment.line,state:0 msgid "Free" -msgstr "Volný" +msgstr "" #. module: account_payment #: wizard_field:populate_payment,search,entries:0 msgid "Entries" -msgstr "Příspěvky" +msgstr "" #. module: account_payment #: wizard_field:populate_payment,init,duedate:0 @@ -96,7 +100,7 @@ msgstr "" #: rml:payment.order:0 #: view:payment.order:0 msgid "Amount" -msgstr "Částka" +msgstr "" #. module: account_payment #: rml:payment.order:0 @@ -111,7 +115,7 @@ msgstr "" #. module: account_payment #: selection:payment.order,state:0 msgid "Cancelled" -msgstr "Zrušeno" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new @@ -123,7 +127,7 @@ msgstr "" #: rml:payment.order:0 #: field:payment.order,reference:0 msgid "Reference" -msgstr "Odkaz" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree @@ -134,7 +138,7 @@ msgstr "" #. module: account_payment #: selection:payment.order,date_prefered:0 msgid "Directly" -msgstr "Přímo" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_line_form @@ -157,7 +161,7 @@ msgstr "" #. module: account_payment #: selection:payment.order,state:0 msgid "Confirmed" -msgstr "Potvrzeno" +msgstr "" #. module: account_payment #: help:payment.line,ml_date_created:0 @@ -177,12 +181,12 @@ msgstr "" #. module: account_payment #: selection:payment.line,state:0 msgid "Structured" -msgstr "Strukturované" +msgstr "" #. module: account_payment #: field:payment.order,state:0 msgid "State" -msgstr "Stav" +msgstr "" #. module: account_payment #: view:payment.line:0 @@ -223,17 +227,17 @@ msgstr "" #. module: account_payment #: field:payment.order,date_done:0 msgid "Execution date" -msgstr "Datum představení" +msgstr "" #. module: account_payment #: selection:payment.order,date_prefered:0 msgid "Fixed date" -msgstr "Pevné datum" +msgstr "" #. module: account_payment #: field:payment.line,info_partner:0 msgid "Destination Account" -msgstr "Protiúčet" +msgstr "" #. module: account_payment #: view:payment.line:0 @@ -251,12 +255,12 @@ msgstr "" #: wizard_button:populate_payment,search,end:0 #: wizard_button:populate_statement,init,end:0 msgid "_Cancel" -msgstr "Zrušit" +msgstr "" #. module: account_payment #: field:payment.line,create_date:0 msgid "Created" -msgstr "Vytvořeno" +msgstr "" #. module: account_payment #: view:payment.line:0 @@ -281,12 +285,12 @@ msgstr "" #. module: account_payment #: field:payment.line,communication:0 msgid "Communication" -msgstr "Komunikace" +msgstr "" #. module: account_payment #: selection:payment.order,date_prefered:0 msgid "Due date" -msgstr "Termín dokončení" +msgstr "" #. module: account_payment #: field:account.invoice,amount_to_pay:0 @@ -307,7 +311,7 @@ msgstr "" #: view:payment.type:0 #: help:payment.type,name:0 msgid "Payment Type" -msgstr "Typ platby" +msgstr "" #. module: account_payment #: help:payment.line,amount_currency:0 diff --git a/addons/analytic/project.py b/addons/analytic/project.py index 0c3c46690ac..9194bd9906b 100644 --- a/addons/analytic/project.py +++ b/addons/analytic/project.py @@ -63,13 +63,13 @@ class account_analytic_account(osv.osv): res = {} ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) acc_set = ",".join(map(str, ids2)) - + for i in ids: res.setdefault(i,0.0) - + if not ids2: return res - + where_date = '' if context.get('from_date',False): where_date += " AND l.date >= '" + context['from_date'] + "'" @@ -78,18 +78,18 @@ class account_analytic_account(osv.osv): cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency<0 and a.id =ANY(%s) GROUP BY a.id",(ids2,)) r = dict(cr.fetchall()) return self._compute_currency_for_level_tree(cr, uid, ids, ids2, r, acc_set, context) - + def _debit_calc(self, cr, uid, ids, name, arg, context={}): res = {} ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) acc_set = ",".join(map(str, ids2)) - + for i in ids: res.setdefault(i,0.0) - + if not ids2: return res - + where_date = '' if context.get('from_date',False): where_date += " AND l.date >= '" + context['from_date'] + "'" @@ -98,48 +98,48 @@ class account_analytic_account(osv.osv): cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency>0 and a.id =ANY(%s) GROUP BY a.id" ,(ids2,)) r= dict(cr.fetchall()) return self._compute_currency_for_level_tree(cr, uid, ids, ids2, r, acc_set, context) - + def _balance_calc(self, cr, uid, ids, name, arg, context={}): res = {} ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) acc_set = ",".join(map(str, ids2)) - + for i in ids: res.setdefault(i,0.0) - + if not ids2: return res - + where_date = '' if context.get('from_date',False): where_date += " AND l.date >= '" + context['from_date'] + "'" if context.get('to_date',False): where_date += " AND l.date <= '" + context['to_date'] + "'" cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE a.id =ANY(%s) GROUP BY a.id",(ids2,)) - + for account_id, sum in cr.fetchall(): res[account_id] = sum return self._compute_currency_for_level_tree(cr, uid, ids, ids2, res, acc_set, context) - + def _quantity_calc(self, cr, uid, ids, name, arg, context={}): #XXX must convert into one uom res = {} ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)]) acc_set = ",".join(map(str, ids2)) - + for i in ids: res.setdefault(i,0.0) - + if not ids2: return res - + where_date = '' if context.get('from_date',False): where_date += " AND l.date >= '" + context['from_date'] + "'" if context.get('to_date',False): where_date += " AND l.date <= '" + context['to_date'] + "'" - + cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \ FROM account_analytic_account a \ LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \ @@ -182,7 +182,7 @@ class account_analytic_account(osv.osv): def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}): result=self._get_company_currency(cr, uid, ids, field_name, arg, context={}) return result - + _columns = { 'name' : fields.char('Account Name', size=128, required=True), 'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'), @@ -192,10 +192,10 @@ class account_analytic_account(osv.osv): 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2), 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'), 'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'), - 'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance'), - 'debit' : fields.function(_debit_calc, method=True, type='float', string='Debit'), - 'credit' : fields.function(_credit_calc, method=True, type='float', string='Credit'), - 'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'), + 'balance' : fields.function(_balance_calc, method=True, type='float', string='Balance',store=True), + 'debit' : fields.function(_debit_calc, method=True, type='float', string='Debit',store=True), + 'credit' : fields.function(_credit_calc, method=True, type='float', string='Credit',store=True), + 'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity',store=True), 'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'), 'partner_id' : fields.many2one('res.partner', 'Associated Partner'), 'contact_id' : fields.many2one('res.partner.address', 'Contact'), diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po index 5ba61eb14a7..f795546b2fe 100644 --- a/addons/audittrail/i18n/it.po +++ b/addons/audittrail/i18n/it.po @@ -7,19 +7,23 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-07 08:27+0000\n" -"Last-Translator: iTuxer \n" +"PO-Revision-Date: 2009-02-03 12:33+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE +"X-Launchpad-Export-Date: 2010-03-30 04:13+0000\n" +======= "X-Launchpad-Export-Date: 2010-04-17 04:17+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail #: model:ir.module.module,shortdesc:audittrail.module_meta_information msgid "Audit Trail" -msgstr "Audit Trail" +msgstr "" #. module: audittrail #: constraint:ir.model:0 @@ -32,22 +36,22 @@ msgstr "" #. module: audittrail #: field:audittrail.log.line,log_id:0 msgid "Log" -msgstr "Log" +msgstr "" #. module: audittrail #: selection:audittrail.rule,state:0 msgid "Subscribed" -msgstr "Iscritto" +msgstr "" #. module: audittrail #: view:audittrail.log:0 msgid "Old Value : " -msgstr "Valore precendente : " +msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Create" -msgstr "Crea" +msgstr "" #. module: audittrail #: wizard_view:audittrail.view.log,init:0 @@ -67,7 +71,7 @@ msgstr "" #. module: audittrail #: field:audittrail.log.line,old_value:0 msgid "Old Value" -msgstr "Valore precedente" +msgstr "" #. module: audittrail #: constraint:ir.actions.act_window:0 diff --git a/addons/base_contact/i18n/ko.po b/addons/base_contact/i18n/ko.po index a5dbaad3f46..d209a3d2db3 100644 --- a/addons/base_contact/i18n/ko.po +++ b/addons/base_contact/i18n/ko.po @@ -14,7 +14,11 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE +"X-Launchpad-Export-Date: 2010-04-07 03:46+0000\n" +======= "X-Launchpad-Export-Date: 2010-04-17 04:03+0000\n" +>>>>>>> MERGE-SOURCE "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po deleted file mode 100644 index 4977c9a4a3f..00000000000 --- a/addons/base_setup/i18n/fa.po +++ /dev/null @@ -1,283 +0,0 @@ -# Persian translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-08 14:27+0000\n" -"Last-Translator: Sadegh Ismael Nattaj \n" -"Language-Team: Persian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,city:0 -#: wizard_field:base_setup.base_setup,init,city:0 -#: wizard_field:base_setup.base_setup,update,city:0 -msgid "City" -msgstr "شهر" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,finish:0 -msgid "" -"You can start configuring the system or connect directly to the database " -"using the default setup." -msgstr "" -"شما می‌توانید با بکارگیری از سوارسازی پیش‌فرض آغاز به پیکربندی سامانه کنید و " -"یا یک‌راست به دادگان متصل شوید." - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,zip:0 -#: wizard_field:base_setup.base_setup,init,zip:0 -#: wizard_field:base_setup.base_setup,update,zip:0 -msgid "Zip code" -msgstr "کد پستی" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,init:0 -msgid "Select a Profile" -msgstr "یک پروفایل را برگزینید" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Report header" -msgstr "سرنویس گزارش" - -#. module: base_setup -#: wizard_button:base_setup.base_setup,finish,config:0 -msgid "Start Configuration" -msgstr "آغاز پیکربندی" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,init:0 -msgid "" -"You'll be able to install more modules later through the Administration menu." -msgstr "" -"شما می‌توانید از طریق منوی راهبری پیمانه‌های بیشتری را در آینده برپاسازی " -"نمایید." - -#. module: base_setup -#: wizard_view:base_setup.base_setup,init:0 -msgid "" -"A profile sets a pre-selection of modules for specific needs. These profiles " -"have been setup to help you discover the different aspects of OpenERP. This " -"is just an overview, we have 300+ available modules." -msgstr "" -"یک پروفایل دارای پیمانه‌های از پیش گزینش شده برای نیازهای خاص است. این " -"پروفایل‌ها برای این سوار می‌شوند تا به شما برای شناخت بیشتر جنبه‌های متفاوت " -"اپن ای‌آر‌پی کمک نماید. این تنها یک پیش‌نمایش است، ما بیش از ۳۰۰ پیمانه " -"آماده داریم." - -#. module: base_setup -#: wizard_button:base_setup.base_setup,company,update:0 -#: wizard_button:base_setup.base_setup,init,company:0 -msgid "Next" -msgstr "پس" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,email:0 -#: wizard_field:base_setup.base_setup,init,email:0 -#: wizard_field:base_setup.base_setup,update,email:0 -msgid "E-mail" -msgstr "ایمیل" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,state_id:0 -#: wizard_field:base_setup.base_setup,init,state_id:0 -#: wizard_field:base_setup.base_setup,update,state_id:0 -msgid "State" -msgstr "استان" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,finish:0 -msgid "Your new database is now fully installed." -msgstr "دادگان نو شما بطور کامل برپاسازی گردید." - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,profile:0 -#: wizard_field:base_setup.base_setup,init,profile:0 -#: wizard_field:base_setup.base_setup,update,profile:0 -msgid "Profile" -msgstr "پروفایل" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,rml_footer1:0 -#: wizard_field:base_setup.base_setup,init,rml_footer1:0 -#: wizard_field:base_setup.base_setup,update,rml_footer1:0 -msgid "Report Footer 1" -msgstr "پانویس گزارش ۱" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,rml_footer2:0 -#: wizard_field:base_setup.base_setup,init,rml_footer2:0 -#: wizard_field:base_setup.base_setup,update,rml_footer2:0 -msgid "Report Footer 2" -msgstr "پانویس گزارش ۲" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "General Information" -msgstr "آگهگان عمومی" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,street2:0 -#: wizard_field:base_setup.base_setup,init,street2:0 -#: wizard_field:base_setup.base_setup,update,street2:0 -msgid "Street2" -msgstr "خیابان۲" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Report Information" -msgstr "آگهگان گزارش" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,phone:0 -#: wizard_field:base_setup.base_setup,init,phone:0 -#: wizard_field:base_setup.base_setup,update,phone:0 -msgid "Phone" -msgstr "تلفن" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Define Main Company" -msgstr "تعریف شرکت اصلی" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,name:0 -#: wizard_field:base_setup.base_setup,init,name:0 -#: wizard_field:base_setup.base_setup,update,name:0 -msgid "Company Name" -msgstr "نام شرکت" - -#. module: base_setup -#: help:base_setup.base_setup,company,rml_footer2:0 -#: help:base_setup.base_setup,init,rml_footer2:0 -#: help:base_setup.base_setup,update,rml_footer2:0 -msgid "" -"This sentence will appear at the bottom of your reports.\n" -"We suggest you to put bank information here:\n" -"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" -msgstr "" -"این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n" -"پیشنهاد می‌کنیم آگهگان بانکی را اینجا وارد نمایید:\n" -"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,country_id:0 -#: wizard_field:base_setup.base_setup,init,country_id:0 -#: wizard_field:base_setup.base_setup,update,country_id:0 -msgid "Country" -msgstr "کشور" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -#: wizard_view:base_setup.base_setup,finish:0 -#: wizard_view:base_setup.base_setup,init:0 -#: wizard_view:base_setup.base_setup,update:0 -#: model:ir.actions.wizard,name:base_setup.action_wizard_setup -#: model:ir.actions.wizard,name:base_setup.wizard_base_setup -msgid "Setup" -msgstr "سوارکردن" - -#. module: base_setup -#: help:base_setup.base_setup,company,rml_footer1:0 -#: help:base_setup.base_setup,init,rml_footer1:0 -#: help:base_setup.base_setup,update,rml_footer1:0 -msgid "" -"This sentence will appear at the bottom of your reports.\n" -"We suggest you to write legal sentences here:\n" -"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" -msgstr "" -"این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n" -"پیشنهاد می‌کنیم تا از عبارات قانونی در اینجا بکار ببرید:\n" -"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,update:0 -msgid "Summary" -msgstr "چکیده" - -#. module: base_setup -#: wizard_button:base_setup.base_setup,update,finish:0 -msgid "Install" -msgstr "برپایی" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,finish:0 -msgid "Installation Done" -msgstr "برپایی انجام شد" - -#. module: base_setup -#: help:base_setup.base_setup,company,rml_header1:0 -#: help:base_setup.base_setup,init,rml_header1:0 -#: help:base_setup.base_setup,update,rml_header1:0 -msgid "" -"This sentence will appear at the top right corner of your reports.\n" -"We suggest you to put a slogan here:\n" -"\"Open Source Business Solutions\"." -msgstr "" -"این جمله در گوشه بالا سمت راست گزارش‌های شما ظاهر خواهد شد.\n" -"پیشنهاد می‌کنیم شعار خود را اینجا قرار دهید:\n" -"\"راهکارهای بازمتن برای تجارت\"." - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,rml_header1:0 -#: wizard_field:base_setup.base_setup,init,rml_header1:0 -#: wizard_field:base_setup.base_setup,update,rml_header1:0 -msgid "Report Header" -msgstr "سرنویس گزارش" - -#. module: base_setup -#: wizard_view:base_setup.base_setup,company:0 -msgid "Your Logo - Use a size of about 450x150 pixels." -msgstr "نشان شما - اندازه تصویری ۱۵۰×۴۵۰ پیکسل را بکار برید." - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,currency:0 -#: wizard_field:base_setup.base_setup,init,currency:0 -#: wizard_field:base_setup.base_setup,update,currency:0 -msgid "Currency" -msgstr "ارز" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,street:0 -#: wizard_field:base_setup.base_setup,init,street:0 -#: wizard_field:base_setup.base_setup,update,street:0 -msgid "Street" -msgstr "خیابان" - -#. module: base_setup -#: wizard_button:base_setup.base_setup,finish,menu:0 -msgid "Use Directly" -msgstr "بکارگیری آنی" - -#. module: base_setup -#: wizard_button:base_setup.base_setup,init,menu:0 -msgid "Cancel" -msgstr "لغو" - -#. module: base_setup -#: wizard_field:base_setup.base_setup,company,logo:0 -#: wizard_field:base_setup.base_setup,init,logo:0 -#: wizard_field:base_setup.base_setup,update,logo:0 -msgid "Logo" -msgstr "نشان" - -#. module: base_setup -#: model:ir.module.module,shortdesc:base_setup.module_meta_information -msgid "Base Setup" -msgstr "سوارکردن پایه" - -#. module: base_setup -#: wizard_button:base_setup.base_setup,company,init:0 -#: wizard_button:base_setup.base_setup,update,company:0 -msgid "Previous" -msgstr "پیش" diff --git a/addons/board_account/__openerp__.py b/addons/board_account/__openerp__.py index 82ecb16fa37..58de913f2ea 100644 --- a/addons/board_account/__openerp__.py +++ b/addons/board_account/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -38,9 +38,6 @@ 'account', 'hr_timesheet_invoice', 'board', - 'report_account', - 'report_analytic', - 'report_analytic_line', 'account_report' ], 'update_xml': ['board_account_view.xml'], diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml index 50b0fedd37e..2beb9899cb6 100644 --- a/addons/board_account/board_account_view.xml +++ b/addons/board_account/board_account_view.xml @@ -41,7 +41,7 @@ - + diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm/__init__.py similarity index 100% rename from addons/board_crm_configuration/__init__.py rename to addons/board_crm/__init__.py diff --git a/addons/board_crm_configuration/__openerp__.py b/addons/board_crm/__openerp__.py similarity index 100% rename from addons/board_crm_configuration/__openerp__.py rename to addons/board_crm/__openerp__.py diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml similarity index 100% rename from addons/board_crm_configuration/board_crm_demo.xml rename to addons/board_crm/board_crm_demo.xml diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml similarity index 91% rename from addons/board_crm_configuration/board_crm_statistical_view.xml rename to addons/board_crm/board_crm_statistical_view.xml index 2b3c348c6a4..9a43e4e96c2 100644 --- a/addons/board_crm_configuration/board_crm_statistical_view.xml +++ b/addons/board_crm/board_crm_statistical_view.xml @@ -6,40 +6,38 @@ --> Leads By Stage - Graph - report.crm.lead.section.stage + crm.lead.report graph - report.crm.opportunity.categ.graph - report.crm.opportunity.categ + crm.opportunity.report graph - - report.crm.lead.section.stage + crm.lead.report form graph,tree,form @@ -48,7 +46,7 @@ + + + + CRM Configuration + + + crm.opportunity.user.graph1 + crm.opportunity.report + graph + + + + + + + + + crm.lead + form + tree,form + + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + + + crm.meeting + form + tree,form + + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + + + + crm.lead.report + form + graph,tree,form + + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + + + + crm.opportunity.report + form + graph,tree,form + + [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + + + + CRM - Dashboard Form + board.board + form + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + CRM Dashboard + board.board + form + form + menu + + + + + + + + diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm/i18n/ar.po similarity index 100% rename from addons/board_crm_configuration/i18n/ar.po rename to addons/board_crm/i18n/ar.po diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm/i18n/bg.po similarity index 100% rename from addons/board_crm_configuration/i18n/bg.po rename to addons/board_crm/i18n/bg.po diff --git a/addons/board_crm_configuration/i18n/board_crm_configuration.pot b/addons/board_crm/i18n/board_crm_configuration.pot similarity index 100% rename from addons/board_crm_configuration/i18n/board_crm_configuration.pot rename to addons/board_crm/i18n/board_crm_configuration.pot diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm/i18n/bs.po similarity index 100% rename from addons/board_crm_configuration/i18n/bs.po rename to addons/board_crm/i18n/bs.po diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm/i18n/ca.po similarity index 100% rename from addons/board_crm_configuration/i18n/ca.po rename to addons/board_crm/i18n/ca.po diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm/i18n/cs.po similarity index 100% rename from addons/board_crm_configuration/i18n/cs.po rename to addons/board_crm/i18n/cs.po diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm/i18n/de.po similarity index 100% rename from addons/board_crm_configuration/i18n/de.po rename to addons/board_crm/i18n/de.po diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm/i18n/el.po similarity index 100% rename from addons/board_crm_configuration/i18n/el.po rename to addons/board_crm/i18n/el.po diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm/i18n/es.po similarity index 100% rename from addons/board_crm_configuration/i18n/es.po rename to addons/board_crm/i18n/es.po diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm/i18n/es_AR.po similarity index 100% rename from addons/board_crm_configuration/i18n/es_AR.po rename to addons/board_crm/i18n/es_AR.po diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm/i18n/et.po similarity index 100% rename from addons/board_crm_configuration/i18n/et.po rename to addons/board_crm/i18n/et.po diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm/i18n/fr.po similarity index 100% rename from addons/board_crm_configuration/i18n/fr.po rename to addons/board_crm/i18n/fr.po diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm/i18n/hr.po similarity index 100% rename from addons/board_crm_configuration/i18n/hr.po rename to addons/board_crm/i18n/hr.po diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm/i18n/hu.po similarity index 100% rename from addons/board_crm_configuration/i18n/hu.po rename to addons/board_crm/i18n/hu.po diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm/i18n/id.po similarity index 100% rename from addons/board_crm_configuration/i18n/id.po rename to addons/board_crm/i18n/id.po diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm/i18n/it.po similarity index 100% rename from addons/board_crm_configuration/i18n/it.po rename to addons/board_crm/i18n/it.po diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm/i18n/ko.po similarity index 100% rename from addons/board_crm_configuration/i18n/ko.po rename to addons/board_crm/i18n/ko.po diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm/i18n/lt.po similarity index 100% rename from addons/board_crm_configuration/i18n/lt.po rename to addons/board_crm/i18n/lt.po diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm/i18n/nl.po similarity index 100% rename from addons/board_crm_configuration/i18n/nl.po rename to addons/board_crm/i18n/nl.po diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm/i18n/nl_BE.po similarity index 100% rename from addons/board_crm_configuration/i18n/nl_BE.po rename to addons/board_crm/i18n/nl_BE.po diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm/i18n/pl.po similarity index 100% rename from addons/board_crm_configuration/i18n/pl.po rename to addons/board_crm/i18n/pl.po diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm/i18n/pt.po similarity index 100% rename from addons/board_crm_configuration/i18n/pt.po rename to addons/board_crm/i18n/pt.po diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm/i18n/pt_BR.po similarity index 100% rename from addons/board_crm_configuration/i18n/pt_BR.po rename to addons/board_crm/i18n/pt_BR.po diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm/i18n/ro.po similarity index 100% rename from addons/board_crm_configuration/i18n/ro.po rename to addons/board_crm/i18n/ro.po diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm/i18n/ru.po similarity index 100% rename from addons/board_crm_configuration/i18n/ru.po rename to addons/board_crm/i18n/ru.po diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm/i18n/sk.po similarity index 100% rename from addons/board_crm_configuration/i18n/sk.po rename to addons/board_crm/i18n/sk.po diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm/i18n/sl.po similarity index 100% rename from addons/board_crm_configuration/i18n/sl.po rename to addons/board_crm/i18n/sl.po diff --git a/addons/board_crm_configuration/i18n/sq.po b/addons/board_crm/i18n/sq.po similarity index 100% rename from addons/board_crm_configuration/i18n/sq.po rename to addons/board_crm/i18n/sq.po diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm/i18n/sv.po similarity index 100% rename from addons/board_crm_configuration/i18n/sv.po rename to addons/board_crm/i18n/sv.po diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm/i18n/tlh.po similarity index 100% rename from addons/board_crm_configuration/i18n/tlh.po rename to addons/board_crm/i18n/tlh.po diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm/i18n/tr.po similarity index 100% rename from addons/board_crm_configuration/i18n/tr.po rename to addons/board_crm/i18n/tr.po diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm/i18n/uk.po similarity index 100% rename from addons/board_crm_configuration/i18n/uk.po rename to addons/board_crm/i18n/uk.po diff --git a/addons/board_crm_configuration/i18n/vi.po b/addons/board_crm/i18n/vi.po similarity index 100% rename from addons/board_crm_configuration/i18n/vi.po rename to addons/board_crm/i18n/vi.po diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm/i18n/zh_CN.po similarity index 100% rename from addons/board_crm_configuration/i18n/zh_CN.po rename to addons/board_crm/i18n/zh_CN.po diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm/i18n/zh_TW.po similarity index 100% rename from addons/board_crm_configuration/i18n/zh_TW.po rename to addons/board_crm/i18n/zh_TW.po diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml deleted file mode 100644 index 51f09c25d62..00000000000 --- a/addons/board_crm_configuration/board_crm_view.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - CRM Configuration - - - - crm.opportunity.user.graph1 - report.crm.opportunity.user - graph - - - - - - - - - - crm.lead - form - tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - - - - crm.meeting - form - tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - - - - - - report.crm.lead.section.stage - form - graph,tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - - - - report.crm.opportunity.user - form - graph,tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] - - - - CRM - Dashboard Form - board.board - form - -
- - - - - - - - - - - - - - - - - - - -
- - - - CRM Dashboard - board.board - form - form - menu - - - - - - - - diff --git a/addons/board_hr/__openerp__.py b/addons/board_hr/__openerp__.py index b64d09c1b33..500887abb52 100644 --- a/addons/board_hr/__openerp__.py +++ b/addons/board_hr/__openerp__.py @@ -32,7 +32,7 @@ This module implements a dashboard for human resource management that includes: """, 'author': 'Tiny', 'depends': [ 'project_issue','board','hr_expense','hr_timesheet_sheet','hr_holidays' - ], + , 'hr_evaluation'], 'update_xml': ['board_hr_view.xml'], 'demo_xml': [], 'installable': True, diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml index 710a6d88b4a..d26b4b2e6cf 100644 --- a/addons/board_hr/board_hr_view.xml +++ b/addons/board_hr/board_hr_view.xml @@ -15,25 +15,52 @@ - - Timesheets + + My Current Evaluations ir.actions.act_window - hr_timesheet_sheet.sheet + hr_evaluation.evaluation form - [('date_to','>=',time.strftime('%Y-%m-01')),('date_from','<=',time.strftime('%Y-%m-01'))] - + [('state','!=','done'),('create_uid','=',uid)] + My Leaves ir.actions.act_window - hr.holidays.per.user + hr.holidays form tree,form - + [('user_id','=',uid)] + + + Timesheets by Month + ir.actions.act_window + timesheet.report + form + graph,tree + [('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))] + + + + Remaining Leaves by User + ir.actions.act_window + hr.holidays.remaining.leaves.user + form + graph,tree + [('user_id','=',uid)] + + + + Timesheets + ir.actions.act_window + hr_timesheet_sheet.sheet + form + graph,tree + + board.hr.form board.board @@ -42,11 +69,13 @@
- + + + - - + +
diff --git a/addons/board_project/__openerp__.py b/addons/board_project/__openerp__.py index 92a8aeb1518..f934c7d3bc5 100644 --- a/addons/board_project/__openerp__.py +++ b/addons/board_project/__openerp__.py @@ -34,16 +34,14 @@ This module implements a dashboard for project member that includes: 'author': 'Tiny', 'depends': [ 'project', - 'report_timesheet', 'board', 'project_planning', - 'report_analytic_line', - 'report_task', 'hr_timesheet_sheet', 'project_issue', - 'resource' + 'resource', + 'scrum' ], - 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'], + 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml','board_project_issue_view.xml','board_scrum_view.xml'], 'demo_xml': ['board_project_demo.xml'], 'installable': True, 'active': False, diff --git a/addons/board_project/board_project_issue_view.xml b/addons/board_project/board_project_issue_view.xml new file mode 100644 index 00000000000..eaf3a2f8612 --- /dev/null +++ b/addons/board_project/board_project_issue_view.xml @@ -0,0 +1,45 @@ + + + + + + Project issues + project.issue + form + tree,form + [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))] + + + + + board.project.issue.form + board.board + form + +
+ + + + + + + + +
+ + + + + Project Issue Dashboard + board.board + form + form + menu + + + + + diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml index f22a2acde55..e2ce251e49b 100644 --- a/addons/board_project/board_project_manager_view.xml +++ b/addons/board_project/board_project_manager_view.xml @@ -13,13 +13,13 @@ - - Pipeline of tasks - report.task.user.pipeline.open - form - graph,tree - [('user_id','in',department_users_get())] - + + + + + + + hr.timesheet.sheet.tree.simplified.board @@ -66,7 +66,6 @@ - diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml index 231aebdb110..1c5093cb047 100644 --- a/addons/board_project/board_project_view.xml +++ b/addons/board_project/board_project_view.xml @@ -47,6 +47,14 @@ [('user_id','=',uid),('state','=','open')] + + My Pending Tasks + project.task + form + tree,form + [('user_id','=',uid),('state','=','pending')] + + My Task's Deadlines project.task @@ -91,13 +99,18 @@
- - - - + + + - - + + + + + + + +
diff --git a/addons/board_project/board_scrum_view.xml b/addons/board_project/board_scrum_view.xml new file mode 100644 index 00000000000..daf3cb375ca --- /dev/null +++ b/addons/board_project/board_scrum_view.xml @@ -0,0 +1,63 @@ + + + + + scrum.sprint.dashboard.tree + scrum.sprint + tree + + + + + + + + + + + + +