diff --git a/addons/account/__init__.py b/addons/account/__init__.py index 24129306e13..52c65f0c3da 100644 --- a/addons/account/__init__.py +++ b/addons/account/__init__.py @@ -25,6 +25,7 @@ import project import partner import invoice import account_bank_statement +import account_bank import account_cash_statement import account_move_line import account_analytic_line diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 2122f988d5d..1b378e15e93 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -122,13 +122,15 @@ module named account_voucher. 'company_view.xml', 'board_account_view.xml', "wizard/account_report_profit_loss_view.xml", - "wizard/account_report_balance_sheet_view.xml" + "wizard/account_report_balance_sheet_view.xml", + "account_bank_view.xml" ], 'demo_xml': [ - 'account_demo.xml', + 'demo/account_demo.xml', 'project/project_demo.xml', 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', + 'demo/account_invoice_demo.xml', # 'account_unit_test.xml', ], 'test': [ diff --git a/addons/account/account.py b/addons/account/account.py index 72208314ed9..0cee9291e97 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -602,7 +602,7 @@ class account_journal(osv.osv): _description = "Journal" _columns = { 'name': fields.char('Journal Name', size=64, required=True), - 'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."), + 'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."), 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True, help="Select 'Sale' for Sale journal to be used at the time of making invoice."\ " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\ @@ -2675,9 +2675,10 @@ class wizard_multi_charts_accounts(osv.osv_memory): return False def _get_default_accounts(self, cr, uid, context=None): - return [{'acc_name': _('Current'),'account_type':'bank'}, - {'acc_name': _('Deposit'),'account_type':'bank'}, - {'acc_name': _('Cash'),'account_type':'cash'}] + return [ + {'acc_name': _('Bank Account'),'account_type':'bank'}, + {'acc_name': _('Cash'),'account_type':'cash'} + ] _defaults = { 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id, diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py new file mode 100644 index 00000000000..a3d66ccdf7c --- /dev/null +++ b/addons/account/account_bank.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from tools.translate import _ +from osv import fields, osv + +class bank(osv.osv): + _inherit = "res.partner.bank" + _columns = { + 'journal_id': fields.many2one('account.journal', 'Account Journal', help="This journal will be created automatically for this bank account when you save the record"), + } + def create(self, cr, uid, data, context={}): + result = super(bank, self).create(cr, uid, data, context=context) + self.post_write(cr, uid, [result], context=context) + return result + + def write(self, cr, uid, ids, data, context={}): + result = super(bank, self).write(cr, uid, ids, data, context=context) + self.post_write(cr, uid, ids, context=context) + return result + + def post_write(self, cr, uid, ids, context={}): + obj_acc = self.pool.get('account.account') + obj_data = self.pool.get('ir.model.data') + for bank in self.browse(cr, uid, ids, context): + if bank.company_id and not bank.journal_id: + # Find the code and parent of the bank account to create + dig = 6 + current_num = 1 + ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) + # No liquidity account exists, no template available + if not ids: continue + + ref_acc_bank_temp = obj_acc.browse(cr, uid, ids[0], context=context) + ref_acc_bank = ref_acc_bank_temp.parent_id + while True: + new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num) + ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)]) + if not ids: + break + current_num += 1 + + acc = { + 'name': (bank.bank_name or '')+' '+bank.acc_number, + 'currency_id': bank.company_id.currency_id.id, + 'code': new_code, + 'type': 'liquidity', + 'user_type': ref_acc_bank_temp.user_type.id, + 'reconcile': False, + 'parent_id': ref_acc_bank.id, + 'company_id': bank.company_id.id, + } + acc_bank_id = obj_acc.create(cr,uid,acc,context=context) + + # Get the journal view id + data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')]) + data = obj_data.browse(cr, uid, data_id[0], context=context) + view_id_cash = data.res_id + + jour_obj = self.pool.get('account.journal') + new_code = 1 + while True: + code = _('BNK')+str(new_code) + ids = jour_obj.search(cr, uid, [('code','=',code)], context=context) + if not ids: + break + new_code += 1 + + #create the bank journal + vals_journal = { + 'name': (bank.bank_name or '')+' '+bank.acc_number, + 'code': code, + 'type': 'bank', + 'company_id': bank.company_id.id, + 'analytic_journal_id': False, + 'currency_id': False, + 'default_credit_account_id': acc_bank_id, + 'default_debit_account_id': acc_bank_id, + 'view_id': view_id_cash + } + journal_id = jour_obj.create(cr, uid, vals_journal, context=context) + + self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context) + return True + diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml new file mode 100644 index 00000000000..d91739817ac --- /dev/null +++ b/addons/account/account_bank_view.xml @@ -0,0 +1,48 @@ + + + + + + + + Partner Bank Accounts - Journal + res.partner.bank + form + + + + + + + + + + + + + + Bank Accounts + res.partner.bank + form + tree,form + + Configure your company's bank account and select those that must appear on the report footer. You can drag & drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data. + + + + + + + + 4 + + + + + diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index d3acde730a9..151f7bbc0f0 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -19,9 +19,9 @@ Configure - - 23 - + + 23 + @@ -52,7 +52,7 @@ - + @@ -82,7 +82,7 @@ 3 - special + automatic diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 0f12001193d..b21d3e9604f 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -378,10 +378,6 @@ - - - - diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 867aaeeba51..062e1f6382b 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -16,7 +16,7 @@ - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 0c4ade61439..5de205e1690 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -767,7 +767,7 @@ An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company. - + @@ -1201,13 +1201,6 @@ - - - - - - - @@ -1266,8 +1259,8 @@ tree,form - [('account_id', 'child_of', active_id)] - {'account_id':active_id} + [] + {'search_default_account_id': [active_id]} diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index dd424e17ceb..e5b262c07f9 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -1,11 +1,6 @@ - - - Accountants - - Receivable Accounts report.account.receivable diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index fbae77349af..b2936955246 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -1,15 +1,14 @@ - - + Receivable receivable income unreconciled - + Payable payable expense @@ -43,7 +42,7 @@ liability - + Income income income @@ -591,15 +590,15 @@ - - - + + + - - - + + + @@ -617,7 +616,7 @@ Generate Chart of Accounts from a Chart Template - special + automatic diff --git a/addons/account/account_demo.xml b/addons/account/demo/account_demo.xml similarity index 100% rename from addons/account/account_demo.xml rename to addons/account/demo/account_demo.xml diff --git a/addons/account/demo/account_invoice_demo.xml b/addons/account/demo/account_invoice_demo.xml new file mode 100644 index 00000000000..3a3c7751b89 --- /dev/null +++ b/addons/account/demo/account_invoice_demo.xml @@ -0,0 +1,50 @@ + + + + + 2011-07-21 + + + + + + + none + + draft + in_invoice + + + 2011-06-01 + + + + + + + + + + + + + + + + [RPAN100] Rear Panel SHE100 + + + + + + + + + + + + + [RCK200] Rack 200cm + + + diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 7cd2ad13673..b5151f9ab0d 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-15 02:11+0000\n" -"Last-Translator: Chronos \n" +"PO-Revision-Date: 2011-08-13 17:32+0000\n" +"Last-Translator: Jan B. Krejčí \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: 2011-07-16 04:56+0000\n" -"X-Generator: Launchpad (build 13405)\n" +"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n" +"X-Generator: Launchpad (build 13674)\n" "X-Poedit-Language: Czech\n" #. module: account @@ -40,13 +40,12 @@ msgid "" "You cannot remove/deactivate an account which is set as a property to any " "Partner." msgstr "" -"Nemůžete odstranit/deaktivovat účet, který je nastaven jako vlastnost " -"některého partnera" +"Nemůžete odstranit/deaktivovat účet, který je přiřazen některému partnerovi" #. module: account #: view:account.move.reconcile:0 msgid "Journal Entry Reconcile" -msgstr "" +msgstr "Likvidace záznamu v knize" #. module: account #: field:account.installer.modules,account_voucher:0 @@ -71,12 +70,12 @@ msgstr "Zbytek" #: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" -msgstr "Prosím nadefinujte sekvenci knihy faktur" +msgstr "Prosím nadefinujte číselnou řadu knihy faktur" #. module: account #: constraint:account.period:0 msgid "Error ! The duration of the Period(s) is/are invalid. " -msgstr "Chyba! Délku období (s) je / jsou neplatné. " +msgstr "Chyba! Neplatná délka období. " #. module: account #: field:account.analytic.line,currency_id:0 @@ -91,12 +90,12 @@ msgstr "Definice potomků" #. module: account #: model:ir.model,name:account.model_report_aged_receivable msgid "Aged Receivable Till Today" -msgstr "Splatné pohledávky do dnešního dne" +msgstr "Pohledávky splatné ke dnešku" #. module: account #: field:account.partner.ledger,reconcil:0 msgid "Include Reconciled Entries" -msgstr "" +msgstr "Zahrnout zlikvidované záznamy" #. module: account #: view:account.pl.report:0 @@ -104,13 +103,13 @@ msgid "" "The Profit and Loss report gives you an overview of your company profit and " "loss in a single document" msgstr "" -"Výkaz zisku a ztrát Vám dá přehled o zisku a ztrátě společnosti v jediném " +"Výkaz zisku a ztráty Vám dá přehled o zisku či ztrátě společnosti v jediném " "dokumentu" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 msgid "Import from invoice or payment" -msgstr "Importovat z faktur nebo plateb" +msgstr "Importovat z faktury nebo platby" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -128,17 +127,19 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disabled" msgstr "" +"Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, " +"které se k nim váží, protože tyto nebudou zrušeny" #. module: account #: report:account.tax.code.entries:0 msgid "Accounting Entries-" -msgstr "Účetní zápisy-" +msgstr "Účetní záznamy -" #. module: account #: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" -msgstr "Nemůžet smazat vložené pohyby: \"%s\"!" +msgstr "Nemůžet smazat zaúčtované pohyby: \"%s\"!" #. module: account #: report:account.invoice:0 @@ -154,7 +155,7 @@ msgstr "Původ" #: view:account.move.line.reconcile:0 #: view:account.move.line.reconcile.writeoff:0 msgid "Reconcile" -msgstr "Vyrovnání" +msgstr "Likvidace" #. module: account #: field:account.bank.statement.line,ref:0 @@ -169,7 +170,7 @@ msgstr "Odkaz" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Choose Fiscal Year " -msgstr "Vyberte Daňový rok " +msgstr "VYberte fiskální rok " #. module: account #: help:account.payment.term,active:0 @@ -178,7 +179,7 @@ msgid "" "term without removing it." msgstr "" "Pokud je pole nastaveno na Nepravda, umožní vám to skrýt platební období bez " -"jejího odebrání." +"jeho odebrání." #. module: account #: code:addons/account/invoice.py:1436 @@ -195,12 +196,12 @@ msgstr "Zdroj účtu" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal msgid "All Analytic Entries" -msgstr "Všechny analytické položky" +msgstr "Všechny analytické záznamy" #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard msgid "Invoices Created Within Past 15 Days" -msgstr "" +msgstr "Faktury vytvořené v posledních 15 dnech" #. module: account #: selection:account.account.type,sign:0 @@ -211,7 +212,7 @@ msgstr "Záporné" #: code:addons/account/wizard/account_move_journal.py:95 #, python-format msgid "Journal: %s" -msgstr "Deník: %s" +msgstr "Kniha: %s" #. module: account #: help:account.analytic.journal,type:0 @@ -220,6 +221,9 @@ msgid "" "invoice) to create analytic entries, OpenERP will look for a matching " "journal of the same type." msgstr "" +"Udává typ analytické knihy. Pokud mají být pro dokument (např. fakturu) " +"vytvořeny analytické položky, OpenERP bude hledet vyhovující knihu shodného " +"typu." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -239,13 +243,13 @@ msgid "" "No period defined for this date: %s !\n" "Please create a fiscal year." msgstr "" -"Není určena perioda pro tento datum: %s !\n" -"Prosíme vytvořte daňový rok." +"Pro toto datum: %s není definováno období.\n" +"Prosím vytvořte fiskální rok." #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_select msgid "Move line reconcile select" -msgstr "" +msgstr "Výběr likvidace pohybu" #. module: account #: help:account.model.line,sequence:0 @@ -253,6 +257,8 @@ msgid "" "The sequence field is used to order the resources from lower sequences to " "higher ones" msgstr "" +"Pole \"sequence\" je použito pro řazení záznamů od nejnižšího čísla k " +"nejvyššímu" #. module: account #: help:account.tax.code,notprintable:0 @@ -261,17 +267,19 @@ msgid "" "Check this box if you don't want any VAT related to this Tax Code to appear " "on invoices" msgstr "" +"Zaškrtněte toto pole, pokud nechcete, aby se ve fakturách objevovalo k " +"tomuto daňovému kódu žádné DPH" #. module: account #: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" -msgstr "Faktura '%s' je částečně zaplacená: %s%s of %s%s (%s%s zbývá)" +msgstr "Faktura '%s' je zaplacená částečně: %s%s z %s%s (zbývá %s%s)" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Accounting entries are an input of the reconciliation." -msgstr "Účetní položky jsou vstupem vyrovnání." +msgstr "Účetní záznamy jsou vstupem likvidace" #. module: account #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports @@ -282,12 +290,12 @@ msgstr "Belgické výkazy" #: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." -msgstr "Nemůžete přida/upravit položky v uzavřeném deníku." +msgstr "Nemůžete přidávat/upravovat položky v uzavřené knize." #. module: account #: view:account.bank.statement:0 msgid "Calculated Balance" -msgstr "Spočítat rozvahu" +msgstr "Vypočtený zůstatek" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -299,7 +307,7 @@ msgstr "Ruční opakování" #. module: account #: view:account.fiscalyear.close.state:0 msgid "Close Fiscalyear" -msgstr "Uzavřít finační rok" +msgstr "Uzávěrka fiskálního roku" #. module: account #: field:account.automatic.reconcile,allow_write_off:0 @@ -314,13 +322,13 @@ msgstr "Vyberte období pro analýzu" #. module: account #: view:account.move.line:0 msgid "St." -msgstr "" +msgstr "Sv." #. module: account #: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." -msgstr "" +msgstr "Firma řádku faktury nesouhlasí s firmou faktury" #. module: account #: field:account.journal.column,field:0 @@ -333,6 +341,8 @@ msgid "" "Installs localized accounting charts to match as closely as possible the " "accounting needs of your company based on your country." msgstr "" +"Nainstaluje lokalizované účtové rozvrhy, co nejlépe odpovídající účetním " +"potřebám vaší firmy a vaší země." #. module: account #: code:addons/account/wizard/account_move_journal.py:63 @@ -343,11 +353,15 @@ msgid "" "You can create one in the menu: \n" "Configuration/Financial Accounting/Accounts/Journals." msgstr "" +"Pro tuto firmu neexistuje účetní kniha typu %s.\n" +"\n" +"Můžete ji vytvořit v nabídce:\n" +"Konfigurace/Finanční účetnictví/Účty/Knihy" #. module: account #: model:ir.model,name:account.model_account_unreconcile msgid "Account Unreconcile" -msgstr "" +msgstr "Zrušit likvidaci" #. module: account #: view:product.product:0 @@ -377,6 +391,9 @@ msgid "" "OpenERP. Journal items are created by OpenERP if you use Bank Statements, " "Cash Registers, or Customer/Supplier payments." msgstr "" +"Tento pohled je používán účetními pro hromadné vytváření záznamů. OpenERP " +"vytvoří záznamy, když použijete bankovní výpisy, pokladnu nebo platby " +"klientů či dodavatelům." #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -397,12 +414,12 @@ msgstr "Datum vytvoření" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "" +msgstr "Dobropis přijatý" #. module: account #: selection:account.journal,type:0 msgid "Opening/Closing Situation" -msgstr "" +msgstr "Počáteční/konečný stav" #. module: account #: help:account.journal,currency:0 @@ -412,7 +429,7 @@ msgstr "Měna použitá k zadání příkazu" #. module: account #: field:account.open.closed.fiscalyear,fyear_id:0 msgid "Fiscal Year to Open" -msgstr "Finanční rok k otevření" +msgstr "Fiskální rok k otevření" #. module: account #: help:account.journal,sequence_id:0 @@ -420,11 +437,12 @@ msgid "" "This field contains the informatin related to the numbering of the journal " "entries of this journal." msgstr "" +"Toto pole obsahuje informace související s číslováním záznamů této knihy." #. module: account #: field:account.journal,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "Výchozí dluhový účet" +msgstr "Výchozí debetní účet" #. module: account #: view:account.move:0 @@ -439,7 +457,7 @@ msgstr "Kladný" #. module: account #: view:account.move.line.unreconcile.select:0 msgid "Open For Unreconciliation" -msgstr "Otevřít pro vyrovnání" +msgstr "Otevřít pro zrušení likvidace" #. module: account #: field:account.fiscal.position.template,chart_template_id:0 @@ -460,6 +478,9 @@ msgid "" "it comes to 'Printed' state. When all transactions are done, it comes in " "'Done' state." msgstr "" +"Když je vytvořen záznam v knize, jeho stav je \"Draft\". Když je vytištěn " +"report, stav se změní na \"Printed\". Když jsou hotovy všechny transakce, " +"záznam přejde do stavu \"Done\"." #. module: account #: model:ir.actions.act_window,help:account.action_account_tax_chart @@ -469,6 +490,10 @@ msgid "" "amount of each area of the tax declaration for your country. It’s presented " "in a hierarchical structure, which can be modified to fit your needs." msgstr "" +"Daňový přehled je strom reprezentující strukturu daňových kódů či případů, " +"který zobrazuje aktuální daňovou situaci. Přehled zobrazuje výši všech " +"oblastí daňového přiznání pro vaši zemi. Je strukturován hierarchicky a může " +"být podle potřeby upraven." #. module: account #: view:account.analytic.line:0 @@ -502,7 +527,7 @@ msgstr "" #: field:validate.account.move,journal_id:0 #, python-format msgid "Journal" -msgstr "Deník" +msgstr "Kniha" #. module: account #: model:ir.model,name:account.model_account_invoice_confirm @@ -517,7 +542,7 @@ msgstr "Nadřazený cíl" #. module: account #: field:account.bank.statement,account_id:0 msgid "Account used in this journal" -msgstr "Účet použitý v tomto deníku" +msgstr "Účet použitý v této knize" #. module: account #: help:account.aged.trial.balance,chart_account_id:0 @@ -536,17 +561,17 @@ msgstr "Účet použitý v tomto deníku" #: help:account.report.general.ledger,chart_account_id:0 #: help:account.vat.declaration,chart_account_id:0 msgid "Select Charts of Accounts" -msgstr "" +msgstr "Vyberte účtový rozvrh" #. module: account #: view:product.product:0 msgid "Purchase Taxes" -msgstr "Daně nákupu" +msgstr "Nákupní daně" #. module: account #: model:ir.model,name:account.model_account_invoice_refund msgid "Invoice Refund" -msgstr "Vrácení faktury" +msgstr "Dobropis vydaný" #. module: account #: report:account.overdue:0 @@ -556,13 +581,13 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,unreconciled:0 msgid "Not reconciled transactions" -msgstr "Žádné vyrovnané transakce" +msgstr "Nezlikvidované transakce" #. module: account #: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" -msgstr "" +msgstr "Stav pokladny neodpovídá vypočtenému zůstatku!" #. module: account #: view:account.fiscal.position:0 @@ -575,12 +600,12 @@ msgstr "Mapování daně" #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "Uzavřít finanční rok" +msgstr "Uzavřít fiskální rok" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 msgid "The accountant confirms the statement." -msgstr "Účetní potvrzuje příkaz" +msgstr "Účetní potvrzuje výpis." #. module: account #: selection:account.balance.report,display_account:0 @@ -596,12 +621,12 @@ msgstr "Vše" #. module: account #: field:account.invoice.report,address_invoice_id:0 msgid "Invoice Address Name" -msgstr "Jméno adresy faktury" +msgstr "Název příjemce faktury" #. module: account #: selection:account.installer,period:0 msgid "3 Monthly" -msgstr "3 měsíce" +msgstr "Kvartální" #. module: account #: view:account.unreconcile.reconcile:0 @@ -609,6 +634,8 @@ 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 "" +"Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, " +"které s nimi souvisejí, protože tyto nebudou zrušeny" #. module: account #: view:analytic.entries.report:0 @@ -618,7 +645,7 @@ msgstr " 30 dní " #. module: account #: field:ir.sequence,fiscal_ids:0 msgid "Sequences" -msgstr "Posloupnosti" +msgstr "Číselné řady" #. module: account #: view:account.fiscal.position.template:0 @@ -628,12 +655,12 @@ msgstr "Mapování daní" #. module: account #: report:account.central.journal:0 msgid "Centralized Journal" -msgstr "Centralizovaný deník" +msgstr "Centralizovaná kniha" #. module: account #: sql_constraint:account.sequence.fiscalyear:0 msgid "Main Sequence must be different from current !" -msgstr "Hlavní posloupnost musí být odlišná od aktuální !" +msgstr "Hlavní číselná řada musí být odlišná od současné!" #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -645,18 +672,18 @@ msgstr "Částka kódu daně" #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" -msgstr "" +msgstr "KFV" #. module: account #: help:account.bank.statement,balance_end_real:0 msgid "closing balance entered by the cashbox verifier" -msgstr "" +msgstr "konečný zůstatek zadaný ověřovatelem pokladny" #. module: account #: view:account.period:0 #: view:account.period.close:0 msgid "Close Period" -msgstr "Ukončit období" +msgstr "Uzavřít období" #. module: account #: model:ir.model,name:account.model_account_common_partner_report @@ -666,19 +693,19 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,period_id:0 msgid "Opening Entries Period" -msgstr "Období otvíracích položek" +msgstr "Období počátečních zůstatků" #. module: account #: model:ir.model,name:account.model_account_journal_period msgid "Journal Period" -msgstr "Období deníku" +msgstr "Období knihy" #. module: account #: code:addons/account/account_move_line.py:723 #: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" -msgstr "" +msgstr "Při likvidaci záznamů by u všech měla být stejná firma" #. module: account #: view:account.account:0 @@ -690,12 +717,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_aged_receivable #, python-format msgid "Receivable Accounts" -msgstr "Účety pohledávek" +msgstr "Pohledávky" #. module: account #: model:ir.model,name:account.model_account_report_general_ledger msgid "General Ledger Report" -msgstr "ˇ" +msgstr "Hlavní kniha" #. module: account #: view:account.invoice:0 @@ -705,17 +732,17 @@ msgstr "Znovu otevřít" #. module: account #: view:account.use.model:0 msgid "Are you sure you want to create entries?" -msgstr "Chcete opravdu vytvořit položky?" +msgstr "Opravdu chcete vytvořit záznamy?" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 msgid "Check" -msgstr "Zkontrolovat" +msgstr "Šekový" #. module: account #: field:account.partner.reconcile.process,today_reconciled:0 msgid "Partners Reconciled Today" -msgstr "" +msgstr "Dnes likvidovaní partneři" #. module: account #: selection:account.payment.term.line,value:0 @@ -864,6 +891,7 @@ msgstr "Vytvořit 3-měsíční období" #. module: account #: report:account.overdue:0 +#: report:account.aged_trial_balance:0 msgid "Due" msgstr "Do" @@ -916,7 +944,7 @@ msgstr "" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 msgid "Bank statement" -msgstr "Bankovní příkaz" +msgstr "Bankovní výpis" #. module: account #: field:account.analytic.line,move_id:0 @@ -955,6 +983,10 @@ msgstr "Položky modelu" #: field:account.journal,code:0 #: report:account.partner.balance:0 #: field:account.period,code:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 msgid "Code" msgstr "Kód" @@ -1072,7 +1104,7 @@ msgstr "Začátek období" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement" -msgstr "Potvrdit příkaz" +msgstr "Potvrdit výpis" #. module: account #: field:account.fiscal.position.tax,tax_dest_id:0 @@ -1276,6 +1308,7 @@ msgstr "Analýza položek deníku" #. module: account #: model:ir.ui.menu,name:account.next_id_22 +#: report:account.aged_trial_balance:0 msgid "Partners" msgstr "Partneři" @@ -1286,7 +1319,7 @@ msgstr "Partneři" #: model:process.node,name:account.process_node_bankstatement0 #: model:process.node,name:account.process_node_supplierbankstatement0 msgid "Bank Statement" -msgstr "Bankovní příkaz" +msgstr "Bankovní výpis" #. module: account #: view:res.partner:0 @@ -1373,6 +1406,9 @@ msgid "" "entry per accounting document: invoice, refund, supplier payment, bank " "statements, etc." msgstr "" +"Záznam v knize se skládá z položek, kde každá je debetní nebo kreditní " +"transakcí. OpenERP automaticky vytvoří jeden záznam v knize pro každý účetní " +"dokument: fakturu, dobropis, platbu dodavateli, bankovní výpis atd." #. module: account #: view:account.entries.report:0 @@ -1475,7 +1511,7 @@ msgstr "Jít na dalšího partnera" #. module: account #: view:account.bank.statement:0 msgid "Search Bank Statements" -msgstr "Hledat bankovní příkazy" +msgstr "Hledat v bankovních výpisech" #. module: account #: sql_constraint:account.model.line:0 @@ -1499,7 +1535,7 @@ msgstr "" #: view:account.bank.statement:0 #: field:account.bank.statement,line_ids:0 msgid "Statement lines" -msgstr "Řádky příkazů" +msgstr "Řádky výpisu" #. module: account #: model:ir.actions.act_window,help:account.action_bank_statement_tree @@ -1511,6 +1547,10 @@ msgid "" "the Payment column of a line, you can press F1 to open the reconciliation " "form." msgstr "" +"Bankovní výpis je souhrn všech transakcí v daném období na bankovním účtu. " +"Počáteční zůstatek je vyplněn automaticky, konečný byste měli najít na " +"výpisu z banky. Když jste ve sloupci Platba v položce, stiskem F1 vyvoláte " +"likvidaci." #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -1704,7 +1744,7 @@ msgstr "Tyto období se mohou překrývat." #. module: account #: model:process.node,name:account.process_node_draftstatement0 msgid "Draft statement" -msgstr "Návrh příkazu" +msgstr "Rozpracovaný výpis" #. module: account #: view:account.tax:0 @@ -1916,6 +1956,8 @@ msgid "" "be with same name as statement name. This allows the statement entries to " "have the same references than the statement itself" msgstr "" +"Jestliže zadáte název jiný než \"/\", budou se stejně jmenovat i vytvořené " +"účetní záznamy." #. module: account #: model:ir.actions.act_window,name:account.action_account_unreconcile @@ -1948,7 +1990,7 @@ msgstr "Účty k vyrovnání" #. module: account #: model:process.transition,note:account.process_transition_filestatement0 msgid "Import of the statement in the system from an electronic file" -msgstr "" +msgstr "Import výpisu v elektronické podobě." #. module: account #: model:process.node,name:account.process_node_importinvoice0 @@ -2125,8 +2167,13 @@ msgstr "Šablona výrobku" #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 #: model:ir.model,name:account.model_account_fiscalyear +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 +#: report:account.aged_trial_balance:0 msgid "Fiscal Year" -msgstr "Přestupný rok(Fiscal Year)" +msgstr "Účetní období" #. module: account #: help:account.aged.trial.balance,fiscalyear_id:0 @@ -2145,17 +2192,17 @@ msgstr "Přestupný rok(Fiscal Year)" #: help:account.report.general.ledger,fiscalyear_id:0 #: help:account.vat.declaration,fiscalyear_id:0 msgid "Keep empty for all open fiscal year" -msgstr "Nechat prázdné pro všechny otevřené finanční pozice" +msgstr "Pro vybrání všech účetních období nechte pole prázdné" #. module: account #: model:ir.model,name:account.model_account_move msgid "Account Entry" -msgstr "Položka účtu" +msgstr "Účetní záznam" #. module: account #: field:account.sequence.fiscalyear,sequence_main_id:0 msgid "Main Sequence" -msgstr "Hlavní posloupnosti" +msgstr "Hlavní číselná řada" #. module: account #: field:account.invoice,payment_term:0 @@ -2467,7 +2514,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_bank_statement_tree #: model:ir.ui.menu,name:account.menu_bank_statement_tree msgid "Bank Statements" -msgstr "Bankovní příkazy" +msgstr "Bankovní výpisy" #. module: account #: selection:account.tax.template,applicable_type:0 @@ -2651,7 +2698,7 @@ msgstr "" #: help:account.bank.statement,account_id:0 msgid "" "used in statement reconciliation domain, but shouldn't be used elswhere." -msgstr "" +msgstr "použito v rámci likvidace výpisu, nemělo by se používat jinde" #. module: account #: field:account.invoice.tax,base_amount:0 @@ -3822,6 +3869,8 @@ msgid "" "the system on document validation (invoices, bank statements...) and will be " "created in 'Posted' state." msgstr "" +"Ručně vytvořené účetní záznamy jsou typicky založeny jako nezaúčtované. Toto " +"jde pro vybrané knihy přeskakovat, takže založené záznamy se rovnou zaúčtují." #. module: account #: code:addons/account/account_analytic_line.py:90 @@ -3920,7 +3969,7 @@ msgstr "Režim zobrazení" #. module: account #: model:process.node,note:account.process_node_importinvoice0 msgid "Statement from invoice or payment" -msgstr "" +msgstr "Výpis z faktury nebo platby" #. module: account #: view:account.payment.term.line:0 @@ -3952,7 +4001,7 @@ msgstr "Statistiky faktur" #. module: account #: model:process.transition,note:account.process_transition_paymentorderreconcilation0 msgid "Bank statements are entered in the system." -msgstr "" +msgstr "Bankovní výpisy jsou zadány do systému." #. module: account #: code:addons/account/wizard/account_reconcile.py:133 @@ -4301,7 +4350,7 @@ msgstr "Jste si jisti?" #. module: account #: help:account.move.line,statement_id:0 msgid "The bank statement used for bank reconciliation" -msgstr "" +msgstr "Bankovní výpis použitý pro likvidaci banky" #. module: account #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0 @@ -4511,6 +4560,11 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,target_move:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 +#: report:account.aged_trial_balance:0 msgid "Target Moves" msgstr "Cílové pohyby" @@ -4627,6 +4681,8 @@ msgstr "Výsledek vyrovnání" #: view:account.bs.report:0 #: model:ir.actions.act_window,name:account.action_account_bs_report #: model:ir.ui.menu,name:account.menu_account_bs_report +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 msgid "Balance Sheet" msgstr "Zůstatkový list" @@ -4663,7 +4719,7 @@ msgstr "" #. module: account #: view:account.tax.template:0 msgid "Compute Code (if type=code)" -msgstr "" +msgstr "Vypočítat kód (pokud typ = kód)" #. module: account #: selection:account.analytic.journal,type:0 @@ -4854,7 +4910,7 @@ msgstr "Analytické účetnictví" #: selection:account.invoice.report,type:0 #: selection:report.invoice.created,type:0 msgid "Customer Refund" -msgstr "" +msgstr "Dobropis vystavený" #. module: account #: view:account.account:0 @@ -5555,7 +5611,7 @@ msgstr "Šablony účtů" #. module: account #: report:account.vat.declaration:0 msgid "Tax Statement" -msgstr "Daňový příkaz" +msgstr "Daňový výkaz" #. module: account #: model:ir.model,name:account.model_res_company @@ -6018,6 +6074,8 @@ msgid "" "corresponds with the entries (or records) of that account in your accounting " "system." msgstr "" +"Likvidace banky spočívá v kontrole, že bankovní výpis odpovídá záznamům v " +"účetnictví." #. module: account #: model:process.node,note:account.process_node_draftstatement0 @@ -6301,6 +6359,8 @@ msgstr "" #: report:account.general.journal:0 #: report:account.invoice:0 #: report:account.partner.balance:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 msgid "Total:" msgstr "Celkem:" @@ -6374,7 +6434,7 @@ msgstr "Dokončeno" #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 msgid "A statement with manual entries becomes a draft statement." -msgstr "" +msgstr "Výpis s ručně zadanými položkami je nastaven jako rozpracovaný." #. module: account #: view:account.aged.trial.balance:0 @@ -6409,7 +6469,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_menu_Bank_process msgid "Statements Reconciliation" -msgstr "Vyrovnání příkazů" +msgstr "Likvidace výpisů" #. module: account #: report:account.invoice:0 @@ -6531,7 +6591,7 @@ msgstr "Nadřazená šablona účtu" #: field:account.move.line,statement_id:0 #: model:process.process,name:account.process_process_statementprocess0 msgid "Statement" -msgstr "Příkaz" +msgstr "Výpis" #. module: account #: help:account.journal,default_debit_account_id:0 @@ -6627,7 +6687,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "" +msgstr "Řádek bankovního výpisu" #. module: account #: field:account.automatic.reconcile,date2:0 @@ -7327,6 +7387,9 @@ msgid "" "will see the taxes with codes related to your legal statement according to " "your country." msgstr "" +"Tento daňový přehled slouží k vytváření pravidelných daňových výkazů. " +"Uvidíte v něm daně a jejich kódy příslušející k daňovým přiznáním podle vaší " +"země." #. module: account #: view:account.installer.modules:0 @@ -7492,6 +7555,11 @@ msgstr "Měna společnosti" #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 +#: report:account.aged_trial_balance:0 msgid "Chart of Account" msgstr "" @@ -7607,6 +7675,10 @@ msgstr "Deník vrácení peněz" #: report:account.general.journal:0 #: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 msgid "Filter By" msgstr "Filtrovat podle" @@ -7663,7 +7735,7 @@ msgstr "Mezivýsledek" #. module: account #: view:account.vat.declaration:0 msgid "Print Tax Statement" -msgstr "Tisknout daňový příkaz" +msgstr "Tisk daňového výkazu" #. module: account #: view:account.model.line:0 @@ -7810,7 +7882,7 @@ msgstr "" msgid "" "The amount of the voucher must be the same amount as the one on the " "statement line" -msgstr "" +msgstr "Částka na dokladu musí odpovídat částce v řádku výpisu" #. module: account #: code:addons/account/account_move_line.py:1137 @@ -7869,7 +7941,7 @@ msgstr "Měna" #: help:account.bank.statement.line,sequence:0 msgid "" "Gives the sequence order when displaying a list of bank statement lines." -msgstr "" +msgstr "Určuje pořadí v zobrazení seznamu řádků výpisu" #. module: account #: model:process.transition,note:account.process_transition_validentries0 @@ -8146,6 +8218,7 @@ msgstr "" #. module: account #: field:account.aged.trial.balance,direction_selection:0 +#: report:account.aged_trial_balance:0 msgid "Analysis Direction" msgstr "" @@ -8262,6 +8335,10 @@ msgstr "Nechejte prázdné pro použití příjmového účtu" #: report:account.third_party_ledger_other:0 #: field:report.account.receivable,balance:0 #: field:report.aged.receivable,balance:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 msgid "Balance" msgstr "Zůstatek" @@ -8273,6 +8350,10 @@ msgstr "Ručně nebo automaticky zadáno do systému" #. module: account #: report:account.account.balance:0 #: report:account.general.ledger_landscape:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.balancesheet:0 +#: report:pl.account.horizontal:0 +#: report:pl.account:0 msgid "Display Account" msgstr "Zobrazit účet" @@ -8337,7 +8418,7 @@ msgstr "" #: code:addons/account/account_bank_statement.py:391 #, python-format msgid "Cannot delete bank statement(s) which are already confirmed !" -msgstr "" +msgstr "Nelze smazat bankovní výpis, který už byl potvrzen!" #. module: account #: code:addons/account/wizard/account_automatic_reconcile.py:152 @@ -8408,7 +8489,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement msgid "Bank statements" -msgstr "Bankovní příkazy" +msgstr "Bankovní výpisy" #. module: account #: help:account.addtmpl.wizard,cparent_id:0 @@ -8575,6 +8656,7 @@ msgstr "Vstupní předplatné" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,date_from:0 +#: report:account.aged_trial_balance:0 msgid "Start Date" msgstr "Počáteční datum" @@ -9045,6 +9127,7 @@ msgstr "Stavy" #: field:report.account.sales,amount_total:0 #: field:report.account_type.sales,amount_total:0 #: field:report.invoice.created,amount_total:0 +#: report:account.aged_trial_balance:0 msgid "Total" msgstr "Celkem" @@ -9125,13 +9208,13 @@ msgstr "t" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree msgid "Draft statements" -msgstr "" +msgstr "Rozpracované výpisy" #. module: account #: model:process.transition,note:account.process_transition_statemententries0 msgid "" "Manual or automatic creation of payment entries according to the statements" -msgstr "" +msgstr "Manuální nebo automatické vytvoření záznamů o platbách podle výpisů" #. module: account #: view:account.invoice:0 @@ -9363,7 +9446,7 @@ msgstr "Další volitelná měna, pokud je položka více-měnová." #: model:process.transition,note:account.process_transition_invoiceimport0 msgid "" "Import of the statement in the system from a supplier or customer invoice" -msgstr "" +msgstr "Import výpisu do systému z vydané nebo přijaté faktury" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing @@ -9543,6 +9626,7 @@ msgstr "account.addtmpl.wizard" #: field:account.partner.ledger,result_selection:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 +#: report:account.aged_trial_balance:0 msgid "Partner's" msgstr "Partneři" @@ -9867,10 +9951,6 @@ msgstr "" #~ msgid "Taxed Amount" #~ msgstr "Zdaněná částka" -#, python-format -#~ msgid "The statement balance is incorrect !\n" -#~ msgstr "Zůstatek příkaz není správný !\n" - #, python-format #~ msgid "Invoice " #~ msgstr "Faktura " @@ -9878,3 +9958,7 @@ msgstr "" #, python-format #~ msgid "is validated." #~ msgstr "není platné." + +#, python-format +#~ msgid "The statement balance is incorrect !\n" +#~ msgstr "Nesprávný zůstatek výpisu!\n" diff --git a/addons/account/installer.py b/addons/account/installer.py index 764809d2cf0..1f16e066578 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -19,6 +19,7 @@ # ############################################################################## +import logging import time import datetime from dateutil.relativedelta import relativedelta @@ -33,6 +34,7 @@ import tools class account_installer(osv.osv_memory): _name = 'account.installer' _inherit = 'res.config.installer' + __logger = logging.getLogger(_name) def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') @@ -232,9 +234,7 @@ class account_installer(osv.osv_memory): cr, uid, ids, context=context) chart = self.read(cr, uid, ids, ['charts'], context=context)[0]['charts'] - self.logger.notifyChannel( - 'installer', netsvc.LOG_DEBUG, - 'Installing chart of accounts %s'%chart) + self.__logger.debug('Installing chart of accounts %s', chart) return modules | set([chart]) account_installer() diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index 461d1fcd45a..fbee97875ae 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -97,27 +97,30 @@
- + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml index 6df74d0a0ba..7cf5a59efc1 100644 --- a/addons/account/project/analytic_account_demo.xml +++ b/addons/account/project/analytic_account_demo.xml @@ -2,7 +2,7 @@ - + 0 diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index e1f383f4792..08a2b4507ca 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -215,12 +215,6 @@ -
- - - - - diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 8a84ad47fc6..5c4c9a0a525 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -4,12 +4,13 @@ Accounting / Invoicing & Payments - Accounting / Accountant + Accounting / Manager + diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index dec34e6e717..99aa83826df 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -78,7 +78,7 @@ class account_move_journal(osv.osv_memory): @return: Returns a dict that contains definition for fields, views, and toolbars """ - res = super(account_move_journal, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu) + res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) if not view_id: return res diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml index 24fe913d179..01795140c69 100644 --- a/addons/account/wizard/account_move_journal_view.xml +++ b/addons/account/wizard/account_move_journal_view.xml @@ -8,7 +8,7 @@ form
- +
diff --git a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml index 3543539debb..fa40ef1e618 100644 --- a/addons/account_analytic_plans/account_analytic_plans_installer_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_installer_view.xml @@ -1,4 +1,3 @@ - @@ -15,11 +14,7 @@ 15 - normal - skip - - diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index aa26fc79141..f9bbf551330 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -1,4 +1,3 @@ - @@ -14,29 +13,29 @@
- + - + - + - + - + @@ -100,28 +99,22 @@ - + -