pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: merging from the same branch

Browse Source 
bzr revid: mga@tinyerp.com-20100628115113-6mcy4gxjunu42mis
This commit is contained in:
Mantavya Gajjar
2010-06-28 17:21:13 +05:30
parent aca407a77f 13917f92e0
commit 69ea761e14
25 changed files with 419 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_bank_statement.py
+15 -2
View File
@@ -303,6 +303,13 @@ class account_bank_statement(osv.osv):
_('Ledger Posting line "%s" is not valid') % line.name)
if move.reconcile_id and move.reconcile_id.line_ids:
## Search if move has already a partial reconciliation
previous_partial = False
for line_reconcile_move in move.reconcile_id.line_ids:
if line_reconcile_move.reconcile_partial_id:
previous_partial = True
break
##
torec += map(lambda x: x.id, move.reconcile_id.line_ids)
#try:
if abs(move.reconcile_amount-move.amount)<0.0001:
@@ -312,8 +319,14 @@ class account_bank_statement(osv.osv):
for entry in move.reconcile_id.line_new_ids:
writeoff_acc_id = entry.account_id.id
break
account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
## If we have already a partial reconciliation
## We need to make a partial reconciliation
## To add this amount to previous paid amount
if previous_partial:
account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
## If it's the first reconciliation, we do a full reconciliation as regular
else:
account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
else:
account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
#except:
addons/account_voucher/i18n/es.po
+4 -4
View File
@@ -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: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 09:23+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-06-27 21:01+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-22 04:17+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
@@ -215,7 +215,7 @@ msgstr "Estado"
#: selection:account.voucher.line,type:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Debit"
msgstr "Débito"
msgstr "Debe"
#. module: account_voucher
#: field:account.voucher,type:0
addons/audittrail/i18n/es.po
+6 -7
View File
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 08:59+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"PO-Revision-Date: 2010-06-27 21:04+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-22 04:16+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
@@ -83,7 +82,7 @@ msgstr "Ver registro"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log_line
msgid "audittrail.log.line"
msgstr "audittrail.registro.linea"
msgstr "auditoria.registro.linea"
#. module: audittrail
#: field:audittrail.log,method:0
@@ -212,7 +211,7 @@ msgstr "Reglas de auditoría"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_rule
msgid "audittrail.rule"
msgstr "audittrail.regla"
msgstr "auditoria.regla"
#. module: audittrail
#: view:audittrail.rule:0
@@ -227,7 +226,7 @@ msgstr "Registrar escrituras"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log
msgid "audittrail.log"
msgstr "audittrail.registro"
msgstr "auditoria.registro"
#. module: audittrail
#: field:audittrail.log.line,field_description:0
addons/base_calendar/security/ir.model.access.csv
+4 -8
View File
@@ -1,9 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_calendar_attendee","calendar.attendee","model_calendar_attendee",base.group_user,1,1,1,1
"access_calendar_alarm","calendar.alarm","model_calendar_alarm",base.group_user,1,1,1,1
"access_res_alarm","res.alarm","model_res_alarm",base.group_user,1,1,1,1
"access_calendar_event_all","calendar.event","model_calendar_event",base.group_user,1,1,1,1
"access_calendar_todo","calendar.todo","model_calendar_todo",base.group_user,1,1,1,1
"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",base.group_user,1,1,1,1
"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",base.group_user,1,1,1,1
"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",base.group_user,1,1,1,1
"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_calendar_attendee calendar.attendee model_calendar_attendee base.group_user 1 1 1 1
3 access_calendar_alarm calendar.alarm model_calendar_alarm base.group_user 1 1 1 1
4 access_res_alarm res.alarm model_res_alarm base.group_user 1 1 1 1
5 access_calendar_event_all access_calendar_todo calendar.event calendar.todo model_calendar_event model_calendar_todo base.group_user 1 1 1 1
access_calendar_todo calendar.todo model_calendar_todo base.group_user 1 1 1 1
access_base_calendar_invite_attendee base_calendar.invite.attendee model_base_calendar_invite_attendee base.group_user 1 1 1 1
access_calendar_event_edit_all calendar_event_edit_all model_calendar_event_edit_all base.group_user 1 1 1 1
access_base_calendar_set_exrule base.calendar.set.exrule model_base_calendar_set_exrule base.group_user 1 1 1 1
addons/crm/__openerp__.py
+3 -3
View File
@@ -70,6 +70,9 @@ Create dashboard for CRM that includes:
'crm_phonecall_data.xml',
],
'update_xml': [
'security/crm_security.xml',
'security/ir.model.access.csv',
'wizard/crm_lead_to_partner_view.xml',
'wizard/crm_lead_to_opportunity_view.xml',
@@ -97,9 +100,6 @@ Create dashboard for CRM that includes:
'crm_opportunity_view.xml',
'crm_opportunity_menu.xml',
'security/crm_security.xml',
'security/ir.model.access.csv',
'report/crm_lead_report_view.xml',
'report/crm_phonecall_report_view.xml',
addons/crm/crm_phonecall_menu.xml
+2 -2
View File
@@ -67,7 +67,7 @@
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
<field name="context">{'set_editable':True,'default_state':'open','search_default_current':1,'search_default_today':1}</field>
<field name="context" eval="'{\'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
</record>
@@ -103,7 +103,7 @@
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/>
<field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
<field name="context">{'default_state':'open','search_default_current':1}</field>
<field name="context" eval="'{\'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
</record>
addons/crm/crm_phonecall_view.xml
+5 -2
View File
@@ -204,8 +204,11 @@
<tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
<field name="date" string="Date"/>
<field name="name" string="Call Summary"/>
<field name="partner_id" string="Partner"/>
<field name="partner_contact"/>
<field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)"
string="Partner" />
<field name="partner_address_id" string="Contact"
on_change="onchange_partner_address_id(partner_address_id, email_from)" />
<field name="partner_phone"/>
<field name="user_id"/>
<field name="state" invisible="1"/>
addons/crm/crm_view.xml
+4
View File
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.menu" id="base.menu_base_config">
<field eval="[(4, ref('crm.group_crm_manager'))]" name="groups_id"/>
</record>
<menuitem id="base.menu_crm_config_sales" name="Sales"
parent="base.menu_base_config" sequence="1"/>
addons/crm/i18n/es.po
+40 -40
View File
@@ -7,14 +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-23 17:20+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"PO-Revision-Date: 2010-06-27 22:27+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-26 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -2302,7 +2301,7 @@ msgstr "Email empleado"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting
msgid "Meeting Cases"
msgstr ""
msgstr "Casos reuniones"
#. module: crm
#: view:crm.job:0
@@ -2322,7 +2321,7 @@ msgstr "Trabajos"
#. module: crm
#: view:crm.case.rule:0
msgid "%(case_date)s = Creation date"
msgstr ""
msgstr "%(case_date)s = Fecha de creación"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone3
@@ -2348,12 +2347,12 @@ msgstr "Correctivo"
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity
msgid "Opportunity Cases"
msgstr ""
msgstr "Casos oportunidades"
#. module: crm
#: view:crm.case:0
msgid "Support Query"
msgstr ""
msgstr "Petición de soporte"
#. module: crm
#: view:crm.case.rule:0
@@ -2387,7 +2386,7 @@ msgstr "Enviar correo"
#. module: crm
#: wizard_view:crm.new.send.mail,init:0
msgid "Set case state to"
msgstr ""
msgstr "Establecer estado del caso a"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund3
@@ -2474,7 +2473,7 @@ msgstr "Cerrado"
#. module: crm
#: view:crm.job:0
msgid "Candidate Name2"
msgstr ""
msgstr "Nombre 2 candidato"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2516,32 +2515,32 @@ msgstr ""
#. module: crm
#: field:crm.meeting,freebusy:0
msgid "FreeBusy"
msgstr ""
msgstr "LibreOcupado"
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet1
msgid "Customer Meeting"
msgstr ""
msgstr "Reunión de cliente"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc2:0
msgid "Attachment2"
msgstr ""
msgstr "Adjunto 2"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc3:0
msgid "Attachment3"
msgstr ""
msgstr "Adjunto 3"
#. module: crm
#: view:crm.job:0
msgid "Degree"
msgstr ""
msgstr "Grado"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc1:0
msgid "Attachment1"
msgstr ""
msgstr "Adjunto 1"
#. module: crm
#: code:addons/crm/crm_phonecall.py:0
@@ -2610,7 +2609,7 @@ msgstr ">"
#. module: crm
#: view:crm.job:0
msgid "Candidate Phone"
msgstr ""
msgstr "Teléfono candidato"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
@@ -2632,7 +2631,7 @@ msgstr "Meses"
#: model:ir.actions.act_window,name:crm.action_crm_opportunity_assign_wizard
#: model:ir.actions.act_window,name:crm.action_crm_phonecall_assign_wizard
msgid "To Assign"
msgstr ""
msgstr "Para asignar"
#. module: crm
#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
@@ -2649,6 +2648,7 @@ msgstr "Cuando un proyecto/oportunidad real es detectado"
#: wizard_view:crm.job.partner_create,init:0
msgid "Are you sure you want to create a partner based on this job request ?"
msgstr ""
"Está seguro de que desea crear una empresa basada en esta solicitud laboral ?"
#. module: crm
#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
@@ -2675,12 +2675,12 @@ msgstr "Disminuir (0>1)"
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_case_history_event
msgid "History of Events"
msgstr ""
msgstr "Histórico de eventos"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_category2
msgid "Category2 of case"
msgstr ""
msgstr "Categoría 2 del caso"
#. module: crm
#: wizard_field:crm.new.send.mail,init,to:0
@@ -2718,7 +2718,7 @@ msgstr "Reciclado"
#: model:crm.case.categ,name:crm.categ_lead8
#: model:crm.case.categ,name:crm.categ_oppor8
msgid "Other"
msgstr ""
msgstr "Otro"
#. module: crm
#: view:crm.case:0
@@ -2728,7 +2728,7 @@ msgstr ""
#: selection:crm.new.send.mail,init,state:0
#: view:crm.opportunity:0
msgid "Done"
msgstr ""
msgstr "Hecho"
#. module: crm
#: field:crm.segmentation,som_interval_max:0
@@ -2777,7 +2777,7 @@ msgstr "Ya existe una empresa con el mismo nombre."
#. module: crm
#: model:ir.model,name:crm.model_crm_phonecall
msgid "Phonecall Cases"
msgstr ""
msgstr "Casos llamadas"
#. module: crm
#: help:crm.case.rule,sequence:0
@@ -2787,7 +2787,7 @@ msgstr ""
#. module: crm
#: field:crm.menu.config_wizard,helpdesk:0
msgid "Helpdesk"
msgstr ""
msgstr "Asistencia/Ayuda"
#. module: crm
#: field:crm.case,user_id:0
@@ -2809,18 +2809,18 @@ msgstr "Responsable"
#: model:crm.case.stage,name:crm.stage_claim4
#: model:crm.case.stage,name:crm.stage_meet3
msgid "Invalid"
msgstr ""
msgstr "Inválido"
#. module: crm
#: wizard_button:crm.job.meeting_set,init,order:0
#: wizard_button:crm.phonecall.meeting_set,init,order:0
msgid "Set Meeting"
msgstr ""
msgstr "Fijar reunión"
#. module: crm
#: field:crm.menu.config_wizard,meeting:0
msgid "Calendar of Meetings"
msgstr ""
msgstr "Calendario de reuniones"
#. module: crm
#: view:crm.case:0
@@ -2840,7 +2840,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Lead Name"
msgstr ""
msgstr "Nombre iniciativa"
#. module: crm
#: view:crm.claim:0
@@ -2861,22 +2861,22 @@ msgstr ""
#: wizard_view:crm.lead.opportunity_set,create_partner:0
#: wizard_view:crm.lead.partner_create,init:0
msgid "Are you sure you want to create a partner based on this lead ?"
msgstr ""
msgstr "¿Está seguro que quiere crear una empresa basada en esta iniciativa?"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job6
msgid "Refused by Employee"
msgstr ""
msgstr "Rechazado por el empleado"
#. module: crm
#: field:crm.case,partner_name:0
msgid "Employee's Name"
msgstr ""
msgstr "Nombre del empleado"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job2
msgid "First Interview"
msgstr ""
msgstr "Primera entrevista"
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -2884,17 +2884,17 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Month"
msgstr ""
msgstr "Este mes"
#. module: crm
#: view:crm.job:0
msgid "Availability (weeks)"
msgstr ""
msgstr "Disponibilidad (semanas)"
#. module: crm
#: view:crm.opportunity:0
msgid "Opportunities Tree"
msgstr ""
msgstr "Árbol de oportunidades"
#. module: crm
#: help:crm.case,state:0
@@ -2911,12 +2911,12 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Open Jobs"
msgstr ""
msgstr "Trabajos abiertos"
#. module: crm
#: selection:crm.email.add.cc,name:0
msgid "Email Address"
msgstr ""
msgstr "Correo electrónico"
#. module: crm
#: help:crm.segmentation,som_interval_max:0
@@ -2930,17 +2930,17 @@ msgstr ""
#. module: crm
#: field:crm.case,case_id:0
msgid "Related Case"
msgstr ""
msgstr "Caso relacionado"
#. module: crm
#: field:crm.case.rule,server_action_id:0
msgid "Server Action"
msgstr ""
msgstr "Acción servidor"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ_claim0
msgid "All Claims"
msgstr ""
msgstr "Todas las reclamaciones"
#. module: crm
#: field:crm.case.log,user_id:0
addons/crm/security/ir.model.access.csv
+14 -5
View File
@@ -4,9 +4,13 @@
"access_crm_segmentation","crm.segmentation","model_crm_segmentation","crm.group_crm_manager",1,1,1,1
"access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1
"access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0
"access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0
"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","crm.group_crm_manager",1,1,1,1
"access_crm_lead_manager","crm.lead.manager","model_crm_lead","crm.group_crm_manager",1,1,1,1
"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
"access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_user",1,1,1,1
"access_crm_meeting_all","crm.meeting"_allll,"model_crm_meeting","base.group_user",1,0,0,0
"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
"access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_user",1,1,1,1
"access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0
"access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_user",1,1,1,1
@@ -19,12 +23,17 @@
"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
"access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1
"access_crm_lead_report_user","crm.lead.report.user","model_crm_lead_report","crm.group_crm_user",1,0,0,0
"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
"access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","crm.group_crm_manager",1,0,0,0
"access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_manager",1,0,0,0
"access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
"access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1
"access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
"access_crm_installer","crm.installer.rule","model_crm_installer","base.group_system",1,1,1,1
"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","crm.group_crm_manager",1,0,1,0
"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","crm.group_crm_manager",1,0,1,0
"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","crm.group_crm_manager",1,0,0,0
"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","crm.group_crm_manager",1,1,1,1
"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","crm.group_crm_manager",1,1,1,1
"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","crm.group_crm_user",1,1,1,0
"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","crm.group_crm_manager",1,1,1,1
"access_res_partner","res.partner.crm.user","base.model_res_partner","crm.group_crm_user",1,0,0,0
"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","crm.group_crm_user",1,0,0,0
"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","crm.group_crm_user",1,0,0,0
Can't render this file because it contains an unexpected character in line 9 and column 38.
addons/crm/wizard/crm_send_email.py
+1 -1
View File
@@ -207,7 +207,7 @@ class crm_send_new_email(osv.osv_memory):
res_id = hist.res_id
case = model_pool.browse(cr, uid, res_id)
if 'email_to' in fields:
res.update({'email_to': case.email_from or hist.email_from or False})
res.update({'email_to': hist.email_from or False})
if 'email_from' in fields:
res.update({'email_from': user_mail_from})
addons/crm_claim/security/ir.model.access.csv
+4 -2
View File
@@ -1,3 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_crm_claim","crm.claim","model_crm_claim","crm.group_crm_manager",1,1,1,1
"access_crm_claim_report_user","crm.claim.report","model_crm_claim_report","crm.group_crm_user",1,0,0,0
"access_crm_claim_manager","crm.claim.manager","model_crm_claim","crm.group_crm_manager",1,1,1,1
"access_crm_claim_user","crm.claim.user","model_crm_claim","crm.group_crm_user",1,1,1,1
"access_crm_claim_report_user","crm.claim.report.user","model_crm_claim_report","crm.group_crm_user",1,0,0,0
"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","crm.group_crm_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_crm_claim access_crm_claim_manager crm.claim crm.claim.manager model_crm_claim crm.group_crm_manager 1 1 1 1
3 access_crm_claim_report_user access_crm_claim_user crm.claim.report crm.claim.user model_crm_claim_report model_crm_claim crm.group_crm_user 1 0 1 0 1 0 1
4 access_crm_claim_report_user crm.claim.report.user model_crm_claim_report crm.group_crm_user 1 0 0 0
5 access_crm_claim_report_manager crm.claim.report.manager model_crm_claim_report crm.group_crm_manager 1 0 0 0
addons/crm_fundraising/security/ir.model.access.csv
+4 -2
View File
@@ -1,3 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_crm_fundraising","crm.fundraising","model_crm_fundraising","crm.group_crm_manager",1,1,1,1
"access_crm_fundraising_report_user","crm.fundraising.report","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0
"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","crm.group_crm_manager",1,1,1,1
"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","crm.group_crm_user",1,1,1,1
"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0
"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","crm.group_crm_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_crm_fundraising access_crm_fundraising_manager crm.fundraising crm.fundraising.manager model_crm_fundraising crm.group_crm_manager 1 1 1 1
3 access_crm_fundraising_report_user access_crm_fundraising_user crm.fundraising.report crm.fundraising.user model_crm_fundraising_report model_crm_fundraising crm.group_crm_user 1 0 1 0 1 0 1
4 access_crm_fundraising_report_user crm.fundraising.report.user model_crm_fundraising_report crm.group_crm_user 1 0 0 0
5 access_crm_fundraising_report_manager crm.fundraising.report.manager model_crm_fundraising_report crm.group_crm_manager 1 0 0 0
addons/crm_helpdesk/security/ir.model.access.csv
+4 -2
View File
@@ -1,3 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_crm_helpdesk","crm.helpdesk","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1
"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","crm.group_crm_user",1,1,1,1
"access_report_crm_helpdesk_user","report.crm.helpdesk.user","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","crm.group_crm_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_crm_helpdesk access_crm_helpdesk_manager crm.helpdesk crm.helpdesk.manager model_crm_helpdesk crm.group_crm_manager 1 1 1 1
3 access_report_crm_helpdesk access_crm_helpdesk_user report.crm.helpdesk crm.helpdesk.user model_crm_helpdesk_report model_crm_helpdesk crm.group_crm_user 1 1 1 1
4 access_report_crm_helpdesk_user report.crm.helpdesk.user model_crm_helpdesk_report crm.group_crm_user 1 1 1 1
5 access_report_crm_helpdesk_manager report.crm.helpdesk.manager model_crm_helpdesk_report crm.group_crm_manager 1 1 1 1
addons/event/i18n/es.po
+123 -102
View File
@@ -7,111 +7,110 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-01-26 17:13+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"PO-Revision-Date: 2010-06-27 22:00+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-22 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: event
#: field:event.event,date_end:0
#: field:report.event.registration,date_end:0
msgid "Ending date"
msgstr ""
msgstr "Fecha de finalización"
#. module: event
#: field:event.event,register_min:0
msgid "Minimum Registrations"
msgstr ""
msgstr "Registros mínimos"
#. module: event
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nombre de modelo inválido en la definición de acción."
#. module: event
#: field:event.event,mail_registr:0
msgid "Registration Email"
msgstr ""
msgstr "Email de registro"
#. module: event
#: model:crm.case.section,name:event.event_0_crm_case_section
msgid "Concert of Bon Jovi"
msgstr ""
msgstr "Concierto de Bon Jovi"
#. module: event
#: field:event.event,mail_confirm:0
msgid "Confirmation Email"
msgstr ""
msgstr "Email de confirmación"
#. module: event
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
msgstr ""
msgstr "¡Error! No puede crear secciones recursivas."
#. module: event
#: model:ir.model,name:event.model_event_registration
msgid "Event Registration"
msgstr ""
msgstr "Registro evento"
#. module: event
#: model:ir.actions.wizard,name:event.event_reg_invoice
msgid "Make Invoice"
msgstr ""
msgstr "Crear factura"
#. module: event
#: field:report.event.type.registration,draft_state:0
msgid "Draft Registrations"
msgstr ""
msgstr "Registros borrador"
#. module: event
#: view:report.event.registration:0
msgid "Event on Registration"
msgstr ""
msgstr "Evento en el registro"
#. module: event
#: wizard_button:event.reg_make_invoice,init,end:0
msgid "Ok"
msgstr ""
msgstr "Aceptar"
#. module: event
#: field:event.event,mail_auto_confirm:0
msgid "Mail Auto Confirm"
msgstr ""
msgstr "Enviar correo auto confirmación"
#. module: event
#: model:product.template,name:event.event_product_1_product_template
msgid "Ticket for Opera"
msgstr ""
msgstr "Entrada para la ópera"
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
msgid "Invoice Rejected"
msgstr ""
msgstr "Factura rechazada"
#. module: event
#: view:event.event:0
msgid "Confirm Event"
msgstr ""
msgstr "Confirmar evento"
#. module: event
#: model:crm.case.section,name:event.event_1_crm_case_section
msgid "Opera of Verdi"
msgstr ""
msgstr "Ópera de Verdi"
#. module: event
#: field:report.event.registration,draft_state:0
msgid "Draft Registration"
msgstr ""
msgstr "Registro borrador"
#. module: event
#: wizard_view:event.reg_make_invoice,init:0
msgid "Create Invoices"
msgstr ""
msgstr "Crear facturas"
#. module: event
#: model:ir.module.module,description:event.module_meta_information
@@ -131,22 +130,36 @@ msgid ""
"event or per event category in :\n"
" Events / Reporting\n"
msgstr ""
"Organización y planificación de eventos.\n"
"\n"
" Este módulo le permite\n"
" * gestionar sus eventos y sus registros\n"
" * usar emails para confirmar automáticamente y enviar confirmaciones "
"para cualquier registro a un evento\n"
" * ...\n"
"\n"
" Note that:\n"
" - You can define new types of events in\n"
" Events / Configuration / Types of Events\n"
" - You can access predefined reports about number of registration per "
"event or per event category in :\n"
" Events / Reporting\n"
#. module: event
#: view:event.registration:0
msgid "Extra Info"
msgstr ""
msgstr "Información extra"
#. module: event
#: view:event.registration:0
msgid "Registration"
msgstr ""
msgstr "Registro"
#. module: event
#: field:event.type,name:0
#: model:ir.model,name:event.model_event_type
msgid "Event type"
msgstr ""
msgstr "Tipo de evento"
#. module: event
#: view:event.event:0
@@ -154,54 +167,54 @@ msgstr ""
#: model:ir.module.module,shortdesc:event.module_meta_information
#: field:report.event.registration,name:0
msgid "Event"
msgstr ""
msgstr "Evento"
#. module: event
#: selection:event.event,state:0
msgid "Confirmed"
msgstr ""
msgstr "Confirmado"
#. module: event
#: wizard_view:event.confirm_registration,split:0
msgid "Registration Confirmation"
msgstr ""
msgstr "Confirmación del registro"
#. module: event
#: view:event.registration:0
msgid "Dates"
msgstr ""
msgstr "Fechas"
#. module: event
#: field:event.event,register_current:0
#: model:ir.actions.act_window,name:event.action_registration_confirm
#: model:ir.ui.menu,name:event.menu_action_registration_confirm
msgid "Confirmed Registrations"
msgstr ""
msgstr "Registros confirmados"
#. module: event
#: field:event.event,mail_auto_registr:0
msgid "Mail Auto Register"
msgstr ""
msgstr "Enviar correo auto registro"
#. module: event
#: view:event.registration:0
msgid "Badge"
msgstr ""
msgstr "Distintivo"
#. module: event
#: field:event.event,section_id:0
msgid "Case section"
msgstr ""
msgstr "Sección del caso"
#. module: event
#: field:event.registration,tobe_invoiced:0
msgid "To be Invoiced"
msgstr ""
msgstr "Para ser facturado"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_event
msgid "All Events"
msgstr ""
msgstr "Todos los eventos"
#. module: event
#: model:ir.ui.menu,name:event.menu_report_event
@@ -211,34 +224,34 @@ msgstr "Informe"
#. module: event
#: view:event.registration:0
msgid "Cancel Registration"
msgstr ""
msgstr "Cancelar registro"
#. module: event
#: model:ir.ui.menu,name:event.menu_action_event_categories
msgid "Events by Categories"
msgstr ""
msgstr "Eventos por categorías"
#. module: event
#: wizard_view:event.confirm_registration,split:0
msgid "The event limit is reached. What do you want to do?"
msgstr ""
msgstr "Se ha alcanzado el límite del evento. ¿Qué desea hacer?"
#. module: event
#: field:report.event.type.registration,confirm_state:0
msgid "Confirm Registrations"
msgstr ""
msgstr "Confirmar registros"
#. module: event
#: view:event.registration:0
msgid "References"
msgstr ""
msgstr "Referencias"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_type_registration
#: model:ir.ui.menu,name:event.menu_report_event_type_registration
#: view:report.event.type.registration:0
msgid "Registration By Event Types"
msgstr ""
msgstr "Registro por tipos de evento"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_config
@@ -253,7 +266,7 @@ msgstr "¡XML inválido para la definición de la vista!"
#. module: event
#: wizard_button:event.confirm_registration,split,confirm:0
msgid "Confirm Anyway"
msgstr ""
msgstr "Confirmar de todos modos"
#. module: event
#: constraint:product.template:0
@@ -263,75 +276,75 @@ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
#. module: event
#: view:event.event:0
msgid "Parent Category"
msgstr ""
msgstr "Categoría padre"
#. module: event
#: view:event.registration:0
msgid "Registration Invoiced"
msgstr ""
msgstr "Registro facturado"
#. module: event
#: field:report.event.type.registration,nbevent:0
msgid "Number Of Events"
msgstr ""
msgstr "Número de eventos"
#. module: event
#: view:event.event:0
msgid "Cancel Event"
msgstr ""
msgstr "Cancelar evento"
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
msgid "Error Messages"
msgstr ""
msgstr "Mensajes de error"
#. module: event
#: view:event.event:0
msgid "Mailing"
msgstr ""
msgstr "Envío correo"
#. module: event
#: model:product.template,name:event.event_product_0_product_template
msgid "Ticket for Concert"
msgstr ""
msgstr "Entrada para concierto"
#. module: event
#: field:event.event,register_prospect:0
#: model:ir.actions.act_window,name:event.action_registration_draft
#: model:ir.ui.menu,name:event.menu_action_registration_draft
msgid "Unconfirmed Registrations"
msgstr ""
msgstr "Registros sin confirmar"
#. module: event
#: field:event.registration,partner_invoice_id:0
msgid "Partner Invoiced"
msgstr ""
msgstr "Empresa facturada"
#. module: event
#: view:event.registration:0
msgid "Communication history"
msgstr ""
msgstr "Histórico comunicación"
#. module: event
#: selection:event.event,state:0
msgid "Canceled"
msgstr ""
msgstr "Cancelado"
#. module: event
#: view:event.event:0
msgid "Event Done"
msgstr ""
msgstr "Evento realizado"
#. module: event
#: field:event.registration,badge_name:0
msgid "Badge Name"
msgstr ""
msgstr "Nombre de distintivo"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_registration
#: model:ir.ui.menu,name:event.menu_report_event_registration
msgid "Events On Registrations"
msgstr ""
msgstr "Eventos en los registros"
#. module: event
#: constraint:product.template:0
@@ -344,27 +357,27 @@ msgstr ""
#. module: event
#: wizard_field:event.reg_make_invoice,init,inv_created:0
msgid "Invoice Created"
msgstr ""
msgstr "Factura creada"
#. module: event
#: view:event.event:0
msgid "Statistics"
msgstr ""
msgstr "Estadísticas"
#. module: event
#: selection:event.event,state:0
msgid "Draft"
msgstr ""
msgstr "Borrador"
#. module: event
#: view:event.event:0
msgid "Event description"
msgstr ""
msgstr "Descripción del evento"
#. module: event
#: model:ir.model,name:event.model_report_event_type_registration
msgid "Event type on registration"
msgstr ""
msgstr "Tipo de evento en el registro"
#. module: event
#: constraint:ir.model:0
@@ -377,7 +390,7 @@ msgstr ""
#. module: event
#: field:event.registration,event_id:0
msgid "Event Related"
msgstr ""
msgstr "Evento relacionado"
#. module: event
#: model:crm.case.section,name:event.case_section_event
@@ -389,167 +402,170 @@ msgstr "Eventos"
#. module: event
#: field:event.registration,nb_register:0
msgid "Number of Registration"
msgstr ""
msgstr "Número de registro"
#. module: event
#: view:event.event:0
#: field:event.event,state:0
#: view:event.registration:0
msgid "Status"
msgstr ""
msgstr "Estado"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_categories
msgid "Events by section"
msgstr ""
msgstr "Eventos por sección"
#. module: event
#: model:ir.ui.menu,name:event.menu_action_registration
msgid "All Registrations"
msgstr ""
msgstr "Todos los registros"
#. module: event
#: help:event.event,mail_auto_registr:0
msgid ""
"Check this box if you want to use the automatic mailing for new registration"
msgstr ""
"Marque esta opción si desea utilizar el correo automático para nuevos "
"registros"
#. module: event
#: view:event.event:0
msgid "Set To Draft"
msgstr ""
msgstr "Establecer en borrador"
#. module: event
#: view:event.registration:0
#: model:ir.actions.wizard,name:event.event_confirm_registration
#: field:report.event.registration,confirm_state:0
msgid "Confirm Registration"
msgstr ""
msgstr "Confirmación registro"
#. module: event
#: view:event.registration:0
msgid "History"
msgstr ""
msgstr "Histórico"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_type
msgid "Types of Events"
msgstr ""
msgstr "Tipos de eventos"
#. module: event
#: field:event.registration,contact_id:0
msgid "Partner Contact"
msgstr ""
msgstr "Contacto empresa"
#. module: event
#: view:event.event:0
msgid "Auto Confirmation Email"
msgstr ""
msgstr "Correo de confirmación automático"
#. module: event
#: view:event.event:0
#: view:event.registration:0
msgid "General"
msgstr ""
msgstr "General"
#. module: event
#: view:event.registration:0
msgid "Send Reminder"
msgstr ""
msgstr "Enviar recordatorio"
#. module: event
#: selection:event.event,state:0
msgid "Done"
msgstr ""
msgstr "Realizado"
#. module: event
#: field:event.event,date_begin:0
#: field:report.event.registration,date_begin:0
msgid "Beginning date"
msgstr ""
msgstr "Fecha inicio"
#. module: event
#: field:event.registration,invoice_id:0
msgid "Invoice"
msgstr ""
msgstr "Factura"
#. module: event
#: model:ir.model,name:event.model_report_event_registration
msgid "Events on registrations"
msgstr ""
msgstr "Eventos en los registros"
#. module: event
#: wizard_button:event.confirm_registration,split,end:0
msgid "Cancel"
msgstr ""
msgstr "Cancelar"
#. module: event
#: wizard_button:event.reg_make_invoice,init,open:0
msgid "Open"
msgstr ""
msgstr "Abierto"
#. module: event
#: field:event.registration,badge_title:0
msgid "Badge Title"
msgstr ""
msgstr "Título del distintivo"
#. module: event
#: model:ir.actions.act_window,name:event.action_new_event_form
#: model:ir.ui.menu,name:event.menu_event_new_event
msgid "New event"
msgstr ""
msgstr "Nuevo evento"
#. module: event
#: field:event.registration,unit_price:0
msgid "Unit Price"
msgstr ""
msgstr "Precio unitario"
#. module: event
#: model:crm.case.section,name:event.event_2_crm_case_section
msgid "Conference on ERP Buisness"
msgstr ""
msgstr "Conferencia en negocios ERP"
#. module: event
#: field:event.registration,badge_partner:0
msgid "Badge Partner"
msgstr ""
msgstr "Empresa distinguida"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_view_confirm
#: model:ir.ui.menu,name:event.menu_event_event_confirm
msgid "Confirmed Events"
msgstr ""
msgstr "Eventos confirmados"
#. module: event
#: field:event.event,register_max:0
#: field:report.event.registration,register_max:0
msgid "Maximum Registrations"
msgstr ""
msgstr "Registros máximos"
#. module: event
#: field:event.event,type:0
msgid "Type"
msgstr ""
msgstr "Tipo"
#. module: event
#: help:event.event,mail_registr:0
msgid "This email will be sent when someone subscribes to the event."
msgstr ""
"Este correo electrónico será enviado cuando alguien se suscriba al evento."
#. module: event
#: model:product.template,name:event.event_product_2_product_template
msgid "Ticket for Conference"
msgstr ""
msgstr "Entrada para conferencia"
#. module: event
#: field:event.registration,case_id:0
msgid "Case"
msgstr ""
msgstr "Caso"
#. module: event
#: view:event.event:0
msgid "Name"
msgstr ""
msgstr "Nombre"
#. module: event
#: help:event.event,mail_auto_confirm:0
@@ -557,6 +573,8 @@ msgid ""
"Check this box if you want ot use the automatic confirmation emailing or the "
"reminder"
msgstr ""
"Marque esta opción si desea utilizar el correo de confirmación automático o "
"el recordatorio"
#. module: event
#: help:event.event,mail_confirm:0
@@ -565,55 +583,58 @@ msgid ""
"subscribes to a confirmed event. This is also the email sent to remind "
"someone about the event."
msgstr ""
"Este correo electrónico será enviado cuando el evento sea confirmado o "
"cuando alguien se suscriba a un evento confirmado. Éste es también el correo "
"que será enviado para recordar a alguien sobre el evento."
#. module: event
#: field:event.event,product_id:0
msgid "Product"
msgstr ""
msgstr "Producto"
#. module: event
#: field:event.registration,invoice_label:0
msgid "Label Invoice"
msgstr ""
msgstr "Etiquetar factura"
#. module: event
#: view:event.registration:0
msgid "Payments"
msgstr ""
msgstr "Pagos"
#. module: event
#: view:event.type:0
#: field:report.event.type.registration,name:0
msgid "Event Type"
msgstr ""
msgstr "Tipo de evento"
#. module: event
#: view:event.event:0
#: model:ir.actions.act_window,name:event.action_registration
#: model:ir.actions.wizard,name:event.wizard_event_registration
msgid "Registrations"
msgstr ""
msgstr "Registros"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_view_draft
#: model:ir.ui.menu,name:event.menu_event_event_draft
msgid "Draft Events"
msgstr ""
msgstr "Eventos en borrador"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_main
msgid "Events Organisation"
msgstr ""
msgstr "Organización de eventos"
#. module: event
#: view:event.registration:0
msgid "Actions"
msgstr ""
msgstr "Acciones"
#. module: event
#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
msgid "List Register Partners"
msgstr ""
msgstr "Listar empresas registradas"
#. module: event
#: constraint:product.product:0
@@ -623,4 +644,4 @@ msgstr "Error: Código EAN erróneo"
#. module: event
#: view:event.event:0
msgid "Auto Registration Email"
msgstr ""
msgstr "Correo de registro automático"
addons/mail_gateway/mail_gateway.py
+22 -29
View File
@@ -217,39 +217,34 @@ class mailgate_tool(osv.osv_memory):
msg_id = msg_pool.create(cr, uid, msg_data, context=context)
return True
def email_forward(self, cr, uid, model, res_ids, msg, email_error=False):
def email_forward(self, cr, uid, model, res_ids, msg, email_error=False, context=None):
"""Sends an email to all people following the thread
@param res_id: Id of the record of OpenObject model created from the Email details
@param msg: Email details
@param res_id: Id of the record of OpenObject model created from the email message
@param msg: email.message.Message to forward
@param email_error: Default Email address in case of any Problem
"""
for res_id in res_ids:
history_pool = self.pool.get('mailgate.message')
message = email.message_from_string(tools.ustr(msg).encode('utf-8'))
encoding = message.get_content_charset()
message['body'] = message.get_payload(decode=True)
if encoding:
message['body'] = self._to_decode(message['body'], [encoding])
subject = message['Subject']
model_pool = self.pool.get(model)
from_email = self._decode_header(message['From'])
model_pool = self.pool.get(model)
message_followers = model_pool.message_followers(cr, uid, [res_id])[res_id]
for res in model_pool.browse(cr, uid, res_ids, context=context):
message_followers = model_pool.message_followers(cr, uid, [res.id])[res.id]
message_followers_emails = self.to_email(','.join(message_followers))
message_recipients = self.to_email(','.join([from_email,self._decode_header(message['To']),self._decode_header(message['Cc'])]) )
message_recipients = self.to_email(','.join([self._decode_header(msg['from']),
self._decode_header(msg['to']),
self._decode_header(msg['cc'])]))
message_forward = [i for i in message_followers_emails if (i and (i not in message_recipients))]
res = None
try:
res = tools.email_send(from_email, message_forward, subject, body, openobject_id=res_id)
except Exception, e:
if email_error:
temp_msg = '[%s] %s'%(res_id, message['Subject'])
del message['Subject']
message['Subject'] = '[OpenERP-Error] %s' %(temp_msg)
tools.email_send(from_email, email_error, message.get('Subject'), message.get('body'), openobject_id=res_id)
if message_forward:
# TODO: we need an interface for this for all types of objects, not just leads
if hasattr(res, 'section'):
del msg['reply-to']
msg['reply-to'] = res.section.email_from
if not tools.misc._email_send(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)
def process_email(self, cr, uid, model, message, attach=True, context=None):
"""This function Processes email and create record for given OpenERP model
@@ -295,8 +290,6 @@ class mailgate_tool(osv.osv_memory):
return res_id
history_pool = self.pool.get('mailgate.message')
# Warning: message_from_string doesn't always work correctly on unicode,
# we must use utf-8 strings here :-(
msg_txt = email.message_from_string(tools.ustr(message).encode('utf-8'))
@@ -426,7 +419,7 @@ class mailgate_tool(osv.osv_memory):
context = context)
else:
self.history(cr, uid, model, res_ids, msg, att_ids, context=context)
self.email_forward(cr, uid, model, res_ids, message)
self.email_forward(cr, uid, model, res_ids, msg_txt)
return new_res_id
def get_partner(self, cr, uid, from_email, context=None):
addons/product/i18n/es.po
+7 -7
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-21 19:25+0000\n"
"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
"PO-Revision-Date: 2010-06-27 21:00+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-22 04:09+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -192,7 +192,7 @@ msgstr "Tipos de precios"
#. module: product
#: selection:product.template,type:0
msgid "Stockable Product"
msgstr "Producto almacenable"
msgstr "Almacenable"
#. module: product
#: model:product.category,name:product.product_category_services
@@ -226,7 +226,7 @@ msgstr "Nombre de este tipo de precio."
#. module: product
#: help:product.pricelist.version,date_start:0
msgid "Starting date for this pricelist version to be valid."
msgstr "Fecha inicial de esta versión de tarifa para ser válida."
msgstr "Fecha inicial de validez para esta versión de tarifa."
#. module: product
#: field:product.product,incoming_qty:0
@@ -256,7 +256,7 @@ msgid ""
"type. Purchase will trigger purchase orders when requested."
msgstr ""
"Producir generará órdenes de producción o tareas, de acuerdo al tipo de "
"producto. Comprar disparará pedidos de compras cuando sea necesario."
"producto. Comprar generará pedidos de compras cuando sea necesario."
#. module: product
#: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -1534,7 +1534,7 @@ msgstr "Obtener bajo pedido"
#. module: product
#: field:product.pricelist.item,price_surcharge:0
msgid "Price Surcharge"
msgstr "Sobrecarga precio"
msgstr "Recargo precio"
#. module: product
#: constraint:product.pricelist.version:0
addons/product_expiry/i18n/es.po
+24 -27
View File
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-06-30 15:09+0000\n"
"PO-Revision-Date: 2010-04-29 04:43+0000\n"
"Last-Translator: Rhubeni Lopes de Andrade <rhube.itsasecret@gmail.com>\n"
"PO-Revision-Date: 2010-06-27 22:08+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-30 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_expiry
#: field:product.product,life_time:0
msgid "Product lifetime"
msgstr "Ciclo de vida producto"
msgstr "Ciclo de vida del producto"
#. module: product_expiry
#: model:product.template,name:product_expiry.product_product_from_product_template
@@ -54,11 +54,13 @@ msgstr "¡XML no válido para la definición de la vista!"
#: help:stock.production.lot,life_date:0
msgid "The date the lot may become dangerous and should not be consumed."
msgstr ""
"Fecha en la que el producto puede llegar a ser peligroso y no debería ser "
"consumido."
#. module: product_expiry
#: field:stock.production.lot,removal_date:0
msgid "Removal Date"
msgstr ""
msgstr "Fecha de eliminación"
#. module: product_expiry
#: model:ir.module.module,description:product_expiry.module_meta_information
@@ -70,6 +72,12 @@ msgid ""
" - alert date\n"
"Used, for example, in food industries."
msgstr ""
"Gestionar diferentes fechas en productos y lotes de producción:\n"
" - fin de vida\n"
" - fecha de caducidad\n"
" - fecha de retirada\n"
" - fecha de alerta\n"
"Usados, por ejemplo, en la industria alimentaria."
#. module: product_expiry
#: model:product.template,name:product_expiry.product_product_pain_product_template
@@ -96,17 +104,19 @@ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM."
#. module: product_expiry
#: field:stock.production.lot,life_date:0
msgid "End of Life Date"
msgstr ""
msgstr "Fecha de fin de vida"
#. module: product_expiry
#: field:stock.production.lot,use_date:0
msgid "Best before Date"
msgstr ""
msgstr "Fecha caducidad"
#. module: product_expiry
#: help:stock.production.lot,use_date:0
msgid "The date the lot starts deteriorating without becoming dangerous."
msgstr ""
"Fecha en la que el producto empieza a deteriorarse sin llegar a ser "
"peligroso."
#. module: product_expiry
#: model:product.template,name:product_expiry.product_product_jambon_product_template
@@ -116,7 +126,7 @@ msgstr "Queso Camembert francés"
#. module: product_expiry
#: help:product.product,removal_time:0
msgid "The number of days before a production lot should be removed."
msgstr ""
msgstr "Número de días antes de que un lote de producción deba ser retirado."
#. module: product_expiry
#: field:product.product,use_time:0
@@ -126,7 +136,7 @@ msgstr "Tiempo de uso producto"
#. module: product_expiry
#: field:stock.production.lot,alert_date:0
msgid "Alert Date"
msgstr ""
msgstr "Fecha de alerta"
#. module: product_expiry
#: field:product.product,removal_time:0
@@ -139,6 +149,8 @@ msgid ""
"The number of days before a production lot starts deteriorating without "
"becoming dangerous."
msgstr ""
"Número de días antes de que un producto empieza a deteriorarse sin llegar a "
"ser peligroso."
#. module: product_expiry
#: constraint:product.product:0
@@ -151,30 +163,15 @@ msgid ""
"The number of days before a production lot may become dangerous and should "
"not be consumed."
msgstr ""
"Número de días antes de que un producto pueda llegar a ser peligroso y no "
"debe ser consumido."
#. module: product_expiry
#: help:stock.production.lot,removal_date:0
msgid "The date the lot should be removed."
msgstr ""
msgstr "Fecha en la que el producto debería ser eliminado."
#. module: product_expiry
#: field:product.product,alert_time:0
msgid "Product alert time"
msgstr "Fecha alerta producto"
#~ msgid "Alert date"
#~ msgstr "Fecha alarma"
#~ msgid ""
#~ "Track different dates on products and lots. Used, for exampel, in food "
#~ "industries: expiry date, alert date, date of removal, eso."
#~ msgstr ""
#~ "Gestiona distintas fechas para productos y lotes. Utilizado, por ejemplo, en "
#~ "industria alimentaria: Fecha de caducidad, fecha de alarma, fecha de "
#~ "eliminación, ..."
#~ msgid "DLUO"
#~ msgstr "Fecha caducidad"
#~ msgid "Removal date"
#~ msgstr "Fecha eliminación"
addons/product_manufacturer/i18n/es.po
+108
View File
@@ -0,0 +1,108 @@
# Spanish translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-25 13:27+0000\n"
"PO-Revision-Date: 2010-06-27 21:56+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
"Language-Team: Spanish <es@li.org>\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-Generator: Launchpad (build Unknown)\n"
#. module: product_electronic
#: model:ir.module.module,description:product_electronic.module_meta_information
msgid "A module that add manufacturers and attributes on the product form"
msgstr ""
"Un módulo que añade fabricantes y atributos en el formulario de producto"
#. module: product_electronic
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer product code"
msgstr "Código de producto del fabricante"
#. module: product_electronic
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "¡XML inválido para la estructura de la vista!"
#. module: product_electronic
#: view:product.electronic.attribute:0
msgid "Product Template Name"
msgstr "Nombre de plantilla de producto"
#. module: product_electronic
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"¡El nombre del objeto debe empezar con x_ y no puede contener ningún "
"carácter especial!"
#. module: product_electronic
#: model:ir.model,name:product_electronic.model_product_electronic_attribute
msgid "Product attributes"
msgstr "Atributos de producto"
#. module: product_electronic
#: view:product.product:0
msgid "Manufacturing data"
msgstr "Datos de fabricación"
#. module: product_electronic
#: view:product.product:0
msgid "Product reference"
msgstr "Referencia del producto"
#. module: product_electronic
#: field:product.electronic.attribute,name:0
msgid "Attribute"
msgstr "Atributo"
#. module: product_electronic
#: field:product.electronic.attribute,product_id:0
msgid "Product"
msgstr "Producto"
#. module: product_electronic
#: field:product.electronic.attribute,value:0
msgid "Value"
msgstr "Valor"
#. module: product_electronic
#: view:product.product:0
msgid "Manufacturing Data"
msgstr "Datos de fabricación"
#. module: product_electronic
#: view:product.product:0
msgid "Product name"
msgstr "Nombre del producto"
#. module: product_electronic
#: view:product.product:0
#: field:product.product,attribute_ids:0
msgid "Attributes"
msgstr "Atributos"
#. module: product_electronic
#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
msgid "Products Attributes & Manufacturers"
msgstr "Fabricantes y atributos de los productos"
#. module: product_electronic
#: field:product.product,manufacturer_pname:0
msgid "Manufacturer product name"
msgstr "Nombre del fabricante del producto"
#. module: product_electronic
#: field:product.product,manufacturer:0
msgid "Manufacturer"
msgstr "Fabricante"
addons/project_gtd/i18n/zh_CN.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 09:47+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"PO-Revision-Date: 2010-06-27 22:23+0000\n"
"Last-Translator: Fan.Khiyon <Unknown>\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-22 04:13+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
@@ -30,7 +30,7 @@ msgstr "对象名必须以x_开头并且不能包含特殊字符"
#. module: project_gtd
#: model:ir.model,name:project_gtd.model_project_gtd_timebox
msgid "project.gtd.timebox"
msgstr ""
msgstr "project.gtd.timebox"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.act_timebox_tasks_my_deadline_open
addons/project_issue/security/ir.model.access.csv
+1
View File
@@ -1,5 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
"access_project_issue","project.issue","model_project_issue","project_issue.group_project_supporter",1,1,1,1
"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
"access_project_issue_report","project.issue.report","model_project_issue_report","project_issue.group_project_supporter",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_project_issue_all project.issue model_project_issue project.group_project_manager 1 1 1 1
3 access_project_issue_user project.issue model_project_issue project.group_project_user 1 1 1 1
4 access_project_issue project.issue model_project_issue project_issue.group_project_supporter 1 1 1 1
5 access_project_issue_report_all project.issue.report model_project_issue_report project.group_project_manager 1 1 1 1
6 access_project_issue_report project.issue.report model_project_issue_report project_issue.group_project_supporter 1 1 1 1
addons/project_retro_planning/i18n/zh_TW.po
+4 -4
View File
@@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-01-30 12:44+0000\n"
"Last-Translator: <>\n"
"PO-Revision-Date: 2010-06-27 14:09+0000\n"
"Last-Translator: Rossi Liu <Unknown>\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-22 04:19+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
msgid "Project Retro planning"
msgstr ""
msgstr "舊有的規劃項目"
addons/purchase/i18n/es.po
+4 -4
View File
@@ -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: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 19:39+0000\n"
"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
"PO-Revision-Date: 2010-06-27 20:58+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-22 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -681,7 +681,7 @@ msgstr "Posición fiscal"
#. module: purchase
#: rml:purchase.order:0
msgid "Request for Quotation N°"
msgstr ""
msgstr "Petición de presupuesto Nº"
#. module: purchase
#: field:purchase.order,invoice_id:0
addons/sale_analytic_plans/i18n/zh_TW.po
+6 -6
View File
@@ -7,26 +7,26 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-01-30 13:19+0000\n"
"Last-Translator: <>\n"
"PO-Revision-Date: 2010-06-27 14:29+0000\n"
"Last-Translator: Rossi Liu <Unknown>\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-22 04:16+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_analytic_plans
#: field:sale.order.line,analytics_id:0
msgid "Analytic Distribution"
msgstr ""
msgstr "分佈分析"
#. module: sale_analytic_plans
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "無效的XML視圖結構!"
#. module: sale_analytic_plans
#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
msgid "Sales Analytic Distribution Management"
msgstr ""
msgstr "銷售分佈分析管理"
addons/sale_journal/i18n/es.po
+6 -7
View File
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 10:39+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"PO-Revision-Date: 2010-06-27 22:12+0000\n"
"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-22 04:10+0000\n"
"X-Launchpad-Export-Date: 2010-06-28 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
@@ -315,7 +314,7 @@ msgstr "Activo"
#. module: sale_journal
#: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
msgid "Draft sales"
msgstr "Borrador de ventas"
msgstr "Ventas borrador"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
@@ -335,7 +334,7 @@ msgstr "diario_venta.factura.tipo.árbol"
#. module: sale_journal
#: view:sale_journal.sale.journal:0
msgid "Confirm Sales"
msgstr "Confirmar las ventas"
msgstr "Confirmar ventas"
#. module: sale_journal
#: field:sale_journal.picking.journal,date_created:0
@@ -383,7 +382,7 @@ msgstr "Realizado"
#. module: sale_journal
#: selection:sale_journal.sale.stats,state:0
msgid "Cancel"
msgstr "Cancelar"
msgstr "Cancelado"
#. module: sale_journal
#: field:sale_journal.picking.journal,picking_stats_ids:0