diff --git a/addons/account/account.py b/addons/account/account.py index d4e31167c43..b01da6b1425 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -181,7 +181,7 @@ class account_account_type(osv.osv): 'Balance' will generally be used for cash accounts. 'Detail' will copy each existing journal item of the previous year, even the reconciled ones. 'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""), - 'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', + 'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', store=True, selection= [('none','/'), ('income', _('Profit & Loss (Income account)')), ('expense', _('Profit & Loss (Expense account)')), @@ -836,6 +836,8 @@ class account_journal(osv.osv): @return: Returns a list of tupples containing id, name """ + if isinstance(ids, (int, long)): + ids = [ids] result = self.browse(cr, user, ids, context=context) res = [] for rs in result: diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index e1a29a6edfb..5ca9f26b96b 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -5,6 +5,7 @@ Invoicing & Payments + Accountant diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index a5049c0a345..28bedbf65a1 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -82,6 +82,7 @@ access_account_entries_report_invoice,account.entries.report,model_account_entri access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,1,0,0,0 access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0 access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1 +access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0 access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1 access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1 access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0 diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 1353efca1f5..d87e4d04a0c 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -92,14 +92,14 @@ class account_move_journal(osv.osv_memory): journal = False if journal_id: - journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name'] + journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).name journal_string = _("Journal: %s") % tools.ustr(journal) else: journal_string = _("Journal: All") period = False if period_id: - period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name'] + period = period_pool.browse(cr, uid, period_id, context=context).name period_string = _("Period: %s") % tools.ustr(period) open_string = _("Open") diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index ea4d7887a15..3c391d8d885 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -26,15 +26,12 @@ 'sequence': 10, 'summary': 'Financial and Analytic Accounting', 'description': """ -Accounting Access Rights. -========================= +Accounting Access Rights +======================== +It gives the Administrator user access to all accounting features such as journal items and the chart of accounts. -This module gives the Admin user the access to all the accounting features -like the journal items and the chart of accounts. - -It assigns manager and user access rights to the Administrator and only -user rights to Demo user. - """, +It assigns manager and user access rights to the Administrator and only user rights to the Demo user. +""", 'website': 'http://www.openerp.com', 'depends' : ['account_voucher'], 'data': [ diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index 5b563017c62..d7ed9c1ad13 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -5,6 +5,7 @@ + @@ -14,10 +15,9 @@ reload - + - automatic - 100 + open diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 1b4da45c30f..70beb41ac13 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -465,7 +465,7 @@ class account_analytic_account(osv.osv): def open_sale_order_lines(self,cr,uid,ids,context=None): if context is None: context = {} - sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))]) + sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','in',context.get('search_default_partner_id',False))]) names = [record.name for record in self.browse(cr, uid, ids, context=context)] name = _('Sale Order Lines of %s') % ','.join(names) return { diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 9e5be21cf70..ffbe48f0b19 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -73,9 +73,18 @@ account.analytic.account form tree,form,graph - {'default_type':'contract'} + {'default_type':'contract', 'search_default_open':1, 'search_default_pending':1} [('type','=','contract')] + +

+ Click to create a new contract. +

+ Use contracts to follow tasks, issues, timesheets or invoicing based on + work done, expenses and/or sales orders. OpenERP will automatically manage + the alerts for the renewal of the contracts to the right salesperson. +

+ tree,form [('type','=','template')] {'search_default_type':'template','default_type' : 'template'} + +

+ Click here to create a template of contract. +

+ Templates are used to prefigure contract/project that + can be selected by the salespeople to quickly configure the + terms and conditions of the contract. +

+ + diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 21f9cc69b8a..f6b4842b596 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -299,7 +299,7 @@ - + diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv index 131f4424568..f4174f72782 100644 --- a/addons/account_budget/security/ir.model.access.csv +++ b/addons/account_budget/security/ir.model.access.csv @@ -4,4 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1 -access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,0,0 +access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,1,1,0 diff --git a/addons/account_sequence/i18n/el.po b/addons/account_sequence/i18n/el.po new file mode 100644 index 00000000000..0a7aa3cbb0f --- /dev/null +++ b/addons/account_sequence/i18n/el.po @@ -0,0 +1,214 @@ +# Greek translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:35+0000\n" +"PO-Revision-Date: 2012-09-15 17:55+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-09-16 04:39+0000\n" +"X-Generator: Launchpad (build 15944)\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 "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You can not create more than one move per period on centralized journal" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be the same for its related account and period." +msgstr "" +"Η εταιρία πρέπει να είναι ίδια για τους σχετικούς λογαριασμούς και περίοδο" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "Επόμενος αριθμός αυτής της ακολουθίας" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Επόμενος Αριθμός" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "Αριθμός Προσαύξησης" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "" + +#. 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 "" + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create journal items on an account of type view." +msgstr "" + +#. 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 "" + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create journal items on closed account." +msgstr "" + +#. module: account_sequence +#: constraint:account.journal:0 +msgid "" +"Configuration error! The currency chosen should be shared by the default " +"accounts too." +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"The selected account of your Journal Entry forces to provide a secondary " +"currency. You should remove the secondary currency on the account or select " +"a multi-currency view on the journal." +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"The date of your Journal Entry is not in the defined period! You should " +"change the date or remove this constraint from the journal." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "" diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 03befcc3acd..a6bb9dc5159 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -25,13 +25,19 @@ 'author' : 'OpenERP SA', 'summary': 'Send Invoices and Track Payments', 'description': """ -eInvoicing & Payments module manage all Voucher Entries such as 'Reconciliation Entries', 'Adjustment Entries', 'Closing or Opening Entries' for Sales, Purchase, Bank, Cash, Expense, Contra. -============================================================================================================================================================================================== +Invoicing & Payments by Accounting Voucher & Receipts +====================================================== +The specific and easy-to-use Invoicing system in OpenERP allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your suppliers and customers. - * Voucher Entry - * Voucher Receipt [Sales & Purchase] - * Voucher Payment [Customer & Supplier] - * Cheque Register +You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. + +The Invoicing system includes receipts and vouchers (an easy way to keep track of sales and purchases). It also offers you an easy method of registering payments, without having to encode complete abstracts of account. + +This module manages: + +* Voucher Entry +* Voucher Receipt [Sales & Purchase] +* Voucher Payment [Customer & Supplier] """, 'category': 'Accounting & Finance', 'sequence': 4, diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index ba9d6433888..07647d02fe3 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -272,10 +272,9 @@ reload - + - automatic - 100 + open diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml index 704d9bb8244..51f5428002f 100644 --- a/addons/analytic/analytic_view.xml +++ b/addons/analytic/analytic_view.xml @@ -41,6 +41,7 @@ units is reached, the account manager is warned by email to renew the contract.

+ diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 07bb3fc539c..3b382a072f4 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -3,18 +3,21 @@ - User - Own Leads Only + User: Own Leads Only + the user will have access to his own data in the sales application. - User - All Leads + User: All Leads + the user will have access to all records of everyone in the sales application. Manager + the user will have an access to the sales configuration as well as statistic reports. diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml index d18fa5495d9..ec11528d15a 100644 --- a/addons/crm/test/process/communication_with_customer.yml +++ b/addons/crm/test/process/communication_with_customer.yml @@ -18,9 +18,9 @@ assert not lead.partner_id, "Customer should be a new" assert lead.name == "Fournir votre devis avec le meilleur prix.", "Subject does not match" - - I reply him request with welcome message. + I reply him request with welcome message. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic). - - !python {model: mail.compose.message}: | + !python {model: mail.mail}: | lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right ')]) context.update({'active_model': 'crm.lead','active_id': lead_ids[0]}) id = self.create(cr, uid, {'body': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context) diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po index fa7a7d0561c..9a2a2699a03 100644 --- a/addons/crm_partner_assign/i18n/pt_BR.po +++ b/addons/crm_partner_assign/i18n/pt_BR.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-07-28 18:41+0000\n" +"PO-Revision-Date: 2012-09-15 21:58+0000\n" "Last-Translator: Fábio Martinelli - http://zupy.com.br " "\n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-07 04:59+0000\n" -"X-Generator: Launchpad (build 15914)\n" +"X-Launchpad-Export-Date: 2012-09-16 04:39+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,send_to:0 @@ -36,7 +36,7 @@ msgstr "Excluir Permanentemente o email após o envio" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_close:0 msgid "Delay to Close" -msgstr "Espera para Fechar" +msgstr "Adiar Fechamento" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,email_to:0 @@ -92,12 +92,12 @@ msgstr "Março" #. module: crm_partner_assign #: selection:crm.lead.report.assign,type:0 msgid "Lead" -msgstr "Prospécto" +msgstr "Prospecto" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Delay to close" -msgstr "Atraso para fechar" +msgstr "Adiar o fechamento" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 @@ -233,7 +233,7 @@ msgstr "Anterior" #: code:addons/crm_partner_assign/partner_geo_assign.py:36 #, python-format msgid "Network error" -msgstr "Erro de rede" +msgstr "Erro na rede" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,email_from:0 @@ -274,12 +274,12 @@ msgstr "Prioridade" #: view:crm.lead.report.assign:0 #: field:crm.lead.report.assign,state:0 msgid "State" -msgstr "Status" +msgstr "Situação" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_expected:0 msgid "Overpassed Deadline" -msgstr "Prazo Superado" +msgstr "Prazo Ultrapassado" #. module: crm_partner_assign #: field:crm.lead.report.assign,type:0 @@ -318,12 +318,12 @@ msgstr "Analisar Prospecções" #. module: crm_partner_assign #: field:crm.lead.report.assign,creation_date:0 msgid "Creation Date" -msgstr "Dt. Criação" +msgstr "Data de Criação" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,res_id:0 msgid "Related Document ID" -msgstr "Documento Relacionado" +msgstr "ID do Documento Relacionado" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -397,7 +397,7 @@ msgstr "Fechar" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,use_template:0 msgid "Use Template" -msgstr "Usar modelo" +msgstr "Usar Modelo" #. module: crm_partner_assign #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign @@ -453,7 +453,7 @@ msgstr "Assunto" #: view:crm.lead.report.assign:0 #: view:crm.partner.report.assign:0 msgid "Salesman" -msgstr "Vendedor" +msgstr "Representante" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -580,7 +580,7 @@ msgstr "# da Oportunidade" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Lead Assign" -msgstr "Atribuir Prospécto" +msgstr "Atribuir Prospecto" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -600,7 +600,7 @@ msgstr "Janeiro" #. module: crm_partner_assign #: help:crm.lead,partner_assigned_id:0 msgid "Partner this case has been forwarded/assigned to." -msgstr "O Parceiro desse Caso foi Enviado/Atribuído para." +msgstr "Parceiro para que este caso foi enviado/atribuído" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,date:0 @@ -661,7 +661,7 @@ msgstr "Nome da Grade" #. module: crm_partner_assign #: help:crm.lead,date_assign:0 msgid "Last date this case was forwarded/assigned to a partner" -msgstr "Última data que este Caso foi Enviado/Atribuído a um parceiro" +msgstr "Última data que este caso foi enviado/atribuído a um parceiro" #. module: crm_partner_assign #: selection:crm.lead.report.assign,state:0 @@ -679,7 +679,9 @@ msgstr "Cópia oculta da mensagem para os destinatários" msgid "" "Full message headers, e.g. SMTP session headers (usually available on " "inbound messages only)" -msgstr "Cabeçalho completo, Ex Cabecalhos SMTP" +msgstr "" +"Cabeçalho completo da mensagem, Ex. SMTP session headers (geralmente " +"disponível somente para mensagens recebidas)" #. module: crm_partner_assign #: field:res.partner,date_localization:0 @@ -808,7 +810,7 @@ msgstr "Abril" #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree msgid "Partnership Analysis" -msgstr "Analise de Parceria" +msgstr "Análise de Parceria" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead @@ -839,7 +841,7 @@ msgstr "" #. module: crm_partner_assign #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "Erro! Você não pode criar recursivamente a membros associados." +msgstr "Erro! Você não pode criar membros associados recursivamente." #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history:0 diff --git a/addons/crm_todo/i18n/ru.po b/addons/crm_todo/i18n/ru.po new file mode 100644 index 00000000000..8ec484e8453 --- /dev/null +++ b/addons/crm_todo/i18n/ru.po @@ -0,0 +1,96 @@ +# Russian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-09-14 06:29+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-09-15 04:55+0000\n" +"X-Generator: Launchpad (build 15944)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "Задачи" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "Резерв времени" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "Для отмены задачи" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"Ошибка! Дата завершения задачи должна быть позднее чем дата начала задачи" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "crm.lead" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "Далее" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "Мои задачи" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "Задачи" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "Сделано" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Ошибка! Вы не можете создавать рекурсивные задачи." + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "Отмена" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "Доп. инфо." + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "Кандидат / предложение" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "Для смены в состояние \"Сделано\"" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "Назад" diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 0f18673a007..1ead23ab402 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -69,7 +69,7 @@ class document_directory(osv.osv): } - def _get_root_directory(self, cr,uid, context=None): + def _get_root_directory(self, cr, uid, context=None): objid=self.pool.get('ir.model.data') try: mid = objid._get_id(cr, uid, 'document', 'dir_root') @@ -77,9 +77,7 @@ class document_directory(osv.osv): return False root_id = objid.read(cr, uid, mid, ['res_id'])['res_id'] return root_id - except Exception, e: - - _logger.warning('Cannot set directory root:'+ str(e)) + except Exception: return False return objid.browse(cr, uid, mid, context=context).res_id diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 2a8b9f34ddf..2740967d53a 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -114,7 +114,7 @@ report.document.user - + diff --git a/addons/document_page/document_page_demo.xml b/addons/document_page/document_page_demo.xml index 96984fe2e0b..a5ca56fd573 100644 --- a/addons/document_page/document_page_demo.xml +++ b/addons/document_page/document_page_demo.xml @@ -6,7 +6,6 @@ OpenERP Features - 10 category Summary of the feature diff --git a/addons/document_page/wizard/document_page_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py index 68697233f84..79a43f952f0 100644 --- a/addons/document_page/wizard/document_page_create_menu.py +++ b/addons/document_page/wizard/document_page_create_menu.py @@ -65,7 +65,6 @@ class document_page_create_menu(osv.osv_memory): 'view_id': False, 'type': 'ir.actions.act_window', 'target': 'inlineview', - 'nodestroy': True, } value['domain'] = "[('parent_id','=',%d)]" % (page.id) value['res_id'] = page.id diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 1e548f68991..8860d32686e 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -25,21 +25,18 @@ 'name': 'Events Organisation', 'version': '0.1', 'category': 'Tools', - 'summary': 'For Trainings, Conferences & Meetings', + 'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations', 'description': """ Organization and management of Events. ====================================== -This module allows you: ------------------------ - * to manage your events and their registrations - * to use emails to automatically confirm and send acknowledgements for any - registration to an event +The event module allows you to efficiently organise events and all related tasks: planification, registration tracking, +attendances, etc. -Note that: ----------- - - You can define new types of events in - **Events** / **Configuration** / **Types of Events** +Key Features +------------ +* Manage your Events and Registrations +* Use emails to automatically confirm and send acknowledgements for any event registration """, 'author': 'OpenERP SA', 'depends': ['base_setup', 'board', 'email_template', 'google_map'], diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml index 2c19fdc574f..5e34ddcfe02 100644 --- a/addons/event/event_data.xml +++ b/addons/event/event_data.xml @@ -7,10 +7,9 @@ reload - + - automatic - 100 + open diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml index d9e7266d055..6eda25fcc4d 100644 --- a/addons/event_moodle/wizard_moodle.xml +++ b/addons/event_moodle/wizard_moodle.xml @@ -39,10 +39,9 @@ - + - automatic - Configuration of moodle + open diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index 1d7a30ee2ee..f37dea3f075 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -81,8 +81,6 @@ class sale_order_line(osv.osv): 'nb_register': int(order_line.product_uom_qty), 'email': order_line.order_id.partner_id.email, 'phone': order_line.order_id.partner_id.phone, - 'street': order_line.order_id.partner_invoice_id.street, - 'city': order_line.order_id.partner_invoice_id.city, 'origin': order_line.order_id.name, 'event_id': order_line.event_id.id, } diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py index c502f101f07..7eb568075c3 100644 --- a/addons/google_base_account/wizard/google_login.py +++ b/addons/google_base_account/wizard/google_login.py @@ -38,12 +38,12 @@ class google_login(osv.osv_memory): def google_login(self, user, password, type='', context=None): if type == 'group': - gd_client = gdata.contacts.client.ContactsClient(source='OpenERP') - if type == 'contact': gd_client = gdata.contacts.service.ContactsService() - if type == 'calendar': + elif type == 'contact': + gd_client = gdata.contacts.service.ContactsService() + elif type == 'calendar': gd_client = gdata.calendar.service.CalendarService() - if type =='docs_client': + elif type =='docs_client': gd_client = gdata.docs.client.DocsClient() else: gd_client = gdata.contacts.service.ContactsService() diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 8dc202230e6..b99482ef8c5 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -26,16 +26,19 @@ 'category': 'Human Resources', 'sequence': 12, 'website': 'http://www.openerp.com', - 'summary': 'All Infos on Employees', + 'summary': 'Jobs, Departments, Employees Details', 'description': """ -Module for Human Resource Management. -===================================== +Human Resources Management +========================= + +This application enables you to manage important aspects of your company's staff and other details such as their skills, contacts, working time... + You can manage: --------------- - * Employees and hierarchies : You can define your employee with User and display hierarchies - * HR Departments - * HR Jobs +* Employees and hierarchies : You can define your employee with User and display hierarchies +* HR Departments +* HR Jobs """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index 32f96fb2abb..c42857e5f6b 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -7,10 +7,9 @@ reload - + - automatic - 100 + open diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index d3bc79bda1a..8fdd2928fe6 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -55,7 +55,7 @@ class hr_attendance(osv.osv): 'name': fields.datetime('Date', required=True, select=1), 'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True), 'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'), - 'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True), + 'employee_id': fields.many2one('hr.employee', "Employee", required=True, select=True), 'day': fields.function(_day_compute, type='char', string='Day', store=True, select=1, size=32), } _defaults = { diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 4be0f94947c..6a8a802e1e1 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -25,19 +25,27 @@ 'author': 'OpenERP SA', 'category': 'Human Resources', 'website': 'http://www.openerp.com', - 'summary': 'Periodical Evaluations, Surveys', + 'summary': 'Periodical Evaluations, Appraisals, Surveys', 'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg'], 'depends': ['hr','base_calendar','survey'], 'description': """ -Ability to create employees evaluation. -======================================= +Periodical Employees evaluation and appraisals +============================================== -An evaluation can be created by employee for subordinates, juniors as well as -his manager. The evaluation is done under a plan in which various surveys can be -created and it can be defined which level of employee hierarchy fills what and -final review and evaluation is done by the manager. Every evaluation filled by -the employees can be viewed in the form of pdf file. - """, +By using this application you can maintain the motivational process by doing periodical evaluations of your employees' performance. The regular assessment of human resources can benefit your people as well your organization. + +An evaluation plan can be assigned to each employee. These plans define the frequency and the way you manage your periodic personal evaluations. You will be able to define steps and attach interview forms to each step. + +Manages several types of evaluations: bottom-up, top-down, self-evaluations and the final evaluation by the manager. + +Key Features +------------ +* Ability to create employees evaluations. +* An evaluation can be created by an employee for subordinates, juniors as well as his manager. +* The evaluation is done according to a plan in which various surveys can be created. Each survey can be answered by a particular level in the employees hierarchy. The final review and evaluation is done by the manager. +* Every evaluation filled by employees can be viewed in a PDF form. +* Interview Requests are generated automatically by OpenERP according to employees evaluation plans. Each user receives automatic emails and requests to perform a periodical evaluation of their colleagues. +""", "demo": ["hr_evaluation_demo.xml"], "data": [ 'security/ir.model.access.csv', diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml index 2cf656a72bb..607cd017a85 100644 --- a/addons/hr_evaluation/hr_evaluation_data.xml +++ b/addons/hr_evaluation/hr_evaluation_data.xml @@ -1,17 +1,10 @@ - - - done - - - - + - automatic - 100 + open diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 63fca88b148..64648c65fee 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -27,19 +27,21 @@ 'sequence': 30, 'summary': 'Expenses Validation, Invoicing', 'description': """ -This module aims to manage employee expenses. -============================================= +Manage expenses by Employees +============================ -The whole workflow is implemented: +This application allows you to manage your employees' daily expenses. It gives you access to your employees’ fee notes and give you the right to complete and validate or refuse the notes. After validation it creates an invoice for the employee. +Employee can encode their own expenses and the validation flow puts it automatically in the accounting after validation by managers. + + +The whole flow is implemented as: ---------------------------------- - * Draft expense - * Confirmation of the sheet by the employee - * Validation by his manager - * Validation by the accountant and receipt creation +* Draft expense +* Confirmation of the sheet by the employee +* Validation by his manager +* Validation by the accountant and receipt creation -This module also uses the analytic accounting and is compatible with -the invoice on timesheet module so that you will be able to automatically -re-invoice your customer's expenses if your work by project. +This module also uses analytic accounting and is compatible with the invoice on timesheet module so that you are able to automatically re-invoice your customers' expenses if your work by project. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml index c2d1d88d1bf..03a461a84c5 100644 --- a/addons/hr_expense/hr_expense_installer_view.xml +++ b/addons/hr_expense/hr_expense_installer_view.xml @@ -1,15 +1,9 @@ - - - done - - - + - automatic - 100 + open diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 070ae0344b0..512ab8e425d 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -29,33 +29,20 @@ 'summary': 'Holidays, Allocation and Leave Requests', 'website': 'http://www.openerp.com', 'description': """ -This module allows you to manage leaves and leave requests. -=========================================================== +Manage leaves and allocation requests +===================================== -Implements a dashboard for human resource management that includes: -------------------------------------------------------------------- - * Leaves +This application controls the holiday schedule of your company. It allows employees to request holidays. Then, managers can review requests for holidays and approve or reject them. This way you can control the overall holiday planning for the company or department. -Note that: -~~~~~~~~~~ - - A synchronisation with an internal agenda (use of the CRM module) is - possible: in order to automatically create a case when an holiday request - is accepted, you have to link the holidays status to a case section. You - can setup this info and your colour preferences in - - **Human Resources** / **Configuration** / **Leave Type** - - An employee can make an ask for more off-days by making a new Allocation. It will increase his total of that leave type available (if the request is accepted). - - There are two ways to print the employee's holidays: - * The first will allow to choose employees by department and is used by clicking the menu item located in - **Reporting** / **Human Resources** / **Leaves** / **Leaves by Department** - * The second will allow you to choose the holidays report for specific employees. Go on the list - **Human Resources** / **Human Resources** / **Employees** - then select the ones you want to choose, click on the print icon and select the option - 'Leaves Summary' - - The wizard allows you to choose if you want to print either the Approved & Confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in - **Settings** / **Users** / **Users** - - for example, you maybe will do it for the user 'admin'. +You can configure several kinds of leaves (sickness, holidays, paid days, ...) and allocate leaves to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted). + +You can keep track of leaves in different ways by following reports: + +* Leaves Summary +* Leaves by Department +* Leaves Analysis + +A synchronization with an internal agenda (Meetings of the CRM module) is also possible in order to automatically create a meeting when a holiday request is accepted by setting up a type of meeting in Leave Type. """, 'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'], 'depends': ['hr', 'base_calendar', 'process', 'resource'], diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml index 1e534093eb3..afe2e69e697 100644 --- a/addons/hr_holidays/hr_holidays_data.xml +++ b/addons/hr_holidays/hr_holidays_data.xml @@ -1,16 +1,10 @@ - - - done - - - + - automatic - 100 + open diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 58484a91567..d5b8b50306d 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -99,8 +99,8 @@ Salary Structures Hierarchy diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index ee000f3951e..d498e41498d 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -25,17 +25,16 @@ 'version': '1.0', 'category': 'Human Resources', 'sequence': 24, - 'summary': 'Recruitment Process, Job Descriptions', + 'summary': 'Jobs, Recruitment, Applications, Job Interviews', 'description': """ -Manages job positions and the recruitment process. -================================================== +Manage job positions and the recruitment process +================================================= -It's integrated with the survey module to allow you to define interview for different jobs. +This application allows you to easily keep track of jobs, vacancies, applications, interviews... -This module is integrated with the mail gateway to automatically tracks email -sent to jobs@YOURCOMPANY.com. It's also integrated with the document management -system to store and search in your CV base. - """, +It is integrated with the mail gateway to automatically fetch email sent to in the list of applications. It's also integrated with the document management system to store and search in the CV base and find the candidate that you are looking for. Similarly, it is integrated with the survey module to allow you to define interviews for different jobs. +You can define the different phases of interviews and easily rate the applicant from the kanban view. +""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'], diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 2748834ae9a..298e3e64195 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -194,7 +194,7 @@ class hr_applicant(base_stage, osv.Model): When the case is over, the state is set to \'Done\'.\ If the case needs to be reviewed then the state is \ set to \'Pending\'.'), - 'categ_ids': fields.many2many('hr.applicant_category', string='Categories'), + 'categ_ids': fields.many2many('hr.applicant_category', string='Tags'), 'company_id': fields.many2one('res.company', 'Company'), 'user_id': fields.many2one('res.users', 'Responsible'), # Applicant Columns @@ -398,7 +398,7 @@ class hr_applicant(base_stage, osv.Model): for applicant in self.browse(cr, uid, ids, context=context): address_id = False if applicant.partner_id: - address_id = applicant.partner_id.address_get(['contact'])['contact'] + address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact'] if applicant.job_id: applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1}) emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or applicant.name, diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index acb8e06cbdb..098a8aec210 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -337,7 +337,7 @@