diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 04f55566d40..fe3f93b492c 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -113,8 +113,6 @@ module named account_vouchers 'report/account_invoice_report_view.xml', 'report/account_entries_report_view.xml', 'report/account_report_view.xml', - 'report/account_analytic_report_view.xml', - 'report/account_account_report_view.xml', 'report/account_analytic_entries_report_view.xml', 'board_account_view.xml', "wizard/account_pl_report_view.xml", diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index afe024b7194..2a7922c13b2 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -177,7 +177,6 @@ class account_cash_statement(osv.osv): ('confirm', 'Confirm'), ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"), 'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"), - 'date':fields.datetime("Open On"), 'closing_date':fields.datetime("Closed On"), 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on transactions"), 'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 0bc9e476601..3a0f889d931 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -508,7 +508,7 @@ class account_move_line(osv.osv): _constraints = [ (_check_no_view, 'You can not create move line on view account.', ['account_id']), (_check_no_closed, 'You can not create move line on closed account.', ['account_id']), - (_check_company_id,'Company must be same for its related account and period.',['company_id'] ), + (_check_company_id, 'Company must be same for its related account and period.', ['company_id']), ] #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 9ab85f924e0..77bc6a52b2e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -59,8 +59,9 @@ + Period + --> + @@ -387,16 +388,10 @@ - - - - - - - + diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index 37225273e03..1f7322afaff 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -14,31 +14,48 @@ Asset asset + asset balance + + Receivable + receivable + asset + unreconciled + Liability liability + liability balance + + Payable + payable + liability + unreconciled + + + Income + income + income + none + + + Expense + expense + expense + none + Equity equity balance - - Income - income - unreconciled - - - Expense - expense - unreconciled - Cash cash + asset balance @@ -65,7 +82,7 @@ your own accounts. - + This chart of account is used for automated testing purpose. It is installed only if you selected demo data during your database creation. Modules can @@ -75,12 +92,12 @@ your own chart of account. Main Payable - x 440000 + x 44000 payable - + This chart of account is used for automated testing purpose. It is installed only if you selected demo data during your database creation. Modules can @@ -90,7 +107,7 @@ your own chart of account. Petty Cash - x 570000 + x 57000 other @@ -104,7 +121,7 @@ your own chart of account. Products Purchase - x 600000 + x 60000 other @@ -118,11 +135,11 @@ your own chart of account. Products Sales - x 701000 + x 70000 other - + This chart of account is used for automated testing purpose. It is installed only if you selected demo data during your database creation. Modules can diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml deleted file mode 100644 index bd9101a3382..00000000000 --- a/addons/account/report/account_account_report_view.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - account.account.report.tree - account.account.report - tree - - - - - - - - - - - - - - - - - - - - - account.account.report.graph - account.account.report - graph - - - - - - - - - - - - account.account.report.search - account.account.report - search - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Accounts Analysis - account.account.report - form - tree,graph - {"search_default_Account":1,"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]} - - - - - - - diff --git a/addons/account/report/account_analytic_report.py b/addons/account/report/account_analytic_report.py deleted file mode 100644 index a740076ad09..00000000000 --- a/addons/account/report/account_analytic_report.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import tools -from osv import fields,osv - -class analytic_report(osv.osv): - _name = "analytic.report" - _description = "Analytic Accounts Statistics" - _auto = False - _columns = { - 'date_start': fields.date('Date Start', readonly=True), - 'date_end': fields.date('Date End', readonly=True), - 'name' : fields.char('Analytic Account', size=128, readonly=True), - 'partner_id' : fields.many2one('res.partner', 'Associated Partner', readonly=True), - 'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', readonly=True), - 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', readonly=True), - 'user_id' : fields.many2one('res.users', 'Account Manager', readonly=True), - 'product_id' : fields.many2one('product.product', 'Product', readonly=True), - 'total_quantity': fields.float('# Total Quantity', readonly=True), - 'debit' : fields.float('Debit', readonly=True), - 'credit' : fields.float('Credit', readonly=True), - 'balance' : fields.float('Balance', readonly=True), - 'year': fields.char('Year', size=4, readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'nbr':fields.integer('# of Lines', readonly=True), - 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type'), - - 'state': fields.selection([('draft','Draft'), - ('open','Open'), - ('pending','Pending'), - ('cancelled', 'Cancelled'), - ('close','Close'), - ('template', 'Template')], - 'State', readonly=True), - - } - _order = 'date_start desc' - def init(self, cr): - tools.drop_view_if_exists(cr, 'analytic_report') - cr.execute(""" - create or replace view analytic_report as ( - select - min(s.id) as id, - to_char(s.create_date, 'YYYY') as year, - to_char(s.create_date, 'MM') as month, - to_char(s.create_date, 'YYYY-MM-DD') as day, - l.journal_id, - l.product_id, - s.parent_id, - s.date_start, - s.date as date_end, - s.user_id, - s.company_id, - s.type, - s.name, - s.partner_id, - sum(s.quantity) as total_quantity, - s.debit, - s.credit, - s.balance, - count(*) as nbr, - s.state - from account_analytic_account s - left join account_analytic_line l on (s.id=l.account_id) - GROUP BY s.create_date,s.state,l.journal_id,s.name, - s.partner_id,s.date_start,s.date,s.user_id, - s.company_id,s.type, - s.debit,s.credit,s.balance,s.parent_id,l.product_id - ) - """) -analytic_report() diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index 070b3a8c10a..b3570a73da0 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -1,128 +1,6 @@ - - analytic.report.tree - analytic.report - tree - - - - - - - - - - - - - - - - - - - - - - - - - - analytic.report.search - analytic.report - search - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - account.analytic.report.graph - analytic.report - graph - - - - - - - - - - - - Analytic Accounts Analysis - analytic.report - form - tree,graph - {'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]} - - - diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index 2c22db01e53..2103eb40e76 100644 --- a/addons/account/report/account_entries_report.py +++ b/addons/account/report/account_entries_report.py @@ -24,100 +24,84 @@ from osv import fields,osv class account_entries_report(osv.osv): _name = "account.entries.report" - _description = "Entries" + _description = "Journal Items Analysis" _auto = False _rec_name = 'date' _columns = { 'date': fields.date('Effective Date', readonly=True), 'date_created': fields.date('Date Created', readonly=True), 'date_maturity': fields.date('Date Maturity', readonly=True), - 'nbr':fields.integer('# of Entries', readonly=True), - 'nbl':fields.integer('# of Lines', readonly=True), - 'amount': fields.float('Amount', readonly=True), + 'ref': fields.char('Reference', size=64, readonly=True), + 'nbr':fields.integer('# of Items', readonly=True), + 'debit':fields.float('Debit', readonly=True), + 'credit':fields.float('Credit', readonly=True), + 'balance': fields.float('Balance', readonly=True), 'year': fields.char('Year', size=4, readonly=True), - 'day': fields.char('Day', size=128, readonly=True), + 'date': fields.date('Date', size=128, readonly=True), 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), - 'ref': fields.char('Reference', size=64, readonly=True), 'period_id': fields.many2one('account.period', 'Period', readonly=True), 'account_id': fields.many2one('account.account', 'Account', readonly=True), 'journal_id': fields.many2one('account.journal', 'Journal', readonly=True), + 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'state': fields.selection([('draft','Draft'), ('posted','Posted')], 'State', readonly=True, help='When new account move is created the state will be \'Draft\'. When all the payments are done it will be in \'Posted\' state.'), 'state_2': fields.selection([('draft','Draft'), ('valid','Valid')], 'State of Move Line', readonly=True, help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'), 'partner_id': fields.many2one('res.partner','Partner', readonly=True), - 'period_id2': fields.many2one('account.period', 'Move Line Period', readonly=True), 'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'journal_id2': fields.many2one('account.journal', 'Move Line Journal', readonly=True), - 'type': fields.selection([ - ('pay_voucher','Cash Payment'), - ('bank_pay_voucher','Bank Payment'), - ('rec_voucher','Cash Receipt'), - ('bank_rec_voucher','Bank Receipt'), - ('cont_voucher','Contra'), - ('journal_sale_vou','Journal Sale'), - ('journal_pur_voucher','Journal Purchase'), - ('journal_voucher','Journal Voucher'), - ],'Type',readonly=True), 'quantity': fields.float('Products Quantity', digits=(16,2), readonly=True), + 'user_type': fields.many2one('account.account.type', 'Account Type', readonly=True), + 'type': fields.selection([ + ('receivable', 'Receivable'), + ('payable', 'Payable'), + ('view', 'View'), + ('consolidation', 'Consolidation'), + ('other', 'Others'), + ('closed', 'Closed'), + ], 'Internal Type', readonly=True, help="This type is used to differentiate types with "\ + "special effects in Open ERP: view can not have entries, consolidation are accounts that "\ + "can have children accounts for multi-company consolidations, payable/receivable are for "\ + "partners accounts (for debit/credit computations), closed for depreciated accounts."), 'company_id': fields.many2one('res.company', 'Company', readonly=True), } _order = 'date desc' - def init(self, cr): tools.drop_view_if_exists(cr, 'account_entries_report') cr.execute(""" create or replace view account_entries_report as ( - select - min(l.id) as id, - am.ref as ref, - sum(l.quantity) as quantity, - am.state as state, - l.state as state_2, - am.date as date, - count(l.id) as nbr, - count(distinct am.id) as nbl, - l.debit as amount, - to_char(am.date, 'YYYY') as year, - to_char(am.date, 'MM') as month, - to_char(am.date, 'YYYY-MM-DD') as day, - am.company_id as company_id, - l.account_id as account_id, - l.analytic_account_id as analytic_account_id, - l.date_created as date_created, - l.date_maturity as date_maturity, - am.journal_id as journal_id, - l.journal_id as journal_id2, - l.period_id as period_id2, - am.period_id as period_id, - l.partner_id as partner_id, - l.product_id as product_id, - am.type as type - from - account_move_line l - left join - account_move am on (am.id=l.move_id) - group by am.ref, - am.state, - am.date, - am.company_id, - am.journal_id, - l.journal_id, - am.period_id, - l.period_id, - am.type, - l.partner_id, - l.analytic_account_id, - l.product_id, - l.date_created, - l.date_maturity, - l.account_id, - l.state, - l.debit + select + l.id as id, + am.date as date, + l.date_maturity as date_maturity, + l.date_created as date_created, + am.ref as ref, + am.state as state, + l.state as state_2, + to_char(am.date, 'YYYY') as year, + to_char(am.date, 'MM') as month, + l.partner_id as partner_id, + l.product_id as product_id, + am.company_id as company_id, + am.journal_id as journal_id, + p.fiscalyear_id as fiscalyear_id, + am.period_id as period_id, + l.account_id as account_id, + l.analytic_account_id as analytic_account_id, + a.type as type, + a.user_type as user_type, + 1 as nbr, + l.quantity as quantity, + l.debit as debit, + l.credit as credit, + l.debit-l.credit as balance + from + account_move_line l + left join account_account a on (l.account_id = a.id) + left join account_move am on (am.id=l.move_id) + left join account_period p on (am.period_id=p.id) ) """) - account_entries_report() diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 5645c34d20c..184b087ce95 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -14,7 +14,6 @@ - @@ -23,12 +22,13 @@ - + - - - + + + + @@ -38,8 +38,8 @@ graph - - + + @@ -49,77 +49,61 @@ search - - - - - - - + + + - - + + + + + + + + + + - + - + + + + + + + - - + + - - - - - - - + - - - - - - - + - + + + - Entries Analysis + Accounting Analysis account.entries.report form tree,graph - {'search_default_This Month':1,'search_default_Journal':1,'group_by_no_leaf':1,'group_by':[]} - + {'search_default_profit': 1,'search_default_group_journal':1,'search_default_group_period': 1, 'group_by_no_leaf':1,'group_by':[]} diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po index 397104d8f9e..f51e5ef5696 100644 --- a/addons/account_voucher/i18n/es.po +++ b/addons/account_voucher/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po index dda9f7880f3..c5bcad7c68f 100644 --- a/addons/audittrail/i18n/es.po +++ b/addons/audittrail/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po index 98802efa85d..6069a1860cc 100644 --- a/addons/crm/i18n/es.po +++ b/addons/crm/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-06-27 22:27+0000\n" +"PO-Revision-Date: 2010-06-28 22:26+0000\n" "Last-Translator: Borja López Soilán (Pexego) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -2239,7 +2239,7 @@ msgstr "Creado" #. module: crm #: view:crm.lead:0 msgid "Lead Information" -msgstr "" +msgstr "Información iniciativa" #. module: crm #: model:ir.model,name:crm.model_crm_segmentation_line @@ -2264,6 +2264,8 @@ msgid "" "Helps you to encode the result of a phone call or to plan a list of phone " "calls to process." msgstr "" +"Le ayuda a registrar el resultado de una llamada telefónica o planear una " +"lista de llamadas a procesar." #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_cal_import @@ -2278,7 +2280,7 @@ msgstr "" #. module: crm #: model:crm.case.category2,name:crm.category_job3 msgid " > Bac +5" -msgstr "" +msgstr " > Bac +5" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -2559,6 +2561,8 @@ msgid "" "If the active field is set to true, it will allow you to hide the case " "without removing it." msgstr "" +"Si el campo activo está establecido a verdadero, le permitirá ocultar el " +"caso sin eliminarlo." #. module: crm #: model:ir.model,name:crm.model_crm_menu_config_wizard @@ -2637,7 +2641,7 @@ msgstr "Para asignar" #: code:addons/crm/wizard/wizard_cal_subscribe.py:0 #, python-format msgid "Please provide Proper URL !" -msgstr "" +msgstr "Por favor, ¡provea una URL adecuada!" #. module: crm #: model:process.node,note:crm.process_node_opportunities0 @@ -2764,7 +2768,7 @@ msgstr "Abierto" #. module: crm #: selection:crm.meeting,class:0 msgid "PUBLIC" -msgstr "" +msgstr "PÚBLICO" #. module: crm #: code:addons/crm/wizard/crm_job_wizard.py:0 @@ -2783,6 +2787,8 @@ msgstr "Casos llamadas" #: help:crm.case.rule,sequence:0 msgid "Gives the sequence order when displaying a list of case rules." msgstr "" +"Establece el orden de secuencia cuando se muestra una lista de reglas de " +"casos." #. module: crm #: field:crm.menu.config_wizard,helpdesk:0 @@ -2845,7 +2851,7 @@ msgstr "Nombre iniciativa" #. module: crm #: view:crm.claim:0 msgid "Claim/Action Description" -msgstr "" +msgstr "Descripción Reclamación/Acción" #. module: crm #: field:crm.case.rule,trg_max_history:0 @@ -2855,7 +2861,7 @@ msgstr "Máximo historial de comunicaciones" #. module: crm #: view:crm.lead:0 msgid "Meeting For Leads Generation" -msgstr "" +msgstr "Reunión para generación de iniciativas" #. module: crm #: wizard_view:crm.lead.opportunity_set,create_partner:0 @@ -2907,6 +2913,14 @@ msgid "" " \n" "If the case needs to be reviewed then the state is set to 'Pending'." msgstr "" +"El estado se establece a 'Borrador', cuando se crea un caso. " +" \n" +"Si el caso está en progreso el estado se establece a 'Abierto'. " +" \n" +"Cuando el caso se cierra, el estado se establece a 'Realizado'. " +" \n" +"Si el caso necesita ser revisado entonces en estado se establece a " +"'Pendiente'." #. module: crm #: view:crm.job:0 @@ -2951,12 +2965,12 @@ msgstr "Usuario responsable" #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0 #, python-format msgid "Email not sent !" -msgstr "" +msgstr "¡Correo no enviado!" #. module: crm #: wizard_field:crm.phonecall.partner_create,init,close:0 msgid "Close Phonecall" -msgstr "" +msgstr "Cerrar llamada" #. module: crm #: field:crm.case,email_last:0 @@ -2966,12 +2980,12 @@ msgstr "Último email" #. module: crm #: view:crm.case.rule:0 msgid "Regex on Communication History" -msgstr "" +msgstr "Exp. reg. en histórico de comunicaciones" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund4 msgid "Demand Draft" -msgstr "" +msgstr "Borrador demanda" #. module: crm #: field:crm.case,id:0 @@ -2987,12 +3001,12 @@ msgstr "Historial del registro" #: wizard_field:crm.lead.opportunity_set,opportunity,name:0 #: wizard_field:crm.phonecall.opportunity_set,opportunity,name:0 msgid "Opportunity Summary" -msgstr "" +msgstr "Resumen oportunidad" #. module: crm #: view:crm.case:0 msgid "Search Case" -msgstr "" +msgstr "Buscar caso" #. module: crm #: view:crm.segmentation:0 @@ -3008,7 +3022,7 @@ msgstr "Descripción del caso" #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0 #: wizard_field:crm.opportunity.reschedule_phone_call,init,user_id:0 msgid "Assign To" -msgstr "" +msgstr "Asignar a" #. module: crm #: field:crm.case,date_action_last:0 @@ -3018,7 +3032,7 @@ msgstr "Última acción" #. module: crm #: field:crm.case,duration:0 msgid "Duration" -msgstr "" +msgstr "Duración" #. module: crm #: model:ir.model,name:crm.model_report_crm_case_section_categ_stage @@ -3028,12 +3042,12 @@ msgstr "Casos por sección, categoría y fase" #. module: crm #: view:crm.job:0 msgid "Candidate Hired" -msgstr "" +msgstr "Candidato contratado" #. module: crm #: field:crm.menu.config_wizard,jobs:0 msgid "Jobs Hiring Process" -msgstr "" +msgstr "Proceso de selección de personal" #. module: crm #: model:ir.ui.menu,name:crm.next_id_52 @@ -3044,12 +3058,12 @@ msgstr "Todos los casos" #: code:addons/crm/wizard/crm_lead_wizard.py:0 #, python-format msgid "A partner is already defined on this lead." -msgstr "" +msgstr "Una empresa ya ha sido definida en esta iniciativa." #. module: crm #: view:crm.lead:0 msgid "Lead Source" -msgstr "" +msgstr "Origen iniciativa" #. module: crm #: field:report.crm.case.section.categ.categ2,nbr:0 @@ -3057,17 +3071,17 @@ msgstr "" #: field:report.crm.case.section.categ2,nbr:0 #: field:report.crm.case.section.stage,nbr:0 msgid "# of Cases" -msgstr "" +msgstr "# de casos" #. module: crm #: selection:crm.meeting,class:0 msgid "PRIVATE" -msgstr "" +msgstr "PRIVADO" #. module: crm #: wizard_view:caldav.crm.subscribe,init:0 msgid "Provide path for Remote Calendar" -msgstr "" +msgstr "Provea un camino para el calendario remoto" #. module: crm #: view:crm.segmentation:0 @@ -3078,28 +3092,28 @@ msgstr "Segmentación" #. module: crm #: view:crm.fundraising:0 msgid "Funds Form" -msgstr "" +msgstr "Formulario fondos" #. module: crm #: view:crm.meeting:0 msgid "Search Meetings" -msgstr "" +msgstr "Buscar reuniones" #. module: crm #: selection:crm.lead.opportunity_set,create_partner,action:0 #: selection:crm.phonecall.opportunity_set,create_partner,action:0 msgid "Create a new partner" -msgstr "" +msgstr "Crear una nueva empresa" #. module: crm #: field:crm.case,company_id:0 msgid "Company" -msgstr "" +msgstr "Compañía" #. module: crm #: model:crm.case.stage,name:crm.stage_lead3 msgid "In Process" -msgstr "" +msgstr "En curso" #. module: crm #: selection:crm.segmentation,state:0 @@ -3115,18 +3129,18 @@ msgstr "%(case_user)s = Nombre del responsable" #: wizard_field:crm.job.reschedule_phone_call,init,note:0 #: wizard_field:crm.opportunity.reschedule_phone_call,init,note:0 msgid "Goals" -msgstr "" +msgstr "Objetivos" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_tree #: view:report.crm.case.section.categ2:0 msgid "Cases by Section and Type" -msgstr "" +msgstr "Casos por sección y tipo" #. module: crm #: model:ir.ui.menu,name:crm.menu_aftersale msgid "After-Sale Services" -msgstr "" +msgstr "Servicios post-venta" #. module: crm #: wizard_button:caldav.crm.export,init,end:0 @@ -3134,17 +3148,17 @@ msgstr "" #: wizard_button:caldav.crm.subscribe,display,end:0 #: view:crm.email.add.cc:0 msgid "Ok" -msgstr "" +msgstr "Aceptar" #. module: crm #: wizard_field:caldav.crm.export,init,name:0 msgid "File name" -msgstr "" +msgstr "Nombre fichero" #. module: crm #: view:crm.lead:0 msgid "Search Leads" -msgstr "" +msgstr "Buscar iniciativas" #. module: crm #: help:crm.case.rule,active:0 @@ -3152,6 +3166,8 @@ msgid "" "If the active field is set to true, it will allow you to hide the case rule " "without removing it." msgstr "" +"Si el campo activo está establecido a verdadero, le permitirá ocultar la " +"regla de caso sin eliminarla." #. module: crm #: code:addons/crm/crm.py:0 @@ -3163,13 +3179,13 @@ msgstr "¡Error!" #. module: crm #: model:ir.model,name:crm.model_crm_claim_assign_wizard msgid "crm.claim.assign_wizard" -msgstr "" +msgstr "crm.reclamación.asistente_asignación" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ0_act_job #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_job msgid "All Jobs Requests" -msgstr "" +msgstr "Todas las peticiones de trabajo" #. module: crm #: selection:crm.case,state:0 @@ -3181,12 +3197,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,state:0 #: selection:report.crm.case.section.stage,state:0 msgid "Cancelled" -msgstr "" +msgstr "Cancelado" #. module: crm #: view:crm.job:0 msgid "Applied Job" -msgstr "" +msgstr "Trabajo solicitado" #. module: crm #: help:crm.meeting,exrule:0 @@ -3194,31 +3210,33 @@ msgid "" "defines a rule or repeating pattern for " "anexception to a recurrence set" msgstr "" +"define una regla o patrón repetitivo para una excepción a un conjunto " +"recurrente" #. module: crm #: view:crm.phonecall:0 msgid "Relevant" -msgstr "" +msgstr "Relevante" #. module: crm #: wizard_field:crm.case.opportunity.partner_opportunity,init,name:0 msgid "Opportunity Name" -msgstr "" +msgstr "Nombre oportunidad" #. module: crm #: field:crm.meeting,rrule:0 msgid "Recurrent Rule" -msgstr "" +msgstr "Regla recurrente" #. module: crm #: wizard_view:caldav.crm.import,init:0 msgid "Import ICS" -msgstr "" +msgstr "Importar ICS" #. module: crm #: view:crm.phonecall:0 msgid "Call Summary" -msgstr "" +msgstr "Resumen de llamadas" #. module: crm #: field:crm.segmentation.line,expr_operator:0 @@ -3233,7 +3251,7 @@ msgstr "Historial de comunicación del caso" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ msgid "Cases by Opportunities and Type" -msgstr "" +msgstr "Casos por oportunidades y tipo" #. module: crm #: view:crm.case.rule:0 @@ -3266,18 +3284,18 @@ msgstr "Expresión opcional" #. module: crm #: model:crm.case.categ,name:crm.categ_fund1 msgid "Social Rehabilitation And Rural Upliftment" -msgstr "" +msgstr "Rehabilitación social y recuperación rural" #. module: crm #: code:addons/crm/wizard/crm_job_wizard.py:0 #, python-format msgid "A partner is already defined on this job request." -msgstr "" +msgstr "Una empresa ya está definida para esta petición de trabajo" #. module: crm #: model:crm.case.stage,name:crm.stage_lead1 msgid "New" -msgstr "" +msgstr "Nuevo" #. module: crm #: field:crm.case,description:0 @@ -3301,12 +3319,12 @@ msgstr "Canal" #. module: crm #: help:crm.case.rule,act_mail_to_email:0 msgid "Email-id of the persons whom mail is to be sent" -msgstr "" +msgstr "Email-id de las personas a las que se mandará el correo" #. module: crm #: model:ir.model,name:crm.model_crm_claim msgid "Claim Cases" -msgstr "" +msgstr "Casos de reclamaciones" #. module: crm #: view:crm.case.rule:0 @@ -3321,22 +3339,22 @@ msgstr "Casos por iniciativas y fase" #. module: crm #: field:crm.meeting,exdate:0 msgid "Exception Date/Times" -msgstr "" +msgstr "Fecha/horas excepción" #. module: crm #: view:crm.meeting.generic_wizard:0 msgid "Generic Wizard" -msgstr "" +msgstr "Asistente genérico" #. module: crm #: model:process.transition,note:crm.process_transition_leadopportunity0 msgid "Creating business opportunities from Leads" -msgstr "" +msgstr "Creando oportunidades de negocio desde iniciativas" #. module: crm #: model:ir.ui.menu,name:crm.next_id_64 msgid "Reporting" -msgstr "" +msgstr "Informes" #. module: crm #: code:addons/crm/crm.py:0 @@ -3362,12 +3380,12 @@ msgstr "Pendiente" #. module: crm #: model:process.transition,name:crm.process_transition_leadopportunity0 msgid "Prospect Opportunity" -msgstr "" +msgstr "Oportunidad de prospección" #. module: crm #: view:crm.job:0 msgid "Expected Salary" -msgstr "" +msgstr "Salario esperado" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_configuration @@ -3377,54 +3395,54 @@ msgstr "Configuración" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_new_send_mail msgid "Send New Mail" -msgstr "" +msgstr "Enviar nuevo correo" #. module: crm #: constraint:ir.cron:0 msgid "Invalid arguments" -msgstr "" +msgstr "Argumentos inválidos" #. module: crm #: field:crm.meeting,transparent:0 msgid "Trensparent" -msgstr "" +msgstr "Transparente" #. module: crm #: view:crm.case:0 msgid "My Cases" -msgstr "" +msgstr "Mis casos" #. module: crm #: model:crm.case.categ,name:crm.categ_lead7 #: model:crm.case.categ,name:crm.categ_oppor7 msgid "Word of mouth" -msgstr "" +msgstr "De palabra" #. module: crm #: view:crm.lead:0 msgid "Lead Subject" -msgstr "" +msgstr "Asunto iniciativa" #. module: crm #: view:crm.lead:0 #: view:crm.phonecall:0 msgid "Convert to Opportunity" -msgstr "" +msgstr "Convertir a oportunidad" #. module: crm #: model:crm.case.stage,name:crm.stage_phone1 msgid "Planned" -msgstr "" +msgstr "Planificado" #. module: crm #: model:crm.case.category2,name:crm.category_meet3 msgid "Customer Office" -msgstr "" +msgstr "Oficina cliente" #. module: crm #: view:crm.job:0 msgid "Candidate Email" -msgstr "" +msgstr "Email candidato" #. module: crm #: view:crm.opportunity:0 @@ -3434,7 +3452,7 @@ msgstr "Fase de ventas: " #. module: crm #: view:crm.claim:0 msgid "Type of Action" -msgstr "" +msgstr "Tipo de acción" #. module: crm #: field:crm.case.rule,act_user_id:0 @@ -3444,7 +3462,7 @@ msgstr "Establecer responsable a" #. module: crm #: view:crm.job:0 msgid "Meeting With Candidates" -msgstr "" +msgstr "Reunión con candidatos" #. module: crm #: help:crm.segmentation,som_interval:0 @@ -3468,12 +3486,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "December" -msgstr "" +msgstr "Diciembre" #. module: crm #: view:report.crm.case.section.categ.categ2:0 msgid "Search Cases by User" -msgstr "" +msgstr "Buscar casos por usuario" #. module: crm #: view:crm.case.rule:0 @@ -3488,7 +3506,7 @@ msgstr "Enviar correo a empresa" #. module: crm #: view:crm.fundraising:0 msgid "Funds Tree" -msgstr "" +msgstr "Árbol de fondos" #. module: crm #: field:crm.case.rule,act_method:0 @@ -3498,7 +3516,7 @@ msgstr "Método llamada al objeto" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_category_act_fund_all1 msgid "All Funds" -msgstr "" +msgstr "Todos los fondos" #. module: crm #: field:crm.case.section,calendar:0 @@ -3510,12 +3528,12 @@ msgstr "Calendario" #. module: crm #: model:crm.case.categ,name:crm.categ_job1 msgid "Salesman" -msgstr "" +msgstr "Comercial" #. module: crm #: model:crm.case.section,name:crm.section_support_help msgid "HelpDesk" -msgstr "" +msgstr "Ayuda/Asistencia" #. module: crm #: field:crm.case,ref2:0 @@ -3532,12 +3550,12 @@ msgstr "Compra Ventas" #: model:ir.actions.wizard,name:crm.wizard_crm_job_meeting_set #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_meeting_set msgid "Schedule Meeting" -msgstr "" +msgstr "Programar reunión" #. module: crm #: model:crm.case.categ,name:crm.categ_fund4 msgid "Arts And Culture" -msgstr "" +msgstr "Arte y cultura" #. module: crm #: model:crm.case.categ,name:crm.categ_phone2 @@ -3545,7 +3563,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound msgid "Outbound" -msgstr "" +msgstr "Saliente" #. module: crm #: code:addons/crm/crm.py:0 @@ -3556,7 +3574,7 @@ msgstr "Añadir al historial" #. module: crm #: view:crm.meeting:0 msgid "Confirmed" -msgstr "" +msgstr "Confirmado" #. module: crm #: selection:crm.segmentation,state:0 @@ -3568,7 +3586,7 @@ msgstr "No ejecutado" #: wizard_field:crm.lead.opportunity_set,opportunity,probability:0 #: wizard_field:crm.phonecall.opportunity_set,opportunity,probability:0 msgid "Success Probability" -msgstr "" +msgstr "Probabilidad de éxito" #. module: crm #: code:addons/crm/crm.py:0 @@ -3593,7 +3611,7 @@ msgstr "Demora después fecha del disparo" #. module: crm #: view:crm.lead:0 msgid "Lead Details" -msgstr "" +msgstr "Detalles iniciativa" #. module: crm #: field:crm.case.rule,act_section_id:0 @@ -3623,17 +3641,17 @@ msgstr "¡Debe indicar un Email de empresa para usar esta acción!" #: wizard_view:crm.phonecall.opportunity_set,create_partner:0 #: wizard_view:crm.phonecall.partner_create,init:0 msgid "You may have to verify that this partner does not exist already." -msgstr "" +msgstr "Debería verificar que esta empresa no exista ya." #. module: crm #: view:crm.job:0 msgid "Qualication" -msgstr "" +msgstr "Cualificación" #. module: crm #: view:crm.meeting:0 msgid "Change RRule" -msgstr "" +msgstr "Cambiar regla" #. module: crm #: selection:crm.email.add.cc,name:0 @@ -3643,14 +3661,14 @@ msgstr "" #: field:report.crm.case.section.categ2,user_id:0 #: field:report.crm.case.section.stage,user_id:0 msgid "User" -msgstr "" +msgstr "Usuario" #. module: crm #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_categ2 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_categ2_tree #: view:report.crm.case.section.categ.categ2:0 msgid "Cases by Section, Category and Type" -msgstr "" +msgstr "Casos por sección, categoría y tipo" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3658,12 +3676,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "November" -msgstr "" +msgstr "Noviembre" #. module: crm #: model:crm.case.category2,name:crm.category_job2 msgid "Licenced" -msgstr "" +msgstr "Licenciado" #. module: crm #: field:crm.case.section,parent_id:0 @@ -3679,7 +3697,7 @@ msgstr "Sección padre" #: model:ir.actions.wizard,name:crm.wizard_crm_job_reschedule_phone_call #: model:ir.actions.wizard,name:crm.wizard_crm_opportunity_reschedule_phone_call msgid "Schedule Phone Call" -msgstr "" +msgstr "Planificar llamada telefónica" #. module: crm #: code:addons/crm/crm.py:0 @@ -3696,12 +3714,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "January" -msgstr "" +msgstr "Enero" #. module: crm #: model:process.process,name:crm.process_process_contractprocess0 msgid "Contract" -msgstr "" +msgstr "Contrato" #. module: crm #: field:crm.case.section,child_ids:0 @@ -3716,7 +3734,7 @@ msgstr "Ingresos previstos" #. module: crm #: model:crm.case.categ,name:crm.categ_fund3 msgid "Healthcare" -msgstr "" +msgstr "Servicios sanitarios" #. module: crm #: view:crm.case:0 @@ -3730,7 +3748,7 @@ msgstr "" #: view:crm.phonecall:0 #: view:crm.phonecall.assign_wizard:0 msgid "Assign" -msgstr "" +msgstr "Asignar" #. module: crm #: field:crm.case,partner_address_id:0 @@ -3740,12 +3758,12 @@ msgstr "Contacto empresa" #. module: crm #: model:crm.case.category2,name:crm.category_meet1 msgid "Office" -msgstr "" +msgstr "Oficina" #. module: crm #: model:ir.model,name:crm.model_crm_fundraising msgid "Fund Raising Cases" -msgstr "" +msgstr "Casos de reunión de fondos" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage @@ -3774,7 +3792,7 @@ msgstr "Cerrado" #. module: crm #: model:ir.model,name:crm.model_crm_helpdesk_assign_wizard msgid "crm.helpdesk.assign_wizard" -msgstr "" +msgstr "crm.asistencia.aistente_asignación" #. module: crm #: view:crm.case.rule:0 @@ -3790,28 +3808,28 @@ msgstr "Código de sección" #: wizard_field:crm.job.meeting_set,init,date:0 #: wizard_field:crm.phonecall.meeting_set,init,date:0 msgid "Meeting date" -msgstr "" +msgstr "Fecha reunión" #. module: crm #: selection:crm.meeting,class:0 msgid "CONFIDENTIAL" -msgstr "" +msgstr "CONFIDENCIAL" #. module: crm #: help:crm.case.rule,act_mail_body:0 msgid "Content of mail" -msgstr "" +msgstr "Contenido del correo" #. module: crm #: model:crm.case.stage,name:crm.stage_meet2 msgid "Not fixed" -msgstr "" +msgstr "No corregido" #. module: crm #: model:crm.case.categ,name:crm.categ_lead3 #: model:crm.case.categ,name:crm.categ_oppor3 msgid "Employee" -msgstr "" +msgstr "Empleado" #. module: crm #: field:crm.case,email_from:0 @@ -3821,7 +3839,7 @@ msgstr "Email empresa" #. module: crm #: view:crm.case.rule:0 msgid "% = The '%' Character" -msgstr "" +msgstr "% = EL '%' caracter" #. module: crm #: view:crm.case:0 @@ -3842,12 +3860,12 @@ msgstr "Descripción" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "May" -msgstr "" +msgstr "Mayo" #. module: crm #: view:crm.job:0 msgid "Internal Notes" -msgstr "" +msgstr "Notas internas" #. module: crm #: help:crm.case.rule,act_remind_user:0 @@ -3867,7 +3885,7 @@ msgstr "" #: view:crm.opportunity:0 #: wizard_field:crm.send.mail,init,cc:0 msgid "CC" -msgstr "" +msgstr "CC" #. module: crm #: field:crm.segmentation.line,operator:0 @@ -3877,7 +3895,7 @@ msgstr "Obligatorio / Opcional" #. module: crm #: wizard_button:caldav.crm.import,init,open:0 msgid "_Import" -msgstr "" +msgstr "_Importar" #. module: crm #: code:addons/crm/crm.py:0 @@ -3910,14 +3928,14 @@ msgstr "Muy bajo" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "February" -msgstr "" +msgstr "Febrero" #. module: crm #: view:crm.phonecall:0 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_case #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner msgid "Schedule a Meeting" -msgstr "" +msgstr "Planificar una reunión" #. module: crm #: view:crm.case.rule:0 @@ -3937,7 +3955,7 @@ msgstr "" #: wizard_view:crm.new.send.mail,init:0 #: wizard_view:crm.send.mail,init:0 msgid "Mass Mailing" -msgstr "" +msgstr "Envío masivo de correo" #. module: crm #: view:crm.case.rule:0 @@ -3950,22 +3968,22 @@ msgstr "Acciones de Email" #: field:report.crm.case.section.categ2,name:0 #: field:report.crm.case.section.stage,name:0 msgid "Year" -msgstr "" +msgstr "Año" #. module: crm #: model:crm.case.category2,name:crm.categ2_fund1 msgid "Cash" -msgstr "" +msgstr "Efectivo" #. module: crm #: view:crm.fundraising:0 msgid "Funds by Categories" -msgstr "" +msgstr "Fondos por categorías" #. module: crm #: model:process.node,note:crm.process_node_leads0 msgid "Very first contact with new prospect" -msgstr "" +msgstr "Primer contacto con nueva prospección" #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3973,22 +3991,22 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "April" -msgstr "" +msgstr "Abril" #. module: crm #: model:crm.case.stage,name:crm.stage_meet5 msgid "Future" -msgstr "" +msgstr "Futuro" #. module: crm #: wizard_field:caldav.crm.export,init,file_path:0 msgid "Save ICS file" -msgstr "" +msgstr "Guardar archivo ICS" #. module: crm #: wizard_field:caldav.crm.subscribe,init,url_path:0 msgid "Provide path for remote calendar" -msgstr "" +msgstr "Provea una ruta para el calendario remoto" #. module: crm #: view:crm.case.log:0 @@ -4003,12 +4021,12 @@ msgstr "Condiciones sobre temporización" #. module: crm #: model:ir.model,name:crm.model_crm_helpdesk msgid "Helpdesk Cases" -msgstr "" +msgstr "Casos de asistencia" #. module: crm #: model:ir.actions.wizard,name:crm.wizard_crm_cal_export msgid "Export ICS File" -msgstr "" +msgstr "Exportar archivo ICS" #. module: crm #: field:crm.case.rule,sequence:0 @@ -4021,12 +4039,12 @@ msgstr "Secuencia" #: wizard_view:caldav.crm.import,init:0 #: wizard_field:caldav.crm.import,init,file_path:0 msgid "Select ICS file" -msgstr "" +msgstr "Exportar archivo ICS" #. module: crm #: wizard_view:caldav.crm.import,display:0 msgid "Import Message" -msgstr "" +msgstr "Importar mensaje" #. module: crm #: field:crm.segmentation.line,expr_name:0 @@ -4042,17 +4060,17 @@ msgstr "Casos por sección" #. module: crm #: view:crm.job:0 msgid "New Jobs" -msgstr "" +msgstr "Nuevos trabajos" #. module: crm #: field:crm.menu.config_wizard,fund:0 msgid "Fund Raising Operations" -msgstr "" +msgstr "Operaciones de obtención de fondos" #. module: crm #: model:crm.case.category2,name:crm.category_lead8 msgid "Newsletter" -msgstr "" +msgstr "Boletín de noticias" #~ msgid "My Draft " #~ msgstr "Mis borradores " diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index c20ea9b48b9..1372553a7b7 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -222,6 +222,7 @@ diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po index 4559c5b1ada..05c2d723edd 100644 --- a/addons/event/i18n/es.po +++ b/addons/event/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: event diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index 071d26a0c74..15744987ec8 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -235,19 +235,20 @@ class mailgate_tool(osv.osv_memory): if message_forward: # TODO: we need an interface for this for all types of objects, not just leads - if hasattr(res, 'section'): + if hasattr(res, 'section_id'): del msg['reply-to'] - msg['reply-to'] = res.section.email_from + msg['reply-to'] = res.section_id.reply_to - if not tools.misc._email_send(msg, openobject_id=res.id) and email_error: + smtp_from = self.to_email(msg['from']) + if not tools.misc._email_send(smtp_from, message_forward, msg, openobject_id=res.id) and email_error: subj = msg['subject'] del msg['subject'], msg['to'], msg['cc'], msg['bcc'] msg['subject'] = '[OpenERP-Forward-Failed] %s' % subj msg['to'] = email_error - tools.misc._email_send(msg, openobject_id=res.id) + tools.misc._email_send(smtp_from, self.to_email(email_error), msg, openobject_id=res.id) def process_email(self, cr, uid, model, message, attach=True, context=None): - """This function Processes email and create record for given OpenERP model + """This function Processes email and create record for given OpenERP model @param self: The object pointer @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, diff --git a/addons/partner_geo_assign/partner_geo_assign.py b/addons/partner_geo_assign/partner_geo_assign.py index e0a0d49f603..2407268fbcf 100644 --- a/addons/partner_geo_assign/partner_geo_assign.py +++ b/addons/partner_geo_assign/partner_geo_assign.py @@ -23,6 +23,7 @@ from osv import osv from osv import fields import urllib,re import random, time +from tools.translate import _ def geo_find(addr): import urllib,re @@ -82,7 +83,7 @@ class crm_lead(osv.osv): if lead.partner_assigned_id.address: email = lead.partner_assigned_id.address[0].email if not email: - raise osv.except_osv(_('Error !'), _('No partner assigned to this opportunity')) + raise osv.except_osv(_('Error !'), _('No email on the partner assigned to this opportunity')) forward = fobj.create(cr, uid, { 'name': 'email', 'history': 'whole', diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po index b0f799cc608..82a676836ec 100644 --- a/addons/product/i18n/es.po +++ b/addons/product/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po index 2b3f27f0de1..0e95299de0d 100644 --- a/addons/product_expiry/i18n/es.po +++ b/addons/product_expiry/i18n/es.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product_expiry diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po index 42f8bdc2629..05a8392bbfe 100644 --- a/addons/product_manufacturer/i18n/es.po +++ b/addons/product_manufacturer/i18n/es.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product_electronic diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po index cc32edbe876..e552228897d 100644 --- a/addons/project_gtd/i18n/zh_CN.po +++ b/addons/project_gtd/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: project_gtd diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po index f5f267875ca..5d2817349d4 100644 --- a/addons/project_retro_planning/i18n/zh_TW.po +++ b/addons/project_retro_planning/i18n/zh_TW.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: project_retro_planning diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po index f49b031bfd4..9f5827c5e68 100644 --- a/addons/purchase/i18n/es.po +++ b/addons/purchase/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: purchase diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po index a1ce96418b5..d4287dc9b7e 100644 --- a/addons/sale_analytic_plans/i18n/zh_TW.po +++ b/addons/sale_analytic_plans/i18n/zh_TW.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_analytic_plans diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po index c2bfada3ab3..f3af787b5ff 100644 --- a/addons/sale_journal/i18n/es.po +++ b/addons/sale_journal/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-06-29 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_journal