diff --git a/addons/.bzrignore b/addons/.bzrignore new file mode 100644 index 00000000000..8d98f9debde --- /dev/null +++ b/addons/.bzrignore @@ -0,0 +1 @@ +.* diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 9470c6fc01e..8355cf6be3c 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -283,7 +283,10 @@ class account_move_line(osv.osv): result.append((line.id, line.name)) return result - def _balance_search(self, cursor, user, obj, name, args): + def _balance_search(self, cursor, user, obj, name, args, domain=None, context=None): + if context is None: + context = {} + if not len(args): return [] where = ' and '.join(map(lambda x: '(abs(sum(debit-credit))'+x[1]+str(x[2])+')',args)) diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index 2dcf62a1dbb..5c74b02b379 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-20 12:49+0000\n" -"Last-Translator: Hend Awad \n" +"PO-Revision-Date: 2010-02-22 08:34+0000\n" +"Last-Translator: some one \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: 2009-12-21 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index a1939af14ab..f9ddb94f736 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-20 14:43+0000\n" -"Last-Translator: Henning Eggers \n" +"PO-Revision-Date: 2010-02-28 09:03+0000\n" +"Last-Translator: Ferdinand @ ChriCar \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: 2009-12-16 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-03-01 05:01+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -763,7 +763,7 @@ msgstr "Jahresende Buchungsjournal" #: view:product.product:0 #: view:product.template:0 msgid "Purchase Properties" -msgstr "EInkaufs Eingenschaften" +msgstr "Einkauf Eigenschaften" #. module: account #: model:process.node,note:account.process_node_paymententries0 @@ -1566,7 +1566,7 @@ msgstr "Kontenplan Vorlagen" #. module: account #: field:account.invoice,move_id:0 msgid "Invoice Movement" -msgstr "Workflow der Rechnung" +msgstr "Rechnungsbuchung" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index b3fc6fc6a58..0e4d26915e6 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-14 09:09+0000\n" +"PO-Revision-Date: 2010-02-18 09:24+0000\n" "Last-Translator: Olivier Dony (OpenERP) \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-01-15 04:34+0000\n" +"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1599,7 +1599,7 @@ msgstr "Devise société" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template msgid "Fiscal Position Template Account Mapping" -msgstr "Mapping du Compte Modèle de la Position Fiscale" +msgstr "Affectation des comptes suivant le modèle de régime fiscal" #. module: account #: field:account.analytic.account,parent_id:0 @@ -1657,7 +1657,7 @@ msgstr "Transaction non-lettrée" #: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" -msgstr "Mapping des taxes" +msgstr "Affectation des taxes" #. module: account #: view:account.config.wizard:0 diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 21fbe4cf06d..5a9097ea95b 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-30 16:38+0000\n" +"PO-Revision-Date: 2010-02-23 13:20+0000\n" "Last-Translator: Dukai Gábor \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-01-31 04:51+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1789,7 +1789,7 @@ msgstr "Értékesítés" #: wizard_button:account.account.balance.report,account_selection,checktype:0 #: wizard_button:account.general.ledger.report,account_selection,checktype:0 msgid "Next" -msgstr "" +msgstr "Tovább" #. module: account #: help:res.partner,property_account_position:0 diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 94f21ef277a..d5abcb0ce40 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-16 18:36+0000\n" -"Last-Translator: Andrzej MoST (Marcin Ostajewski) \n" +"PO-Revision-Date: 2010-02-20 16:07+0000\n" +"Last-Translator: Grzegorz Grzelak (Cirrus) \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-01-17 04:46+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -45,7 +45,7 @@ msgstr "Podaj wiadomość dla raportu o przeterminowanych należnościach." #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement from draft" -msgstr "Zatwierdź projekt zestawienia" +msgstr "Zatwierdź projekt wyciągu" #. module: account #: model:account.account.type,name:account.account_type_asset @@ -60,7 +60,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: account #: help:account.journal,currency:0 msgid "The currency used to enter statement" -msgstr "Waluta zastosowana do wprowadzenia zestawienia" +msgstr "Waluta zastosowana do wprowadzenia wyciągu" #. module: account #: wizard_view:account_use_models,init_form:0 @@ -334,7 +334,7 @@ msgstr "Odnośnik" #. module: account #: wizard_view:account.subscription.generate,init:0 msgid "Subscription Compute" -msgstr "" +msgstr "Oblicz subskrypcję" #. module: account #: rml:account.central.journal:0 @@ -344,7 +344,7 @@ msgstr "Nr konta" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Delta Debit" -msgstr "" +msgstr "Przyrost Winien" #. module: account #: rml:account.invoice:0 @@ -466,7 +466,7 @@ msgstr "Specjalne Obliczenie" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement with/without reconciliation from draft statement" -msgstr "Potwierdź projekt zestawienia z lub bez uzgodnienia" +msgstr "Potwierdź projekt wyciągu z lub bez uzgodnienia" #. module: account #: wizard_view:account.move.bank.reconcile,init:0 @@ -910,7 +910,7 @@ msgstr "Dziennik odpisów" #: field:account.model.line,amount_currency:0 #: field:account.move.line,amount_currency:0 msgid "Amount Currency" -msgstr "Waluta kwoty" +msgstr "Kwota w walucie" #. module: account #: field:account.chart.template,property_account_expense_categ:0 @@ -981,7 +981,7 @@ msgstr "Domyślne konto Winien" #: 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 "Zapisy wg zestawień" +msgstr "Zapisy wg wyciągów" #. module: account #: model:process.transition,name:account.process_transition_analyticinvoice0 @@ -1471,7 +1471,7 @@ msgstr "Wyświetl konta " #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line msgid "Statement reconcile line" -msgstr "Pozycja uzgodnienia zestawienia" +msgstr "Pozycja uzgodnienia wyciągu" #. module: account #: view:account.tax:0 @@ -1631,7 +1631,7 @@ msgstr "Konta należności i zobowiązań" #: view:account.subscription:0 #: field:account.subscription,lines_id:0 msgid "Subscription Lines" -msgstr "" +msgstr "Pozycje subskrypcji" #. module: account #: selection:account.analytic.journal,type:0 @@ -1750,13 +1750,13 @@ msgstr "Włącz do kwoty bazowej" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Delta Credit" -msgstr "" +msgstr "Przyrost Ma" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile #: model:ir.actions.wizard,name:account.wizard_unreconcile msgid "Unreconcile Entries" -msgstr "" +msgstr "Skasuj uzgodnienie zapisów" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 @@ -1772,7 +1772,7 @@ msgstr "Rejestr kosztów dla okresu" #: model:ir.actions.act_window,name:account.action_bank_statement_tree2 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2 msgid "New Statement" -msgstr "Nowe zestawienie" +msgstr "Nowy wyciąg" #. module: account #: wizard_field:account.analytic.account.chart,init,from_date:0 @@ -1936,7 +1936,7 @@ msgstr "Projekty faktur dla klienta" #. module: account #: model:ir.model,name:account.model_account_subscription_line msgid "Account Subscription Line" -msgstr "" +msgstr "Pozycja konta subskrypcji" #. module: account #: selection:account.account.balance.report,checktype,state:0 @@ -2154,7 +2154,7 @@ msgstr "Uzgodnienie płatności" #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree msgid "Statements reconciliation" -msgstr "Uzgodnienie zestawienia" +msgstr "Uzgodnienie wyciagów" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -2187,7 +2187,7 @@ msgstr "Schemat podatków" #. module: account #: field:account.payment.term.line,value_amount:0 msgid "Value Amount" -msgstr "" +msgstr "Kwota" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open @@ -2270,7 +2270,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_generate_subscription #: model:ir.ui.menu,name:account.menu_generate_subscription msgid "Create subscription entries" -msgstr "" +msgstr "Utwórz zapisy subskrypcji" #. module: account #: wizard_field:account.fiscalyear.close,init,journal_id:0 @@ -2321,7 +2321,7 @@ msgstr "" #. module: account #: help:account.invoice.tax,base_code_id:0 msgid "The account basis of the tax declaration." -msgstr "" +msgstr "Konto podstawy do deklaracji podatkowej" #. module: account #: rml:account.analytic.account.journal:0 @@ -2352,7 +2352,7 @@ msgstr "Typ odnośnika" #: wizard_button:account.move.line.unreconcile,init,unrec:0 #: wizard_button:account.reconcile.unreconcile,init,unrec:0 msgid "Unreconcile" -msgstr "" +msgstr "Skasuj uzgodnienie" #. module: account #: field:account.tax,type:0 @@ -2363,7 +2363,7 @@ msgstr "Typ podatku" #. module: account #: model:process.transition,name:account.process_transition_statemententries0 msgid "Statement Entries" -msgstr "Zapisy zestawienia" +msgstr "Zapisy wyciągu" #. module: account #: field:account.analytic.line,user_id:0 @@ -2627,7 +2627,7 @@ msgstr "Konto zobowiązań" #. module: account #: wizard_view:populate_statement_from_inv,init:0 msgid "Import Invoices in Statement" -msgstr "Importuj faktury do zestawienia" +msgstr "Importuj faktury do wyciągu" #. module: account #: view:account.invoice:0 @@ -2673,7 +2673,7 @@ msgstr "Kapitał własny" #. module: account #: field:wizard.company.setup,overdue_msg:0 msgid "Overdue Payment Message" -msgstr "" +msgstr "Komunikat przeterminowanej płatności" #. module: account #: model:ir.model,name:account.model_account_tax_code_template @@ -2703,7 +2703,7 @@ msgstr "Zamykanie roku" #. module: account #: model:ir.ui.menu,name:account.menu_generic_report msgid "Generic Reports" -msgstr "" +msgstr "Ogólne raporty" #. module: account #: wizard_field:account.automatic.reconcile,init,power:0 @@ -2808,12 +2808,12 @@ msgstr "Nazwa" #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 msgid "Reconciliation transactions" -msgstr "" +msgstr "Transakcje uzgodnień" #. module: account #: wizard_field:account.aged.trial.balance,init,direction_selection:0 msgid "Analysis Direction" -msgstr "" +msgstr "Kierunek analizy" #. module: account #: wizard_button:populate_statement_from_inv,init,go:0 @@ -2928,7 +2928,7 @@ msgstr "Konto Podatkowe" #. module: account #: model:process.transition,note:account.process_transition_statemententries0 msgid "From statement, create entries" -msgstr "Z zestawienia, utwórz zapisy" +msgstr "Z wyciągu, utwórz zapisy" #. module: account #: field:account.analytic.account,complete_name:0 @@ -2981,7 +2981,7 @@ msgstr "Mapowanie podatków" #: wizard_view:account.move.line.unreconcile,init:0 #: wizard_view:account.reconcile.unreconcile,init:0 msgid "Unreconciliation transactions" -msgstr "" +msgstr "Transakcje kasowania uzgodnień" #. module: account #: model:process.transition,note:account.process_transition_paymentorderbank0 @@ -3029,7 +3029,7 @@ msgstr "Dziennik analityczny -" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Debit" -msgstr "" +msgstr "Winien - analityka" #. module: account #: field:account.account,currency_mode:0 @@ -3268,7 +3268,7 @@ msgstr "Kurs średni" #: model:process.node,note:account.process_node_bankstatement0 #: model:process.node,note:account.process_node_supplierbankstatement0 msgid "Statement encoding produces payment entries" -msgstr "" +msgstr "Wprowadzenie wyciągu generuje zapisy płatności" #. module: account #: field:account.account,code:0 @@ -3342,7 +3342,7 @@ msgstr "30 dni od końca miesiąca" #. module: account #: field:account.chart.template,tax_code_root_id:0 msgid "Root Tax Code" -msgstr "" +msgstr "Główny kod podatkowy" #. module: account #: constraint:account.invoice:0 @@ -3543,7 +3543,7 @@ msgstr "Zapłać i uzgodnij" #: rml:account.central.journal:0 #: model:ir.actions.report.xml,name:account.account_central_journal msgid "Central Journal" -msgstr "" +msgstr "Dziennik główny" #. module: account #: rml:account.third_party_ledger:0 @@ -3709,7 +3709,7 @@ msgstr "Wprowadzanie zapisów" #: wizard_view:account.invoice.refund,init:0 #: model:ir.actions.wizard,name:account.wizard_invoice_refund msgid "Credit Note" -msgstr "" +msgstr "Nota kredytowa" #. module: account #: model:ir.actions.todo,note:account.config_fiscalyear @@ -3754,7 +3754,7 @@ msgstr "Miesiąc" #. module: account #: model:ir.model,name:account.model_account_subscription msgid "Account Subscription" -msgstr "" +msgstr "Konto subskrypcji" #. module: account #: field:account.model.line,date_maturity:0 @@ -3766,7 +3766,7 @@ msgstr "Data zapłaty" #. module: account #: view:account.subscription:0 msgid "Entry Subscription" -msgstr "" +msgstr "Zapis subskrypcji" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 @@ -3815,7 +3815,7 @@ msgstr "Data faktury" #. module: account #: selection:account.account.type,close_method:0 msgid "Unreconciled" -msgstr "" +msgstr "Skasowano uzgodnienie" #. module: account #: field:account.account,note:0 @@ -3880,7 +3880,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 "Komunikat raportu przeterminowanych płatności" #. module: account #: selection:account.tax,tax_group:0 @@ -3966,6 +3966,9 @@ msgid "" "needs to create analytic entries, Open ERP will look for a matching journal " "of the same type." msgstr "" +"Podaje typ dziennika analitycznego. Kiedy dokument (np. faktura) ma utworzyć " +"zapisy analityczne, to OpenERP będzie szukał odpowiedniego dziennika tego " +"samego typu." #. module: account #: field:account.journal,groups_id:0 @@ -3975,7 +3978,7 @@ msgstr "Grupy" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Code/Date" -msgstr "" +msgstr "Kod/Data" #. module: account #: field:account.account,active:0 @@ -4084,7 +4087,7 @@ msgstr "Zmiana stanu konta" #: view:account.bank.statement:0 #: field:account.bank.statement,line_ids:0 msgid "Statement lines" -msgstr "Pozycje zestawienia" +msgstr "Pozycje wyciągu" #. module: account #: field:account.move.line,amount_taxed:0 @@ -4160,7 +4163,7 @@ msgstr "Ogólne" #. module: account #: rml:account.general.journal:0 msgid "Credit Trans." -msgstr "" +msgstr "Trans. Ma" #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 @@ -4228,7 +4231,7 @@ msgstr "Szukaj zapisów" #: model:process.node,note:account.process_node_analytic0 #: model:process.node,note:account.process_node_analyticcost0 msgid "Analytic costs to reinvoice purchases, timesheets, ..." -msgstr "" +msgstr "Koszt analityczny do refakturowania zakupów, kart pracy, ..." #. module: account #: field:account.account,tax_ids:0 @@ -4276,7 +4279,7 @@ msgstr "" #. module: account #: field:account.account,parent_left:0 msgid "Parent Left" -msgstr "" +msgstr "Lewy nadrzędny" #. module: account #: help:account.journal,sequence_id:0 @@ -4397,7 +4400,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_subscription_form_running #: model:ir.ui.menu,name:account.menu_action_subscription_form_running msgid "Running Subscriptions" -msgstr "" +msgstr "Działające subskrypcje" #. module: account #: selection:account.move,type:0 @@ -4413,7 +4416,7 @@ msgstr "Zaksięgowano" #: view:account.tax:0 #: view:account.tax.template:0 msgid "Credit Notes" -msgstr "" +msgstr "Nota kredytowa" #. module: account #: field:account.config.wizard,date2:0 @@ -4587,7 +4590,7 @@ msgstr "Ważna zapisy" #: model:ir.actions.wizard,name:account.wizard_line_account_use_model #: model:ir.ui.menu,name:account.menu_account_use_model msgid "Create Entries From Models" -msgstr "Utwórz zapisu z modeli" +msgstr "Utwórz zapisy z modeli" #. module: account #: field:account.account.template,reconcile:0 @@ -4642,7 +4645,7 @@ msgstr "" #: field:account.bank.statement.line,statement_id:0 #: field:account.move.line,statement_id:0 msgid "Statement" -msgstr "Zestawienie" +msgstr "Wyciąg" #. module: account #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move @@ -4719,7 +4722,7 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_draftstatement0 msgid "Draft statement" -msgstr "Projekt zestawienia" +msgstr "Projekt wyciągu" #. module: account #: field:account.analytic.journal,name:0 @@ -4729,7 +4732,7 @@ msgstr "Nazwa dziennika" #. module: account #: model:process.transition,note:account.process_transition_invoiceimport0 msgid "Import invoice from statement" -msgstr "Importuj fakturę z zestawienia" +msgstr "Importuj fakturę z wyciągu" #. module: account #: selection:account.automatic.reconcile,init,power:0 @@ -4825,7 +4828,7 @@ msgstr "Anulowano" #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree msgid "Draft statements" -msgstr "Projekty zestawień" +msgstr "Projekty wyciągów" #. module: account #: wizard_field:populate_statement_from_inv,init,date:0 @@ -4852,7 +4855,7 @@ msgstr "Konta należności" #. module: account #: wizard_button:account.move.line.unreconcile.select,init,open:0 msgid "Open for unreconciliation" -msgstr "" +msgstr "Otwórz do kasowania uzgodnień" #. module: account #: field:account.bank.statement.reconcile,statement_line:0 @@ -5082,7 +5085,7 @@ msgstr "Grupuj pozycje faktury" #. module: account #: model:ir.ui.menu,name:account.menu_finance_configuration msgid "Configuration" -msgstr "Ustawienia" +msgstr "Konfiguracja" #. module: account #: view:account.analytic.line:0 @@ -5098,7 +5101,7 @@ msgstr "Dziennik kont" #. module: account #: view:account.subscription.line:0 msgid "Subscription lines" -msgstr "" +msgstr "pozycje subskrypcji" #. module: account #: field:account.chart.template,property_account_income:0 @@ -5204,7 +5207,7 @@ msgstr "Szablon kodu konta podatkowego" #. module: account #: view:account.subscription:0 msgid "Subscription Periods" -msgstr "" +msgstr "Okresy subskrypcji" #. module: account #: model:process.node,name:account.process_node_manually0 @@ -5265,7 +5268,7 @@ msgstr "Podatek zamienny" #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 msgid "Encode manually statement comes into the draft statement" -msgstr "Ręcznie wprowadzone zestawienie jest projektem" +msgstr "Ręcznie wprowadzony wyciąg jest projektem wyciągu" #. module: account #: model:ir.ui.menu,name:account.next_id_43 @@ -5292,7 +5295,7 @@ msgstr "Płatności" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 msgid "Accounting entries at statement's confirmation" -msgstr "Zapisy księgowe przy potwierdzeniu zestawienia" +msgstr "Zapisy księgowe przy potwierdzeniu wyciągu" #. module: account #: wizard_view:account_use_models,create:0 @@ -5474,7 +5477,7 @@ msgstr "Zastosowanie podatku" #: model:ir.actions.act_window,name:account.action_subscription_form #: model:ir.ui.menu,name:account.menu_action_subscription_form msgid "Subscription Entries" -msgstr "" +msgstr "Zapisy subskrypcji" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree6 @@ -5995,12 +5998,12 @@ msgstr "Obszary podatkowe" #. module: account #: model:process.process,name:account.process_process_statementprocess0 msgid "Statement Process" -msgstr "" +msgstr "Proces wyciągu" #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile msgid "Statement reconcile" -msgstr "" +msgstr "Uzgodnienia wyciągu" #. module: account #: wizard_field:account.fiscalyear.close,init,sure:0 diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index f37e09831bb..6028201e069 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-14 10:44+0000\n" -"Last-Translator: Carlos Paiva \n" +"PO-Revision-Date: 2010-02-22 21:38+0000\n" +"Last-Translator: sbrianti \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-01-15 04:34+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -313,7 +313,7 @@ msgstr "Pagamentos atrasados" #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 #: wizard_view:account.vat.declaration,init:0 msgid "Select period" -msgstr "Periodo selecionado" +msgstr "Selecione o período" #. module: account #: field:account.invoice,origin:0 @@ -1011,7 +1011,7 @@ msgstr "Período" #. module: account #: rml:account.partner.balance:0 msgid "Grand total" -msgstr "Grande total" +msgstr "Total geral" #. module: account #: model:ir.ui.menu,name:account.menu_finance_accounting @@ -1340,7 +1340,7 @@ msgstr "Modelo" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "Fechar ano fiscal" +msgstr "Fechar um ano fiscal" #. module: account #: field:account.journal,centralisation:0 @@ -1355,7 +1355,7 @@ msgstr "Mensagem:" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 msgid "Select invoices you want to pay and manages advances" -msgstr "Selecionar faturaa s pagar e administrar vantagens" +msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer" #. module: account #: selection:account.account,type:0 @@ -1389,7 +1389,7 @@ msgstr "O método de calculo para o valor do imposto." #: model:process.node,note:account.process_node_accountingentries0 #: model:process.node,note:account.process_node_supplieraccountingentries0 msgid "Validated accounting entries." -msgstr "Lançamentos de conta validado" +msgstr "Lançamentos contábeis validados" #. module: account #: wizard_view:account.move.line.unreconcile,init:0 @@ -1398,8 +1398,9 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disable" msgstr "" -"Se você não concilia transações, você também deve verificar todas as ações " -"que estão ligadas a essas operações, porque não será desativaadas" +"Se você desfazer a reconciliação de transações, você deve também verificar " +"todas as ações que estão ligadas a essas operações, porque elas não serão " +"desfeitas pelo sistema" #. module: account #: model:process.node,name:account.process_node_electronicfile0 diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 670e2b00756..6f15cd4b369 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-16 11:32+0000\n" -"Last-Translator: Treecko \n" +"PO-Revision-Date: 2010-02-24 18:59+0000\n" +"Last-Translator: Anders Eriksson \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-02-17 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -73,6 +73,8 @@ msgid "" "This account will be used to value incoming stock for the current product " "category" msgstr "" +"Detta konto kommer att användas användas för inleveranser till lagret för " +"den aktuella produktkategorin" #. module: account #: help:account.invoice,period_id:0 @@ -105,7 +107,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_vat_declaration #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration msgid "Print Taxes Report" -msgstr "" +msgstr "Skriv ut momsrapport" #. module: account #: field:account.account,parent_id:0 @@ -115,7 +117,7 @@ msgstr "" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "" +msgstr "Journalverifikat" #. module: account #: field:account.invoice,residual:0 @@ -159,7 +161,7 @@ msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm msgid "Confirm draft invoices" -msgstr "" +msgstr "Godkänn preliminära fakturor" #. module: account #: help:account.payment.term.line,days2:0 @@ -172,12 +174,12 @@ msgstr "" #. module: account #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "Total kredit" #. module: account #: field:account.config.wizard,charts:0 msgid "Charts of Account" -msgstr "" +msgstr "Kontoplan" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select @@ -200,7 +202,7 @@ msgstr "" #. module: account #: field:account.tax.code,sum_period:0 msgid "Period Sum" -msgstr "" +msgstr "Periodtotal" #. module: account #: view:account.tax:0 @@ -235,19 +237,19 @@ msgstr "" #: field:account.tax.template,amount:0 #: xsl:account.transfer:0 msgid "Amount" -msgstr "" +msgstr "Belopp" #. module: account #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger #: model:ir.actions.wizard,name:account.wizard_third_party_ledger #: model:ir.ui.menu,name:account.menu_third_party_ledger msgid "Partner Ledger" -msgstr "" +msgstr "Partnerreskontra" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "" +msgstr "Leverantörsskatter" #. module: account #: view:account.move:0 @@ -282,13 +284,13 @@ msgstr "" #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Fixed" -msgstr "" +msgstr "Fast" #. module: account #: model:ir.actions.report.xml,name:account.account_overdue #: view:res.company:0 msgid "Overdue Payments" -msgstr "" +msgstr "Försenade betalningar" #. module: account #: wizard_view:account.account.balance.report,checktype:0 @@ -299,7 +301,7 @@ msgstr "" #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 #: wizard_view:account.vat.declaration,init:0 msgid "Select period" -msgstr "" +msgstr "Välj period" #. module: account #: field:account.invoice,origin:0 @@ -350,7 +352,7 @@ msgstr "" #: field:account.move.line,analytic_account_id:0 #: field:report.hr.timesheet.invoice.journal,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Objekt" #. module: account #: field:account.tax,child_depend:0 @@ -363,12 +365,12 @@ msgstr "" #: rml:account.general.journal:0 #: field:account.journal,name:0 msgid "Journal Name" -msgstr "" +msgstr "Journalnamn" #. module: account #: view:account.payment.term:0 msgid "Description on invoices" -msgstr "" +msgstr "Fakturabeskrivning" #. module: account #: constraint:account.analytic.account:0 @@ -410,17 +412,17 @@ msgstr "" #. module: account #: rml:account.overdue:0 msgid "Date:" -msgstr "" +msgstr "Datum:" #. module: account #: selection:account.account.type,sign:0 msgid "Negative" -msgstr "" +msgstr "Negativ" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "(Konto/Partner) namn" #. module: account #: selection:account.move,type:0 @@ -464,7 +466,7 @@ msgstr "" #. module: account #: rml:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "Rabatt (%)" #. module: account #: rml:account.general.ledger:0 @@ -473,12 +475,12 @@ msgstr "" #: rml:account.overdue:0 #: field:account.subscription,ref:0 msgid "Ref" -msgstr "" +msgstr "Ref" #. module: account #: field:account.tax.template,type_tax_use:0 msgid "Tax Use In" -msgstr "" +msgstr "Aktuell moms" #. module: account #: help:account.tax.template,include_base_amount:0 @@ -501,12 +503,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "" +msgstr "Momsmallar" #. module: account #: view:account.invoice:0 msgid "Supplier invoice" -msgstr "" +msgstr "Leverantörsfaktura" #. module: account #: model:process.transition,name:account.process_transition_reconcilepaid0 @@ -523,7 +525,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form msgid "Tax Templates" -msgstr "" +msgstr "Momsmallar" #. module: account #: field:account.invoice,reconciled:0 @@ -549,7 +551,7 @@ msgstr "" #. module: account #: view:account.invoice.line:0 msgid "Line" -msgstr "" +msgstr "Rad" #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -560,7 +562,7 @@ msgstr "" #: selection:account.tax,applicable_type:0 #: selection:account.tax.template,applicable_type:0 msgid "True" -msgstr "" +msgstr "Sant" #. module: account #: help:account.payment.term.line,days:0 @@ -577,7 +579,7 @@ msgstr "" #. module: account #: rml:account.central.journal:0 msgid "Printing Date" -msgstr "" +msgstr "Utskriftsdatum" #. module: account #: rml:account.general.ledger:0 @@ -616,7 +618,7 @@ msgstr "" #. module: account #: field:account.analytic.account,contact_id:0 msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: account #: selection:account.model.line,date:0 @@ -637,7 +639,7 @@ msgstr "" #. module: account #: field:account.invoice.line,discount:0 msgid "Discount (%)" -msgstr "" +msgstr "Rabatt (%)" #. module: account #: wizard_field:account.move.line.reconcile,init_full,writeoff:0 @@ -653,12 +655,12 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_analytic_accounting msgid "Analytic Accounting" -msgstr "" +msgstr "Objektsredovisning" #. module: account #: rml:account.overdue:0 msgid "Sub-Total :" -msgstr "" +msgstr "Subtotal :" #. module: account #: field:account.analytic.account,line_ids:0 @@ -671,7 +673,7 @@ msgstr "" #. module: account #: selection:account.subscription,period_type:0 msgid "month" -msgstr "" +msgstr "månad" #. module: account #: field:account.analytic.account,partner_id:0 diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 912095110e7..96f3a0afb40 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -29,18 +29,6 @@ from mx.DateTime import RelativeDateTime from tools import config from tools.translate import _ -#class fiscalyear_seq(osv.osv): -# _name = "fiscalyear.seq" -# _description = "Maintains Invoice sequences with Fiscal Year" -# _rec_name = 'fiscalyear_id' -# _columns = { -# 'journal_id': fields.many2one('account.journal', 'Journal'), -# 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year',required=True), -# 'sequence_id':fields.many2one('ir.sequence', 'Sequence',required=True), -# } -# -#fiscalyear_seq() - class account_invoice(osv.osv): def _amount_all(self, cr, uid, ids, name, args, context=None): res = {} @@ -505,21 +493,21 @@ class account_invoice(osv.osv): else: journal_ids=self.pool.get('account.journal').search(cr,uid,[]) dom={'journal_id': [('id','in',journal_ids)]} - + if currency_id and company_id: currency = self.pool.get('res.currency').browse(cr, uid, currency_id) if currency.company_id.id != company_id: val['currency_id'] = False else: val['currency_id'] = currency.id - + if company_id: company = self.pool.get('res.company').browse(cr, uid, company_id) if company.currency_id.company_id.id != company_id: - val['currency_id'] = False + val['currency_id'] = False else: val['currency_id'] = company.currency_id.id - + return {'value' : val, 'domain': dom } # go from canceled state to draft state @@ -631,7 +619,84 @@ class account_invoice(osv.osv): self.write(cr, uid, [inv.id], res['value']) return True + def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj): + if not inv.tax_line: + for tax in compute_taxes.values(): + ait_obj.create(cr, uid, tax) + else: + tax_key = [] + for tax in inv.tax_line: + if tax.manual: + continue + key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id) + tax_key.append(key) + if not key in compute_taxes: + raise osv.except_osv(_('Warning !'), _('Global taxes defined, but are not in invoice lines !')) + base = compute_taxes[key]['base'] + if abs(base - tax.base) > inv.company_id.currency_id.rounding: + raise osv.except_osv(_('Warning !'), _('Tax base different !\nClick on compute to update tax base')) + for key in compute_taxes: + if not key in tax_key: + raise osv.except_osv(_('Warning !'), _('Taxes missing !')) + + def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines): + total = 0 + total_currency = 0 + for i in invoice_move_lines: + if inv.currency_id.id != company_currency: + i['currency_id'] = inv.currency_id.id + i['amount_currency'] = i['price'] + i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id, + company_currency, i['price'], + context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}) + else: + i['amount_currency'] = False + i['currency_id'] = False + i['ref'] = ref + if inv.type in ('out_invoice','in_refund'): + total += i['price'] + total_currency += i['amount_currency'] or i['price'] + i['price'] = - i['price'] + else: + total -= i['price'] + total_currency -= i['amount_currency'] or i['price'] + return total, total_currency, invoice_move_lines + + def inv_line_characteristic_hashcode(self, invoice, invoice_line): + """Overridable hashcode generation for invoice lines. Lines having the same hashcode + will be grouped together if the journal has the 'group line' option. Of course a module + can add fields to invoice lines that would need to be tested too before merging lines + or not.""" + return "%s-%s-%s-%s-%s"%( + invoice_line['account_id'], + invoice_line.get('tax_code_id',"False"), + invoice_line.get('product_id',"False"), + invoice_line.get('analytic_account_id',"False"), + invoice_line.get('date_maturity',"False")) + + def group_lines(self, cr, uid, iml, line, inv): + """Merge account move lines (and hence analytic lines) if invoice line hashcodes are equals""" + if inv.journal_id.group_invoice_lines: + line2 = {} + for x, y, l in line: + tmp = self.inv_line_characteristic_hashcode(inv, l) + + if tmp in line2: + am = line2[tmp]['debit'] - line2[tmp]['credit'] + (l['debit'] - l['credit']) + line2[tmp]['debit'] = (am > 0) and am or 0.0 + line2[tmp]['credit'] = (am < 0) and -am or 0.0 + line2[tmp]['tax_amount'] += l['tax_amount'] + line2[tmp]['analytic_lines'] += l['analytic_lines'] + else: + line2[tmp] = l + line = [] + for key, val in line2.items(): + line.append((0,0,val)) + + return line + def action_move_create(self, cr, uid, ids, *args): + """Creates invoice related analytics and financial move lines""" ait_obj = self.pool.get('account.invoice.tax') cur_obj = self.pool.get('res.currency') context = {} @@ -650,24 +715,7 @@ class account_invoice(osv.osv): context.update({'lang': inv.partner_id.lang}) compute_taxes = ait_obj.compute(cr, uid, inv.id, context=context) - if not inv.tax_line: - for tax in compute_taxes.values(): - ait_obj.create(cr, uid, tax) - else: - tax_key = [] - for tax in inv.tax_line: - if tax.manual: - continue - key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id) - tax_key.append(key) - if not key in compute_taxes: - raise osv.except_osv(_('Warning !'), _('Global taxes defined, but are not in invoice lines !')) - base = compute_taxes[key]['base'] - if abs(base - tax.base) > inv.company_id.currency_id.rounding: - raise osv.except_osv(_('Warning !'), _('Tax base different !\nClick on compute to update tax base')) - for key in compute_taxes: - if not key in tax_key: - raise osv.except_osv(_('Warning !'), _('Taxes missing !')) + self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj) if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0): raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.')) @@ -684,24 +732,7 @@ class account_invoice(osv.osv): # create one move line for the total and possibly adjust the other lines amount total = 0 total_currency = 0 - for i in iml: - if inv.currency_id.id != company_currency: - i['currency_id'] = inv.currency_id.id - i['amount_currency'] = i['price'] - i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id, - company_currency, i['price'], - context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}) - else: - i['amount_currency'] = False - i['currency_id'] = False - i['ref'] = ref - if inv.type in ('out_invoice','in_refund'): - total += i['price'] - total_currency += i['amount_currency'] or i['price'] - i['price'] = - i['price'] - else: - total -= i['price'] - total_currency -= i['amount_currency'] or i['price'] + total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml) acc_id = inv.account_id.id name = inv['name'] or '/' @@ -756,26 +787,7 @@ class account_invoice(osv.osv): line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context={})) ,iml) - if inv.journal_id.group_invoice_lines: - line2 = {} - for x, y, l in line: - tmp = str(l['account_id']) - tmp += '-'+str(l.get('tax_code_id',"False")) - tmp += '-'+str(l.get('product_id',"False")) - tmp += '-'+str(l.get('analytic_account_id',"False")) - tmp += '-'+str(l.get('date_maturity',"False")) - - if tmp in line2: - am = line2[tmp]['debit'] - line2[tmp]['credit'] + (l['debit'] - l['credit']) - line2[tmp]['debit'] = (am > 0) and am or 0.0 - line2[tmp]['credit'] = (am < 0) and -am or 0.0 - line2[tmp]['tax_amount'] += l['tax_amount'] - line2[tmp]['analytic_lines'] += l['analytic_lines'] - else: - line2[tmp] = l - line = [] - for key, val in line2.items(): - line.append((0,0,val)) + line = self.group_lines(cr, uid, iml, line, inv) journal_id = inv.journal_id.id #self._get_journal(cr, uid, {'type': inv['type']}) journal = self.pool.get('account.journal').browse(cr, uid, journal_id) @@ -1449,4 +1461,3 @@ class account_invoice_tax(osv.osv): account_invoice_tax() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index f22e37e5e71..ab81e7d88fc 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.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 . # ############################################################################## @@ -70,51 +70,51 @@ account_analytic_default() class account_invoice_line(osv.osv): _inherit = 'account.invoice.line' _description = 'account invoice line' - - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, context={}): - res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, context) + + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}): + res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context) rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context) if rec: res_prod['value'].update({'account_analytic_id':rec.analytic_id.id}) else: - res_prod['value'].update({'account_analytic_id':False}) + res_prod['value'].update({'account_analytic_id':False}) return res_prod account_invoice_line() class stock_picking(osv.osv): _inherit = "stock.picking" - + def _get_account_analytic_invoice(self, cursor, user, picking, move_line): partner_id = picking.address_id and picking.address_id.partner_id or False rec = self.pool.get('account.analytic.default').account_get(cursor, user, move_line.product_id.id, partner_id and partner_id.id, user, time.strftime('%Y-%m-%d'), context={}) - + if rec: return rec.analytic_id.id - + return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line) - + stock_picking() class sale_order_line(osv.osv): _inherit = 'sale.order.line' - + # Method overridden to set the analytic account by default on criterion match def invoice_line_create(self, cr, uid, ids, context={}): create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context) sale_line_obj = self.browse(cr, uid, ids[0], context) pool_inv_line = self.pool.get('account.invoice.line') - + for line in pool_inv_line.browse(cr, uid, create_ids, context): rec = self.pool.get('account.analytic.default').account_get(cr, uid, line.product_id.id, sale_line_obj.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context) - + if rec: pool_inv_line.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context) return create_ids - -sale_order_line() - + +sale_order_line() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po index f87507a75db..e8d137b0f84 100644 --- a/addons/account_analytic_default/i18n/pl.po +++ b/addons/account_analytic_default/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 09:38+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-20 15:28+0000\n" +"Last-Translator: Grzegorz Grzelak (Cirrus) \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: 2009-12-16 05:18+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default @@ -21,12 +21,12 @@ msgstr "" #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form msgid "Analytic Defaults" -msgstr "" +msgstr "Domyślne ustawienia analityczne" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information msgid "Account Analytic Default" -msgstr "" +msgstr "Domyślne ustawienia konta analitycznego" #. module: account_analytic_default #: constraint:ir.ui.view:0 @@ -84,7 +84,7 @@ msgstr "Użytkownik" #. module: account_analytic_default #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open @@ -111,4 +111,4 @@ msgstr "Warunki" #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user msgid "Analytic Rules" -msgstr "" +msgstr "Reguły analityczne" diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po index 06a8f231901..91e2130547d 100644 --- a/addons/account_analytic_default/i18n/ru.po +++ b/addons/account_analytic_default/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-16 12:18+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-25 08:30+0000\n" +"Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-16 05:18+0000\n" +"X-Launchpad-Export-Date: 2010-02-27 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default @@ -26,12 +26,12 @@ msgstr "Аналитика по умолчанию" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information msgid "Account Analytic Default" -msgstr "" +msgstr "Счет аналитики по умолчанию" #. module: account_analytic_default #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" +msgstr "Некорректный формат XML для структуры вида!" #. module: account_analytic_default #: constraint:ir.model:0 @@ -69,12 +69,12 @@ msgstr "Продукция" #. module: account_analytic_default #: field:account.analytic.default,analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Счет аналитического учета" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_analytic_default msgid "Analytic Distributions" -msgstr "" +msgstr "Аналитическое распределение" #. module: account_analytic_default #: field:account.analytic.default,user_id:0 @@ -84,7 +84,7 @@ msgstr "Пользователь" #. module: account_analytic_default #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия" #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po index 8411fdcf8e9..edb2f39126e 100644 --- a/addons/account_analytic_plans/i18n/de.po +++ b/addons/account_analytic_plans/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-22 18:43+0000\n" +"PO-Revision-Date: 2010-02-28 09:02+0000\n" "Last-Translator: Ferdinand @ ChriCar \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: 2009-12-16 05:16+0000\n" +"X-Launchpad-Export-Date: 2010-03-01 05:01+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -143,7 +143,7 @@ msgstr "Konto3 ID" #: field:account.analytic.plan.instance,journal_id:0 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 msgid "Analytic Journal" -msgstr "Analyse Journal" +msgstr "Analytisches Journal" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -300,7 +300,7 @@ msgstr "Analyt. Planpositionen" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Crossovered Analytic -" -msgstr "" +msgstr "Matrix Analyse" #. module: account_analytic_plans #: field:account.analytic.plan.instance,plan_id:0 diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po new file mode 100644 index 00000000000..0a0a150f8ec --- /dev/null +++ b/addons/account_anglo_saxon/i18n/it.po @@ -0,0 +1,64 @@ +# Italian 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-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-02-27 18:15+0000\n" +"Last-Translator: phede92 \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-01 05:01+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr " Contabili di proprietà" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_balance/i18n/bs.po b/addons/account_balance/i18n/bs.po index 4092eee07c8..c64e580a32d 100644 --- a/addons/account_balance/i18n/bs.po +++ b/addons/account_balance/i18n/bs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-16 14:07+0000\n" +"PO-Revision-Date: 2010-02-22 12:42+0000\n" "Last-Translator: adnan \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-02-17 04:56+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_balance @@ -73,27 +73,27 @@ msgstr "Odaberite razdoblja" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Percentage" -msgstr "" +msgstr "Procenat" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 msgid "Compare Selected Years In Terms Of" -msgstr "" +msgstr "Usporedi odabrane godine pod uvjetima" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Fiscal Year(s)(Maximum Three Years)" -msgstr "" +msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,select_account:0 msgid "Select Reference Account(for % comparision)" -msgstr "" +msgstr "Izaberi odgovarajuća konta (za poređenje u %)" #. module: account_balance #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report msgid "Account balance-Compare Years" -msgstr "" +msgstr "Saldo konta - poredi godine" #. module: account_balance #: model:ir.module.module,description:account_balance.module_meta_information @@ -120,108 +120,108 @@ msgstr "" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You have to select 'Landscape' option. Please Check it." -msgstr "" +msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je." #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "" +msgstr "Prikaži izvješće u položenoj formi" #. module: account_balance #: help:account.balance.account.balance.report,init,periods:0 msgid "All periods if empty" -msgstr "" +msgstr "Ako je prazno, sva razdoblja" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "Sa saldom različit od 0" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Total :" -msgstr "" +msgstr "Ukupno :" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Account Balance -" -msgstr "" +msgstr "Saldo računa -" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,format_perc:0 msgid "Show Comparision in %" -msgstr "" +msgstr "Prikaži usporedbu u %" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period" -msgstr "" +msgstr "Odaberite razdoblje" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "" +msgstr "Postavke izvješća" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "With movements" -msgstr "" +msgstr "Sa kretanjima" #. module: account_balance #: wizard_button:account.balance.account.balance.report,backtoinit,end:0 #: wizard_button:account.balance.account.balance.report,zero_years,end:0 msgid "Ok" -msgstr "" +msgstr "Uredu" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Cash" -msgstr "" +msgstr "Gotovina" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Don't Compare" -msgstr "" +msgstr "Ne uspoređuj" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,account_choice:0 msgid "Show Accounts" -msgstr "" +msgstr "Prikaži račune" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Credit" -msgstr "" +msgstr "Potražuje" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "1. You have selected more than 3 years in any case." -msgstr "" +msgstr "1. Odabrali ste više od 3 godine u svakom slučaju." #. module: account_balance #: model:ir.module.module,shortdesc:account_balance.module_meta_information msgid "Accounting and financial management-Compare Accounts" -msgstr "" +msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Year :" -msgstr "" +msgstr "Godina:" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You can select maximum 3 years. Please check again." -msgstr "" +msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno." #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Balance" -msgstr "" +msgstr "Saldo" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -229,27 +229,30 @@ msgid "" "3. You have selected 'Percentage' option with more than 2 years, but you " "have not selected landscape format." msgstr "" +"Izabrali ste \"Postotak\" opciju sa više od dvije godine, ali niste odabrali " +"\"Položeni\" format." #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "" "You might have done following mistakes. Please correct them and try again." msgstr "" +"Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno." #. module: account_balance #: help:account.balance.account.balance.report,init,select_account:0 msgid "Keep empty for comparision to its parent" -msgstr "" +msgstr "Ostavite prazno za usporedbu sa roditeljem" #. module: account_balance #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Creation Date" -msgstr "" +msgstr "Datum kreiranja" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,fiscalyear:0 msgid "Fiscal year" -msgstr "" +msgstr "Fiskalna godina" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -257,11 +260,12 @@ msgid "" "2. You have not selected 'Percentage' option, but you have selected more " "than 2 years." msgstr "" +"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine." #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,periods:0 msgid "Periods" -msgstr "" +msgstr "Razdoblja" #. module: account_balance #: wizard_view:account.balance.account.balance.report,zero_years:0 @@ -270,18 +274,21 @@ msgid "" "credit/debit columns and % option.This can lead contents to be printed out " "of the paper.Please try again." msgstr "" +"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa " +"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van " +"papira. Molimo pokušajte ponovno." #. module: account_balance #: wizard_button:account.balance.account.balance.report,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Odustani" #. module: account_balance #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "You have to select at least 1 Fiscal Year. Try again." -msgstr "" +msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno." #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Customize Report" -msgstr "" +msgstr "Prilagodite izvješće" diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po index 953e7c7cdd9..cd5ff57e079 100644 --- a/addons/account_budget/i18n/tr.po +++ b/addons/account_budget/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-14 21:29+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-27 08:20+0000\n" +"Last-Translator: Oktay Altunergil \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-02-17 04:56+0000\n" +"X-Launchpad-Export-Date: 2010-03-01 05:01+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget @@ -35,7 +35,7 @@ msgstr "Bütçe Durumları" #. module: account_budget #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "İşlem tanımlamasında geçersiz model adı." #. module: account_budget #: rml:account.analytic.account.budget:0 diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po new file mode 100644 index 00000000000..e02f069f3db --- /dev/null +++ b/addons/account_chart/i18n/nb.po @@ -0,0 +1,23 @@ +# Norwegian Bokmal 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-02-21 07:35+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_chart +#: model:ir.module.module,description:account_chart.module_meta_information +msgid "Remove minimal account chart" +msgstr "Fjern minimal konto diagram" diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po index fb88848c6b7..8a31febc9de 100644 --- a/addons/account_chart/i18n/sv.po +++ b/addons/account_chart/i18n/sv.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-18 15:24+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-21 07:34+0000\n" +"Last-Translator: Kristian Bremvaag \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: 2009-12-16 05:27+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "" +msgstr "Ta bort minimal konto diagram" diff --git a/addons/account_invoice_layout/.project b/addons/account_invoice_layout/.project deleted file mode 100644 index 9fcfcc5ebf0..00000000000 --- a/addons/account_invoice_layout/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - account_invoice_layout - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/addons/account_invoice_layout/.pydevproject b/addons/account_invoice_layout/.pydevproject deleted file mode 100644 index b4c1448c08b..00000000000 --- a/addons/account_invoice_layout/.pydevproject +++ /dev/null @@ -1,6 +0,0 @@ - - - - -python 2.4 - diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po new file mode 100644 index 00000000000..91f9a1721ef --- /dev/null +++ b/addons/account_tax_include/i18n/en_AU.po @@ -0,0 +1,53 @@ +# English (Australia) 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-02-26 06:55+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: English (Australia) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-02-27 04:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_tax_include +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_tax_include +#: field:account.invoice,price_type:0 +msgid "Price method" +msgstr "" + +#. module: account_tax_include +#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information +msgid "Invoices and prices with taxes included" +msgstr "" + +#. module: account_tax_include +#: selection:account.invoice,price_type:0 +msgid "Tax included" +msgstr "" + +#. module: account_tax_include +#: selection:account.invoice,price_type:0 +msgid "Tax excluded" +msgstr "" + +#. module: account_tax_include +#: view:account.tax:0 +msgid "Compute Code for Taxes included prices" +msgstr "" + +#. module: account_tax_include +#: field:account.invoice.line,price_subtotal_incl:0 +msgid "Subtotal" +msgstr "" diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po new file mode 100644 index 00000000000..be869c8f14c --- /dev/null +++ b/addons/account_tax_include/i18n/sk.po @@ -0,0 +1,53 @@ +# Slovak 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-02-23 08:12+0000\n" +"Last-Translator: Radoslav Sloboda \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-02-25 04:50+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_tax_include +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Neplatný súbor XML pre zobrazenie architektúry!" + +#. module: account_tax_include +#: field:account.invoice,price_type:0 +msgid "Price method" +msgstr "" + +#. module: account_tax_include +#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information +msgid "Invoices and prices with taxes included" +msgstr "Faktúry a ceny zahrnuté s DPH" + +#. module: account_tax_include +#: selection:account.invoice,price_type:0 +msgid "Tax included" +msgstr "" + +#. module: account_tax_include +#: selection:account.invoice,price_type:0 +msgid "Tax excluded" +msgstr "" + +#. module: account_tax_include +#: view:account.tax:0 +msgid "Compute Code for Taxes included prices" +msgstr "" + +#. module: account_tax_include +#: field:account.invoice.line,price_subtotal_incl:0 +msgid "Subtotal" +msgstr "Medzisúčet" diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py index d4255bb96a9..94e2871da84 100644 --- a/addons/account_tax_include/invoice_tax_incl.py +++ b/addons/account_tax_include/invoice_tax_incl.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 . # ############################################################################## @@ -36,7 +36,7 @@ class account_invoice(osv.osv): _defaults = { 'price_type': lambda *a: 'tax_excluded', } - + def refund(self, cr, uid, ids, date=None, period_id=None, description=None): map_old_new = {} refund_ids = [] @@ -44,12 +44,12 @@ class account_invoice(osv.osv): new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description) refund_ids += new_id map_old_new[old_inv_id] = new_id[0] - + for old_inv_id in map_old_new.keys(): old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type'] self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record}) return refund_ids - + account_invoice() class account_invoice_line(osv.osv): @@ -156,16 +156,16 @@ class account_invoice_line(osv.osv): else: return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context) - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None): + def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): # note: will call product_id_change_unit_price_inv with context... - # Temporary trap, for bad context that came from koo: + # Temporary trap, for bad context that came from koo: # if isinstance(context, str): # print "str context:", context ctx = (context and context.copy()) or {} ctx.update({'price_type': ctx.get('price_type','tax_excluded')}) - return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context=ctx) + return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx) account_invoice_line() class account_invoice_tax(osv.osv): @@ -180,7 +180,7 @@ class account_invoice_tax(osv.osv): cur_obj = self.pool.get('res.currency') cur = inv.currency_id company_currency = inv.company_id.currency_id.id - + for line in inv.invoice_line: data = self.pool.get('account.invoice.line')._amount_line2(cr, uid, [line.id], [], [], context)[line.id] for tax in data['data']: @@ -218,7 +218,7 @@ class account_invoice_tax(osv.osv): t['amount'] = cur_obj.round(cr, uid, cur, t['amount']) t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount']) t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount']) - + return tax_grouped account_invoice_tax() diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po new file mode 100644 index 00000000000..8e8275d3025 --- /dev/null +++ b/addons/analytic_user_function/i18n/sk.po @@ -0,0 +1,66 @@ +# Slovak 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-02-23 08:09+0000\n" +"Last-Translator: Radoslav Sloboda \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: analytic_user_function +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Neplatný súbor XML pre zobrazenie architektúry!" + +#. module: analytic_user_function +#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid +msgid "Relation table between users and products on a analytic account" +msgstr "" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,product_id:0 +msgid "Product" +msgstr "Produkt" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,account_id:0 +msgid "Analytic Account" +msgstr "Analytický účet" + +#. module: analytic_user_function +#: view:account.analytic.account:0 +#: field:account.analytic.account,user_product_ids:0 +msgid "Users/Products Rel." +msgstr "" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,user_id:0 +msgid "User" +msgstr "Užívateľ" + +#. module: analytic_user_function +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!" + +#. module: analytic_user_function +#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information +msgid "Analytic User Function" +msgstr "" + +#. module: analytic_user_function +#: view:analytic_user_funct_grid:0 +msgid "User's Product for this Analytic Account" +msgstr "" diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index e6c39afcaf7..584762828f1 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -37,6 +37,9 @@ months = { 10:"October", 11:"November", 12:"December"} def get_recurrent_dates(rrulestring, exdate, startdate=None): + def todate(date): + val = parser.parse(''.join((re.compile('\d')).findall(date)) + 'Z') + return val if not startdate: startdate = datetime.now() rset1 = rrule.rrulestr(rrulestring, dtstart=startdate, forceset=True) @@ -394,7 +397,7 @@ request was delegated to"), 'language': fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."), 'user_id': fields.many2one('res.users', 'User'), 'partner_address_id': fields.many2one('res.partner.address', 'Contact'), - 'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), + 'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner', help="Partner related to contact"), 'email': fields.char('Email', size=124, required=True, help="Email of Invited Person"), 'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 7bdaaf2a88f..59e426c2c09 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -71,8 +71,8 @@ - - + + diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po index 97dfcfe2d53..ba39c7ebd5b 100644 --- a/addons/base_module_quality/i18n/de.po +++ b/addons/base_module_quality/i18n/de.po @@ -8,19 +8,19 @@ 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: 2009-11-22 18:58+0000\n" +"PO-Revision-Date: 2010-02-28 09:01+0000\n" "Last-Translator: Ferdinand @ ChriCar \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-16 05:26+0000\n" +"X-Launchpad-Export-Date: 2010-03-01 05:01+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality #: field:module.quality.check,final_score:0 msgid "Final Score (%)" -msgstr "Final Score (%)" +msgstr "Endergebnis" #. module: base_module_quality #: constraint:ir.model:0 diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po index 4c567fde222..654d6cd016f 100644 --- a/addons/base_module_quality/i18n/ru.po +++ b/addons/base_module_quality/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-02 17:45+0000\n" +"PO-Revision-Date: 2010-02-25 08:34+0000\n" "Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-04 04:47+0000\n" +"X-Launchpad-Export-Date: 2010-02-27 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality @@ -98,7 +98,7 @@ msgstr "Неправильный XML для просмотра архитект #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_check msgid "module.quality.check" -msgstr "" +msgstr "Проверка качества" #. module: base_module_quality #: field:module.quality.detail,name:0 @@ -154,7 +154,7 @@ msgstr "Проверка качества" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_detail msgid "module.quality.detail" -msgstr "" +msgstr "Детальный отчет от качестве модуля" #. module: base_module_quality #: selection:module.quality.detail,state:0 diff --git a/addons/base_report_creator/i18n/pl.po b/addons/base_report_creator/i18n/pl.po index 444587ab9d7..4ef0133d8ef 100644 --- a/addons/base_report_creator/i18n/pl.po +++ b/addons/base_report_creator/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 12:16+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-02-26 20:18+0000\n" +"Last-Translator: Grzegorz Grzelak (Cirrus) \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: 2009-12-16 05:21+0000\n" +"X-Launchpad-Export-Date: 2010-02-27 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator @@ -27,7 +27,7 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report,view_graph_type:0 msgid "Graph Type" -msgstr "" +msgstr "Typ wykresu" #. module: base_report_creator #: view:base_report_creator.report:0 @@ -57,7 +57,7 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report.filter,expression:0 msgid "Value" -msgstr "" +msgstr "Wartość" #. module: base_report_creator #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields @@ -67,7 +67,7 @@ msgstr "" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 msgid "Ending Date" -msgstr "" +msgstr "Data końcowa" #. module: base_report_creator #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter @@ -84,17 +84,17 @@ msgstr "" #: view:base_report_creator.report:0 #: wizard_button:base_report_creator.report.menu.create,init,create_menu:0 msgid "Create Menu" -msgstr "" +msgstr "Utwórz menu" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Minimum" -msgstr "" +msgstr "Minimum" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0 msgid "Operator" -msgstr "" +msgstr "Operator" #. module: base_report_creator #: selection:base_report_creator.report.filter,condition:0 @@ -131,7 +131,7 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report,type:0 msgid "Report Type" -msgstr "" +msgstr "Typ raportu" #. module: base_report_creator #: view:base_report_creator.report:0 @@ -141,7 +141,7 @@ msgstr "Stan" #. module: base_report_creator #: selection:base_report_creator.report,state:0 msgid "Valid" -msgstr "Prawidłowy" +msgstr "Skończony" #. module: base_report_creator #: view:base_report_creator.report:0 @@ -158,7 +158,7 @@ msgstr "" #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Form" -msgstr "" +msgstr "Formularz" #. module: base_report_creator #: selection:base_report_creator.report,view_type3:0 @@ -172,12 +172,12 @@ msgstr "" #: field:base_report_creator.report.filter,report_id:0 #: model:ir.model,name:base_report_creator.model_base_report_creator_report msgid "Report" -msgstr "" +msgstr "Raport" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 msgid "Starting Date" -msgstr "" +msgstr "Data rozpoczęcia" #. module: base_report_creator #: constraint:ir.ui.view:0 @@ -189,7 +189,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!" #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Tree" -msgstr "" +msgstr "Drzewo" #. module: base_report_creator #: field:base_report_creator.report,group_ids:0 @@ -209,12 +209,12 @@ msgstr "" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Security" -msgstr "Zabezpieczenia" +msgstr "Uprawnienia" #. module: base_report_creator #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0 msgid "Menu Name" -msgstr "" +msgstr "Nazwa Menu" #. module: base_report_creator #: selection:base_report_creator.report.filter,condition:0 @@ -235,21 +235,21 @@ msgstr "" #. module: base_report_creator #: selection:base_report_creator.report.fields,graph_mode:0 msgid "Y Axis" -msgstr "" +msgstr "Oś Y" #. module: base_report_creator #: selection:base_report_creator.report,view_type1:0 #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Calendar" -msgstr "" +msgstr "Kalendarz" #. module: base_report_creator #: selection:base_report_creator.report,view_type1:0 #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Graph" -msgstr "" +msgstr "Wykres" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0 @@ -259,7 +259,7 @@ msgstr "Nazwa pola" #. module: base_report_creator #: selection:base_report_creator.report,state:0 msgid "Draft" -msgstr "Roboczy" +msgstr "Projekt" #. module: base_report_creator #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0 @@ -269,12 +269,12 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report,state:0 msgid "Status" -msgstr "" +msgstr "Stan" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_orientation:0 msgid "Vertical" -msgstr "" +msgstr "Pionowo" #. module: base_report_creator #: selection:base_report_creator.report,type:0 @@ -284,7 +284,7 @@ msgstr "" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "General Configuration" -msgstr "" +msgstr "Konfiguracja ogólna" #. module: base_report_creator #: wizard_view:base_report_creator.report_filter.fields,init:0 @@ -294,38 +294,38 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report,active:0 msgid "Active" -msgstr "" +msgstr "Aktywne" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_orientation:0 msgid "Horizontal" -msgstr "" +msgstr "Poziomo" #. module: base_report_creator #: field:base_report_creator.report.fields,group_method:0 msgid "Grouping Method" -msgstr "" +msgstr "Metoda grupowania" #. module: base_report_creator #: field:base_report_creator.report.filter,condition:0 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0 msgid "Condition" -msgstr "" +msgstr "Warunek" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Count" -msgstr "" +msgstr "Licznik" #. module: base_report_creator #: selection:base_report_creator.report.fields,graph_mode:0 msgid "X Axis" -msgstr "" +msgstr "Oś X" #. module: base_report_creator #: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0 msgid "Parent Menu" -msgstr "" +msgstr "Menu nadrzędne" #. module: base_report_creator #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0 @@ -340,12 +340,12 @@ msgstr "" #. module: base_report_creator #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open msgid "Open Report" -msgstr "" +msgstr "Otwórz raport" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Grouped" -msgstr "" +msgstr "Zgrupowane" #. module: base_report_creator #: view:base_report_creator.report:0 @@ -358,7 +358,7 @@ msgstr "" #: wizard_button:base_report_creator.report_filter.fields,init,end:0 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #. module: base_report_creator #: constraint:ir.model:0 @@ -391,7 +391,7 @@ msgstr "" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_type:0 msgid "Pie Chart" -msgstr "" +msgstr "Wykres kołowy" #. module: base_report_creator #: field:base_report_creator.report,view_type3:0 @@ -417,42 +417,42 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report,name:0 msgid "Report Name" -msgstr "" +msgstr "Nazwa raportu" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Fields" -msgstr "" +msgstr "Pola" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Average" -msgstr "" +msgstr "Średnia" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Reports" -msgstr "" +msgstr "Raporty" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Maximum" -msgstr "" +msgstr "Maksimum" #. module: base_report_creator #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0 msgid "Continue" -msgstr "" +msgstr "Kontynuuj" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0 msgid "Values" -msgstr "" +msgstr "Wartości" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_type:0 msgid "Bar Chart" -msgstr "" +msgstr "Wykres słupkowy" #. module: base_report_creator #: field:base_report_creator.report,view_type2:0 @@ -472,12 +472,12 @@ msgstr "" #. module: base_report_creator #: field:base_report_creator.report.fields,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Numeracja" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0 msgid "Filter Field" -msgstr "" +msgstr "Pole filtrowania" #. module: base_report_creator #: view:base_report_creator.report:0 diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po new file mode 100644 index 00000000000..37e59c8a91f --- /dev/null +++ b/addons/base_vat/i18n/en_AU.po @@ -0,0 +1,39 @@ +# English (Australia) 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-02-26 07:31+0000\n" +"Last-Translator: brentos \n" +"Language-Team: English (Australia) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-02-27 04:48+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: base_vat +#: model:ir.module.module,description:base_vat.module_meta_information +msgid "" +"Enable the VAT Number for the partner. Check the validity of that VAT Number." +msgstr "Enable the ABN for the partner. Check the validity of at ABN." + +#. module: base_vat +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Invalid XML for View Architecture!" + +#. module: base_vat +#: field:res.partner,vat_subjected:0 +msgid "VAT Legal Statement" +msgstr "GST Legal Statement" + +#. module: base_vat +#: model:ir.module.module,shortdesc:base_vat.module_meta_information +msgid "VAT" +msgstr "GST" diff --git a/addons/board_account/i18n/sk.po b/addons/board_account/i18n/sk.po index d18ef8f08ea..3c440b6b02c 100644 --- a/addons/board_account/i18n/sk.po +++ b/addons/board_account/i18n/sk.po @@ -8,19 +8,19 @@ 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: 2009-12-15 11:05+0000\n" +"PO-Revision-Date: 2010-02-23 08:20+0000\n" "Last-Translator: Radoslav Sloboda \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n" +"X-Launchpad-Export-Date: 2010-02-25 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_account #: view:board.board:0 msgid "Analytic accounts to close" -msgstr "" +msgstr "Zatvoriť analytické účty" #. module: board_account #: view:board.board:0 @@ -36,24 +36,24 @@ msgstr "Neplatný súbor XML pre zobrazenie architektúry!" #: model:ir.actions.act_window,name:board_account.open_board_account #: model:ir.ui.menu,name:board_account.menu_board_account msgid "Accounting Dashboard" -msgstr "" +msgstr "Nástenka účtovníctva" #. module: board_account #: model:ir.actions.act_window,name:board_account.action_aged_receivable msgid "Receivable Accounts" -msgstr "" +msgstr "Účty pohľadávok" #. module: board_account #: view:board.board:0 #: model:ir.actions.act_window,name:board_account.act_my_account msgid "Accounts to invoice" -msgstr "" +msgstr "Účty na faktúre" #. module: board_account #: view:board.board:0 #: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice msgid "Costs to invoice" -msgstr "" +msgstr "Náklady na faktúru" #. module: board_account #: view:board.board:0 @@ -73,17 +73,17 @@ msgstr "" #. module: board_account #: view:board.board:0 msgid "My indicators" -msgstr "" +msgstr "Moja ukazovatele" #. module: board_account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Neplatný názov modelu v akcii definície." #. module: board_account #: model:ir.ui.menu,name:board_account.next_id_68 msgid "Accounting" -msgstr "" +msgstr "Účtovníctvo" #. module: board_account #: view:board.board:0 diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index 05d2d54113f..ec083dd91b1 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -24,9 +24,9 @@ import crm_mailgate import crm_action_rule import crm_segmentation import crm_meeting +import crm_opportunity import crm_lead import crm_phonecall -import crm_opportunity import crm_claim import crm_fundraising import crm_helpdesk diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 1289b44a0cd..589e26d5521 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -62,15 +62,15 @@ icon_lst = { class crm_case_section(osv.osv): _name = "crm.case.section" - _description = "Case Section" + _description = "Sales Teams" _order = "name" _columns = { - 'name': fields.char('Case Section',size=64, required=True, translate=True), - 'code': fields.char('Section Code',size=8), - 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case section without removing it."), + 'name': fields.char('Sales Team',size=64, required=True, translate=True), + 'code': fields.char('Code',size=8), + 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the sales team without removing it."), 'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), 'user_id': fields.many2one('res.users', 'Responsible User'), - 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"), + 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this sales team"), 'parent_id': fields.many2one('crm.case.section', 'Parent Section'), 'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'), } @@ -111,17 +111,15 @@ class crm_case_categ(osv.osv): _description = "Category of case" _columns = { - 'name': fields.char('Case Category Name', size=64, required=True, translate=True), - 'probability': fields.float('Probability (%)', required=True), - 'section_id': fields.many2one('crm.case.section', 'Case Section'), + 'name': fields.char('Case Category Name', size=64, required=True, translate=True), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'object_id': fields.many2one('ir.model','Object Name'), } def _find_object_id(self, cr, uid, context=None): object_id = context and context.get('object_id', False) or False ids =self.pool.get('ir.model').search(cr, uid, [('model', '=', object_id)]) return ids and ids[0] - _defaults = { - 'probability': lambda *args: 0.0, + _defaults = { 'object_id' : _find_object_id } # @@ -133,7 +131,7 @@ class crm_case_resource_type(osv.osv): _rec_name = "name" _columns = { 'name': fields.char('Case Resource Type', size=64, required=True, translate=True), - 'section_id': fields.many2one('crm.case.section', 'Case Section'), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'object_id': fields.many2one('ir.model','Object Name'), } def _find_object_id(self, cr, uid, context=None): @@ -153,9 +151,11 @@ class crm_case_stage(osv.osv): _order = "sequence" _columns = { 'name': fields.char('Stage Name', size=64, required=True, translate=True), - 'section_id': fields.many2one('crm.case.section', 'Case Section'), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."), 'object_id': fields.many2one('ir.model','Object Name'), + 'probability': fields.float('Probability (%)', required=True), + 'on_change': fields.boolean('Set Onchange'), } def _find_object_id(self, cr, uid, context=None): object_id = context and context.get('object_id', False) or False @@ -163,6 +163,7 @@ class crm_case_stage(osv.osv): return ids and ids[0] _defaults = { 'sequence': lambda *args: 1, + 'probability': lambda *args: 0.0, 'object_id' : _find_object_id } @@ -218,21 +219,22 @@ class crm_case(osv.osv): 'id': fields.integer('ID', readonly=True), 'name': fields.char('Description', size=1024, required=True), 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the case without removing it."), - 'description': fields.text('Your action'), - 'section_id': fields.many2one('crm.case.section', 'Section', select=True, help='Section to which Case belongs to. Define Responsible user and Email account for mail gateway.'), - 'email_from': fields.char('Partner Email', size=128, help="These people will receive email."), - 'email_cc': fields.char('Watchers Emails', size=252 , help="These people will receive a copy of the future" \ + 'description': fields.text('Description'), + 'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'), + 'email_from': fields.char('Email', size=128, help="These people will receive email."), + 'email_cc': fields.text('Watchers Emails', size=252 , help="These people will receive a copy of the future" \ " communication between partner and users by email"), 'email_last': fields.function(_email_last, method=True, string='Latest E-Mail', type='text'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"), - 'date': fields.datetime('Date'), - 'create_date': fields.datetime('Created' ,readonly=True), - 'date_deadline': fields.datetime('Deadline'), + 'create_date': fields.datetime('Creation Date' ,readonly=True), + 'write_date': fields.datetime('Update Date' ,readonly=True), + 'date_deadline': fields.date('Deadline'), 'user_id': fields.many2one('res.users', 'Responsible'), 'history_line': fields.function(_get_log_ids, method=True, type='one2many', multi="history_line", relation="crm.case.history", string="Communication"), 'log_ids': fields.function(_get_log_ids, method=True, type='one2many', multi="log_ids", relation="crm.case.log", string="Logs History"), + 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ @@ -274,9 +276,9 @@ class crm_case(osv.osv): 'partner_address_id': _get_default_partner_address, 'email_from': _get_default_email, 'state': lambda *a: 'draft', - 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'date_deadline': lambda *a:(datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'), 'section_id': _get_section, + 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), } _order = 'date_deadline desc, date desc,id desc' @@ -318,13 +320,8 @@ class crm_case(osv.osv): s[section] = dict([(v, k) for (k, v) in s[section].iteritems()]) if st in s[section]: self.write(cr, uid, [case.id], {'stage_id': s[section][st]}) - return True + return True - def onchange_categ_id(self, cr, uid, ids, categ, context={}): - if not categ: - return {'value':{}} - cat = self.pool.get('crm.case.categ').browse(cr, uid, categ, context).probability - return {'value':{'probability':cat}} def onchange_case_id(self, cr, uid, ids, case_id, name, partner_id, context={}): if not case_id: @@ -430,7 +427,7 @@ class crm_case(osv.osv): if not part: return {'value':{'partner_address_id': False, 'email_from': False, - 'partner_name2': False}} + }} addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact']) data = {'partner_address_id': addr['contact']} data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value']) @@ -442,7 +439,6 @@ class crm_case(osv.osv): return {'value': {'email_from': False, 'partner_name2': False}} address= self.pool.get('res.partner.address').browse(cr, uid, add) data['email_from'] = address.email - data['partner_name2'] = address.name or '' return {'value': data} def case_close(self, cr, uid, ids, *args): diff --git a/addons/crm/crm_claim.py b/addons/crm/crm_claim.py index adb9e728508..2a560da15b9 100644 --- a/addons/crm/crm_claim.py +++ b/addons/crm/crm_claim.py @@ -29,6 +29,7 @@ class crm_claim(osv.osv): _inherit = 'crm.case' _columns = { 'date_closed': fields.datetime('Closed', readonly=True), + 'date': fields.datetime('Date'), 'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \ diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml index e97221f081b..b82f57b88ca 100644 --- a/addons/crm/crm_claims_view.xml +++ b/addons/crm/crm_claims_view.xml @@ -8,25 +8,25 @@ Claim Categories crm.case.categ form - - [('object_id.model', '=', 'crm.claim')] - {'object_id':'crm.claim'} + + [('object_id.model', '=', 'crm.claim')] + {'object_id':'crm.claim'} # ------------------------------------------------------ # Stages # ------------------------------------------------------ - - Claim Stages - crm.case.stage - form - - [('object_id.model', '=', 'crm.claim')] - {'object_id':'crm.claim'} - - + + Claim Stages + crm.case.stage + form + + [('object_id.model', '=', 'crm.claim')] + {'object_id':'crm.claim'} + + - + CRM - Claims Tree crm.claim @@ -59,36 +59,35 @@ - - - - - - - - + + + + + + + + - - -