diff --git a/addons/account/project/wizard/wizard_analytic_account_chart.py b/addons/account/project/wizard/wizard_analytic_account_chart.py
index 354fe6e6046..e011fad15bb 100644
--- a/addons/account/project/wizard/wizard_analytic_account_chart.py
+++ b/addons/account/project/wizard/wizard_analytic_account_chart.py
@@ -65,7 +65,7 @@ class wizard_analytic_account_chart(wizard.interface):
states = {
'init': {
'actions': [],
- 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel'), ('open', 'Open Charts')]}
+ 'result': {'type': 'form', 'arch':_account_chart_arch, 'fields':_account_chart_fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('open', 'Open Charts', 'gtk-ok')]}
},
'open': {
'actions': [],
diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py
index ca8153f3ce7..ae6b29b0f43 100644
--- a/addons/account/wizard/wizard_account_chart.py
+++ b/addons/account/wizard/wizard_account_chart.py
@@ -24,7 +24,7 @@ import pooler
class wizard_account_chart(wizard.interface):
_account_chart_arch = '''
-
@@ -148,8 +146,8 @@
-
+
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 6babca13272..d1287abacf1 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -132,9 +132,7 @@
-
-
-
+
@@ -146,8 +144,8 @@
-
+
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 42bb1e0c47c..c22ccf782a0 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -80,9 +80,7 @@
-
-
-
+
@@ -94,8 +92,8 @@
-
+
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 11ae3c89087..f660d265111 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -116,8 +116,8 @@
-
+
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index 8b2f3bdef88..60bd4f430f2 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -34,24 +34,28 @@ from osv.orm import except_orm
class crm_cases(osv.osv):
_name = "crm.case"
- _inherit = "crm.case"
+ _inherit = "crm.case"
def msg_new(self, cr, uid, msg):
mailgate_obj = self.pool.get('mail.gateway')
msg_body = mailgate_obj.msg_body_get(msg)
+ msg_subject = mailgate_obj._decode_header(msg['Subject'])
+ msg_from = mailgate_obj._decode_header(msg['From'])
+ msg_cc = mailgate_obj._decode_header(msg['Cc'])
+ body = self.format_body(msg_body['body'])
data = {
- 'name': msg['Subject'],
- 'email_from': msg['From'],
- 'email_cc': msg['Cc'],
+ 'name': msg_subject,
+ 'email_from': msg_from,
+ 'email_cc': msg_cc,
'user_id': False,
- 'description': msg_body['body'],
+ 'description': body,
}
- res = mailgate_obj.partner_get(cr, uid, msg['From'])
+ res = mailgate_obj.partner_get(cr, uid, msg_from)
if res:
data.update(res)
res = self.create(cr, uid, data)
cases = self.browse(cr, uid, [res])
- self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
+ self._history(cr, uid, cases, _('Receive'), history=True, details=body, email_from=msg_from)
return res
def msg_update(self, cr, uid, ids, msg, data={}, default_act='pending'):
@@ -79,10 +83,10 @@ class crm_cases(osv.osv):
if 'partner' in msg_actions:
data['email_from'] = msg_actions['partner'][:128]
-
+ msg_from = self._decode_header(msg['From'])
res = self.write(cr, uid, select, data)
cases = self.browse(cr, uid, select)
- self._history(cr, uid, cases, _('Receive'), history=True, email=msg['From'])
+ self._history(cr, uid, cases, _('Receive'), history=True, details=body_data, email_from=msg['From'])
getattr(self,act)(cr, uid, select)
return res
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 956cba3e2f3..02ffc47e374 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -122,9 +122,7 @@
-
-
-
+
@@ -136,8 +134,8 @@
-
+
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 2f0e2a1c650..2844cd02881 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -78,10 +78,8 @@ class crm_segmentation(osv.osv):
for partner_id in partners:
cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
- cr.commit()
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
- cr.commit()
return True
def process_stop(self, cr, uid, ids, *args):
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ffbe9efcc7a..3348083eb0b 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -216,10 +216,12 @@
-
+
@@ -233,9 +235,11 @@
-
+
@@ -324,9 +328,7 @@
-
-
-
+
@@ -338,8 +340,8 @@
-
+
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 7bd5f418db9..16a23891c8a 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-03-04 10:04+0000\n"
-"Last-Translator: xavi \n"
+"PO-Revision-Date: 2010-03-30 21:03+0000\n"
+"Last-Translator: Luis Gerardo Cruz Garcia \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-03-30 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -27,6 +27,8 @@ msgid ""
"This property defines the list of date/time exceptions for "
"arecurring calendar component."
msgstr ""
+"Esta propiedad define la lista de excepciones (días/horas) para un evento de "
+"calendario recurrente"
#. module: crm
#: help:crm.case.rule,act_mail_to_user:0
@@ -306,7 +308,7 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Exception Dates"
-msgstr ""
+msgstr "Fechas de excepción"
#. module: crm
#: selection:crm.case.rule,trg_date_type:0
@@ -400,17 +402,17 @@ msgstr "Próxima entrevista"
#. module: crm
#: field:crm.case.rule,regex_history:0
msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Expresiones Regulares en el Historial del Caso"
#. module: crm
#: model:ir.model,name:crm.model_crm_email_add_cc
msgid "Email Add CC"
-msgstr ""
+msgstr "Email añadir CC"
#. module: crm
#: model:process.transition,name:crm.process_transition_opportunitymeeting0
msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Oportunidad de Reunión"
#. module: crm
#: help:crm.case,canal_id:0
@@ -423,7 +425,7 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Exception Rules"
-msgstr ""
+msgstr "Reglas de Excepción"
#. module: crm
#: field:crm.menu.config_wizard,opportunity:0
@@ -434,7 +436,7 @@ msgstr "Oportunidades de negocio"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim1
msgid "Accepted as Claim"
-msgstr ""
+msgstr "Aceptado como reclamación"
#. module: crm
#: view:crm.case.rule:0
@@ -459,18 +461,18 @@ msgstr "%(email_from)s = Email empresa"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead6
msgid "Dead"
-msgstr ""
+msgstr "Muerto"
#. module: crm
#: view:crm.meeting:0
msgid "Confirm Meeting"
-msgstr ""
+msgstr "Confirmar reunión"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead1
#: model:crm.case.categ,name:crm.categ_oppor1
msgid "Existing Customer"
-msgstr ""
+msgstr "Cliente existente"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet2
@@ -494,7 +496,7 @@ msgstr "Categoría"
#: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
#: view:report.crm.case.section.categ.stage:0
msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Casos por sección, categoría y fase"
#. module: crm
#: help:crm.case.rule,act_mail_to_watchers:0
@@ -502,11 +504,13 @@ msgid ""
"Check this if you want the rule to mark CC(mail to any other person defined "
"in actions)."
msgstr ""
+"Active esta casilla en caso que quiera que la regla sea marcada CC ( copia "
+"de email para cualquier otra persona definida en las acciones)"
#. module: crm
#: field:crm.meeting,class:0
msgid "Privacy"
-msgstr ""
+msgstr "Privada"
#. module: crm
#: view:crm.case.rule:0
@@ -566,7 +570,7 @@ msgstr "Posición"
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
msgid "Create Opportunity"
-msgstr ""
+msgstr "Crear oportunidad"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -579,7 +583,7 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Meetings Tree"
-msgstr ""
+msgstr "Árbol de reuniones"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -596,7 +600,7 @@ msgstr "Escalado"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
msgid "All Meetings"
-msgstr ""
+msgstr "Todas las reuniones"
#. module: crm
#: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -607,7 +611,7 @@ msgstr "Gestión de relaciones con clientes & proveedores"
#: view:crm.email.add.cc:0
#: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
msgid "Add CC"
-msgstr ""
+msgstr "Agregar CC"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -615,7 +619,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "June"
-msgstr ""
+msgstr "Junio"
#. module: crm
#: field:crm.segmentation,som_interval_default:0
@@ -625,7 +629,7 @@ msgstr "Por defecto (0=Ninguno)"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job7
msgid "Refused by Company"
-msgstr ""
+msgstr "Rechazado por la compañía"
#. module: crm
#: field:crm.case,planned_revenue:0
@@ -643,12 +647,12 @@ msgstr "Permitir eliminar"
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "October"
-msgstr ""
+msgstr "Octubre"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor3
msgid "Value Proposition"
-msgstr ""
+msgstr "Propuesta de valor"
#. module: crm
#: view:crm.case.rule:0
@@ -658,17 +662,17 @@ msgstr "%(case_id)s = ID del caso"
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor2
msgid "New Business"
-msgstr ""
+msgstr "Nuevo negocio"
#. module: crm
#: help:crm.case,email_from:0
msgid "These people will receive email."
-msgstr ""
+msgstr "Estas personas recibirán un email."
#. module: crm
#: help:crm.case.section,calendar:0
msgid "Allows to show calendar"
-msgstr ""
+msgstr "Permite mostrar el calendario"
#. module: crm
#: view:crm.job:0
@@ -676,13 +680,13 @@ msgstr ""
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid " Today "
-msgstr ""
+msgstr " Hoy "
#. module: crm
#: wizard_view:crm.job.reschedule_phone_call,init:0
#: wizard_view:crm.opportunity.reschedule_phone_call,init:0
msgid "Phone Call Description"
-msgstr ""
+msgstr "Descripción de la llamada"
#. module: crm
#: view:crm.case.categ:0
@@ -702,7 +706,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim3
msgid "Policy Claims"
-msgstr ""
+msgstr "Política de reclamaciones"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -718,7 +722,7 @@ msgstr ""
#. module: crm
#: view:crm.phonecall:0
msgid "Assigned to"
-msgstr ""
+msgstr "Asignada a"
#. module: crm
#: view:res.partner.events:0
@@ -728,12 +732,12 @@ msgstr "Eventos empresa"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job4
msgid "Contract Proposed"
-msgstr ""
+msgstr "Contrato propuesto"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Trabajos - Proceso de selección de personal"
#. module: crm
#: view:crm.case:0
@@ -741,7 +745,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Related Cases"
-msgstr ""
+msgstr "Casos Relacionados"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -749,7 +753,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "September"
-msgstr ""
+msgstr "Setiembre"
#. module: crm
#: view:crm.case:0
@@ -764,33 +768,33 @@ msgstr "Historial de comunicación"
#. module: crm
#: view:crm.claim:0
msgid "New Claims"
-msgstr ""
+msgstr "Nuevas Reclamaciones"
#. module: crm
#: view:crm.meeting:0
msgid "Meetings Form"
-msgstr ""
+msgstr "Formulario de reuniones"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor5
msgid "Negotiation/Review"
-msgstr ""
+msgstr "Negociación/Revisión"
#. module: crm
#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Una empresa ya esta definida para esta llamada."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Casos por oportunidades y fase"
#. module: crm
#: view:crm.claim:0
msgid "Date of Claim"
-msgstr ""
+msgstr "Fecha de reclamación"
#. module: crm
#: view:crm.segmentation.line:0
@@ -800,12 +804,12 @@ msgstr "Líneas de segmentación de empresa"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
msgid "All Leads"
-msgstr ""
+msgstr "Todas las iniciativas"
#. module: crm
#: view:crm.lead:0
msgid "Leads Form"
-msgstr ""
+msgstr "Formulario de iniciativas"
#. module: crm
#: view:crm.segmentation:0
@@ -816,17 +820,17 @@ msgstr "Segmentación de empresa"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job5
msgid "Contract Signed"
-msgstr ""
+msgstr "Contrato firmado"
#. module: crm
#: wizard_view:caldav.crm.subscribe,init:0
msgid "Subscribe to Remote ICS"
-msgstr ""
+msgstr "Subcribirse a ICS remotos"
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor1
msgid "Existing Business"
-msgstr ""
+msgstr "Negocio existente"
#. module: crm
#: field:crm.case,probability:0
@@ -837,7 +841,7 @@ msgstr "Probabilidad (%)"
#. module: crm
#: model:ir.model,name:crm.model_crm_lead
msgid "Leads Cases"
-msgstr ""
+msgstr "Casos Oportunidades"
#. module: crm
#: help:crm.case.section,reply_to:0
@@ -864,7 +868,7 @@ msgstr "Regla del caso"
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
#, python-format
msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
#. module: crm
#: view:crm.case:0
@@ -874,12 +878,12 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Emails"
-msgstr ""
+msgstr "Emails"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead7
msgid "Television"
-msgstr ""
+msgstr "Televisión"
#. module: crm
#: view:crm.segmentation:0
@@ -889,18 +893,18 @@ msgstr "Parar el proceso"
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim1
msgid "Factual Claims"
-msgstr ""
+msgstr "Reclamaciones objetivas"
#. module: crm
#: view:crm.phonecall:0
msgid "Search Phonecalls"
-msgstr ""
+msgstr "Buscar llamadas"
#. module: crm
#: wizard_button:crm.lead.opportunity_set,create_partner,create:0
#: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
msgid "Continue"
-msgstr ""
+msgstr "Continue"
#. module: crm
#: field:crm.segmentation,som_interval:0
@@ -915,13 +919,13 @@ msgstr "Valor"
#. module: crm
#: help:caldav.crm.export,init,name:0
msgid "Save in .ics format"
-msgstr ""
+msgstr "Salvar en formato .ics"
#. module: crm
#: wizard_field:crm.new.send.mail,init,text:0
#: wizard_field:crm.send.mail,init,text:0
msgid "Message"
-msgstr ""
+msgstr "Mensaje"
#. module: crm
#: help:crm.segmentation,exclusif:0
@@ -960,7 +964,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_lead6
msgid "Radio"
-msgstr ""
+msgstr "Radio"
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity_assign_wizard
@@ -980,12 +984,13 @@ msgstr "Fecha del disparo"
#. module: crm
#: view:crm.case.history:0
msgid "Search Histories"
-msgstr ""
+msgstr "Buscar en Historial"
#. module: crm
#: help:crm.case.stage,sequence:0
msgid "Gives the sequence order when displaying a list of case stages."
msgstr ""
+"Da el orden de secuencia cuando se muestra un lista de etápas de caso."
#. module: crm
#: model:crm.case.section,name:crm.section_support3
@@ -993,7 +998,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_opp
#: model:process.node,name:crm.process_node_opportunities0
msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
#. module: crm
#: help:crm.segmentation,name:0
@@ -1028,6 +1033,8 @@ msgid ""
"These people will receive a copy of the future communication between partner "
"and users by email"
msgstr ""
+"Estas personas recibirán una copia de toda comunicación entre el partner y "
+"los usuarios."
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -1035,12 +1042,12 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "March"
-msgstr ""
+msgstr "Marzo"
#. module: crm
#: view:crm.case.rule:0
msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Acción del servidor a ser ejecutada"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_rule-act
@@ -1057,13 +1064,13 @@ msgstr ""
#. module: crm
#: wizard_field:crm.new.send.mail,init,state:0
msgid "Set State to"
-msgstr ""
+msgstr "Establecer estado a"
#. module: crm
#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Este correo no puede ser contestado"
#. module: crm
#: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1073,7 +1080,7 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
msgid "Create Partner"
-msgstr ""
+msgstr "Crear empresa"
#. module: crm
#: selection:crm.segmentation.line,expr_operator:0
@@ -1088,12 +1095,12 @@ msgstr ""
#. module: crm
#: view:crm.fundraising:0
msgid "My Funds"
-msgstr ""
+msgstr "Mis donaciones"
#. module: crm
#: field:crm.case,partner_mobile:0
msgid "Mobile"
-msgstr ""
+msgstr "Móvil"
#. module: crm
#: field:crm.case.rule,name:0
@@ -1114,12 +1121,12 @@ msgstr "Historial del caso"
#. module: crm
#: model:crm.case.categ,name:crm.categ_job2
msgid "Junior Developer"
-msgstr ""
+msgstr "Desarrollador junior"
#. module: crm
#: view:crm.meeting:0
msgid "My Meetings"
-msgstr ""
+msgstr "Mis reuniones"
#. module: crm
#: field:crm.case.categ,name:0
@@ -1129,7 +1136,7 @@ msgstr "Nombre de la categoría de casos"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim2
msgid "Preventive"
-msgstr ""
+msgstr "Preventivo"
#. module: crm
#: field:crm.case.rule,act_email_cc:0
@@ -1139,7 +1146,7 @@ msgstr "Añadir observadores (CC)"
#. module: crm
#: wizard_view:caldav.crm.export,init:0
msgid "Export ICS"
-msgstr ""
+msgstr "Exportar ICS"
#. module: crm
#: code:addons/crm/crm_claim.py:0
@@ -1149,7 +1156,7 @@ msgstr ""
#: code:addons/crm/crm_phonecall.py:0
#, python-format
msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "No se puede asignar un caso cerrado."
#. module: crm
#: help:crm.case.rule,act_remind_partner:0
@@ -1167,7 +1174,7 @@ msgstr ""
#: view:crm.meeting:0
#, python-format
msgid "Meetings"
-msgstr ""
+msgstr "Reuniones"
#. module: crm
#: view:crm.case.rule:0
@@ -1192,12 +1199,12 @@ msgstr "Fecha límite"
#: wizard_button:caldav.crm.import,init,end:0
#: wizard_button:caldav.crm.subscribe,init,end:0
msgid "_Cancel"
-msgstr ""
+msgstr "Cancelar"
#. module: crm
#: field:crm.case,category2_id:0
msgid "Category Name"
-msgstr ""
+msgstr "Nombre de Categoría"
#. module: crm
#: view:crm.segmentation:0
@@ -1207,7 +1214,7 @@ msgstr "Segmentaciones de empresa"
#. module: crm
#: view:crm.meeting:0
msgid "Recurrency Rule"
-msgstr ""
+msgstr "Regla concurrente"
#. module: crm
#: model:ir.model,name:crm.model_crm_case_categ
@@ -1221,12 +1228,12 @@ msgstr "Categoría del caso"
#: view:crm.phonecall:0
#: wizard_field:crm.send.mail,init,subject:0
msgid "Subject"
-msgstr ""
+msgstr "Asunto"
#. module: crm
#: field:crm.meeting,attendees:0
msgid "Attendees"
-msgstr ""
+msgstr "Asistentes"
#. module: crm
#: model:ir.module.module,description:crm.module_meta_information
@@ -1281,7 +1288,7 @@ msgstr ""
#. module: crm
#: model:process.transition,note:crm.process_transition_leadpartner0
msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "El prospecto se convierte a partner"
#. module: crm
#: view:crm.case.rule:0
@@ -1291,17 +1298,17 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Pending Claims"
-msgstr ""
+msgstr "Reclamaciones Pendientes"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Casos por oportunidades, categoría y etapa"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead4
msgid "Print"
-msgstr ""
+msgstr "Imprimir"
#. module: crm
#: field:crm.case,som:0
@@ -1316,12 +1323,12 @@ msgstr "Grado de satisfacción"
#: field:report.crm.case.section.categ.categ2,category2_id:0
#: field:report.crm.case.section.categ2,category2_id:0
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#. module: crm
#: view:crm.job:0
msgid "Candidate Refused"
-msgstr ""
+msgstr "Candidato rechazado"
#. module: crm
#: view:crm.segmentation:0
@@ -1351,7 +1358,7 @@ msgstr "Fecha creación"
#: view:crm.phonecall:0
#: model:process.node,name:crm.process_node_meeting0
msgid "Meeting"
-msgstr ""
+msgstr "Reunión"
#. module: crm
#: view:crm.case.rule:0
@@ -1372,12 +1379,12 @@ msgstr "Cambiar a borrador"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ_categ2
msgid "Cases by section, Category and Category2"
-msgstr ""
+msgstr "Casos por sección, categoría y categoría2"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor6
msgid "Closed Won"
-msgstr ""
+msgstr "Cerrado-Ganado"
#. module: crm
#: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1396,7 +1403,7 @@ msgstr "Casos abiertos"
#: field:report.crm.case.section.categ2,stage_id:0
#: field:report.crm.case.section.stage,stage_id:0
msgid "Stage"
-msgstr ""
+msgstr "Fase"
#. module: crm
#: constraint:ir.ui.view:0
@@ -1409,24 +1416,26 @@ msgid ""
"If the active field is set to true, it will allow you to hide the case "
"section without removing it."
msgstr ""
+"Si el campo activo esta en verdadero, te permitira esconder la sección del "
+"caso sin removerla"
#. module: crm
#: model:crm.case.categ,name:crm.categ_fund2
msgid "Learning And Education"
-msgstr ""
+msgstr "Aprendizaje y educación"
#. module: crm
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Are you sure you want to create a partner based on this phonecall ?"
-msgstr ""
+msgstr "Estas seguro que deseas crear una empresa basado en esta llamada?"
#. module: crm
#: view:crm.case.stage:0
#: model:ir.actions.act_window,name:crm.crm_case_stage_act
#: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
msgid "Stages"
-msgstr ""
+msgstr "Etapas"
#. module: crm
#: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 7f798630a67..d3e4f18e025 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-22 18:16+0000\n"
+"PO-Revision-Date: 2010-03-31 14:33+0000\n"
"Last-Translator: smii \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-30 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -1942,7 +1942,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.category_job1
msgid "Graduate"
-msgstr ""
+msgstr "Valmistua"
#. module: crm
#: wizard_view:crm.job.meeting_set,init:0
@@ -1951,11 +1951,13 @@ msgid ""
"Note that you can also use the calendar view to graphically schedule your "
"next meeting."
msgstr ""
+"Huomaa, että voit käyttää kalenterinäkymää myös suunnitellaksesi graafisesti "
+"seuraavan kokouksesi."
#. module: crm
#: view:crm.lead:0
msgid "Leads Tree"
-msgstr ""
+msgstr "Opaspuu"
#. module: crm
#: field:crm.meeting,caldav_url:0
@@ -1965,7 +1967,7 @@ msgstr ""
#. module: crm
#: view:crm.meeting:0
msgid "Attendee"
-msgstr ""
+msgstr "Osanottaja"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -1979,12 +1981,12 @@ msgstr ""
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
msgid "Inbound"
-msgstr ""
+msgstr "Saapuva"
#. module: crm
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive sections."
-msgstr ""
+msgstr "Virhe! Et voi luoda rekursiivisia osioita."
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm
@@ -2004,7 +2006,7 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Year"
-msgstr ""
+msgstr "Tänä vuonna"
#. module: crm
#: field:crm.case.rule,act_remind_partner:0
@@ -2022,7 +2024,7 @@ msgstr "Korkein"
#. module: crm
#: view:crm.job:0
msgid "Contract Data"
-msgstr ""
+msgstr "Sopimuksen tiedot (data)"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2037,17 +2039,17 @@ msgstr ""
#. module: crm
#: field:crm.menu.config_wizard,document_ics:0
msgid "Shared Calendar"
-msgstr ""
+msgstr "Jaettu kalenteri"
#. module: crm
#: field:crm.case.section,reply_to:0
msgid "Reply-To"
-msgstr ""
+msgstr "Vastaus osoitteeseen"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ
msgid "Cases by Leads and Type"
-msgstr ""
+msgstr "Tapahtumat johdon ja tyypin mukaan"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
@@ -2058,12 +2060,12 @@ msgstr "Minuuttia"
#: field:report.crm.case.section.categ2,amount_revenue:0
#: field:report.crm.case.section.stage,amount_revenue:0
msgid "Est.Revenue"
-msgstr ""
+msgstr "Arvioitu tuotto"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job1
msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Alkutöiden tarve"
#. module: crm
#: field:crm.case.rule,trg_priority_to:0
@@ -2078,12 +2080,12 @@ msgstr ""
#. module: crm
#: view:crm.claim:0
msgid "Claims Info"
-msgstr ""
+msgstr "Vaade tiedot"
#. module: crm
#: field:crm.case.category2,name:0
msgid "Case Category2 Name"
-msgstr ""
+msgstr "Tapahtuma kategoria2 nimi"
#. module: crm
#: wizard_view:crm.lead.opportunity_set,opportunity:0
@@ -2091,13 +2093,13 @@ msgstr ""
#: model:ir.actions.wizard,name:crm.wizard_crm_lead_opportunity_set
#: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_opportunity_set
msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Muunna mahdollisuudeksi"
#. module: crm
#: model:crm.case.stage,name:crm.stage_phone2
#: view:crm.phonecall:0
msgid "Held"
-msgstr ""
+msgstr "Pysäytetty"
#. module: crm
#: view:crm.case:0
@@ -2113,7 +2115,7 @@ msgstr ""
#. module: crm
#: selection:crm.new.send.mail,init,state:0
msgid "Unchanged"
-msgstr ""
+msgstr "Muuttamaton"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2122,7 +2124,7 @@ msgstr ""
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Convert To Partner"
-msgstr ""
+msgstr "Muunna kumppaniksi"
#. module: crm
#: field:crm.case.rule,trg_state_from:0
@@ -2148,17 +2150,17 @@ msgstr "Prioriteetti"
#. module: crm
#: view:crm.opportunity:0
msgid "Source"
-msgstr ""
+msgstr "Lähde"
#. module: crm
#: field:crm.meeting,location:0
msgid "Location"
-msgstr ""
+msgstr "Sijainti"
#. module: crm
#: view:crm.fundraising:0
msgid "Payment Mode"
-msgstr ""
+msgstr "Maksutapa"
#. module: crm
#: help:crm.case.rule,trg_date_range:0
@@ -2173,7 +2175,7 @@ msgstr ""
#: view:crm.job:0
#: view:crm.lead:0
msgid "Stage: "
-msgstr ""
+msgstr "Vaihe: "
#. module: crm
#: view:crm.case.section:0
@@ -2183,7 +2185,7 @@ msgstr "Tapahtumaosio"
#. module: crm
#: model:process.node,note:crm.process_node_meeting0
msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Ajoita normaali puhelinkokous"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2194,7 +2196,7 @@ msgstr ""
#: code:addons/crm/crm_phonecall.py:0
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Virhe!"
#. module: crm
#: view:crm.case.rule:0
@@ -2204,7 +2206,7 @@ msgstr "Muutettavat kentät"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead1
msgid "Telesales"
-msgstr ""
+msgstr "Puhelinmyynnit"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main
@@ -2214,7 +2216,7 @@ msgstr "Tapahtumahistoriat"
#. module: crm
#: field:crm.case,create_date:0
msgid "Created"
-msgstr ""
+msgstr "Luotu"
#. module: crm
#: view:crm.lead:0
@@ -2231,12 +2233,12 @@ msgstr "Segmentointirivi"
#: wizard_field:crm.opportunity.reschedule_phone_call,init,deadline:0
#: view:crm.phonecall:0
msgid "Planned Date"
-msgstr ""
+msgstr "Suunniteltu päivämäärä"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
msgid "Hours"
-msgstr ""
+msgstr "Tunnit"
#. module: crm
#: help:crm.menu.config_wizard,phonecall:0
@@ -2266,7 +2268,7 @@ msgstr ""
#: selection:report.crm.case.section.categ2,month:0
#: selection:report.crm.case.section.stage,month:0
msgid "July"
-msgstr ""
+msgstr "heinäkuu"
#. module: crm
#: model:crm.case.stage,name:crm.stage_oppor1
@@ -2276,7 +2278,7 @@ msgstr ""
#. module: crm
#: field:crm.case,partner_name2:0
msgid "Employee Email"
-msgstr ""
+msgstr "Työntekijän sähköposti"
#. module: crm
#: model:ir.model,name:crm.model_crm_meeting
@@ -2286,17 +2288,17 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Job Info"
-msgstr ""
+msgstr "Työtehtävän tiedot"
#. module: crm
#: view:crm.meeting:0
msgid "Cancel Meeting"
-msgstr ""
+msgstr "Peruuta kokous/tapaaminen"
#. module: crm
#: model:crm.case.section,name:crm.section_support0
msgid "Jobs"
-msgstr ""
+msgstr "Työpaikat"
#. module: crm
#: view:crm.case.rule:0
@@ -2307,7 +2309,7 @@ msgstr ""
#: model:crm.case.stage,name:crm.stage_phone3
#: view:crm.phonecall:0
msgid "Not Held"
-msgstr ""
+msgstr "Ei pidätetty"
#. module: crm
#: field:crm.case.rule,act_mail_to_user:0
@@ -2317,12 +2319,12 @@ msgstr "Sähköposti vastaavalle"
#. module: crm
#: view:crm.job:0
msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Työpaikat - Rekrytointilomake"
#. module: crm
#: model:crm.case.category2,name:crm.category_claim1
msgid "Corrective"
-msgstr ""
+msgstr "Tarkennus"
#. module: crm
#: model:ir.model,name:crm.model_crm_opportunity
@@ -2345,7 +2347,7 @@ msgstr "Lähetettävän sähköpostin malli"
#: field:report.crm.case.section.categ2,month:0
#: field:report.crm.case.section.stage,month:0
msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
#. module: crm
#: model:crm.case.section,name:crm.section_support2
@@ -2361,7 +2363,7 @@ msgstr ""
#: wizard_button:crm.new.send.mail,init,send:0
#: wizard_button:crm.send.mail,init,send:0
msgid "Send Email"
-msgstr ""
+msgstr "Lähetä sähköpostia"
#. module: crm
#: wizard_view:crm.new.send.mail,init:0
@@ -2371,7 +2373,7 @@ msgstr ""
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund3
msgid "Credit Card"
-msgstr ""
+msgstr "Luottokortti"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2380,6 +2382,8 @@ msgid ""
"No E-Mail ID Found for the Responsible Partner or missing reply address in "
"section!"
msgstr ""
+"Ei löydettyä sähköposti ID:tä vastaavalle kumppanille tai puuttuva "
+"vastausosoite tässä osiossa!"
#. module: crm
#: view:crm.job:0
@@ -2389,18 +2393,18 @@ msgstr ""
#. module: crm
#: field:crm.case.history,log_id:0
msgid "Log"
-msgstr ""
+msgstr "Loki"
#. module: crm
#: help:crm.menu.config_wizard,fund:0
msgid ""
"This may help associations in their fund raising process and tracking."
-msgstr ""
+msgstr "Tämä saattaa auttaa yhteisöjä varainhankinnassa ja sen seurannassa."
#. module: crm
#: view:crm.meeting:0
msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Palauta vahvistamattomaksi"
#. module: crm
#: view:crm.case:0
@@ -2415,7 +2419,7 @@ msgstr "Seuraajien Sähköpostit"
#. module: crm
#: view:crm.case.rule:0
msgid "Note"
-msgstr ""
+msgstr "Huomautus"
#. module: crm
#: field:report.crm.case.section.categ.categ2,delay_close:0
@@ -2423,7 +2427,7 @@ msgstr ""
#: field:report.crm.case.section.categ2,delay_close:0
#: field:report.crm.case.section.stage,delay_close:0
msgid "Delay Close"
-msgstr ""
+msgstr "Viivytä sulkemista"
#. module: crm
#: selection:crm.case,priority:0
@@ -2431,7 +2435,7 @@ msgstr ""
#: selection:crm.case.rule,trg_priority_from:0
#: selection:crm.case.rule,trg_priority_to:0
msgid "Low"
-msgstr ""
+msgstr "Matala"
#. module: crm
#: field:crm.case,date_closed:0
@@ -2444,23 +2448,23 @@ msgstr ""
#: selection:report.crm.case.section.categ2,state:0
#: selection:report.crm.case.section.stage,state:0
msgid "Closed"
-msgstr ""
+msgstr "Suljettu"
#. module: crm
#: view:crm.job:0
msgid "Candidate Name2"
-msgstr ""
+msgstr "Ehdokasnimi 2"
#. module: crm
#: code:addons/crm/crm.py:0
#, python-format
msgid "cancel"
-msgstr ""
+msgstr "Peruuta"
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet2
msgid "Internal Meeting"
-msgstr ""
+msgstr "Sisäinen kokous"
#. module: crm
#: view:crm.case:0
@@ -2469,7 +2473,7 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Events"
-msgstr ""
+msgstr "Tapahtumat"
#. module: crm
#: help:crm.menu.config_wizard,lead:0
@@ -2477,6 +2481,8 @@ msgid ""
"Allows you to track and manage leads which are pre-sales requests or "
"contacts, the very first contact with a customer request."
msgstr ""
+"Sallii sinun seuraavan ja hallinoimaan oppaita jotka ovat esi-myynti "
+"pyyntöjä tai yhteystietoja. Ensimmäinen yhteydenotto asiakkaan pyyntöön."
#. module: crm
#: help:crm.case,som:0
@@ -2494,7 +2500,7 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_meet1
msgid "Customer Meeting"
-msgstr ""
+msgstr "Asiakastapaaminen"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc2:0
@@ -2509,7 +2515,7 @@ msgstr ""
#. module: crm
#: view:crm.job:0
msgid "Degree"
-msgstr ""
+msgstr "Tutkinto"
#. module: crm
#: wizard_field:crm.new.send.mail,init,doc1:0
@@ -2525,7 +2531,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_phone
#, python-format
msgid "Phone Calls"
-msgstr ""
+msgstr "Puhelinsoitot"
#. module: crm
#: help:crm.case,active:0
@@ -2547,19 +2553,19 @@ msgstr "Asiahistoria"
#. module: crm
#: field:crm.case,partner_phone:0
msgid "Phone"
-msgstr ""
+msgstr "Puhelin"
#. module: crm
#: model:crm.case.category2,name:crm.categ2_fund2
msgid "Cheque"
-msgstr ""
+msgstr "Šekki"
#. module: crm
#: field:crm.case,active:0
#: field:crm.case.rule,active:0
#: field:crm.case.section,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktiivinen"
#. module: crm
#: help:crm.case.rule,act_remind_attach:0
@@ -2578,7 +2584,7 @@ msgstr "Pakollinen Määritelmä"
#. module: crm
#: selection:crm.segmentation.line,expr_operator:0
msgid ">"
-msgstr ""
+msgstr ">"
#. module: crm
#: view:crm.job:0
@@ -2588,12 +2594,12 @@ msgstr ""
#. module: crm
#: model:ir.actions.wizard,name:crm.wizard_crm_send_mail
msgid "Send Mail"
-msgstr ""
+msgstr "Lähetä sähköpostia"
#. module: crm
#: selection:crm.case.rule,trg_date_range_type:0
msgid "Months"
-msgstr ""
+msgstr "Kuukautta"
#. module: crm
#: view:crm.claim.assign_wizard:0
@@ -2616,7 +2622,7 @@ msgstr ""
#. module: crm
#: model:process.node,note:crm.process_node_opportunities0
msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Kun todellinen projekti/mahdollisuus on löydetty"
#. module: crm
#: wizard_view:crm.job.partner_create,init:0
@@ -2627,7 +2633,7 @@ msgstr ""
#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
msgid "Action"
-msgstr ""
+msgstr "Toiminto"
#. module: crm
#: code:addons/crm/crm_claim.py:0
@@ -2638,7 +2644,7 @@ msgstr ""
#: model:ir.ui.menu,name:crm.menu_crm_case_claims
#, python-format
msgid "Claims"
-msgstr ""
+msgstr "Vaateet"
#. module: crm
#: field:crm.segmentation,som_interval_decrease:0
@@ -2653,7 +2659,7 @@ msgstr ""
#. module: crm
#: model:ir.model,name:crm.model_crm_case_category2
msgid "Category2 of case"
-msgstr ""
+msgstr "tapahtuman kategoria2"
#. module: crm
#: wizard_field:crm.new.send.mail,init,to:0
@@ -2669,29 +2675,29 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.menu_presale
msgid "Sales"
-msgstr ""
+msgstr "Myynnit"
#. module: crm
#: view:crm.case:0
#: view:crm.phonecall:0
msgid "General"
-msgstr ""
+msgstr "Yleiset"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead2
msgid "Assigned"
-msgstr ""
+msgstr "Määrätty"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead5
msgid "Recycled"
-msgstr ""
+msgstr "Kierrätetty"
#. module: crm
#: model:crm.case.categ,name:crm.categ_lead8
#: model:crm.case.categ,name:crm.categ_oppor8
msgid "Other"
-msgstr ""
+msgstr "Muu"
#. module: crm
#: view:crm.case:0
@@ -2701,7 +2707,7 @@ msgstr ""
#: selection:crm.new.send.mail,init,state:0
#: view:crm.opportunity:0
msgid "Done"
-msgstr ""
+msgstr "Valmis"
#. module: crm
#: field:crm.segmentation,som_interval_max:0
@@ -2732,7 +2738,7 @@ msgstr ""
#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Open"
-msgstr ""
+msgstr "Avoin"
#. module: crm
#: selection:crm.meeting,class:0
@@ -2776,29 +2782,29 @@ msgstr ""
#: field:crm.opportunity.assign_wizard,user_id:0
#: field:crm.phonecall.assign_wizard,user_id:0
msgid "Responsible"
-msgstr ""
+msgstr "Vastuullinen"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim4
#: model:crm.case.stage,name:crm.stage_meet3
msgid "Invalid"
-msgstr ""
+msgstr "Virheellinen"
#. 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 "Aseta kokous"
#. module: crm
#: field:crm.menu.config_wizard,meeting:0
msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Kokouskalenteri"
#. module: crm
#: view:crm.case:0
msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Tapahtumat vaiheen ja arvioiden mukaan"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -2828,18 +2834,18 @@ msgstr "Suurin kommunikointihistoria"
#. module: crm
#: view:crm.lead:0
msgid "Meeting For Leads Generation"
-msgstr ""
+msgstr "Kokous ohjausten luomiseksi"
#. module: crm
#: 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 "Oletko varma, että haluat luoda kumppanin perustuen tähän johtoon ?"
#. module: crm
#: model:crm.case.stage,name:crm.stage_job6
msgid "Refused by Employee"
-msgstr ""
+msgstr "Hylätty työntekijän toimesta"
#. module: crm
#: field:crm.case,partner_name:0
@@ -2849,7 +2855,7 @@ msgstr ""
#. module: crm
#: model:crm.case.stage,name:crm.stage_job2
msgid "First Interview"
-msgstr ""
+msgstr "Ensimmäinen haastattelu"
#. module: crm
#: view:report.crm.case.section.categ.categ2:0
@@ -2857,7 +2863,7 @@ msgstr ""
#: view:report.crm.case.section.categ2:0
#: view:report.crm.case.section.stage:0
msgid "This Month"
-msgstr ""
+msgstr "Tässä kuussa"
#. module: crm
#: view:crm.job:0
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 9db7e24acee..76a9f9bfeaf 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -34,7 +34,7 @@ import time, socket
email_re = re.compile(r"([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6})")
case_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
-reference_re = re.compile("<.*-tinycrm-(\\d+)@(.*)>", re.UNICODE)
+reference_re = re.compile("<.*-openobject-(\\d+)@(.*)>", re.UNICODE)
priorities = {
'1': '1 (Highest)',
@@ -157,26 +157,41 @@ class email_parser(object):
'partner_id': adr[0].get('partner_id', False) and adr[0]['partner_id'][0] or False
}
+ def _to_decode(self, s, charsets):
+ for charset in charsets:
+ if charset:
+ try:
+ return s.decode(charset)
+ except UnicodeError:
+ pass
+ try:
+ return s.decode('ascii')
+ except UnicodeError:
+ return s
+
def _decode_header(self, s):
from email.Header import decode_header
- s = decode_header(s)
- return ''.join(map(lambda x:x[0].decode(x[1] or 'ascii', 'replace'), s))
+ s = decode_header(s)
+ return ''.join(map(lambda x:self._to_decode(x[0], [x[1]]), s))
def msg_new(self, msg):
message = self.msg_body_get(msg)
+ msg_subject = self._decode_header(msg['Subject'])
+ msg_from = self._decode_header(msg['From'])
+ msg_cc = self._decode_header(msg['Cc'] or '')
+
data = {
- 'name': self._decode_header(msg['Subject']),
- 'email_from': self._decode_header(msg['From']),
- 'email_cc': self._decode_header(msg['Cc'] or ''),
- 'canal_id': self.canal_id,
+ 'name': msg_subject,
+ 'email_from': msg_from,
+ 'email_cc': msg_cc,
'user_id': False,
'description': message['body'],
}
- data.update(self.partner_get(self._decode_header(msg['From'])))
+ data.update(self.partner_get(msg_from))
try:
id = self.rpc(self.model, 'create', data)
- self.rpc(self.model, 'history', [id], 'Receive', True, msg['From'], message['body'])
+ self.rpc(self.model, 'history', [id], 'Receive', True, False, message['body'], msg['From'])
#self.rpc(self.model, 'case_open', [id])
except Exception, e:
if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
@@ -223,7 +238,7 @@ class email_parser(object):
if part.get_content_maintype()=='text':
buf = part.get_payload(decode=True)
if buf:
- txt = buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
+ txt = self._to_decode(buf, part.get_charsets())
txt = re.sub("<(\w)>", replace, txt)
txt = re.sub("<\/(\w)>", replace, txt)
if txt and part.get_content_subtype() == 'plain':
@@ -291,7 +306,7 @@ class email_parser(object):
self.rpc(self.model, act, [id])
self.rpc(self.model, 'write', [id], data)
- self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], body['body'])
+ self.rpc(self.model, 'history', [id], 'Receive', True, False, body['body'], msg['From'])
return id
def msg_send(self, msg, emails, priority=None):
@@ -323,12 +338,16 @@ class email_parser(object):
# 'description':body,
#}
#self.rpc(self.model, 'write', [id], data)
- self.rpc(self.model, 'history', [id], 'Send', True, msg['From'], message['body'])
+ self.rpc(self.model, 'history', [id], 'Receive', True, False, message['body'], msg['From'])
return id
def msg_test(self, msg, case_str):
if not case_str:
return (False, False)
+ res = self.rpc(self.model, 'search', [('id', '=', int(case_str))])
+ if not res:
+ return (False, False)
+
emails = self.rpc(self.model, 'emails_get', int(case_str))
return (int(case_str), emails)
@@ -337,9 +356,9 @@ class email_parser(object):
if case_str:
case_str = case_str.group(1)
else:
- case_str = case_re.search(msg.get('Subject', ''))
+ case_str = case_re.search(msg.get('Subject', ''))
if case_str:
- case_str = case_str.group(1)
+ case_str = case_str.group(1)
(case_id, emails) = self.msg_test(msg, case_str)
if case_id:
if emails[0] and self.email_get(emails[0])==self.email_get(self._decode_header(msg['From'])):
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 3adf7694527..1f1e12d2b85 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -24,6 +24,7 @@ from osv import osv, fields
from tools.translate import _
import base64
import tools
+from crm import crm
class crm_send_new_email(osv.osv_memory):
""" Sends new email for the case"""
@@ -31,34 +32,24 @@ class crm_send_new_email(osv.osv_memory):
_description = "Case Send new email"
_columns = {
- 'to' : fields.char('To', size=64, required=True),
- 'cc' : fields.char('CC', size=128),
+ 'email_to' : fields.char('To', size=64, required=True),
+ 'email_from' : fields.char('From', size=64, required=True),
+ 'email_cc' : fields.char('CC', size=128),
'subject': fields.char('Subject', size=128, required=True),
'text': fields.text('Message', required=True),
- 'state': fields.selection([('done', 'Done'), ('pending', 'Pending'), ('unchanged', 'Unchanged')], string='State', required=True),
+ 'state': fields.selection(crm.AVAILABLE_STATES, string='State'),
'doc1': fields.binary("Attachment1"),
'doc2': fields.binary("Attachment2"),
'doc3': fields.binary("Attachment3"),
}
def action_cancel(self, cr, uid, ids, context=None):
- """
- Closes Phonecall to Opportunity form
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Opportunity's IDs
- @param context: A standard dictionary for contextual values
+ """ Closes Phonecall to Opportunity form
"""
return {'type':'ir.actions.act_window_close'}
def action_send(self, cr, uid, ids, context=None):
""" This sends an email to ALL the addresses of the selected partners.
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Phonecall to Opportunity's IDs
- @param context: A standard dictionary for contextual values
"""
if not context:
context = {}
@@ -82,50 +73,47 @@ class crm_send_new_email(osv.osv_memory):
model = hist.log_id.model_id.model
model_pool = self.pool.get(model)
case = model_pool.browse(cr, uid, hist.log_id.res_id)
- emails = [data['to']] + (data['cc'] or '').split(',')
+ emails = [data['email_to']] + (data['email_cc'] or '').split(',')
emails = filter(None, emails)
body = data['text']
if case.user_id.signature:
body += '\n\n%s' % (case.user_id.signature)
-
- case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['to'], details=body)
- email_from = (case.user_id and case.user_id.address_id and \
- case.user_id.address_id.email) or tools.config.get('email_from',False)
+ body = case_pool.format_body(body)
+ email_from = data.get('email_from', False)
+ case_pool._history(cr, uid, [case], _('Send'), history=True, email=data['email_to'], details=body, email_from=email_from)
+
flag = tools.email_send(
email_from,
emails,
data['subject'],
- case_pool.format_body(body),
+ body,
attach=attach,
reply_to=case.section_id.reply_to,
- openobject_id=str(case.id),
- )
- if flag:
+ openobject_id=str(case.id),
+ )
+ if flag:
if data['state'] == 'unchanged':
pass
elif data['state'] == 'done':
case_pool.case_close(cr, uid, [case.id])
- elif data['state'] == 'pending':
- case_pool.case_pending(cr, uid, [case.id])
+ elif data['state'] == 'draft':
+ case_pool.case_reset(cr, uid, [case.id])
+ elif data['state'] in ['cancel', 'open', 'pending']:
+ act = 'case_' + data['state']
+ getattr(case_pool, act)(cr, uid, [case.id])
cr.commit()
# Commented because form does not close due to raise
# raise osv.except_osv(_('Email!'), ("Email Successfully Sent"))
# else:
# raise osv.except_osv(_('Warning!'), _("Email not sent !"))
+
return {}
def default_get(self, cr, uid, fields, context=None):
"""
This function gets default values
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
"""
if not context:
context = {}
@@ -144,12 +132,16 @@ class crm_send_new_email(osv.osv_memory):
res_id = context and context.get('active_ids', []) or []
for case in mod_obj.browse(cr, uid, res_id):
- if 'to' in fields:
- res.update({'to': case.email_from})
+ if 'email_to' in fields:
+ res.update({'email_to': case.email_from})
+ if 'email_from' in fields:
+ res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
+ (case.user_id and case.user_id.address_id and \
+ case.user_id.address_id.email) or tools.config.get('email_from',False)})
if 'subject' in fields:
res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})
- if 'cc' in fields:
- res.update({'cc': case.email_cc or ''})
+ if 'email_cc' in fields:
+ res.update({'email_cc': case.email_cc or ''})
if 'text' in fields:
res.update({'text': case.description or ''})
if 'state' in fields:
@@ -159,13 +151,6 @@ class crm_send_new_email(osv.osv_memory):
def get_reply_defaults(self, cr, uid, fields, context=None):
"""
This function gets default values for reply mail
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of fields for default value
- @param context: A standard dictionary for contextual values
-
- @return : default values of fields.
"""
hist_obj = self.pool.get('crm.case.history')
res_ids = context and context.get('active_ids', []) or []
@@ -174,21 +159,25 @@ class crm_send_new_email(osv.osv_memory):
model = hist.log_id.model_id.model
model_pool = self.pool.get(model)
case = model_pool.browse(cr, uid, hist.log_id.res_id)
- if 'to' in fields and hist.email:
- res.update({'to': hist.email})
+ if 'email_to' in fields:
+ res.update({'email_to': case.email_from or hist.email_from or False})
+ if 'email_from' in fields:
+ res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
+ (case.user_id and case.user_id.address_id and \
+ case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
if 'text' in fields:
header = '-------- Original Message --------'
- sender = 'From: %s' %(hist.email_from or tools.config.get('email_from',False))
- to = 'To: %s' % (hist.email)
- sentdate = 'Sent: %s' % (hist.date)
+ sender = 'From: %s' %(hist.email_from or '')
+ to = 'To: %s' % (hist.email_to or '')
+ sentdate = 'Date: %s' % (hist.date)
desc = '\n%s'%(hist.description)
original = [header, sender, to, sentdate, desc]
original = '\n'.join(original)
- res.update({'text': '\n\n%s'%(original)})
+ res['text']=original
if 'subject' in fields:
res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})
- #if 'state' in fields:
- # res.update({'state': 'pending'})
+ if 'state' in fields:
+ res['state']='pending'
return res
def view_init(self, cr, uid, fields_list, context=None):
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index ece20c89efd..55769455a2a 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -4,14 +4,15 @@
-
- crm.new.send.mail.form
+
+ crm.send.mail.form
crm.send.mail
form
-
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 7e70df3dc4a..dc019f9a4be 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -243,10 +243,8 @@ class crm_segmentation(osv.osv):
for partner_id in partners:
cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
- cr.commit()
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
- cr.commit()
return True
crm_segmentation()
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d07afd43e42..46400fa3da0 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,7 +148,8 @@
-
+
diff --git a/addons/idea/i18n/ru.po b/addons/idea/i18n/ru.po
index e17c673dceb..9f8622ada30 100644
--- a/addons/idea/i18n/ru.po
+++ b/addons/idea/i18n/ru.po
@@ -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: 2008-11-01 16:03+0000\n"
-"Last-Translator: Sergei Kostigoff \n"
+"PO-Revision-Date: 2010-03-30 10:33+0000\n"
+"Last-Translator: Nikolay Chesnokov \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-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
@@ -44,7 +44,7 @@ msgstr "Мои идеи"
#. module: idea
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
#. module: idea
#: selection:idea.idea,my_vote:0
@@ -119,7 +119,7 @@ msgstr "Категория идеи"
#. module: idea
#: model:ir.module.module,shortdesc:idea.module_meta_information
msgid "Idea Manager"
-msgstr ""
+msgstr "Менеджер идеи"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
@@ -222,6 +222,13 @@ msgid ""
"managers can obtain an easy view on best ideas from all the users. Once "
"installed, check the menu 'Ideas' in the 'Tools' main menu."
msgstr ""
+"Этот модуль позволяет вашему пользователю легко и эффективно участвовать в "
+"инновациях бизнеса. Он позволяет каждому выразить идеи о различных вопросах. "
+"После этого, другие пользователи могут прокомментировать эти идеи и провести "
+"голосование за идеи. Каждая идея как счет основанный на различных "
+"голосованиях. Менеджеры могут получить легкий взгляд на самые лучшие идеии "
+"от всех пользователей. Как только установлено, проверите меню «идеи» в "
+"главном меню «Инструменты»."
#. module: idea
#: field:idea.comment,create_date:0
@@ -242,7 +249,7 @@ msgstr "Кол-во голосов"
#. module: idea
#: model:ir.model,name:idea.model_idea_idea
msgid "idea.idea"
-msgstr ""
+msgstr "идеи.идеи"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
@@ -307,7 +314,7 @@ msgstr "Открытые идеи"
#: view:idea.idea:0
#: view:idea.vote.stat:0
msgid "vote_stat of ideas"
-msgstr ""
+msgstr "Статистика голосования"
#. module: idea
#: view:idea.comment:0
diff --git a/addons/l10n_be/wizard/partner_vat_listing.py b/addons/l10n_be/wizard/partner_vat_listing.py
index 09876a2c31c..ba5620a0b4e 100644
--- a/addons/l10n_be/wizard/partner_vat_listing.py
+++ b/addons/l10n_be/wizard/partner_vat_listing.py
@@ -230,19 +230,19 @@ class wizard_vat(wizard.interface):
states = {
'init': {
'actions': [],
- 'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('go_step','View Clients')]},
+ 'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel', 'gtk-cancel'),('go_step','View Clients', 'gtk-ok')]},
},
'go_step': {
'actions': [_get_partner],
- 'result': {'type':'form', 'arch':client_form, 'fields':client_fields, 'state':[('end','Cancel'),('go','Create XML')]},
+ 'result': {'type':'form', 'arch':client_form, 'fields':client_fields, 'state':[('end','Cancel', 'gtk-cancel'),('go','Create XML', 'gtk-ok')]},
},
'go': {
'actions': [_create_xml],
- 'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok')]},
+ 'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok', 'gtk-cancel')]},
}
}
wizard_vat('list.vat.detail')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/wizard_vat_intra.py b/addons/l10n_be/wizard/wizard_vat_intra.py
index 605313e3541..e29e2d9dcea 100644
--- a/addons/l10n_be/wizard/wizard_vat_intra.py
+++ b/addons/l10n_be/wizard/wizard_vat_intra.py
@@ -222,11 +222,11 @@ class parter_vat_intra(wizard.interface):
states = {
'init': {
'actions': [_get_europe_country],
- 'result': {'type': 'form', 'arch':form_intra, 'fields': fields_intra, 'state':[('end','Cancel'),('go','Create XML') ]}
+ 'result': {'type': 'form', 'arch':form_intra, 'fields': fields_intra, 'state':[('end','Cancel', 'gtk-cancel'),('go','Create XML', 'gtk-ok') ]}
},
'go': {
'actions': [_create_xml],
- 'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok')]},
+ 'result': {'type':'form', 'arch':msg_form, 'fields':msg_fields, 'state':[('end','Ok', 'gtk-cancel')]},
}
}
-parter_vat_intra('vat.intra.xml')
\ No newline at end of file
+parter_vat_intra('vat.intra.xml')
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index ee7676d4423..6a7df28b2d1 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -210,10 +210,22 @@ class mail_gateway(osv.osv):
}
return res
- def _decode_header(self, s):
+ def _to_decode(self, s, charsets):
+ for charset in charsets:
+ if charset:
+ try:
+ return s.decode(charset)
+ except UnicodeError:
+ pass
+ try:
+ return s.decode('ascii')
+ except UnicodeError:
+ return s
+
+ def _decode_header(self, s):
from email.Header import decode_header
s = decode_header(s)
- return ''.join(map(lambda x:x[0].decode(x[1] or 'ascii', 'replace'), s))
+ return ''.join(map(lambda x:self._to_decode(x[0], x[1]), s))
def msg_new(self, cr, uid, msg, model):
message = self.msg_body_get(msg)
@@ -250,7 +262,7 @@ class mail_gateway(osv.osv):
if part.get_content_maintype()=='text':
buf = part.get_payload(decode=True)
if buf:
- txt = buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
+ txt = self._to_decode(buf, part.get_charsets())
txt = re.sub("<(\w)>", replace, txt)
txt = re.sub("<\/(\w)>", replace, txt)
if txt and part.get_content_subtype() == 'plain':
@@ -362,13 +374,11 @@ class mail_gateway(osv.osv):
del msg['Subject']
msg['Subject'] = '[%s] %s' %(str(res_id), subject)
- em = [user_email, from_email] + (cc_email or '').split(',')
+ em = [user_email or '', from_email] + (cc_email or '').split(',')
emails = map(self.emails_get, filter(None, em))
-
mm = [self._decode_header(msg['From']), self._decode_header(msg['To'])]+self._decode_header(msg.get('Cc','')).split(',')
msg_mails = map(self.emails_get, filter(None, mm))
-
- emails = filter(lambda m: m and m not in msg_mails, emails)
+ emails = filter(lambda m: m and m not in msg_mails, emails)
try:
self.msg_send(msg, mailgateway.reply_to, emails, priority, res_id)
if hasattr(self.pool.get(res_model), 'msg_send'):
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index e1660a8aea4..c0bfc16aa98 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-15 20:33+0000\n"
-"Last-Translator: lem0na \n"
+"PO-Revision-Date: 2010-03-31 09:02+0000\n"
+"Last-Translator: Boris \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-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -1889,7 +1889,7 @@ msgstr ""
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_root
msgid "Manufacturing"
-msgstr ""
+msgstr "Производство"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 587b88abfa7..e55720e2c9e 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-11 20:49+0000\n"
+"PO-Revision-Date: 2010-03-30 14:06+0000\n"
"Last-Translator: TeMPO \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-03-30 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -853,7 +853,7 @@ msgstr "Machine"
#. module: mrp
#: model:process.node,name:mrp.process_node_servicemts0
msgid "Make to stock"
-msgstr "Production sur stock"
+msgstr "Sur stock"
#. module: mrp
#: field:mrp.workcenter,name:0
@@ -1088,7 +1088,7 @@ msgstr "Rendement produit"
#. module: mrp
#: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
msgid "Orderpoint minimum rule"
-msgstr "Règle de point de commande minimum"
+msgstr "Règle de stock minimum"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_servicemts0
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index b4238ea1fc2..cf3fc9234cf 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -7,24 +7,24 @@ 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-09-08 15:56+0000\n"
-"Last-Translator: Sergei Kostigoff \n"
+"PO-Revision-Date: 2010-03-30 10:42+0000\n"
+"Last-Translator: Nikolay Chesnokov \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-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
msgid "Moves Created"
-msgstr ""
+msgstr "Перемещение создано"
#. module: mrp
#: rml:mrp.production.order:0
msgid "No. Of Cycles"
-msgstr ""
+msgstr "№ цикла"
#. module: mrp
#: help:mrp.procurement.compute.all,init,automatic:0
@@ -37,34 +37,34 @@ msgstr ""
#. module: mrp
#: model:ir.module.module,shortdesc:mrp.module_meta_information
msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Планирование материальных ресурсов"
#. module: mrp
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
#. module: mrp
#: field:mrp.bom.revision,indice:0
msgid "Revision"
-msgstr ""
+msgstr "Ревизия"
#. module: mrp
#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Правила вычисления минимального запаса"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
msgid "Exceptions Procurements"
-msgstr ""
+msgstr "Исключения поставок"
#. module: mrp
#: view:mrp.routing.workcenter:0
msgid "Routing Workcenters"
-msgstr ""
+msgstr "Используемые мощности маршрута"
#. module: mrp
#: help:mrp.property,composition:0
@@ -75,7 +75,7 @@ msgstr ""
#: model:ir.actions.act_window,name:mrp.mrp_routing_action
#: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
msgid "Routings"
-msgstr ""
+msgstr "Маршруты"
#. module: mrp
#: field:mrp.production,picking_id:0
@@ -85,7 +85,7 @@ msgstr "Упаковочный лист"
#. module: mrp
#: model:process.node,name:mrp.process_node_stock0
msgid "Stockable Stock"
-msgstr ""
+msgstr "Склад для складирования"
#. module: mrp
#: field:mrp.procurement,origin:0
@@ -107,7 +107,7 @@ msgstr "Ссылка"
#. module: mrp
#: view:mrp.production:0
msgid "Finished Products"
-msgstr ""
+msgstr "Конечный продукт"
#. module: mrp
#: wizard_field:mrp.procurement.compute.all,init,automatic:0
@@ -118,7 +118,7 @@ msgstr ""
#. module: mrp
#: selection:mrp.bom,method:0
msgid "Set / Pack"
-msgstr ""
+msgstr "Установить / Упаковать"
#. module: mrp
#: constraint:ir.ui.view:0
@@ -149,7 +149,7 @@ msgstr "Продукция и местоположения"
#. module: mrp
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
-msgstr ""
+msgstr "ПМР и Логистическое планирование"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5da3f0b66e3..a238658302c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -144,8 +144,7 @@ class mrp_bom(osv.osv):
@return: True
- """
-
+ """
result = {}
for bom in self.browse(cr, uid, ids, context=context):
result[bom.id] = map(lambda x: x.id, bom.bom_lines)
@@ -156,7 +155,8 @@ class mrp_bom(osv.osv):
sids = self.pool.get('mrp.bom').search(cr, uid, [('bom_id','=',False),('product_id','=',bom.product_id.id)])
if sids:
bom2 = self.pool.get('mrp.bom').browse(cr, uid, sids[0], context=context)
- result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
+ result[bom.id] += map(lambda x: x.id, bom2.bom_lines)
+
return result
def _compute_type(self, cr, uid, ids, field_name, arg, context):
res = dict(map(lambda x: (x,''), ids))
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 4b3f73f34d8..03784511f14 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -64,7 +64,7 @@ class pos_company_discount(osv.osv):
'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
'account_receivable': fields.many2one('account.account',
- 'Default Receivable', required=True, states={'draft': [('readonly', False)]}),
+ 'Default Receivable', states={'draft': [('readonly', False)]}),
}
pos_company_discount()
@@ -158,28 +158,8 @@ class pos_order(osv.osv):
if val
-
+
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index a761e78c362..0cfc0fae9b7 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -27,4 +27,13 @@
"access_pos_open_statement","pos.close.statement","model_pos_close_statement","point_of_sale.group_pos_user",1,0,0,0
"acess_pos_box_entries ","pos.box.entries ","model_pos_box_entries","point_of_sale.group_pos_user",1,0,0,0
"access_pos_box_out","pos.box.out","model_pos_box_out","point_of_sale.group_pos_user",1,0,0,0
-"acess_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_details ","pos.details ","model_pos_details","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sale.user","model_pos_sale_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sale_user","pos.sales.user.today","model_pos_sales_user_today","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_sales_user_today_current_user","pos.sales.user.today.current_user","model_pos_sales_user_today_current_user","point_of_sale.group_pos_user",1,0,0,0
+"access_all_closed_cashbox_of_the_day","all.closed.cashbox.of.the.day","model_all_closed_cashbox_of_the_day","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_receipt","pos.receipt ","model_pos_receipt","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_user","pos.payment.report.user","model_pos_payment_report_user","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_payment_report_date ","pos.payment.report.date ","model_pos_payment_report_date","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_make_payment","pos.make.payment","model_pos_make_payment","point_of_sale.group_pos_user",1,0,0,0
+"access_pos_scan_product","pos.scan.product","model_pos_scan_product","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index 96b0e0f2961..cdfd3f9fb20 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -19,19 +19,7 @@
# along with this program. If not, see .
#
##############################################################################
-
-#import wizard_pos_payment
-
-
-
import wizard_return
-
-
-
-
-
-#import wizard_open_statement
-
import pos_add_product
import pos_confirm
import pos_discount
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 7d6dd346c12..077e2ed89dc 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -31,13 +31,7 @@
new
{'record_id' : active_id}
-
+
\ No newline at end of file
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index f875c093984..c7b0da38168 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -54,16 +54,15 @@ class pos_make_payment(osv.osv_memory):
journal = None
wf_service = netsvc.LocalService("workflow")
- order = self.pool.get('pos.order').browse(cr, uid, record_id, context)
+ order_obj=self.pool.get('pos.order')
+ order = order_obj.browse(cr, uid, record_id, context)
#get amount to pay
amount = order.amount_total - order.amount_paid
-
- if amount<=0.0:
- context.update({'flag':True})
- self.pool.get('pos.order').action_paid(cr,uid,[record_id],context)
+ if amount <= 0.0:
+ context.update({'flag': True})
+ order_obj.action_paid(cr, uid, [record_id], context)
elif order.amount_paid > 0.0:
- self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
-
+ order_obj.write(cr, uid, [record_id], {'state': 'advance'})
invoice_wanted_checked = False
current_date = time.strftime('%Y-%m-%d')
@@ -107,13 +106,14 @@ class pos_make_payment(osv.osv_memory):
amount = order.amount_total - order.amount_paid
if amount==0.0:
res['arch'] = """ """
+
+
+
+
+
+
+
+ """
return res
def check(self, cr, uid, ids, context=None):
@@ -145,7 +145,11 @@ class pos_make_payment(osv.osv_memory):
if order.partner_id and order.invoice_wanted:
return self.create_invoice(cr,uid,ids,context)
else:
- return self.print_report(cr, uid, ids, context)
+ order_obj.write(cr, uid, [record_id],{'state':'paid'})
+ return self.print_report(cr, uid, ids, context)
+ if order.amount_paid > 0.0:
+ self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
+ return self.print_report(cr, uid, ids, context)
return {}
@@ -175,18 +179,13 @@ class pos_make_payment(osv.osv_memory):
datas = {'ids' : context.get('active_ids',[])}
res = {}
datas['form'] = res
- return {
- 'type' : 'ir.actions.report.xml',
- 'report_name':'pos.receipt',
- 'datas' : datas,
- }
-
- def trigger_wkf(self, cr, uid, data, context):
- record_id = context and context.get('active_id',False)
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'pos.order', record_id, 'payment', cr)
- return {}
-
+
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'pos.receipt',
+ 'datas': datas,
+ }
+
_columns = {
'journal':fields.selection(pos_box_entries.get_journal, "Journal",required=True),
'product_id': fields.many2one('product.product', "Acompte"),
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 771ec3c72e3..6608f837a63 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -24,10 +24,10 @@
-
-
-
-
+
+
+
+
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index 593068a9ebf..0d925eb2ba9 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -8,10 +8,8 @@
pos.payment.report
form
-
@@ -101,8 +100,8 @@
-
+
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 3ea0b196705..ef1e002ae78 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -35,11 +35,7 @@ class project_issue_report(osv.osv):
c.priority as priority,
c.project_id as project_id,
c.type_id as type_id,
- count(*) as nbr,
- sum(planned_revenue) as amount_revenue,
- sum(planned_cost) as amount_costs,
- sum(planned_revenue*probability/100)::decimal(16,2) as amount_revenue_prob,
- avg(probability)::decimal(16,2) as probability,
+ count(*) as nbr,
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
from
project_issue c
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index c02a979c780..9f831b6f0cf 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-22 21:23+0000\n"
-"Last-Translator: lem0na \n"
+"PO-Revision-Date: 2010-03-31 08:57+0000\n"
+"Last-Translator: Boris \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-03-30 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -482,7 +482,7 @@ msgstr ""
#: model:ir.module.module,shortdesc:purchase.module_meta_information
#: model:ir.ui.menu,name:purchase.menu_purchase_root
msgid "Purchase Management"
-msgstr ""
+msgstr "Поръчки"
#. module: purchase
#: field:purchase.order,partner_ref:0
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 05bbfa477e0..2b5cd16c4a9 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -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: 2009-12-26 09:01+0000\n"
-"Last-Translator: lem0na \n"
+"PO-Revision-Date: 2010-03-31 08:48+0000\n"
+"Last-Translator: Boris \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-03-30 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-04-01 03:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -599,7 +599,7 @@ msgstr "Опаковане"
#: model:ir.module.module,shortdesc:sale.module_meta_information
#: model:ir.ui.menu,name:sale.menu_sale_root
msgid "Sales Management"
-msgstr "Управление на продажби"
+msgstr "Продажби"
#. module: sale
#: field:sale.order.line,order_id:0
@@ -1174,7 +1174,7 @@ msgstr "Фактура за"
#: model:ir.actions.act_window,name:sale.action_order_tree_new
#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
msgid "New Quotation"
-msgstr "Ново запитване"
+msgstr "Нова оферта"
#. module: sale
#: view:sale.order:0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c62487cfe1e..073d95dac27 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -85,7 +85,6 @@
-
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index a9ea13ea900..90bdf2a6828 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index ad751807bd7..846aa6bfccc 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -52,6 +52,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
"wizard/stock_location_product_view.xml",
"wizard/stock_inventory_line_split_view.xml",
"wizard/stock_change_standard_price_view.xml",
+ "wizard/stock_picking_make_view.xml",
"wizard/stock_traceability_view.xml",
"wizard/stock_picking_make_view.xml",
"wizard/stock_return_picking_view.xml",
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index e1e412690fc..1ea74cea1ef 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -26,7 +26,7 @@
- ['|',('company_id','=',False),,('company_id','=',False)]
+ ['|',('company_id','=',False),('company_id','=',False)]
child_of
user.company_id.id
@@ -41,7 +41,7 @@
- ['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
@@ -52,7 +52,7 @@
- ['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
@@ -76,7 +76,7 @@
- ['|',('company_id','=',False),,('company_id','child_of',[user.company_id.id])]
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5c02ccae976..94fab1dacec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -543,12 +543,12 @@ class stock_picking(osv.osv):
# TODO: Check locations to see if in the same location ?
return True
- def button_confirm(self, cr, uid, ids, *args):
- for id in ids:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'stock.picking', id, 'button_confirm', cr)
- self.force_assign(cr, uid, ids, *args)
- return True
+# def button_confirm(self, cr, uid, ids, *args):
+# for id in ids:
+# wf_service = netsvc.LocalService("workflow")
+# wf_service.trg_validate(uid, 'stock.picking', id, 'button_confirm', cr)
+# self.force_assign(cr, uid, ids, *args)
+# return True
def action_assign(self, cr, uid, ids, *args):
for pick in self.browse(cr, uid, ids):
@@ -2096,7 +2096,6 @@ class stock_picking_move_wizard(osv.osv_memory):
if line.picking_id:
picking_obj.write(cr, uid, [line.picking_id.id], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
picking_obj.write(cr, uid, [act['picking_id']], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
- cr.commit()
old_picking = picking_obj.read(cr, uid, [line.picking_id.id])[0]
if not len(old_picking['move_lines']):
picking_obj.write(cr, uid, [old_picking['id']], {'state': 'done'})
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index e2f525f9c15..42415139dc1 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -12,14 +12,5 @@
multi="True"
name="stock.inventory.line.split"
string="Split inventory lines"/>
-
-
-
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml.moved b/addons/stock/wizard/stock_inventory_merge_view.xml.moved
new file mode 100644
index 00000000000..e8af34c0c71
--- /dev/null
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml.moved
@@ -0,0 +1,27 @@
+
+
+
+
+
+ stock.inventory.merge.form
+ stock.inventory.merge
+ form
+
+
+
+
+
+
+
+
diff --git a/addons/stock/wizard/stock_picking_make_view.xml.moved b/addons/stock/wizard/stock_picking_make_view.xml.moved
new file mode 100644
index 00000000000..fa77042c5d8
--- /dev/null
+++ b/addons/stock/wizard/stock_picking_make_view.xml.moved
@@ -0,0 +1,31 @@
+
+
+
+
+
+ Make Picking
+ stock.picking.make
+ form
+
+
+
+
+
+
+ Make Picking
+ ir.actions.act_window
+ stock.picking.make
+ form
+ form
+ new
+
+
+
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
new file mode 100644
index 00000000000..558afcd8aea
--- /dev/null
+++ b/addons/survey/i18n/de.po
@@ -0,0 +1,697 @@
+# German 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 , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-26 06:01+0000\n"
+"PO-Revision-Date: 2010-03-31 21:32+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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-01 03:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_form
+msgid "Surveys"
+msgstr "Umfragen"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey
+msgid "Survey Analysis Report"
+msgstr "Umfrage Analyse Report"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.ui.menu,name:survey.menu_survey_question_form1
+msgid "Survey Questions"
+msgstr "Umfrage Fragen"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.response:0
+msgid "Set to draft"
+msgstr "Setze auf Entwurf"
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "Startdatum"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Historie"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail:0
+msgid "Body"
+msgstr "Hauptteil"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Give Survey Response"
+msgstr "Gib Umfrage Antworten"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "All Questions"
+msgstr "Alle Fragen"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "Umfrage Start Datum"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr "survey.name.wiz"
+
+#. module: survey
+#: view:survey:0
+msgid "Users Details"
+msgstr "Benutzer Details"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "Umfrage Frage"
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if you require only one response per user"
+msgstr "Setze auf eins, wenn nur eine Antwort je Benutzer benötigt wird"
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Seitentitel"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Umfrage Geschichte"
+
+#. module: survey
+#: field:survey.response,comment:0
+#: field:survey.response.answer,comment:0
+msgid "Notes"
+msgstr "Bemerkung"
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Response"
+msgstr "Gesamt Antworten"
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Ihre Mitteilung"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "Kommentarfeld erlauben"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Warnung!"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "Setze Erinnerung für bestehend Benutzer"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
+msgid "New Survey Question"
+msgstr "Neue Umfrage Frage"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Skip"
+msgstr "Überspringe"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,partner_ids:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_subject:0
+#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
+msgid "Subject"
+msgstr "Betrifft"
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Response Limit"
+msgstr "Maximale Anworten Grenze"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,init,mail_from:0
+msgid "From"
+msgstr "Von"
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Response Type"
+msgstr "Antwort Typ"
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "Seite Übertragung"
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.response,question_id:0
+msgid "Question"
+msgstr "Frage"
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,init,send:0
+msgid "Send"
+msgstr "Absenden"
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Response"
+msgstr "# Antwort"
+
+#. module: survey
+#: field:survey.response,response_answer_ids:0
+msgid "Response Answer"
+msgstr "Antwort"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Summary"
+msgstr "Antwort Zusammenfassung"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+#: wizard_field:wizard.send.invitation,init,send_mail:0
+msgid "Send mail for new user"
+msgstr "Mail an neuen Benutzer senden"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Error !"
+msgstr "Fehler !"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Skipped Question"
+msgstr "Übersprungene Frage"
+
+#. module: survey
+#: wizard_button:wizard.send.invitation,send,end:0
+msgid "_Ok"
+msgstr "_OK"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "Link"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_survey_config
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr "survey.question.wiz"
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML Code für diese Ansicht!"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.response.answer:0
+msgid "Survey Response Answer"
+msgstr ""
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Page :-"
+msgstr "Seite :-"
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Response per User"
+msgstr "Maximale Antworten je Benutzer"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Started Survey :-"
+msgstr "Gesamt gestartete Umfrage :-"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Comment"
+msgstr "Kommentar"
+
+#. module: survey
+#: field:survey.response,date_modify:0
+msgid "Modify Date"
+msgstr "Datum ändern"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Answered Question"
+msgstr "Beantwortete Frage"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr "Sie können diese Umfrage nicht öfter als %s Mal beantworten"
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "Manuell"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+msgid "All Surveys"
+msgstr "Alle Umfragen"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,users:0
+msgid "Users"
+msgstr "Benutzer"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Message"
+msgstr "Nachricht"
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr "Seitennummer"
+
+#. module: survey
+#: wizard_field:wizard.send.invitation,send,note:0
+msgid "Log"
+msgstr "Protokoll"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "All Survey Questions"
+msgstr "Alle Umfrage Fragen"
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "Umfrage Enddatum"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "Start"
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.response,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Abgeschlossen"
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.response.answer,answer_id:0
+msgid "Answer"
+msgstr "Antwort"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+msgid "All Survey Pages"
+msgstr "Alle Umfrage Seiten"
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "Speichere Antwort"
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr "Umfrage Modul"
+
+#. module: survey
+#: model:ir.module.module,description:survey.module_meta_information
+msgid ""
+"\n"
+" This module is used for surveing. It depends on the answers or reviews "
+"of some questions by different users.\n"
+" A survey may have multiple pages. Each page may contain multiple "
+"questions and each question may have multiple answers.\n"
+" Different users may give different answers of question and according to "
+"that survey is done. \n"
+" Partners are also sent mails with user name and password for the "
+"invitation of the survey\n"
+" "
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "Umfrage Details"
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Required Answer"
+msgstr "zwingend notwendige Anwort"
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: field:survey.response,response_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "Gruppen"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,response_ids:0
+#: view:survey.response:0
+#: field:survey.response.answer,response_id:0
+msgid "Response"
+msgstr "Antwort"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_form1
+#: model:ir.ui.menu,name:survey.menu_new_survey_form
+msgid "New Survey"
+msgstr "Neue Umfrage"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.main_menu_survey
+msgid "Survey Management"
+msgstr "Umfrage Management"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Skiped"
+msgstr "Übersprungen"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: view:survey.answer:0
+msgid "Survey Answer"
+msgstr "Umfrage Antwort"
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "Attention!"
+msgstr "Achtung!"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey
+#: view:res.users:0
+#: view:survey:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: field:survey.page,survey_id:0
+#: field:survey.question,survey:0
+msgid "Survey"
+msgstr "Umfrage"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Total Completed Survey :-"
+msgstr "Gesamt abgeschlossene Umfrage :-"
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "Verlauf"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "Gesamt abgeschlossene Umfrage"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Percentage"
+msgstr "Antwort Prozente"
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "Anzahl"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Survey Title :-"
+msgstr "Umfrage Titel"
+
+#. module: survey
+#: view:survey.response:0
+msgid "Done"
+msgstr "Fertig"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+#: wizard_button:wizard.send.invitation,init,end:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "Schließen"
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "Öffnen"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "Gesamt gestartete Umfrage"
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+"beinhalten"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+#: view:survey.response:0
+msgid "Survey Response"
+msgstr "Umfrage Antwort"
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "# Mittel"
+
+#. module: survey
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "Verantwortlich"
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Answered"
+msgstr "Beantwortet"
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "Andere"
+
+#. module: survey
+#: model:ir.actions.wizard,name:survey.wizard_send_invitation
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Send Invitation"
+msgstr "Einladung verschicken"
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "Umfragetitel"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "%"
+msgstr "%"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "Auswahl Umfrage"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
+#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
+msgid "New Survey Page"
+msgstr "Neue Umfrage Seite"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "Umfrage Seite"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Survey Answers"
+msgstr "Umfrage Antworten"
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "# Fragen"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Que:"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+msgid "Page"
+msgstr "Seite"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "User creation"
+msgstr "Benutzer anlegen"
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.page,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,send:0
+msgid "Results :"
+msgstr "Ergebnisse:"
+
+#. module: survey
+#: code:addons/survey/wizard/wizard_survey.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%s Umfrage ist nicht im Status Offen"
+
+#. module: survey
+#: wizard_view:wizard.send.invitation,init:0
+msgid "Select Partner"
+msgstr "Wähle Partner"
+
+#. module: survey
+#: field:survey.response,date_create:0
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+msgid "Survey Pages"
+msgstr "Umfrage Seiten"
+
+#. module: survey
+#: rml:survey_analysis_report:0
+msgid "Response Count"
+msgstr "Umfrage Anzahl"
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "Seitenposition"