diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index fa150b291dc..a93dc70b2fb 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -80,7 +80,10 @@ class account_analytic_line(osv.osv): j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context) prod = product_obj.browse(cr, uid, prod_id, context=context) result = 0.0 - + if prod_id: + unit = prod.uom_id.id + if j_id.type == 'purchase': + unit = prod.uom_po_id.id if j_id.type <> 'sale': a = prod.product_tmpl_id.property_account_expense.id if not a: @@ -127,6 +130,7 @@ class account_analytic_line(osv.osv): return {'value': { 'amount': result, 'general_account_id': a, + 'product_uom_id': unit } } @@ -155,4 +159,4 @@ class res_partner(osv.osv): res_partner() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index e648e7d9534..e83d48170df 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-02-09 17:14+0000\n" +"PO-Revision-Date: 2011-02-25 15:00+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n" +"X-Generator: Launchpad (build 12351)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -6410,11 +6410,10 @@ msgid "" "reconcile in a series of accounts. It finds entries for each partner where " "the amounts correspond." msgstr "" -"Egy vevő/szállító számla akkor minősül rendezettnek, ha az párosításra " -"került a banki/pénztári kifizetéssel vagy egy jóváíró számlával vagy egy " -"szállító/vevő számlával. Az automatikus párosítás funkció minden partnerre " -"megkeresi a párosítható tételeket. Az összegében egyező tételek párosítását " -"végrehajtja." +"Egy számla akkor minősül rendezettnek, ha az párosításra került a " +"banki/pénztári kifizetéssel vagy egy jóváíró számlával. Az automatikus " +"párosítás funkció minden partnerre megkeresi a párosítható tételeket. Az " +"összegében egyező tételek párosítását végrehajtja." #. module: account #: view:account.move:0 diff --git a/addons/account_sequence/i18n/gl.po b/addons/account_sequence/i18n/gl.po new file mode 100644 index 00000000000..abee975d41c --- /dev/null +++ b/addons/account_sequence/i18n/gl.po @@ -0,0 +1,234 @@ +# Galician 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-02-25 09:38+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n" +"X-Generator: Launchpad (build 12351)\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 "Configuración de Aplicación de secuencia de conta" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create entries on different periods/journals in the same move" +msgstr "" +"Non pode crear asentamentos con movementos en distintos períodos/diarios" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "Número de secuencia interno" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "Número seguinte desta secuencia" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Número seguinte" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "Incrementar número" + +#. 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" +" Este módulo xestiona o número de secuencia interno para os asentamentos " +"contables\n" +" " + +#. module: account_sequence +#: model:ir.module.module,shortdesc:account_sequence.module_meta_information +msgid "Entries Sequence Numbering" +msgstr "Numeración da secuencia de asentamentos" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "O número seguinte desta secuencia incrementarase por este número." + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "Configurar a súa Aplicación de secuencia da conta" + +#. module: account_sequence +#: field:account.sequence.installer,progress:0 +msgid "Configuration Progress" +msgstr "Progreso da configuración" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "Valor do sufixo do rexistro para a secuencia." + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "Compañía" + +#. 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 "" +"Esta secuencia utilizarase para xestionar o número interno para os " +"asentamentos relacionados con este diario." + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "Número de enchido" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "Rexistros do diario" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "Número interno" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "A compañía debe ser a mesma para a conta e período relacionados." + +#. 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 engadirá automaticamente algúns '0' á esquerda do \"Número " +"seguinte\" para obter o tamaño de enchido necesario." + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "Nome" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "Non pode crear unha liña de movemento nunha conta pechada." + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create more than one move per period on centralized journal" +msgstr "" +"Non pode crear máis dun movemento por período nun diario centralizado." + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "¡Valor de débito ou haber incorrecto no asentamento contable!" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "Secuencia interna" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "contabilidade.secuencia.instalador" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "Configurar" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "Valor do prefixo do rexistro para a secuencia." + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "Asentamento contable" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "Sufixo" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "Imaxe" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "título" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "¡O nome do diario debe ser único por compañía!" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "Prefixo" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "¡O código do diario debe ser único por compañía!" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" +"Non pode crear unha liña de movemento nunha conta a cobrar/a pagar sen unha " +"empresa." + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "Diario" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "" +"Pode realzar a Aplicación de secuencia da conta mediante instalación ." + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "Non pode crear unha liña de movemento nunha conta de tipo vista." diff --git a/addons/analytic/i18n/bg.po b/addons/analytic/i18n/bg.po new file mode 100644 index 00000000000..53554998c53 --- /dev/null +++ b/addons/analytic/i18n/bg.po @@ -0,0 +1,255 @@ +# Bulgarian 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-02-25 23:13+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n" +"X-Generator: Launchpad (build 12351)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "Подчинени сметки" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "име на сметка" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "Състояние" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "Чернова" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "Затворена" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "Дебит" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "" +"* When an account is created its in 'Draft' state. " +" \n" +"* If any associated partner is there, it can be in 'Open' state. " +" \n" +"* If any pending balance is there it can be in 'Pending'. " +" \n" +"* And finally when all the transactions are over, it can be in 'Close' " +"state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. " +"If its in 'Running' state it is a normal project. " +" \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "Вид сметка" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "Образец" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "Изчакващи" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "Описание" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "Нормален" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "Фирма" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "Максимално количество" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "Потребител" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "Дата" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Account currency" +msgstr "Валута на сметката" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "Количество" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "Кредит" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "Количество" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "За контакт" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "Отказани" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "Баланс" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Грешка! Не можете да създавате рекурсивни аналитични сметки." + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "Крайна дата" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "Код на сметка" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "Пълно има на сметка" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "Аналитична сметка" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "Преглеждане" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "Партньор" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "Начална дата" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "Отвoри" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "Аналитични записи" diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po index 71c27e51ce1..3cf68c013cb 100644 --- a/addons/crm/i18n/ru.po +++ b/addons/crm/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-23 12:48+0000\n" +"PO-Revision-Date: 2011-02-25 19:53+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-02-25 04:39+0000\n" +"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n" "X-Generator: Launchpad (build 12351)\n" #. module: crm @@ -1312,7 +1312,7 @@ msgstr "Пометить как" #. module: crm #: field:crm.meeting,count:0 msgid "Repeat" -msgstr "" +msgstr "Повторить" #. module: crm #: help:crm.meeting,rrule_type:0 @@ -1872,7 +1872,7 @@ msgstr "Звонки" #. module: crm #: view:crm.lead:0 msgid "Communication History" -msgstr "" +msgstr "История общения" #. module: crm #: selection:crm.meeting,show_as:0 @@ -2161,7 +2161,7 @@ msgstr "" #. module: crm #: help:crm.meeting,count:0 msgid "Repeat x times" -msgstr "" +msgstr "Повторить х раз" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_section_act @@ -2190,7 +2190,7 @@ msgstr "Группа" #. module: crm #: field:crm.installer,outlook:0 msgid "MS-Outlook" -msgstr "" +msgstr "MS-Outlook" #. module: crm #: view:crm.phonecall:0 @@ -2480,7 +2480,7 @@ msgstr "Готово" #. module: crm #: help:crm.meeting,interval:0 msgid "Repeat every (Days/Week/Month/Year)" -msgstr "" +msgstr "Повтор каждый (День/Неделя/Месяц/Год)" #. module: crm #: field:crm.segmentation,som_interval_max:0 @@ -2525,7 +2525,7 @@ msgstr "Занят" #. module: crm #: field:crm.meeting,interval:0 msgid "Repeat every" -msgstr "" +msgstr "Повторять каждые" #. module: crm #: field:crm.installer,crm_helpdesk:0 @@ -2639,7 +2639,7 @@ msgstr "Мое отношение Выиграно/Проиграно за по #. module: crm #: field:crm.installer,thunderbird:0 msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #. module: crm #: view:crm.lead.report:0 @@ -2681,7 +2681,7 @@ msgstr "Кандидат в Сделку" #. module: crm #: model:ir.model,name:crm.model_calendar_attendee msgid "Attendee information" -msgstr "" +msgstr "Информация о участнике" #. module: crm #: view:crm.segmentation:0 @@ -3114,7 +3114,7 @@ msgstr "Закрытого/отмененного кандидата нельз #. module: crm #: view:crm.segmentation:0 msgid "Profiling" -msgstr "" +msgstr "Профилирование" #. module: crm #: help:crm.segmentation,exclusif:0 @@ -3428,7 +3428,7 @@ msgstr "Планируемая выручка по этапу и пользов #. module: crm #: view:crm.lead:0 msgid "Communication & History" -msgstr "" +msgstr "Общение & история" #. module: crm #: model:ir.model,name:crm.model_crm_lead_report @@ -3624,7 +3624,7 @@ msgstr "Кому" #. module: crm #: selection:crm.meeting,class:0 msgid "Private" -msgstr "" +msgstr "Личный" #. module: crm #: field:crm.lead,function:0 diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py index 595394478ba..f2241abfdcc 100644 --- a/addons/crm/wizard/email_compose_message.py +++ b/addons/crm/wizard/email_compose_message.py @@ -44,7 +44,7 @@ class email_compose_message(osv.osv_memory): result['email_to'] = data.email_from if 'email_from' in fields: - result['email_from'] = data.user_id and data.user_id.address_id and data.user_id.address_id.email + result['email_from'] = data.user_id and data.user_id.address_id and data.user_id.address_id.email or False if 'description' in fields: result['description'] = '\n' + (tools.ustr(data.user_id.signature or '')) diff --git a/addons/crm_profiling/i18n/gl.po b/addons/crm_profiling/i18n/gl.po new file mode 100644 index 00000000000..1cb025e5348 --- /dev/null +++ b/addons/crm_profiling/i18n/gl.po @@ -0,0 +1,225 @@ +# Galician 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:15+0000\n" +"PO-Revision-Date: 2011-02-25 10:51+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Galician \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-02-26 05:00+0000\n" +"X-Generator: Launchpad (build 12351)\n" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +msgid "Questions List" +msgstr "Lista de preguntas" + +#. module: crm_profiling +#: model:ir.module.module,description:crm_profiling.module_meta_information +msgid "" +"\n" +" This module allows users to perform segmentation within partners.\n" +" It uses the profiles criteria from the earlier segmentation module and " +"improve it. Thanks to the new concept of questionnaire. You can now regroup " +"questions into a questionnaire and directly use it on a partner.\n" +"\n" +" It also has been merged with the earlier CRM & SRM segmentation tool " +"because they were overlapping.\n" +"\n" +" The menu items related are in \"CRM & SRM\\Configuration\\" +"Segmentations\"\n" +"\n" +"\n" +" * Note: this module is not compatible with the module segmentation, " +"since it's the same which has been renamed.\n" +" " +msgstr "" +"\n" +" Este módulo permite ós usuarios realizar unha segmentación das empresas. " +"Utiliza os criterios dos perfís do módulo de segmentación anterior e os " +"mellora. Grazas á nova concepción do cuestionario, agora pode agrupar as " +"preguntas nun cuestionario e utilizalo directamente sobre unha empresa. " +"Fusionouse tamén coa anterior ferramenta de segmentación CRM e SRM, xa que " +"se solapaban. Accédense ás segmentacións desde o menú \"CRM e " +"SRM/Configuración/Segmentacións\"* Nota: este módulo non é compatible co " +"módulo de segmentación, xa que é o mesmo só que foi nomeado.\n" +" " + +#. module: crm_profiling +#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires +msgid "" +"You can create specific topic-related questionnaires to guide your team(s) " +"in the sales cycle by helping them to ask the right questions. The " +"segmentation tool allows you to automatically assign a partner to a category " +"according to his answers to the different questionnaires." +msgstr "" +"Pode crear cuestionarios temáticos específicos para guiar ó(s) seu(s) " +"equipo(s) no ciclo de vendas, axudándolles a formular as preguntas " +"correctas. A ferramenta de segmentación permítelle asignar automaticamente " +"un cliente a unha categoría de acordo coas súas respostas ós diferentes " +"cuestionarios." + +#. module: crm_profiling +#: field:crm_profiling.answer,question_id:0 +#: field:crm_profiling.question,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_question +msgid "Question" +msgstr "Pregunta" + +#. module: crm_profiling +#: wizard_button:open_questionnaire,init,open:0 +msgid "Open Questionnaire" +msgstr "Cuestionario aberto" + +#. module: crm_profiling +#: constraint:res.partner:0 +msgid "Error ! You can not create recursive associated members." +msgstr "¡Erro! Non pode crear membros asociados recursivos." + +#. module: crm_profiling +#: view:crm.segmentation:0 +msgid "Partner Segmentations" +msgstr "Segmentacións da empresa" + +#. module: crm_profiling +#: field:crm_profiling.answer,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_answer +msgid "Answer" +msgstr "Resposta" + +#. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_crm_segmentation +msgid "Partner Segmentation" +msgstr "Segmentación de empresa" + +#. module: crm_profiling +#: view:res.partner:0 +msgid "Profiling" +msgstr "Perfís" + +#. module: crm_profiling +#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information +msgid "Crm Profiling management - To Perform Segmentation within Partners" +msgstr "Xestión de perfís CRM - Permite realizar a segmentación de empresas" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +#: field:crm_profiling.questionnaire,description:0 +msgid "Description" +msgstr "Descrición" + +#. module: crm_profiling +#: field:crm.segmentation,answer_no:0 +msgid "Excluded Answers" +msgstr "Respostas excluídas" + +#. module: crm_profiling +#: view:crm_profiling.answer:0 +#: view:crm_profiling.question:0 +#: field:res.partner,answers_ids:0 +msgid "Answers" +msgstr "Respostas" + +#. module: crm_profiling +#: wizard_field:open_questionnaire,init,questionnaire_name:0 +msgid "Questionnaire name" +msgstr "Nome do cuestionario" + +#. module: crm_profiling +#: view:res.partner:0 +msgid "Use a questionnaire" +msgstr "Usar un cuestionario" + +#. module: crm_profiling +#: view:crm_profiling.questionnaire:0 +#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires +#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire +msgid "Questionnaires" +msgstr "Cuestionarios" + +#. module: crm_profiling +#: help:crm.segmentation,profiling_active:0 +msgid "" +"Check this box if you want to use this tab as " +"part of the segmentation rule. If not checked, " +"the criteria beneath will be ignored" +msgstr "" +"Marque esta opción se desexa usar esta pestana como parte da regra de " +"segmentación. Se non está marcada, ignoraranse os criterios máis abaixo." + +#. module: crm_profiling +#: constraint:crm.segmentation:0 +msgid "Error ! You can not create recursive profiles." +msgstr "Erro! Non se pode crear perfís recursivos." + +#. module: crm_profiling +#: field:crm.segmentation,profiling_active:0 +msgid "Use The Profiling Rules" +msgstr "Usar as regras de perfil" + +#. module: crm_profiling +#: view:crm_profiling.question:0 +#: field:crm_profiling.question,answers_ids:0 +msgid "Avalaible answers" +msgstr "Respostas dispoñibles" + +#. module: crm_profiling +#: field:crm.segmentation,answer_yes:0 +msgid "Included Answers" +msgstr "Respostas incluídas" + +#. module: crm_profiling +#: field:crm.segmentation,child_ids:0 +msgid "Child Profiles" +msgstr "Perfís fillos" + +#. module: crm_profiling +#: view:crm_profiling.question:0 +#: field:crm_profiling.questionnaire,questions_ids:0 +#: model:ir.actions.act_window,name:crm_profiling.open_questions +#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer +msgid "Questions" +msgstr "Preguntas" + +#. module: crm_profiling +#: field:crm.segmentation,parent_id:0 +msgid "Parent Profile" +msgstr "Perfil pai" + +#. module: crm_profiling +#: wizard_button:open_questionnaire,init,end:0 +#: wizard_button:open_questionnaire,open,end:0 +msgid "Cancel" +msgstr "Anular" + +#. module: crm_profiling +#: model:ir.model,name:crm_profiling.model_res_partner +msgid "Partner" +msgstr "Socio" + +#. module: crm_profiling +#: code:addons/crm_profiling/crm_profiling.py:178 +#: field:crm_profiling.questionnaire,name:0 +#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire +#: wizard_view:open_questionnaire,init:0 +#, python-format +msgid "Questionnaire" +msgstr "Cuestionario" + +#. module: crm_profiling +#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire +msgid "Using a questionnaire" +msgstr "Como utilizar un cuestionario" + +#. module: crm_profiling +#: wizard_button:open_questionnaire,open,compute:0 +msgid "Save Data" +msgstr "Gardar datos" diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 40e0091d05e..1fdbb56f40b 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -124,6 +124,28 @@ class hr_expense_expense(osv.osv): self.write(cr, uid, ids, {'state':'paid'}) return True + def invoice(self, cr, uid, ids, context=None): + wf_service = netsvc.LocalService("workflow") + mod_obj = self.pool.get('ir.model.data') + res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form') + res_id = res and res[1] or False, + inv_ids = [] + for id in ids: + wf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr) + inv_ids.append(self.browse(cr, uid, id).invoice_id.id) + return { + 'name': _('Supplier Invoices'), + 'view_type': 'form', + 'view_mode': 'form,tree', + 'view_id': [res_id], + 'res_model': 'account.invoice', + 'context': "{'type':'out_invoice', 'journal_type': 'purchase'}", + 'type': 'ir.actions.act_window', + 'nodestroy': True, + 'target': 'current', + 'res_id': inv_ids and inv_ids[0] or False, + } + def action_invoice_create(self, cr, uid, ids): res = False invoice_obj = self.pool.get('account.invoice') @@ -194,8 +216,6 @@ class hr_expense_expense(osv.osv): account_journal.write(cr, uid, [journal.id],{'analytic_journal_id':analytic_journal_ids[0]}) inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'}) invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True) - wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr) self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'}) res = inv_id diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index aa98cc43c32..5aa2fe5c38e 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -104,7 +104,7 @@