diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 853b9e3f76d..545bfd41f10 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -115,7 +115,7 @@ account.invoice tree - + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6d6f7b29991..2264508a7da 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -44,7 +44,7 @@ account.fiscalyear tree - + @@ -111,7 +111,7 @@ account.period tree - + @@ -228,7 +228,7 @@ tree child_id - + @@ -271,7 +271,7 @@ tree child_id - + @@ -776,7 +776,7 @@ account.move tree - + @@ -1007,7 +1007,7 @@ tree - + @@ -1290,7 +1290,7 @@ account.move tree - + @@ -1395,7 +1395,7 @@ - + @@ -1560,7 +1560,7 @@ account.journal.period tree - + @@ -1816,7 +1816,7 @@ account.subscription tree - + @@ -1946,7 +1946,7 @@ tree - + @@ -2426,10 +2426,10 @@ -act_window_ids = self.pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context) -todo_ids = self.pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context) -self.pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context) -action = self.pool.get('res.config').next(cr, uid, [], context) +act_window_ids = pool.get('ir.actions.act_window').search(cr, uid,[('name', 'in', ('Accounting Chart Configuration', 'Generate Chart of Accounts from a Chart Template'))], context=context) +todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', act_window_ids)], context=context) +pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context) +action = pool.get('res.config').next(cr, uid, [], context) New Company Financial Setting @@ -2530,7 +2530,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) account.bank.statement tree - + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 08a2b4507ca..fb3fd14200a 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -57,7 +57,7 @@ tree child_complete_ids - + diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index baa9e15182b..b1913fa8fcc 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -6,7 +6,7 @@ account.entries.report tree - + diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 963c41b0a0f..cee5d6a8cc2 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -6,7 +6,7 @@ account.invoice.report tree - + diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml index a0cee804992..a625439f6ae 100644 --- a/addons/account/report/account_report_view.xml +++ b/addons/account/report/account_report_view.xml @@ -88,7 +88,7 @@ report.invoice.created tree - + diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 321014ea859..41ebcdf437d 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -152,7 +152,7 @@ crossovered.budget tree - + diff --git a/addons/account_coda/i18n/lv.po b/addons/account_coda/i18n/lv.po new file mode 100644 index 00000000000..2763ce90c84 --- /dev/null +++ b/addons/account_coda/i18n/lv.po @@ -0,0 +1,269 @@ +# Latvian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-09-12 13:54+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-09-13 04:47+0000\n" +"X-Generator: Launchpad (build 13910)\n" + +#. module: account_coda +#: help:account.coda,journal_id:0 +#: field:account.coda.import,journal_id:0 +msgid "Bank Journal" +msgstr "Banku žurnāls" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda.import,note:0 +msgid "Log" +msgstr "Reģistrs" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda_import +msgid "Account Coda Import" +msgstr "Konta Pārskata Imports" + +#. module: account_coda +#: field:account.coda,name:0 +msgid "Coda file" +msgstr "Pārskata fails" + +#. module: account_coda +#: view:account.coda:0 +msgid "Group By..." +msgstr "Grupēt pēc..." + +#. module: account_coda +#: field:account.coda.import,awaiting_account:0 +msgid "Default Account for Unrecognized Movement" +msgstr "Noklusētais Konts Neatpazītām Kustībām" + +#. module: account_coda +#: help:account.coda,date:0 +msgid "Import Date" +msgstr "Importa Datums" + +#. module: account_coda +#: field:account.coda,note:0 +msgid "Import log" +msgstr "Importa žurnāls" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Import" +msgstr "Importēt" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda import" +msgstr "Pārskata Imports" + +#. module: account_coda +#: code:addons/account_coda/account_coda.py:51 +#, python-format +msgid "Coda file not found for bank statement !!" +msgstr "Bankas konta pārskata fails nav atrasts!" + +#. module: account_coda +#: help:account.coda.import,awaiting_account:0 +msgid "" +"Set here the default account that will be used, if the partner is found but " +"does not have the bank account, or if he is domiciled" +msgstr "" +"Iestatiet noklusējuma kontu, kas tiks izmantots, ja partneris ir atrasts, " +"bet tam nav bankas konta vai adreses" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,company_id:0 +msgid "Company" +msgstr "Uzņēmums" + +#. module: account_coda +#: help:account.coda.import,def_payable:0 +msgid "" +"Set here the payable account that will be used, by default, if the partner " +"is not found" +msgstr "" +"Uzstatiet kontu maksājumiem, kas tiks izmantots pēc noklusējuma, ja " +"partneris nav atrasts" + +#. module: account_coda +#: view:account.coda:0 +msgid "Search Coda" +msgstr "Meklēt Pārskatā" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,user_id:0 +msgid "User" +msgstr "Lietotājs" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,date:0 +msgid "Date" +msgstr "Datums" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement +msgid "Coda Import Logs" +msgstr "Pārskata Importa Žurnāls" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda +msgid "coda for an Account" +msgstr "Konta Pārskats" + +#. module: account_coda +#: field:account.coda.import,def_payable:0 +msgid "Default Payable Account" +msgstr "Noklusētais Maksājumu Konts" + +#. module: account_coda +#: help:account.coda,name:0 +msgid "Store the detail of bank statements" +msgstr "Saglabāt bankas pārskata detaļas" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Cancel" +msgstr "Atcelt" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Open Statements" +msgstr "Atvērtie Pārskati" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:167 +#, python-format +msgid "The bank account %s is not defined for the partner %s.\n" +msgstr "Bankas konts %s partnerim %s nav definēts.\n" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_import +msgid "Import Coda Statements" +msgstr "Importēt Bankas Pārskatus" + +#. module: account_coda +#: view:account.coda.import:0 +#: model:ir.actions.act_window,name:account_coda.action_account_coda_import +msgid "Import Coda Statement" +msgstr "Importēt Bankas Pārskatu" + +#. module: account_coda +#: model:ir.module.module,description:account_coda.module_meta_information +msgid "" +"\n" +" Module provides functionality to import\n" +" bank statements from coda files.\n" +" " +msgstr "" +"\n" +" Modulis nodrošina iespēju importēt\n" +" banku pārskatus no coda failiem.\n" +" " + +#. module: account_coda +#: view:account.coda:0 +msgid "Statements" +msgstr "Izraksti" + +#. module: account_coda +#: field:account.bank.statement,coda_id:0 +msgid "Coda" +msgstr "Coda" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Results :" +msgstr "Rezultāti:" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Result of Imported Coda Statements" +msgstr "Importēto Pārskatu Rezultāti" + +#. module: account_coda +#: help:account.coda.import,def_receivable:0 +msgid "" +"Set here the receivable account that will be used, by default, if the " +"partner is not found" +msgstr "" +"Uzstatiet kontu ieņēmumiem, kas tiks izmantots pēc noklusējuma, ja partneris " +"nav atrasts" + +#. module: account_coda +#: field:account.coda.import,coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement +msgid "Coda File" +msgstr "Coda Fails" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_bank_statement +msgid "Bank Statement" +msgstr "Bankas Konta Izraksts" + +#. module: account_coda +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda Logs" +msgstr "Coda Žurnāls" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:311 +#, python-format +msgid "Result" +msgstr "Rezultāts" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Click on 'New' to select your file :" +msgstr "Uzspiest uz 'Jauns' lai izvēlētos savu failu:" + +#. module: account_coda +#: field:account.coda.import,def_receivable:0 +msgid "Default Receivable Account" +msgstr "Noklusētais Ieņēmumu Konts" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Close" +msgstr "Aizvērt" + +#. module: account_coda +#: field:account.coda,statement_ids:0 +msgid "Generated Bank Statements" +msgstr "Ģenerētais Bankas Pārskats" + +#. module: account_coda +#: model:ir.module.module,shortdesc:account_coda.module_meta_information +msgid "Account CODA - import bank statements from coda file" +msgstr "Konta CODA - bankas kontu pārskatu imports no coda faila" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Configure Your Journal and Account :" +msgstr "Konfigurēt Savu Žurnālu un Kontu:" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda Import" +msgstr "Pārskata Imports" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,journal_id:0 +msgid "Journal" +msgstr "Žurnāls" diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 5264071040c..bd1d86ab7ef 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -99,7 +99,7 @@ tree - + diff --git a/addons/account_invoice_layout/i18n/da.po b/addons/account_invoice_layout/i18n/da.po new file mode 100644 index 00000000000..d7f08f09141 --- /dev/null +++ b/addons/account_invoice_layout/i18n/da.po @@ -0,0 +1,366 @@ +# Danish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-09-12 17:17+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Danish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-09-13 04:47+0000\n" +"X-Generator: Launchpad (build 13910)\n" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Sub Total" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Note:" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Cancelled Invoice" +msgstr "" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +#: field:notify.message,name:0 +msgid "Title" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg +#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message +msgid "Invoices with Layout and Message" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Disc. (%)" +msgstr "" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Note" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.model,name:account_invoice_layout.model_notify_message +msgid "Notify By Messages" +msgstr "" + +#. module: account_invoice_layout +#: help:notify.message,msg:0 +msgid "" +"This notification will appear at the bottom of the Invoices when printed." +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Unit Price" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.module.module,description:account_invoice_layout.module_meta_information +msgid "" +"\n" +" This module provides some features to improve the layout of the " +"invoices.\n" +"\n" +" It gives you the possibility to\n" +" * order all the lines of an invoice\n" +" * add titles, comment lines, sub total lines\n" +" * draw horizontal lines and put page breaks\n" +"\n" +" Moreover, there is one option which allows you to print all the selected " +"invoices with a given special message at the bottom of it. This feature can " +"be very useful for printing your invoices with end-of-year wishes, special " +"punctual conditions...\n" +"\n" +" " +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "VAT :" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Tel. :" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "PRO-FORMA" +msgstr "" + +#. module: account_invoice_layout +#: field:account.invoice,abstract_line_ids:0 +msgid "Invoice Lines" +msgstr "" + +#. module: account_invoice_layout +#: view:account.invoice.line:0 +msgid "Seq." +msgstr "" + +#. module: account_invoice_layout +#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message +msgid "Notification Message" +msgstr "" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Product" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Description" +msgstr "" + +#. module: account_invoice_layout +#: help:account.invoice.line,sequence:0 +msgid "Gives the sequence order when displaying a list of invoice lines." +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Price" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Invoice Date" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Taxes:" +msgstr "" + +#. module: account_invoice_layout +#: field:account.invoice.line,functional_field:0 +msgid "Source Account" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form +msgid "Write Messages" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Base" +msgstr "" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Page Break" +msgstr "" + +#. module: account_invoice_layout +#: view:notify.message:0 +#: field:notify.message,msg:0 +msgid "Special Message" +msgstr "" + +#. module: account_invoice_layout +#: help:account.invoice.special.msg,message:0 +msgid "Message to Print at the bottom of report" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Quantity" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Refund" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Fax :" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Total:" +msgstr "" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 +msgid "Select Message" +msgstr "" + +#. module: account_invoice_layout +#: view:notify.message:0 +msgid "Messages" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1 +msgid "Invoices with Layout" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Description / Taxes" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Amount" +msgstr "" + +#. module: account_invoice_layout +#: model:notify.message,msg:account_invoice_layout.demo_message1 +msgid "ERP & CRM Solutions..." +msgstr "" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Net Total :" +msgstr "" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Total :" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Draft Invoice" +msgstr "" + +#. module: account_invoice_layout +#: field:account.invoice.line,sequence:0 +msgid "Sequence Number" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg +msgid "Account Invoice Special Message" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Origin" +msgstr "" + +#. module: account_invoice_layout +#: field:account.invoice.line,state:0 +msgid "Type" +msgstr "" + +#. module: account_invoice_layout +#: selection:account.invoice.line,state:0 +msgid "Separator Line" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Your Reference" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information +msgid "Invoices Layout Improvement" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Supplier Invoice" +msgstr "" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 +msgid "Print" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Tax" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.model,name:account_invoice_layout.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +msgid "Net Total:" +msgstr "" + +#. module: account_invoice_layout +#: view:notify.message:0 +msgid "Write a notification or a wishful message." +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: model:ir.model,name:account_invoice_layout.model_account_invoice +#: report:notify_account.invoice:0 +msgid "Invoice" +msgstr "" + +#. module: account_invoice_layout +#: view:account.invoice.special.msg:0 +msgid "Cancel" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Supplier Refund" +msgstr "" + +#. module: account_invoice_layout +#: field:account.invoice.special.msg,message:0 +msgid "Message" +msgstr "" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Taxes :" +msgstr "" + +#. module: account_invoice_layout +#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form +msgid "All Notification Messages" +msgstr "" diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 76197140b49..7d6e281f58b 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -179,7 +179,7 @@ tree - + diff --git a/addons/account_sequence/i18n/lv.po b/addons/account_sequence/i18n/lv.po new file mode 100644 index 00000000000..d524a796ef1 --- /dev/null +++ b/addons/account_sequence/i18n/lv.po @@ -0,0 +1,230 @@ +# Latvian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-09-12 20:40+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-09-13 04:47+0000\n" +"X-Generator: Launchpad (build 13910)\n" + +#. module: account_sequence +#: view:account.sequence.installer:0 +#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer +msgid "Account Sequence Application Configuration" +msgstr "Kontu Secības Aplikācijas Iestatījumi" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create entries on different periods/journals in the same move" +msgstr "Jūs vienlaicīgi nevarat izveidot ierakstus dažādos periodos/žurnālos" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "Iekšējais kārtas numurs" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "Šīs secības nākamais numurs" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Nākamais Numurs" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "Soļa Numurs" + +#. module: account_sequence +#: model:ir.module.module,description:account_sequence.module_meta_information +msgid "" +"\n" +" This module maintains internal sequence number for accounting entries.\n" +" " +msgstr "" +"\n" +" Šis modulis nodrošina iekšējo kārtas numuru grāmatošanas ierakstiem.\n" +" " + +#. module: account_sequence +#: model:ir.module.module,shortdesc:account_sequence.module_meta_information +msgid "Entries Sequence Numbering" +msgstr "Ierakstu Kārtas Numerācija" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "Sekvences nākamais numurs tiks palielināts par šo skaitli" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "Konfigurēt Tavu Konta Sesības Aplikāciju" + +#. module: account_sequence +#: field:account.sequence.installer,progress:0 +msgid "Configuration Progress" +msgstr "Konfigurācijas Progress" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "Sekvences ieraksta piedēkļa vērtiba" + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "Uzņēmums" + +#. module: account_sequence +#: help:account.journal,internal_sequence_id:0 +msgid "" +"This sequence will be used to maintain the internal number for the journal " +"entries related to this journal." +msgstr "" +"Šo secību izmantos, lai izveidotu ar šo žurnālu saistīto žurnāla ierakstu " +"iekšējo numerāciju" + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "Numerācijas garums" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "Žurnāla Vienumi" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "Iekšējā Numerācija" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "Uzņēmumam ir jāsakrīt ar saistīto kontu un periodu." + +#. module: account_sequence +#: help:account.sequence.installer,padding:0 +msgid "" +"OpenERP will automatically adds some '0' on the left of the 'Next Number' to " +"get the required padding size." +msgstr "" +"OpenERP automātiski pievienos kādu '0' iedaļas 'Nākamais Numurs' kreisajā " +"pusē lai iegūtu nepieciešamo numerācijas garumu." + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "Nosaukums" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "Nav iespējams veikt grāmatojumus slēgtā kontā." + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create more than one move per period on centralized journal" +msgstr "" +"Jūs nevarat centralizētā žurnālā izveidot vairāk par vienu pārvietošanu " +"vienā periodā" + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "Kļūdaina kredīta vai debeta vērtība grāmatojumā!" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "Iekšējā Sekvence" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "account.sequence.installer" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "Konfigurēt" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "Piedēkļa vērtība sekvences ierakstiem" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "Kontējums" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "Priedēklis" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "Attēls" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "nosaukums" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "Žurnāla nosaukumam katrai kompānijai ir jābūt unikālam!" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "Priedēklis" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "Žurnāla kodam ir jābūt unikālam katram uzņēmumam!" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "Žurnāls" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "Ar šo moduli jūs varat uzlabot Konta Sekvences Aplikāciju." + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "Jūs nevarat izveidor grāmatojumu pārskata kontam." diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 6f421f762a1..fd0e1a0c3c6 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -6,7 +6,7 @@ account.voucher tree - + diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index ad32978ddd8..33e69b54c8a 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -7,7 +7,7 @@ sale.receipt.report tree - + diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 66cc9b3f743..bcfedacce77 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -160,7 +160,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -272,7 +272,7 @@ tree - + diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index 6f6b461d1a6..7dd30a063ce 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -37,7 +37,7 @@ audittrail.rule tree - + diff --git a/addons/base_module_record/i18n/cs.po b/addons/base_module_record/i18n/cs.po index 5b707513588..ac9513d58e9 100644 --- a/addons/base_module_record/i18n/cs.po +++ b/addons/base_module_record/i18n/cs.po @@ -4,27 +4,28 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" +"Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-02-03 06:26+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"PO-Revision-Date: 2011-09-09 10:24+0000\n" +"Last-Translator: Jiří Hajda \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:09+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-09-10 05:01+0000\n" +"X-Generator: Launchpad (build 13900)\n" +"X-Poedit-Language: Czech\n" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,category:0 msgid "Category" -msgstr "" +msgstr "Kategorie" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 msgid "Information" -msgstr "" +msgstr "Informace" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 @@ -33,54 +34,57 @@ msgid "" "publish it on OpenERP.com, in the 'Modules' section. You can do it through " "the website or using features of the 'base_module_publish' module." msgstr "" +"Pokud si myslíte, že by váš modul mohl zajímat další lidi, byli bychom rádi, " +"kdybyste jej zveřejnili na OpenERP.com v sekci 'Moduly'. Můžete to provést " +"přes webové stránky nebo pomocí funkcí modulu 'base_module_publish'." #. module: base_module_record #: wizard_button:base_module_record.module_record_data,info,end:0 #: wizard_button:base_module_record.module_record_data,save_yaml,end:0 msgid "End" -msgstr "" +msgstr "Ukončit" #. module: base_module_record #: wizard_view:base_module_record.module_record_data,init:0 #: wizard_view:base_module_record.module_record_objects,init:0 msgid "Choose objects to record" -msgstr "" +msgstr "Vyberte objekt pro zaznamenání" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,author:0 msgid "Author" -msgstr "" +msgstr "Autor" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,directory_name:0 msgid "Directory Name" -msgstr "" +msgstr "Jméno adresáře" #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,filter_cond:0 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0 msgid "Records only" -msgstr "" +msgstr "Piouze záznam" #. module: base_module_record #: model:ir.model,name:base_module_record.model_ir_module_record msgid "ir.module.record" -msgstr "" +msgstr "ir.module.record" #. module: base_module_record #: selection:base_module_record.module_record_objects,info,data_kind:0 msgid "Demo Data" -msgstr "" +msgstr "Ukázková data" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,save,module_filename:0 msgid "Filename" -msgstr "" +msgstr "Jméno souboru" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,version:0 msgid "Version" -msgstr "" +msgstr "Verze" #. module: base_module_record #: wizard_view:base_module_record.module_record_data,info:0 @@ -88,13 +92,13 @@ msgstr "" #: wizard_view:base_module_record.module_record_data,save_yaml:0 #: wizard_view:base_module_record.module_record_objects,init:0 msgid "Objects Recording" -msgstr "" +msgstr "Zaznamenávání objektů" #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,check_date:0 #: wizard_field:base_module_record.module_record_objects,init,check_date:0 msgid "Record from Date" -msgstr "" +msgstr "Záznam od data" #. module: base_module_record #: wizard_view:base_module_record.module_record_data,end:0 @@ -103,170 +107,170 @@ msgstr "" #: wizard_view:base_module_record.module_record_objects,save:0 #: wizard_view:base_module_record.module_record_objects,save_yaml:0 msgid "Module Recording" -msgstr "" +msgstr "Zaznamenávání modulu" #. module: base_module_record #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects msgid "Export Customizations As a Module" -msgstr "" +msgstr "Exportovat vlastní úpravy jako modul" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 msgid "Thanks in advance for your contribution." -msgstr "" +msgstr "Předem díky za váše přispění." #. module: base_module_record #: help:base_module_record.module_record_data,init,objects:0 #: help:base_module_record.module_record_objects,init,objects:0 msgid "List of objects to be recorded" -msgstr "" +msgstr "Seznam objektů k záznamu" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,description:0 msgid "Full Description" -msgstr "" +msgstr "Plný popis" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,name:0 msgid "Module Name" -msgstr "" +msgstr "Jméno modulu" #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,objects:0 #: wizard_field:base_module_record.module_record_objects,init,objects:0 msgid "Objects" -msgstr "" +msgstr "Objekty" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,save,module_file:0 #: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0 msgid "Module .zip File" -msgstr "" +msgstr ".ZIP soubor modulu" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 msgid "Module successfully created !" -msgstr "" +msgstr "Modul úspěšně vytvořen !" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save_yaml:0 msgid "YAML file successfully created !" -msgstr "" +msgstr "Soubor YAML úspěšně vytvořen !" #. module: base_module_record #: wizard_view:base_module_record.module_record_data,info:0 #: wizard_view:base_module_record.module_record_data,save_yaml:0 msgid "Result, paste this to your module's xml" -msgstr "" +msgstr "Výsledek, vložte jej do xml modulu" #. module: base_module_record #: selection:base_module_record.module_record_data,init,filter_cond:0 #: selection:base_module_record.module_record_objects,init,filter_cond:0 msgid "Created" -msgstr "" +msgstr "Vytvořeno" #. module: base_module_record #: wizard_view:base_module_record.module_record_data,end:0 #: wizard_view:base_module_record.module_record_objects,end:0 msgid "Thanks For using Module Recorder" -msgstr "" +msgstr "Díky za použití Záznamníku modulů" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,website:0 msgid "Documentation URL" -msgstr "" +msgstr "URL dokumentace" #. module: base_module_record #: selection:base_module_record.module_record_data,init,filter_cond:0 #: selection:base_module_record.module_record_objects,init,filter_cond:0 msgid "Modified" -msgstr "" +msgstr "Změněno" #. module: base_module_record #: wizard_button:base_module_record.module_record_data,init,record:0 #: wizard_button:base_module_record.module_record_objects,init,record:0 msgid "Record" -msgstr "" +msgstr "Zaznamenávat" #. module: base_module_record #: model:ir.module.module,shortdesc:base_module_record.module_meta_information msgid "Module Record" -msgstr "" +msgstr "Záznam modulu" #. module: base_module_record #: wizard_button:base_module_record.module_record_objects,info,save:0 msgid "Continue" -msgstr "" +msgstr "Pokračovat" #. module: base_module_record #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data msgid "Export Customizations As Data File" -msgstr "" +msgstr "Exportovat vlastní úpravy jako datový soubor" #. module: base_module_record #: code:addons/base_module_record/wizard/base_module_save.py:129 #, python-format msgid "Error" -msgstr "" +msgstr "Chyba" #. module: base_module_record #: selection:base_module_record.module_record_objects,info,data_kind:0 msgid "Normal Data" -msgstr "" +msgstr "Běžná data" #. module: base_module_record #: wizard_button:base_module_record.module_record_data,end,end:0 #: wizard_button:base_module_record.module_record_objects,end,end:0 msgid "OK" -msgstr "" +msgstr "OK" #. module: base_module_record #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec msgid "Module Creation" -msgstr "" +msgstr "Vytvoření modulu" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,info,data_kind:0 msgid "Type of Data" -msgstr "" +msgstr "Typ dat" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,info:0 msgid "Module Information" -msgstr "" +msgstr "Informace modulu" #. module: base_module_record #: wizard_field:base_module_record.module_record_data,init,info_yaml:0 #: wizard_field:base_module_record.module_record_objects,init,info_yaml:0 msgid "YAML" -msgstr "" +msgstr "YAML" #. module: base_module_record #: wizard_field:base_module_record.module_record_data,info,res_text:0 #: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0 msgid "Result" -msgstr "" +msgstr "Výsledek" #. module: base_module_record #: wizard_button:base_module_record.module_record_data,init,end:0 #: wizard_button:base_module_record.module_record_objects,info,end:0 #: wizard_button:base_module_record.module_record_objects,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Zrušit" #. module: base_module_record #: wizard_button:base_module_record.module_record_objects,save,end:0 #: wizard_button:base_module_record.module_record_objects,save_yaml,end:0 msgid "Close" -msgstr "" +msgstr "Uzavřít" #. module: base_module_record #: selection:base_module_record.module_record_data,init,filter_cond:0 #: selection:base_module_record.module_record_objects,init,filter_cond:0 msgid "Created & Modified" -msgstr "" +msgstr "Vytvořeno & upraveno" #. module: base_module_record #: model:ir.module.module,description:base_module_record.module_meta_information @@ -292,3 +296,25 @@ msgid "" "module.\n" " " msgstr "" +"\n" +"Tento modul vám umožňuje vytvořit nový modul bez jakéhokoliv vývoje.\n" +"Zaznamenává všechny operace nad objekty během relace zaznamenávání a\n" +"vytváří .ZIP modul. Díky tomu můžete vytvořit váš vlastní modul přímo z\n" +"klienta OpenERP.\n" +"\n" +"Tato verze pracuje pro vytváření a aktualizaci stávajících záznamů. " +"Přepočítává\n" +"závislosti a propojuje všechny datové typy pomůcek (many2one, many2many, " +"...).\n" +"Podporuje také pracovní toky a demonstrační/aktualziační data.\n" +"\n" +"Měl by vám pomoci jednoduše vytvářet znovu použitelné a zveřejnitelné " +"moduly\n" +"pro vlastní nastavení a demonstrační/testovací data.\n" +"\n" +"Jak jej použít:\n" +"Spusťte průvodce Správa/Přizpůsobení/Vytváření modulů/Exportovat vlastní " +"úpravy jako modul.\n" +"Vyberte častoé kritéria pro záznam a objekty, které mají být zaznamenány a " +"modul záznamu.\n" +" " diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 0e1efb40b32..cb00ac3eb5b 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -79,7 +79,7 @@ Start Configuration code - + diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 09253ae8d81..0a4b8b8ccd0 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -174,7 +174,7 @@ crm.lead.report tree - + diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index b8ce97a7017..83cd1cde725 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -11,6 +11,7 @@ import fnmatch import pooler import netsvc +import sql_db from service import security from osv import osv @@ -68,7 +69,7 @@ class abstracted_fs(object): db, cr = None, None try: try: - db = pooler.get_db(db_name) + db = sql_db.db_connect(db_name) cr = db.cursor() cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'") if not cr.fetchone(): diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 5e01bf6a66c..d21dcdc0335 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -19,6 +19,7 @@ # ############################################################################## import pooler +import sql_db import os import time @@ -361,7 +362,7 @@ class openerp_dav_handler(dav_interface): for db_name in result: cr = None try: - db = pooler.get_db(db_name) + db = sql_db.db_connect(db_name) cr = db.cursor() cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ") res=cr.fetchone() diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index 75111e626e5..09f9062d187 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -56,7 +56,7 @@ email_template.account tree - + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 7794843af40..076b0dda59a 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -8,7 +8,7 @@ report.event.registration tree - + diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 99f421ac4a5..364d9bbe47f 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -7,7 +7,7 @@ email.server tree - + diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 46d5cf55a98..84d2569320c 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -222,7 +222,7 @@ hr_evaluation.evaluation tree - + diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 58008578df3..bc585df7f67 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -7,7 +7,7 @@ hr.evaluation.report tree - diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 750404c40d9..60dffa22d24 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -46,7 +46,7 @@ hr.expense.expense tree - + diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 0018a7e2ce2..9f4d88a0c20 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -7,7 +7,7 @@ hr.expense.report tree - + diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 392f7469390..99d0c611314 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -144,7 +144,7 @@ hr.holidays tree - + @@ -199,7 +199,7 @@ tree 20 - + @@ -224,7 +224,7 @@ hr.holidays tree - + diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 31802c2d4ce..8bb56bb1200 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -213,7 +213,7 @@ hr.payslip tree - + diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml index fee3e4e8b78..73037dfb64f 100644 --- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml +++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml @@ -7,7 +7,7 @@ hr.applicant tree - + diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 2b33dfbda8d..4613c9251b5 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -66,8 +66,8 @@ class hr_analytic_timesheet(osv.osv): _inherits = {'account.analytic.line': 'line_id'} _order = "id desc" _columns = { - 'line_id': fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade', required=True), - 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id', relation='res.partner', store=True), + 'line_id': fields.many2one('account.analytic.line', 'Analytic Line', ondelete='cascade', required=True), + 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner', relation='res.partner', store=True), } def unlink(self, cr, uid, ids, context=None): diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py index 90c9a5d7b8c..e3f7f0c7acb 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py @@ -27,7 +27,7 @@ class hr_so_project(osv.osv_memory): _name = 'hr.sign.out.project' _description = 'Sign Out By Project' _columns = { - 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('type','=','normal')]), + 'account_id': fields.many2one('account.analytic.account', 'Project / Analytic Account', domain=[('type','=','normal')]), 'info': fields.char('Work Description', size=256, required=True), 'date_start': fields.datetime('Starting Date', readonly=True), 'date': fields.datetime('Closing Date'), diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml index 13193e66d99..134c7f99463 100644 --- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml +++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml @@ -25,7 +25,7 @@ hr_timesheet_sheet.sheet tree - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index cf4351112a4..4e1eebb5f4c 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -264,7 +264,7 @@ class hr_timesheet_sheet(osv.osv): return self.sign(cr,uid,ids,'sign_out',context=None) _columns = { - 'name': fields.char('Description', size=64, select=1, + 'name': fields.char('Note', size=64, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}), 'employee_id': fields.many2one('hr.employee', 'Employee', required=True), 'user_id': fields.related('employee_id', 'user_id', type="many2one", relation="res.users", store=True, string="User", required=False, readonly=True),#fields.many2one('res.users', 'User', required=True, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}), @@ -280,9 +280,9 @@ class hr_timesheet_sheet(osv.osv): 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'), 'state' : fields.selection([ ('new', 'New'), - ('draft','Draft'), - ('confirm','Confirmed'), - ('done','Done')], 'State', select=True, required=True, readonly=True, + ('draft','Open'), + ('confirm','Waiting Approval'), + ('done','Approved')], 'State', select=True, required=True, readonly=True, help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \ \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \ \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'), @@ -735,7 +735,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv): _auto = False _order='name' _columns = { - 'name': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), + 'name': fields.many2one('account.analytic.account', 'Project / Analytic Account', readonly=True), 'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True), 'total': fields.float('Total Time', digits=(16,2), readonly=True), 'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True), diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml index be55c83e0fa..4fc5b2fb1b3 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml @@ -7,7 +7,7 @@ - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 321e4c2addd..9569149860c 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -62,17 +62,17 @@
- - - - + + + + - +