[tryton-debian-vcs] tryton-modules-sale-opportunity branch upstream created. 45d0c92cc94a1364b6a9c305d7062ced51647a40

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:09:08 UTC 2013


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-opportunity.git;a=commitdiff;h=45d0c92cc94a1364b6a9c305d7062ced51647a40
commit 45d0c92cc94a1364b6a9c305d7062ced51647a40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:27:56 2013 +0100

    Adding upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 633ca6c..6db1f6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,6 @@
-Version 2.8.2 - 2013-10-01
-* Bug fixes (see mercurial logs for details)
-
-Version 2.8.1 - 2013-07-22
+Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
+* Make party optional in leads
 
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 8162037..5db00b9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
 
  * Python 2.6 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
+ * python-sql (http://code.google.com/p/python-sql/)
  * trytond_party (http://www.tryton.org/)
  * trytond_company (http://www.tryton.org/)
  * trytond_product (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 71580de..74896c8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.8.2
+Version: 3.0.0
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_sale_opportunity
         ========================
         
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/__init__.py b/__init__.py
index 538945e..336ed57 100644
--- a/__init__.py
+++ b/__init__.py
@@ -3,6 +3,7 @@
 
 from trytond.pool import Pool
 from .opportunity import *
+from .configuration import *
 
 
 def register():
@@ -14,6 +15,7 @@ def register():
         OpenSaleOpportunityEmployeeStart,
         SaleOpportunityMonthly,
         SaleOpportunityEmployeeMonthly,
+        Configuration,
         module='sale_opportunity', type_='model')
     Pool.register(
         OpenSaleOpportunityEmployee,
diff --git a/configuration.py b/configuration.py
new file mode 100644
index 0000000..fb3c7d5
--- /dev/null
+++ b/configuration.py
@@ -0,0 +1,19 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from trytond.model import fields
+from trytond.pyson import Eval
+from trytond.pool import PoolMeta
+
+__all__ = ['Configuration']
+__metaclass__ = PoolMeta
+
+
+class Configuration:
+    'Sale Configuration'
+    __name__ = 'sale.configuration'
+    sale_opportunity_sequence = fields.Property(fields.Many2One('ir.sequence',
+            'Opportunity Reference Sequence', domain=[
+                ('company', 'in', [Eval('context', {}).get('company', -1),
+                        None]),
+                ('code', '=', 'sale.opportunity'),
+                ], required=True))
diff --git a/configuration.xml b/configuration.xml
new file mode 100644
index 0000000..927e517
--- /dev/null
+++ b/configuration.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+        <record model="ir.ui.view"
+            id="sale_opportunity_configuration_view_form">
+            <field name="model">sale.configuration</field>
+            <field name="inherit" ref="sale.sale_configuration_view_form"/>
+            <field name="name">configuration_form</field>
+        </record>
+
+        <record model="ir.property" id="property_sale_opportunity_sequence">
+            <field name="field"
+                search="[('model.model', '=', 'sale.configuration'), ('name', '=', 'sale_opportunity_sequence')]"/>
+            <field name="value"
+                eval="'ir.sequence,' + str(ref('sequence_sale_opportunity'))"/>
+        </record>
+    </data>
+</tryton>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 84940ee..4080ff5 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr ""
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Адрес"
@@ -86,6 +90,11 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Име"
 
+#, fuzzy
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Препратка"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Продажба"
@@ -563,6 +572,16 @@ msgctxt ""
 msgid "Opportunities"
 msgstr ""
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Възможност за продажба"
+
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Възможност за продажба"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Възможности по служител по месец"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 422ee8e..371c82f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr "Heu de cancel·lar l 'oportunitat \"%s\" abans de ser eliminat."
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Seqüència referència oportunitat"
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adreça"
@@ -86,6 +90,10 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Referència"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Venda"
@@ -560,6 +568,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Oportunitats"
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunitat"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunitat"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Oportunitats per treballador i mes"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 0d98d4c..9e9271a 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr ""
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr ""
@@ -86,6 +90,10 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr ""
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr ""
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr ""
@@ -560,6 +568,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6f7453d..e7274f1 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -12,6 +12,10 @@ msgstr ""
 "Verkaufschance \"%s\" muss annulliert werden, bevor sie gelöscht werden "
 "kann."
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Nummernkreis Verkaufschance Beleg"
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adresse"
@@ -88,6 +92,10 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Name"
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Beleg"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Verkauf"
@@ -562,6 +570,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Verkaufschancen"
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Verkaufschance"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 34b5ec1..cecc48d 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr "Debe cancelar la oportunidad «%s» antes de eliminar."
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Secuencia de referencia de oportunidad"
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Dirección"
@@ -36,11 +40,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
 
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
@@ -86,6 +90,10 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Referencia"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Venta"
@@ -276,11 +284,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
 
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
@@ -356,11 +364,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
 
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
@@ -432,11 +440,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
@@ -560,6 +568,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Oportunidades"
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de venta"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de venta"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Oportunidades por empleado y mes"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 39cc7e7..9007cc9 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr "La Oportunidad de Venta \"%s\" debe ser cancelada antes de ser eliminada."
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Secuencia de Referencia de Oportunidad"
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Dirección"
@@ -86,6 +90,10 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Referencia"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Venta"
@@ -560,6 +568,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Oportunidades"
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de Venta"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de Venta"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Oportunidades por Empleado por Mes"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1933e0c..1303ede 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -8,7 +8,11 @@ msgstr "La probabilidad debe estar entre 0 y 100."
 
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
-msgstr "Debe cancelar la oportunidad \"%s\" antes de borrar."
+msgstr "Debe cancelar la oportunidad \"%s\" antes de borrarla."
+
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Secuencia referencia oportunidad"
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -80,12 +84,16 @@ msgstr "Plazo de pago"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr "Probabilidad de conversión"
+msgstr "Probabilidad de éxito"
 
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nombre"
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Referencia"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Venta"
@@ -164,7 +172,7 @@ msgstr "Tercero"
 
 msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr "Probabilidad de conversión"
+msgstr "Probabilidad de éxito"
 
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
@@ -252,19 +260,19 @@ msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Tasa de importe convertido"
+msgstr "Porcentaje conseguido (sobre importe total)"
 
 msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Tasa de conversión"
+msgstr "Porcentaje conseguido (sobre el número)"
 
 msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr "Convertida"
+msgstr "Conseguidas"
 
 msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr "Importe convertido"
+msgstr "Importe conseguido"
 
 msgctxt "field:sale.opportunity_employee,create_date:"
 msgid "Create Date"
@@ -332,19 +340,19 @@ msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Tasa de importe convertido"
+msgstr "Porcentaje conseguido (sobre importe total)"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Tasa de conversión"
+msgstr "Porcentaje conseguido (sobre el número)"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr "Convertida"
+msgstr "Conseguidas"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr "Importe convertido"
+msgstr "Importe conseguido"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_date:"
 msgid "Create Date"
@@ -372,7 +380,7 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
-msgstr "Perdida"
+msgstr "Perdidas"
 
 msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
@@ -416,11 +424,11 @@ msgstr "Tasa de conversión"
 
 msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr "Convertida"
+msgstr "Conseguidas"
 
 msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr "Importe convertido"
+msgstr "Importe conseguido"
 
 msgctxt "field:sale.opportunity_monthly,create_date:"
 msgid "Create Date"
@@ -444,7 +452,7 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
-msgstr "Perdida"
+msgstr "Perdidas"
 
 msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
@@ -543,7 +551,7 @@ msgstr "Cancelada"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
 msgid "Converted"
-msgstr "Convertida"
+msgstr "Conseguida"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
@@ -560,6 +568,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Oportunidades"
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidades"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidades"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Oportunidades por empleado y mes"
@@ -594,7 +610,7 @@ msgstr "Historial de oportunidades"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr "Línia de oportunidad"
+msgstr "Línea de oportunidad"
 
 msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
@@ -618,7 +634,7 @@ msgstr "Cancelada"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
-msgstr "Convertida"
+msgstr "Conseguida"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
@@ -638,7 +654,7 @@ msgstr "Cancelada"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
-msgstr "Convertida"
+msgstr "Conseguida"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
@@ -662,11 +678,11 @@ msgstr "Iniciativa/Oportunidad"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr "Línia iniciativa/oportunidad"
+msgstr "Línea iniciativa/oportunidad"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr "Línias Iniciativas/Oportunidades"
+msgstr "Líneas Iniciativas/Oportunidades"
 
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
@@ -678,7 +694,7 @@ msgstr "Convertir a oportunidad"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr "Convertir a pedido"
+msgstr "Convertir a pedido de venta"
 
 msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
@@ -710,7 +726,7 @@ msgstr "Oportunidades por empleado"
 
 msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr "Oportunidades por mes"
+msgstr "Oportunidades por empleado y mes"
 
 msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 627f76c..f0cd616 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr "L'opportunité de vente \"%s\" doit être annulée avant sa suppression."
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Séquence de référence d'opportunité"
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adresse"
@@ -86,6 +90,10 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Référence"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Vente"
@@ -520,11 +528,11 @@ msgstr "Opportunités par employé"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr "Opportunités"
+msgstr "Prospects et opportunités"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr "Contacts commerciaux / Opportunités de vente"
+msgstr "Prospects / Opportunités de ventes"
 
 msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
@@ -548,7 +556,7 @@ msgstr "Convertie"
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
 msgid "Leads"
-msgstr "Leads"
+msgstr "Prospects"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
@@ -560,6 +568,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Opportunités"
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Opportunité de vente"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Opportunité de vente"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Opportunités par employé par mois"
@@ -570,7 +586,7 @@ msgstr "Opportunités par employé"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr "Contacts et opportunités de vente"
+msgstr "Prospects et opportunités"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
@@ -666,7 +682,7 @@ msgstr "Ligne de contact / Opportunité de vente"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr "Lignes de contacts / Opportunités de vente"
+msgstr "Lignes de prospects / opportunités de vente"
 
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
@@ -694,7 +710,7 @@ msgstr "Contact commercial / Opportunité de vente"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr "Contacts commerciaux / Opportunités"
+msgstr "Prospects / Opportunités de ventes"
 
 msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index ba8c17a..b757949 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr ""
+
 #, fuzzy
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -100,6 +104,11 @@ msgid "Name"
 msgstr "Naam bijlage"
 
 #, fuzzy
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Referentie"
+
+#, fuzzy
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Verkoop"
@@ -627,6 +636,14 @@ msgctxt ""
 msgid "Opportunities"
 msgstr ""
 
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index f0c2acb..d216595 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -10,6 +10,10 @@ msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr "Продажа Возможной \"%s\" должна быть отменена перед удалением."
 
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr ""
+
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Адрес"
@@ -86,6 +90,11 @@ msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
+#, fuzzy
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Ссылка"
+
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Продажа"
@@ -560,6 +569,16 @@ msgctxt ""
 msgid "Opportunities"
 msgstr "Возможные продажи"
 
+#, fuzzy
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Продажа Возможной"
+
+#, fuzzy
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Продажа Возможной"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Возможные продажи по сотрудникам по месяцам"
diff --git a/locale/de_DE.po b/locale/sl_SI.po
similarity index 75%
copy from locale/de_DE.po
copy to locale/sl_SI.po
index 6f7453d..784f937 100644
--- a/locale/de_DE.po
+++ b/locale/sl_SI.po
@@ -4,61 +4,63 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100."
-msgstr "Wahrscheinlichkeit muss zwischen 0 und 100 liegen."
+msgstr "Verjetnost mora biti med 0 in 100"
 
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
-msgstr ""
-"Verkaufschance \"%s\" muss annulliert werden, bevor sie gelöscht werden "
-"kann."
+msgstr "Prodajna priložnost \"%s\" more biti pred brisanjem preklicana."
+
+msgctxt "field:sale.configuration,sale_opportunity_sequence:"
+msgid "Opportunity Reference Sequence"
+msgstr "Štetje priložnosti"
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
-msgstr "Adresse"
+msgstr "Naslov"
 
 msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
-msgstr "Betrag"
+msgstr "Znesek"
 
 msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
-msgstr "Kommentar"
+msgstr "Opomba"
 
 msgctxt "field:sale.opportunity,company:"
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Podjetje"
 
 msgctxt "field:sale.opportunity,create_date:"
 msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
 
 msgctxt "field:sale.opportunity,create_uid:"
 msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
 
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Währung"
+msgstr "Valuta"
 
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
+msgstr "Decimalke"
 
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
-msgstr "Bezeichnung"
+msgstr "Opis"
 
 msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
-msgstr "Mitarbeiter"
+msgstr "Zaposlenec"
 
 msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
-msgstr "Enddatum"
+msgstr "Končni datum"
 
 msgctxt "field:sale.opportunity,history:"
 msgid "History"
-msgstr "Historie"
+msgstr "Zgodovina"
 
 msgctxt "field:sale.opportunity,id:"
 msgid "ID"
@@ -66,83 +68,87 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
-msgstr "Positionen"
+msgstr "Postavke"
 
 msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
-msgstr "Ursache für Verlust"
+msgstr "Razlog za zapravljeno priložnost"
 
 msgctxt "field:sale.opportunity,party:"
 msgid "Party"
-msgstr "Partei"
+msgstr "Stranka"
 
 msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
-msgstr "Zahlungsbedingung"
+msgstr "Plačilni rok"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr "Umwandlungswahrscheinlichkeit"
+msgstr "Verjetnost pretvorbe"
 
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
-msgstr "Name"
+msgstr "Ime"
+
+msgctxt "field:sale.opportunity,reference:"
+msgid "Reference"
+msgstr "Sklic"
 
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
-msgstr "Verkauf"
+msgstr "Prodajni nalog"
 
 msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
-msgstr "Anfangsdatum"
+msgstr "Začetni datum"
 
 msgctxt "field:sale.opportunity,state:"
 msgid "State"
-msgstr "Status"
+msgstr "Stanje"
 
 msgctxt "field:sale.opportunity,write_date:"
 msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
 
 msgctxt "field:sale.opportunity,write_uid:"
 msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
 
 msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
-msgstr "Adresse"
+msgstr "Naslov"
 
 msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
-msgstr "Kommentar"
+msgstr "Opomba"
 
 msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Podjetje"
 
 msgctxt "field:sale.opportunity.history,create_date:"
 msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
 
 msgctxt "field:sale.opportunity.history,create_uid:"
 msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
 
 msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr "Änderungsdatum"
+msgstr "Spremenjeno"
 
 msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
-msgstr "Bezeichnung"
+msgstr "Opis"
 
 msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
-msgstr "Mitarbeiter"
+msgstr "Zaposlenec"
 
 msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
-msgstr "Enddatum"
+msgstr "Končni datum"
 
 msgctxt "field:sale.opportunity.history,id:"
 msgid "ID"
@@ -150,55 +156,55 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
-msgstr "Positionen"
+msgstr "Postavke"
 
 msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
-msgstr "Ursache für Verlust"
+msgstr "Razlog za zapravljeno priložnost"
 
 msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
-msgstr "Verkaufschance"
+msgstr "Prodajna priložnost"
 
 msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
-msgstr "Partei"
+msgstr "Stranka"
 
 msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr "Umwandlungswahrscheinlichkeit"
+msgstr "Verjetnost pretvorbe"
 
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
-msgstr "Name"
+msgstr "Ime"
 
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
-msgstr "Anfangsdatum"
+msgstr "Začetni datum"
 
 msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
-msgstr "Status"
+msgstr "Stanje"
 
 msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
-msgstr "Benutzer"
+msgstr "Uporabnik"
 
 msgctxt "field:sale.opportunity.history,write_date:"
 msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
 
 msgctxt "field:sale.opportunity.history,write_uid:"
 msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
 
 msgctxt "field:sale.opportunity.line,create_date:"
 msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
 
 msgctxt "field:sale.opportunity.line,create_uid:"
 msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
 
 msgctxt "field:sale.opportunity.line,id:"
 msgid "ID"
@@ -206,87 +212,87 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
-msgstr "Verkaufschance"
+msgstr "Priložnost"
 
 msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
-msgstr "Artikel"
+msgstr "Izdelek"
 
 msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
-msgstr "Anzahl"
+msgstr "Količina"
 
 msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
-msgstr "Name"
+msgstr "Ime"
 
 msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
-msgstr "Position Verkauf"
+msgstr "Prodajna postavka"
 
 msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
-msgstr "Reihenfolge"
+msgstr "Zap.št."
 
 msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
-msgstr "Einheit"
+msgstr "Enota"
 
 msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Einheit Anzahl Stellen"
+msgstr "Decimalke"
 
 msgctxt "field:sale.opportunity.line,write_date:"
 msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
 
 msgctxt "field:sale.opportunity.line,write_uid:"
 msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
 
 msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
-msgstr "Betrag"
+msgstr "Znesek"
 
 msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Podjetje"
 
 msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Umwandlungsrate Betrag"
+msgstr "Stopnja pretvorjenega zneska"
 
 msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Umwandlungsrate"
+msgstr "Stopnja pretvorbe"
 
 msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr "Umgewandelt"
+msgstr "Pretvorjeno"
 
 msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr "Umgewandelter Betrag"
+msgstr "Pretvorjen znesek"
 
 msgctxt "field:sale.opportunity_employee,create_date:"
 msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
 
 msgctxt "field:sale.opportunity_employee,create_uid:"
 msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
 
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Währung"
+msgstr "Valuta"
 
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
+msgstr "Decimalke"
 
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
-msgstr "Mitarbeiter"
+msgstr "Zaposlenec"
 
 msgctxt "field:sale.opportunity_employee,id:"
 msgid "ID"
@@ -294,27 +300,27 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
-msgstr "Verlust"
+msgstr "Zapravljeno"
 
 msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
-msgstr "Nummer"
+msgstr "Številka"
 
 msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
-msgstr "Name"
+msgstr "Ime"
 
 msgctxt "field:sale.opportunity_employee,write_date:"
 msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
 
 msgctxt "field:sale.opportunity_employee,write_uid:"
 msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
 
 msgctxt "field:sale.opportunity_employee.open.start,end_date:"
 msgid "End Date"
-msgstr "Enddatum"
+msgstr "Končni datum"
 
 msgctxt "field:sale.opportunity_employee.open.start,id:"
 msgid "ID"
@@ -322,51 +328,51 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee.open.start,start_date:"
 msgid "Start Date"
-msgstr "Anfangsdatum"
+msgstr "Začetni datum"
 
 msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
-msgstr "Betrag"
+msgstr "Znesek"
 
 msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Podjetje"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Umwandlungsrate Betrag"
+msgstr "Stopnja pretvorjenega zneska"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Umwandlungsrate"
+msgstr "Stopnja pretvorbe"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr "Umgewandelt"
+msgstr "Pretvorjeno"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr "Umgewandelter Betrag"
+msgstr "Pretvorjen znesek"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_date:"
 msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
 msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Währung"
+msgstr "Valuta"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
+msgstr "Decimalke"
 
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
-msgstr "Mitarbeiter"
+msgstr "Zaposlenec"
 
 msgctxt "field:sale.opportunity_employee_monthly,id:"
 msgid "ID"
@@ -374,71 +380,71 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
-msgstr "Verlust"
+msgstr "Zapravljeno"
 
 msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
-msgstr "Monat"
+msgstr "Mesec"
 
 msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
-msgstr "Nummer"
+msgstr "Številka"
 
 msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
-msgstr "Name"
+msgstr "Ime"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_date:"
 msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
 msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
 
 msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
-msgstr "Jahr"
+msgstr "Leto"
 
 msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
-msgstr "Betrag"
+msgstr "Znesek"
 
 msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Podjetje"
 
 msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Umwandlungsrate Betrag"
+msgstr "Stopnja pretvorjenega zneska"
 
 msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Umwandlungsrate"
+msgstr "Stopnja pretvorbe"
 
 msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr "Umgewandelt"
+msgstr "Pretvorjeno"
 
 msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr "Umgewandelter Betrag"
+msgstr "Pretvorjen znesek"
 
 msgctxt "field:sale.opportunity_monthly,create_date:"
 msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Ustvarjeno"
 
 msgctxt "field:sale.opportunity_monthly,create_uid:"
 msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Ustvaril"
 
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Währung"
+msgstr "Valuta"
 
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
+msgstr "Decimalke"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
@@ -446,282 +452,290 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
-msgstr "Verlust"
+msgstr "Zapravljeno"
 
 msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
-msgstr "Monat"
+msgstr "Mesec"
 
 msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
-msgstr "Nummer"
+msgstr "Številka"
 
 msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
-msgstr "Name"
+msgstr "Ime"
 
 msgctxt "field:sale.opportunity_monthly,write_date:"
 msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Zapisano"
 
 msgctxt "field:sale.opportunity_monthly,write_uid:"
 msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Zapisal"
 
 msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
-msgstr "Jahr"
+msgstr "Leto"
 
 msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
-msgstr "Jahr-Monat"
+msgstr "Leto-Mesec"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr "Geschätzter Ertrag"
+msgstr "Ocenjen znesek prihodkov"
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
-msgstr "Prozentsatz zwischen 0 und 100"
+msgstr "Odstotek med 0 in 100"
 
 msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
-msgstr "In %"
+msgstr "V %"
 
 msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
-msgstr "In %"
+msgstr "V %"
 
 msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "In %"
+msgstr "V %"
 
 msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
-msgstr "In %"
+msgstr "V %"
 
 msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "In %"
+msgstr "V %"
 
 msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
-msgstr "In %"
+msgstr "V %"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
+msgstr "Priložnosti na zaposlenca"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
+msgstr "Mesečne prodajne priložnosti"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
+msgstr "Priložnosti na zaposlenca"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr "Interessenten und Verkaufschancen"
+msgstr "Sledi in priložnosti"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr "Interessenten/Verkaufschancen"
+msgstr "Prodajne sledi/priložnosti"
 
 msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr "Verkaufschancen pro Monat"
+msgstr "Priložnosti na mesec"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
 msgid "All"
-msgstr "Alle"
+msgstr "Vse"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
 msgid "Cancelled"
-msgstr "Annulliert"
+msgstr "Preklicano"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
 msgid "Converted"
-msgstr "Umgewandelt"
+msgstr "Pretvorjeno"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
 msgid "Leads"
-msgstr "Interessenten"
+msgstr "Sledi"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
 msgid "Lost"
-msgstr "Verlust"
+msgstr "Zapravljeno"
 
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
-msgstr "Verkaufschancen"
+msgstr "Priložnosti"
+
+msgctxt "model:ir.sequence,name:sequence_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Prodajna priložnost"
+
+msgctxt "model:ir.sequence.type,name:sequence_type_sale_opportunity"
+msgid "Sale Opportunity"
+msgstr "Prodajna priložnost"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
+msgstr "Mesečne priložnosti na zaposlenca"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
+msgstr "Priložnosti na zaposlenca"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr "Interessenten und Verkaufschancen"
+msgstr "Sledi in priložnosti"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr "Verkaufschancen pro Monat"
+msgstr "Priložnosti na mesec"
 
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
-msgstr "Auswertungen"
+msgstr "Poročila"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr "Verkaufschance"
+msgstr "Prodajna priložnost"
 
 msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
-msgstr "Verkaufschance"
+msgstr "Prodajna priložnost"
 
 msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr "Verkaufschancen Historie"
+msgstr "Zgodovina prodajne priložnosti"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr "Verkaufschance Position"
+msgstr "Postavka prodajne priložnosti"
 
 msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
-msgstr "Verkaufschance pro Mitarbeiter"
+msgstr "Prodajna priložnost na zaposlenca"
 
 msgctxt "model:sale.opportunity_employee.open.start,name:"
 msgid "Open Sale Opportunity per Employee"
-msgstr " Verkaufschancen pro Mitarbeiter Öffnen"
+msgstr "Odpri prodajno priložnost na zaposlenca"
 
 msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
-msgstr "Verkaufschance pro Mitarbeiter pro Monat"
+msgstr "Mesečna prodajna priložnost na zaposlenca"
 
 msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
-msgstr "Verkaufschance pro Monat"
+msgstr "Mesečna prodajna priložnost"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
-msgstr "Annulliert"
+msgstr "Preklicano"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
-msgstr "Umgewandelt"
+msgstr "Pretvorjeno"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
-msgstr "Interessent"
+msgstr "Sled"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
-msgstr "Verlust"
+msgstr "Zapravljeno"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
-msgstr "Verkaufschance"
+msgstr "Priložnost"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
-msgstr "Annulliert"
+msgstr "Preklicano"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
-msgstr "Umgewandelt"
+msgstr "Pretvorjeno"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
-msgstr "Interessent"
+msgstr "Sled"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
-msgstr "Verlust"
+msgstr "Zapravljeno"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
-msgstr "Chance"
+msgstr "Priložnost"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "History"
-msgstr "Historie"
+msgstr "Zgodovina"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
-msgstr "Interessent/Chance"
+msgstr "Sled/Priložnost"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr "Interessent/Verkaufschance"
+msgstr "Postavka prodajne sledi/priložnosti"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr "Interessenten/Verkaufschancen"
+msgstr "Postavke prodajnih sledi/priložnosti"
 
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
-msgstr "Annullieren"
+msgstr "Preklic"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
-msgstr "In Verkaufschance umwandeln"
+msgstr "Pretvorba v priložnost"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr "In Verkauf umwandeln"
+msgstr "Pretvorba v prodajni nalog"
 
 msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
-msgstr "Interessent/Chance"
+msgstr "Sled/Priložnost"
 
 msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
-msgstr "Als Verlust markieren"
+msgstr "Označitev kot zapravljeno"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
-msgstr "Interessent/Verkaufschance"
+msgstr "Prodajna sled/priložnost"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr "Interessenten/Verkaufschancen"
+msgstr "Prodajne sledi/priložnosti"
 
 msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
-msgstr "Auf Interessent setzen"
+msgstr "Preklop na sled"
 
 msgctxt "view:sale.opportunity_employee.open.start:"
 msgid "Sale Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
+msgstr "Prodajne priložnosti na zaposlenca"
 
 msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
+msgstr "Priložnosti na zaposlenca"
 
 msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr "Verkaufschancen pro Monat"
+msgstr "Prodajne priložnosti na mesec"
 
 msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr "Verkaufschancen pro Mitarbeiter"
+msgstr "Prodajne priložnosti na mesec"
 
 msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
-msgstr "Abbrechen"
+msgstr "Prekliči"
 
 msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
-msgstr "Öffnen"
+msgstr "Odpri"
diff --git a/opportunity.py b/opportunity.py
index c26cc16..08760c1 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -3,9 +3,14 @@
 "Sales extension for managing leads and opportunities"
 import datetime
 import time
+from sql import Column, Literal
+from sql.aggregate import Min, Max, Count, Sum
+from sql.conditionals import Coalesce, Case
+from sql.functions import Extract
+
 from trytond.model import ModelView, ModelSQL, Workflow, fields
 from trytond.wizard import Wizard, StateView, StateAction, Button
-from trytond.backend import FIELDS, TableHandler
+from trytond import backend
 from trytond.pyson import Equal, Eval, Not, In, If, Get, PYSONEncoder
 from trytond.transaction import Transaction
 from trytond.pool import Pool
@@ -36,9 +41,14 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
     'Sale Opportunity'
     __name__ = "sale.opportunity"
     _history = True
-    _rec_name = 'description'
-    party = fields.Many2One('party.party', 'Party', required=True, select=True,
-        on_change=['party'], states=_STATES_STOP, depends=_DEPENDS_STOP)
+    _rec_name = 'reference'
+    reference = fields.Char('Reference', readonly=True, required=True,
+        select=True)
+    party = fields.Many2One('party.party', 'Party', select=True,
+        on_change=['party'], states={
+            'readonly': Eval('state').in_(['converted', 'lost', 'cancelled']),
+            'required': ~Eval('state').in_(['lead', 'lost', 'cancelled']),
+            }, depends=['state'])
     address = fields.Many2One('party.address', 'Address',
         domain=[('party', '=', Eval('party'))],
         select=True, depends=['party', 'state'],
@@ -92,6 +102,29 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
             }, depends=['state'])
 
     @classmethod
+    def __register__(cls, module_name):
+        cursor = Transaction().cursor
+        TableHandler = backend.get('TableHandler')
+        sql_table = cls.__table__()
+
+        reference_exists = True
+        if TableHandler.table_exist(cursor, cls._table):
+            table = TableHandler(cursor, cls, module_name)
+            reference_exists = table.column_exist('reference')
+        super(SaleOpportunity, cls).__register__(module_name)
+        table = TableHandler(cursor, cls, module_name)
+
+        # Migration from 2.8: make party not required and add reference as
+        # required
+        table.not_null_action('party', action='remove')
+        if not reference_exists:
+            cursor.execute(*sql_table.update(
+                    columns=[sql_table.reference],
+                    values=[sql_table.id],
+                    where=sql_table.reference == None))
+            table.not_null_action('reference', action='add')
+
+    @classmethod
     def __setup__(cls):
         super(SaleOpportunity, cls).__setup__()
         cls._order.insert(0, ('start_date', 'DESC'))
@@ -171,6 +204,27 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
         if len(payment_terms) == 1:
             return payment_terms[0].id
 
+    @classmethod
+    def create(cls, vlist):
+        pool = Pool()
+        Sequence = pool.get('ir.sequence')
+        Config = pool.get('sale.configuration')
+
+        sequence = Config(1).sale_opportunity_sequence
+        vlist = [x.copy() for x in vlist]
+        for vals in vlist:
+            vals['reference'] = Sequence.get_id(sequence.id)
+        return super(SaleOpportunity, cls).create(vlist)
+
+    @classmethod
+    def copy(cls, opportunities, default=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.setdefault('reference', None)
+        default.setdefault('history', None)
+        return super(SaleOpportunity, cls).copy(opportunities, default=default)
+
     def get_currency(self, name):
         return self.company.currency.id
 
@@ -316,9 +370,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
     _rec_name = "product"
     _history = True
     opportunity = fields.Many2One('sale.opportunity', 'Opportunity')
-    sequence = fields.Integer('Sequence',
-        order_field='(%(table)s.sequence IS NULL) %(order)s, '
-        '%(table)s.sequence %(order)s')
+    sequence = fields.Integer('Sequence')
     product = fields.Many2One('product.product', 'Product', required=True,
             domain=[('salable', '=', True)], on_change=['product', 'unit'])
     quantity = fields.Float('Quantity', required=True,
@@ -339,6 +391,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
 
     @classmethod
     def __register__(cls, module_name):
+        TableHandler = backend.get('TableHandler')
         cursor = Transaction().cursor
         table = TableHandler(cursor, cls, module_name)
 
@@ -347,6 +400,11 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         # Migration from 2.4: drop required on sequence
         table.not_null_action('sequence', action='remove')
 
+    @staticmethod
+    def order_sequence(tables):
+        table, _ = tables[None]
+        return [table.sequence == None, table.sequence]
+
     def on_change_with_unit_digits(self, name=None):
         if self.unit:
             return self.unit.digits
@@ -418,40 +476,34 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
         cls._order.insert(0, ('date', 'DESC'))
 
     @classmethod
-    def _table_query_fields(cls):
-        Opportunity = Pool().get('sale.opportunity')
-        table = '%s__history' % Opportunity._table
-        return [
-            'MIN("%s".__id) AS id' % table,
-            '"%s".id AS opportunity' % table,
-            ('MIN(COALESCE("%s".write_date, "%s".create_date)) AS date'
-                % (table, table)),
-            ('COALESCE("%s".write_uid, "%s".create_uid) AS user'
-                % (table, table)),
-            ] + ['"%s"."%s"' % (table, name)
-                for name, field in cls._fields.iteritems()
-                if name not in ('id', 'opportunity', 'date', 'user')
-                and not hasattr(field, 'set')]
-
-    @classmethod
-    def _table_query_group(cls):
-        Opportunity = Pool().get('sale.opportunity')
-        table = '%s__history' % Opportunity._table
-        return [
-            '"%s".id' % table,
-            'COALESCE("%s".write_uid, "%s".create_uid)' % (table, table),
-        ] + ['"%s"."%s"' % (table, name)
-            for name, field in cls._fields.iteritems()
-            if (name not in ('id', 'opportunity', 'date', 'user')
-                and not hasattr(field, 'set'))]
-
-    @classmethod
     def table_query(cls):
         Opportunity = Pool().get('sale.opportunity')
-        return (('SELECT ' + (', '.join(cls._table_query_fields()))
-                + ' FROM "%s__history" GROUP BY '
-                + (', '.join(cls._table_query_group())))
-            % Opportunity._table, [])
+        opportunity_history = Opportunity.__table_history__()
+        columns = [
+            Min(Column(opportunity_history, '__id')).as_('id'),
+            opportunity_history.id.as_('opportunity'),
+            Min(Coalesce(opportunity_history.write_date,
+                    opportunity_history.create_date)).as_('date'),
+            Coalesce(opportunity_history.write_uid,
+                opportunity_history.create_uid).as_('user'),
+            ]
+        group_by = [
+            opportunity_history.id,
+            Coalesce(opportunity_history.write_uid,
+                opportunity_history.create_uid),
+            ]
+        for name, field in cls._fields.iteritems():
+            if name in ('id', 'opportunity', 'date', 'user'):
+                continue
+            try:
+                field.sql_type()
+            except NotImplementedError:
+                continue
+            column = Column(opportunity_history, name)
+            columns.append(column.as_(name))
+            group_by.append(column)
+
+        return opportunity_history.select(*columns, group_by=group_by)
 
     def get_lines(self, name):
         Line = Pool().get('sale.opportunity.line')
@@ -510,35 +562,33 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
     @classmethod
     def table_query(cls):
         Opportunity = Pool().get('sale.opportunity')
-        clause = ' '
-        args = [True]
+        opportunity = Opportunity.__table__()
+        where = Literal(True)
         if Transaction().context.get('start_date'):
-            clause += 'AND start_date >= %s '
-            args.append(Transaction().context['start_date'])
+            where &= (opportunity.start_date >=
+                Transaction().context['start_date'])
         if Transaction().context.get('end_date'):
-            clause += 'AND start_date <= %s '
-            args.append(Transaction().context['end_date'])
-        return ('SELECT DISTINCT(employee) AS id, '
-                'MAX(create_uid) AS create_uid, '
-                'MAX(create_date) AS create_date, '
-                'MAX(write_uid) AS write_uid, '
-                'MAX(write_date) AS write_date, '
-                'employee, '
-                'company, '
-                'COUNT(1) AS number, '
-                'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._converted_state()) + ') '
-                    'THEN 1 ELSE 0 END) AS converted, '
-                'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._lost_state()) + ') '
-                    'THEN 1 ELSE 0 END) AS lost, '
-                'SUM(amount) AS amount, '
-                'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._converted_state()) + ') '
-                    'THEN amount ELSE 0 END) AS converted_amount '
-            'FROM "' + Opportunity._table + '" '
-            'WHERE %s ' + clause +
-            'GROUP BY employee, company', args)
+            where &= (opportunity.start_date <=
+                Transaction().context['end_date'])
+        return opportunity.select(
+            opportunity.employee.as_('id'),
+            Max(opportunity.create_uid).as_('create_uid'),
+            Max(opportunity.create_date).as_('create_date'),
+            Max(opportunity.write_uid).as_('write_uid'),
+            Max(opportunity.write_date).as_('write_date'),
+            opportunity.employee,
+            opportunity.company,
+            Count(Literal(1)).as_('number'),
+            Sum(Case((opportunity.state.in_(cls._converted_state()),
+                        Literal(1)), else_=Literal(0))).as_('converted'),
+            Sum(Case((opportunity.state.in_(cls._lost_state()),
+                        Literal(1)), else_=Literal(0))).as_('lost'),
+            Sum(opportunity.amount).as_('amount'),
+            Sum(Case((opportunity.state.in_(cls._converted_state()),
+                        opportunity.amount),
+                    else_=Literal(0))).as_('converted_amount'),
+            where=where,
+            group_by=(opportunity.employee, opportunity.company))
 
     def get_conversion_rate(self, name):
         if self.number:
@@ -626,36 +676,33 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
     @classmethod
     def table_query(cls):
         Opportunity = Pool().get('sale.opportunity')
-        type_id = FIELDS[cls.id._type].sql_type(cls.id)[0]
-        type_year = FIELDS[cls.year._type].sql_type(cls.year)[0]
-        return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
-                'create_date, write_uid, write_date, '
-                'CAST(year AS ' + type_year + ') AS year, month, company, '
-                'number, converted, lost, amount, converted_amount '
-            'FROM ('
-                'SELECT EXTRACT(MONTH FROM start_date) + '
-                        'EXTRACT(YEAR FROM start_date) * 100 AS id, '
-                    'MAX(create_uid) AS create_uid, '
-                    'MAX(create_date) AS create_date, '
-                    'MAX(write_uid) AS write_uid, '
-                    'MAX(write_date) AS write_date, '
-                    'EXTRACT(YEAR FROM start_date) AS year, '
-                    'EXTRACT(MONTH FROM start_date) AS month, '
-                    'company, '
-                    'COUNT(1) AS number, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._converted_state()) + ') '
-                    'THEN 1 ELSE 0 END) AS converted, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._lost_state()) + ') '
-                    'THEN 1 ELSE 0 END) AS lost, '
-                    'SUM(amount) AS amount, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._converted_state()) + ') '
-                    'THEN amount ELSE 0 END) AS converted_amount '
-                'FROM "' + Opportunity._table + '" '
-                'GROUP BY year, month, company) AS "' + cls._table + '"',
-            [])
+        opportunity = Opportunity.__table__()
+        type_id = cls.id.sql_type().base
+        type_year = cls.year.sql_type().base
+        year_column = Extract('YEAR', opportunity.start_date
+            ).cast(type_year).as_('year')
+        month_column = Extract('MONTH', opportunity.start_date).as_('month')
+        return opportunity.select(
+            Max(Extract('MONTH', opportunity.start_date)
+                + Extract('YEAR', opportunity.start_date) * 100
+                ).cast(type_id).as_('id'),
+            Max(opportunity.create_uid).as_('create_uid'),
+            Max(opportunity.create_date).as_('create_date'),
+            Max(opportunity.write_uid).as_('write_uid'),
+            Max(opportunity.write_date).as_('write_date'),
+            year_column,
+            month_column,
+            opportunity.company,
+            Count(Literal(1)).as_('number'),
+            Sum(Case((opportunity.state.in_(cls._converted_state()),
+                        Literal(1)), else_=Literal(0))).as_('converted'),
+            Sum(Case((opportunity.state.in_(cls._lost_state()),
+                        Literal(1)), else_=Literal(0))).as_('lost'),
+            Sum(opportunity.amount).as_('amount'),
+            Sum(Case((opportunity.state.in_(cls._converted_state()),
+                        opportunity.amount),
+                    else_=Literal(0))).as_('converted_amount'),
+            group_by=(year_column, month_column, opportunity.company))
 
     def get_conversion_rate(self, name):
         if self.number:
@@ -721,39 +768,36 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
     @classmethod
     def table_query(cls):
         Opportunity = Pool().get('sale.opportunity')
-        type_id = FIELDS[cls.id._type].sql_type(cls.id)[0]
-        type_year = FIELDS[cls.year._type].sql_type(cls.year)[0]
-        return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
-                'create_date, write_uid, write_date, '
-                'CAST(year AS ' + type_year + ') AS year, month, '
-                'employee, company, number, converted, lost, amount, '
-                'converted_amount '
-            'FROM ('
-                'SELECT EXTRACT(MONTH FROM start_date) + '
-                        'EXTRACT(YEAR FROM start_date) * 100 + '
-                        'employee * 1000000 AS id, '
-                    'MAX(create_uid) AS create_uid, '
-                    'MAX(create_date) AS create_date, '
-                    'MAX(write_uid) AS write_uid, '
-                    'MAX(write_date) AS write_date, '
-                    'EXTRACT(YEAR FROM start_date) AS year, '
-                    'EXTRACT(MONTH FROM start_date) AS month, '
-                    'employee, '
-                    'company, '
-                    'COUNT(1) AS number, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._converted_state()) + ') '
-                    'THEN 1 ELSE 0 END) AS converted, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._lost_state()) + ') '
-                    'THEN 1 ELSE 0 END) AS lost, '
-                    'SUM(amount) AS amount, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                    for x in cls._converted_state()) + ') '
-                    'THEN amount ELSE 0 END) AS converted_amount '
-                'FROM "' + Opportunity._table + '" '
-                'GROUP BY year, month, employee, company) '
-            'AS "' + cls._table + '"', [])
+        opportunity = Opportunity.__table__()
+        type_id = cls.id.sql_type().base
+        type_year = cls.year.sql_type().base
+        year_column = Extract('YEAR', opportunity.start_date
+            ).cast(type_year).as_('year')
+        month_column = Extract('MONTH', opportunity.start_date).as_('month')
+        return opportunity.select(
+            Max(Extract('MONTH', opportunity.start_date)
+                + Extract('YEAR', opportunity.start_date) * 100
+                + opportunity.employee * 1000000
+                ).cast(type_id).as_('id'),
+            Max(opportunity.create_uid).as_('create_uid'),
+            Max(opportunity.create_date).as_('create_date'),
+            Max(opportunity.write_uid).as_('write_uid'),
+            Max(opportunity.write_date).as_('write_date'),
+            year_column,
+            month_column,
+            opportunity.employee,
+            opportunity.company,
+            Count(Literal(1)).as_('number'),
+            Sum(Case((opportunity.state.in_(cls._converted_state()),
+                        Literal(1)), else_=Literal(0))).as_('converted'),
+            Sum(Case((opportunity.state.in_(cls._lost_state()),
+                        Literal(1)), else_=Literal(0))).as_('lost'),
+            Sum(opportunity.amount).as_('amount'),
+            Sum(Case((opportunity.state.in_(cls._converted_state()),
+                        opportunity.amount),
+                    else_=Literal(0))).as_('converted_amount'),
+            group_by=(year_column, month_column, opportunity.employee,
+                opportunity.company))
 
     def get_conversion_rate(self, name):
         if self.number:
diff --git a/opportunity.xml b/opportunity.xml
index 9a73526..4b1dea0 100644
--- a/opportunity.xml
+++ b/opportunity.xml
@@ -26,6 +26,26 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">opportunity_tree</field>
         </record>
 
+        <record model="ir.sequence.type" id="sequence_type_sale_opportunity">
+            <field name="name">Sale Opportunity</field>
+            <field name="code">sale.opportunity</field>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_sale_opportunity_group_admin">
+            <field name="sequence_type" ref="sequence_type_sale_opportunity"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_sale_opportunity_group_sale_admin">
+            <field name="sequence_type" ref="sequence_type_sale_opportunity"/>
+            <field name="group" ref="sale.group_sale_admin"/>
+        </record>
+
+        <record model="ir.sequence" id="sequence_sale_opportunity">
+            <field name="name">Sale Opportunity</field>
+            <field name="code">sale.opportunity</field>
+        </record>
+
         <record model="ir.action.act_window" id="act_opportunity_form">
             <field name="name">Leads and Opportunities</field>
             <field name="res_model">sale.opportunity</field>
diff --git a/setup.py b/setup.py
index 33c89a6..29525cd 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
 
-requires = []
+requires = ['python-sql']
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -63,6 +63,7 @@ setup(name='trytond_sale_opportunity',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
+        'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 3edddbc..224624d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
 #this repository contains the full copyright notices and license terms.
 
 from .test_sale_opportunity import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 1336cbf..5c41eca 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.2
+version=3.0.0
 depends:
     account
     company
@@ -11,3 +11,4 @@ depends:
 xml:
     opportunity.xml
     party.xml
+    configuration.xml
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 2933537..2823f84 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.8.2
+Version: 3.0.0
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_sale_opportunity
         ========================
         
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 023c877..72a87ab 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -4,11 +4,13 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
+configuration.xml
 opportunity.xml
 party.xml
 setup.py
 tryton.cfg
 ./__init__.py
+./configuration.py
 ./opportunity.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
@@ -22,8 +24,11 @@ locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
+locale/sl_SI.po
 tests/__init__.py
+tests/__init__.pyc
 tests/test_sale_opportunity.py
+tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
@@ -31,6 +36,7 @@ trytond_sale_opportunity.egg-info/entry_points.txt
 trytond_sale_opportunity.egg-info/not-zip-safe
 trytond_sale_opportunity.egg-info/requires.txt
 trytond_sale_opportunity.egg-info/top_level.txt
+view/configuration_form.xml
 view/opportunity_employee_graph1.xml
 view/opportunity_employee_graph2.xml
 view/opportunity_employee_monthly_tree.xml
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index b2fbc4c..9e21b03 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,9 @@
-trytond_account >= 2.8, < 2.9
-trytond_company >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond_sale >= 2.8, < 2.9
-trytond_stock >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_account >= 3.0, < 3.1
+trytond_company >= 3.0, < 3.1
+trytond_currency >= 3.0, < 3.1
+trytond_party >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond_sale >= 3.0, < 3.1
+trytond_stock >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
new file mode 100644
index 0000000..20bba29
--- /dev/null
+++ b/view/configuration_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="/form/field[@name='sale_sequence']" position="after">
+        <label name="sale_opportunity_sequence"/>
+        <field name="sale_opportunity_sequence"/>
+    </xpath>
+</data>
diff --git a/view/opportunity_form.xml b/view/opportunity_form.xml
index f517cb9..4414219 100644
--- a/view/opportunity_form.xml
+++ b/view/opportunity_form.xml
@@ -6,6 +6,10 @@ this repository contains the full copyright notices and license terms. -->
     <field name="party"/>
     <label name="address"/>
     <field name="address"/>
+    <label name="description"/>
+    <field name="description"/>
+    <label name="reference"/>
+    <field name="reference"/>
     <label name="amount"/>
     <group col="2" id="amount_currency">
         <field name="amount"/>
@@ -13,8 +17,6 @@ this repository contains the full copyright notices and license terms. -->
     </group>
     <label name="probability"/>
     <field name="probability"/>
-    <label name="description"/>
-    <field name="description" colspan="3"/>
     <notebook colspan="4">
         <page string="Lead/Opportunity" id="opportunity">
             <label name="company"/>
diff --git a/view/opportunity_tree.xml b/view/opportunity_tree.xml
index e205677..a9410d3 100644
--- a/view/opportunity_tree.xml
+++ b/view/opportunity_tree.xml
@@ -2,6 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Sales Leads/Opportunities">
+    <field name="reference"/>
     <field name="start_date"/>
     <field name="end_date"/>
     <field name="description"/>
commit ac259ca197acfc0cec80d36b67c21d1cf1d92dfd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Oct 13 20:20:51 2013 +0200

    Adding upstream version 2.8.2.

diff --git a/CHANGELOG b/CHANGELOG
index 767b591..633ca6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.2 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.1 - 2013-07-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c541fe4..71580de 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.8.1
+Version: 2.8.2
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/opportunity.py b/opportunity.py
index 238e906..c26cc16 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -264,7 +264,7 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
         # Cancel before delete
         cls.cancel(opportunities)
         for opportunity in opportunities:
-            if opportunity.state != 'cancel':
+            if opportunity.state != 'cancelled':
                 cls.raise_user_error('delete_cancel', opportunity.rec_name)
         super(SaleOpportunity, cls).delete(opportunities)
 
diff --git a/tryton.cfg b/tryton.cfg
index d9290f1..1336cbf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.1
+version=2.8.2
 depends:
     account
     company
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 478d27d..2933537 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.8.1
+Version: 2.8.2
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
commit bfcf9bef1eaef76820ddee4e876e3fb310e53105
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Aug 5 18:47:28 2013 +0200

    Adding upstream version 2.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index 1e123aa..767b591 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e9a6e5e..c541fe4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/opportunity.py b/opportunity.py
index f88c6ba..238e906 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -198,8 +198,9 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
                     self.party.customer_payment_term.rec_name
         if not res['payment_term']:
             res['payment_term'] = self.default_payment_term()
-            res['payment_term.rec_name'] = PaymentTerm(
-                res['payment_term']).rec_name
+            if res['payment_term']:
+                res['payment_term.rec_name'] = PaymentTerm(
+                    res['payment_term']).rec_name
         return res
 
     def _get_sale_line_opportunity_line(self, sale):
diff --git a/tryton.cfg b/tryton.cfg
index 8e6a7b8..d9290f1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=2.8.1
 depends:
     account
     company
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 5af84d7..478d27d 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.8.0
+Version: 2.8.1
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 8534870..023c877 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -23,9 +23,7 @@ locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
 tests/__init__.py
-tests/__init__.pyc
 tests/test_sale_opportunity.py
-tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
commit 38d803c67f7f9ecbd2affc11ec1173bd9b814a29
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 00:37:35 2013 +0200

    Adding upstream version 2.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 3d508d1..1e123aa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.6.1 - 2013-02-12
+Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
 Version 2.6.0 - 2012-10-22
diff --git a/COPYRIGHT b/COPYRIGHT
index 1dfd029..b2b3c67 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2010-2011 Open Labs Business Solutions.
-Copyright (C) 2010-2012 Cédric Krier.
-Copyright (C) 2010-2012 B2CK SPRL.
+Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index ee9dbd4..52351b5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
 include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index de69bd6..e9a6e5e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.6.1
+Version: 2.8.0
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
 Description: trytond_sale_opportunity
         ========================
         
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 5261bae..84940ee 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,13 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "Вероятността трябва да бъде между 0 и 100!"
+msgid "Probability must be between 0 and 100."
+msgstr ""
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
-"Преди да бъде изтрита възможност за продажба \"%s\" трябва да бъде отказана!"
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -527,29 +526,42 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr "Инициативи/Възможности за продажба"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Отказани инициативи и възможности"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Възможности по месец"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Конвертирани възможности"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Отворени инициативи"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Отказан"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Изгубени ициативи и възможности"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Конвертиран"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Възможности"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Възможности по месец"
+#, fuzzy
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
+msgid "Opportunities"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
@@ -563,26 +575,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Инициативи и възможности"
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Отказани инициативи и възможности"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Конвертирани възможности"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Отворени инициативи"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Изгубени ициативи и възможности"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Възможности"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Възможности по месец"
@@ -700,10 +692,6 @@ msgid "Mark as Lost"
 msgstr "Отбелязване като загубен"
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr "Прехвърляне в инициатива"
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Инициатива/Възможност за продажба"
 
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 67c3d2e..422ee8e 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "L'oportunitat ha de ser entre 0 i 100."
+msgid "Probability must be between 0 and 100."
+msgstr "La provabilitat ha de ser entre 0 i 100."
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr "L'oportunitat \"%s\" ha de ser cancel·lada abans d'eliminar-la."
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
+msgstr "Heu de cancel·lar l 'oportunitat \"%s\" abans de ser eliminat."
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -512,7 +512,7 @@ msgstr "Oportunitats per empleat"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr "Oportunitats per treballador per mes"
+msgstr "Oportunitats per treballador i mes"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_open"
 msgid "Opportunities per Employee"
@@ -526,33 +526,43 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr "Iniciatives/Oportunitats"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciatives i oportunitats cancel·lades"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Oportunitats per mes"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Tot"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Cancel·lat"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunitats convertides"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Convertit"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciatives obertes"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Iniciatives"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciatives i oportunitats perdudes"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Perdut"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
 msgstr "Oportunitats"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Oportunitats per mes"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr "Oportunitats per treballador per mes"
+msgstr "Oportunitats per treballador i mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
 msgid "Opportunities per Employee"
@@ -562,26 +572,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Iniciatives i oportunitats"
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciatives i oportunitats cancelades"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunitats convertides"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciatives obertes"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciatives i oportunitats  perdudes"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Oportunitats"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Oportunitats per mes"
@@ -592,7 +582,7 @@ msgstr "Informes"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr "Oportunitats"
+msgstr "Oportunitat"
 
 msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 7df9ef6..0d98d4c 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
+msgid "Probability must be between 0 and 100."
 msgstr ""
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
 
 msgctxt "field:sale.opportunity,address:"
@@ -526,28 +526,38 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
-msgid "Opportunities"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
+msgid "Opportunities"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
@@ -562,26 +572,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr ""
@@ -699,10 +689,6 @@ msgid "Mark as Lost"
 msgstr ""
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr ""
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index c512d40..6f7453d 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "Wahrscheinlichkeit muss zwischen 0 und 100 liegen!"
+msgid "Probability must be between 0 and 100."
+msgstr "Wahrscheinlichkeit muss zwischen 0 und 100 liegen."
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
 "Verkaufschance \"%s\" muss annulliert werden, bevor sie gelöscht werden "
 "kann."
@@ -58,7 +58,7 @@ msgstr "Enddatum"
 
 msgctxt "field:sale.opportunity,history:"
 msgid "History"
-msgstr "Verlauf"
+msgstr "Historie"
 
 msgctxt "field:sale.opportunity,id:"
 msgid "ID"
@@ -528,30 +528,40 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr "Interessenten/Verkaufschancen"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Annullierte Interessenten und Verkaufschancen"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Verkaufschancen pro Monat"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Alle"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Annulliert"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Umgewandelte Verkaufschancen"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Umgewandelt"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Offene Interessenten"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Interessenten"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Verluste Interessenten und Verkaufschancen"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Verlust"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
 msgstr "Verkaufschancen"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Verkaufschancen pro Monat"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
@@ -564,26 +574,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Interessenten und Verkaufschancen"
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Annullierte Interessenten und Verkaufschancen"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Umgewandelte Verkaufschancen"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Offene Interessenten"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Verluste Interessenten und Verkaufschancen"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Verkaufschancen"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Verkaufschancen pro Monat"
@@ -602,7 +592,7 @@ msgstr "Verkaufschance"
 
 msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr "Verkaufschancen Verlauf"
+msgstr "Verkaufschancen Historie"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
@@ -666,7 +656,7 @@ msgstr "Chance"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "History"
-msgstr "Verlauf"
+msgstr "Historie"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
@@ -701,10 +691,6 @@ msgid "Mark as Lost"
 msgstr "Als Verlust markieren"
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr "Auf Interessent zurücksetzen"
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Interessent/Verkaufschance"
 
diff --git a/locale/es_AR.po b/locale/es_AR.po
index ceb38b3..34b5ec1 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "¡La Probabilidad debe ser entre 0 y 100!"
+msgid "Probability must be between 0 and 100."
+msgstr "La probabilidad debe estar entre 0 y 100."
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr "¡Oportunidad de Venta «%s» debe ser cancelada antes de eliminar!"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar la oportunidad «%s» antes de eliminar."
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -16,7 +16,7 @@ msgstr "Dirección"
 
 msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
 msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
@@ -36,11 +36,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Dígitos de divisa"
 
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
@@ -80,7 +80,7 @@ msgstr "Término de pago"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr "Probabilidad de Conversión"
+msgstr "Probabilidad de conversión"
 
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
@@ -92,7 +92,7 @@ msgstr "Venta"
 
 msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha inicial"
 
 msgctxt "field:sale.opportunity,state:"
 msgid "State"
@@ -128,7 +128,7 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr "Modificar fecha"
+msgstr "Fecha modificación"
 
 msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
@@ -152,11 +152,11 @@ msgstr "Líneas"
 
 msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
-msgstr "Motivo de pérdida"
+msgstr "Motivo de la pérdida"
 
 msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
-msgstr "Oportunidad de Venta"
+msgstr "Oportunidad de venta"
 
 msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
@@ -164,7 +164,7 @@ msgstr "Entidades"
 
 msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr "Probabilidad de Conversión"
+msgstr "Probabilidad de conversión"
 
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
@@ -172,7 +172,7 @@ msgstr "Nombre"
 
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha inicial"
 
 msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
@@ -232,7 +232,7 @@ msgstr "Unidad"
 
 msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígitos unitarios"
+msgstr "Dígitos de unidad"
 
 msgctxt "field:sale.opportunity.line,write_date:"
 msgid "Write Date"
@@ -244,7 +244,7 @@ msgstr "Usuario modificación"
 
 msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
 msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
@@ -252,19 +252,19 @@ msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Tasa de Cantidad de Conversiones"
+msgstr "Tasa de conversión de importe"
 
 msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Tasa de Conversión"
+msgstr "Tasa de conversión"
 
 msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr "Convertido"
+msgstr "Convertida"
 
 msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr "Cantidad Convertida"
+msgstr "Importe convertido"
 
 msgctxt "field:sale.opportunity_employee,create_date:"
 msgid "Create Date"
@@ -276,11 +276,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Dígitos de divisa"
 
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
@@ -320,11 +320,11 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee.open.start,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha inicial"
 
 msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
 msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
@@ -332,19 +332,19 @@ msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Tasa de Cantidad de Conversiones"
+msgstr "Tasa de conversión de importe"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Tasa de Conversión"
+msgstr "Tasa de conversión"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr "Convertido"
+msgstr "Convertida"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr "Cantidad Convertida"
+msgstr "Importe convertido"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_date:"
 msgid "Create Date"
@@ -356,11 +356,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Dígitos de divisa"
 
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
@@ -400,7 +400,7 @@ msgstr "Año"
 
 msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
 msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
@@ -408,19 +408,19 @@ msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr "Tasa de Cantidad de Conversiones"
+msgstr "Tasa de conversión de importe"
 
 msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr "Tasa de Conversión"
+msgstr "Tasa de conversión"
 
 msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr "Convertidas"
+msgstr "Convertida"
 
 msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr "Cantidad Convertida"
+msgstr "Importe convertido"
 
 msgctxt "field:sale.opportunity_monthly,create_date:"
 msgid "Create Date"
@@ -432,11 +432,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Dígitos de divisa"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
@@ -476,7 +476,7 @@ msgstr "Año-Mes"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr "Importe estimado de ingreso"
+msgstr "Importe estimado de ingresos"
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
@@ -484,107 +484,97 @@ msgstr "Porcentaje entre 0 y 100"
 
 msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %"
 
 msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
 msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
 msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
 msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
 msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
-msgstr "Oportunidades por Empleado"
+msgstr "Oportunidades por empleado"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr "Oportunidades por Empleado por Mes"
+msgstr "Oportunidades por empleado y mes"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr "Oportunidades por Empleado"
+msgstr "Oportunidades por empleado"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades"
+msgstr "Iniciativas y oportunidades"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr "Iniciativas/Oportunidades de Ventas"
+msgstr "Iniciativas/Oportunidades de ventas"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Canceladas"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Oportunidades por mes"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunidades Convertidas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Convertido"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciativas Abiertas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Iniciativas"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Perdidas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Perdido"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
 msgstr "Oportunidades"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Oportunidades por Mes"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr "Oportunidades por Empleado por Mes"
+msgstr "Oportunidades por empleado y mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr "Oportunidades por Empleado"
+msgstr "Oportunidades por empleado"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Canceladas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunidades Convertidas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciativas Abiertas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Perdidas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Oportunidades"
+msgstr "Iniciativas y oportunidades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr "Oportunidades por Mes"
+msgstr "Oportunidades por mes"
 
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
@@ -592,35 +582,35 @@ msgstr "Informes"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr "Oportunidad de Venta"
+msgstr "Oportunidad de venta"
 
 msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
-msgstr "Oportunidad de Venta"
+msgstr "Oportunidad de venta"
 
 msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr "Historial de la Oportunidad de Venta"
+msgstr "Historial de oportunidades de venta"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr "Línea de Oportunidad de Venta"
+msgstr "Línea de oportunidad de venta"
 
 msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
-msgstr "Oportunidad de Venta por Empleado"
+msgstr "Oportunidad de venta por empleado"
 
 msgctxt "model:sale.opportunity_employee.open.start,name:"
 msgid "Open Sale Opportunity per Employee"
-msgstr "Oportunidad de Venta Abierta por Empleado"
+msgstr "Abrir oportunidades de venta por empleado"
 
 msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
-msgstr "Oportunidad de Venta por Empleado por Mes"
+msgstr "Oportunidad de venta por empleado y mes"
 
 msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
-msgstr "Oportunidad de Venta por Mes"
+msgstr "Oportunidad de venta por mes"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
@@ -672,11 +662,11 @@ msgstr "Iniciativa/Oportunidad"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr "Línea de Iniciativa/Oportunidad de Venta"
+msgstr "Línea de iniciativa/oportunidad de venta"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr "Líneas de Iniciativas/Oportunidades de Ventas"
+msgstr "Líneas de Iniciativas/Oportunidades de ventas"
 
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
@@ -684,11 +674,11 @@ msgstr "Cancelar"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
-msgstr "Convertir a Oportunidad"
+msgstr "Convertir a oportunidad"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr "Convertir a Venta"
+msgstr "Convertir a pedido"
 
 msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
@@ -696,39 +686,35 @@ msgstr "Iniciativa/Oportunidad"
 
 msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
-msgstr "Marcar como Perdido"
-
-msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr "Restablecer como Iniciativa"
+msgstr "Marcar como perdido"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
-msgstr "Iniciativa/Oportunidad de Venta"
+msgstr "Iniciativas/Oportunidades de venta"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr "Iniciativas/Oportunidades de Ventas"
+msgstr "Iniciativas/Oportunidades de ventas"
 
 msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
-msgstr "Establecer como Iniciativa"
+msgstr "Convertir a iniciativa"
 
 msgctxt "view:sale.opportunity_employee.open.start:"
 msgid "Sale Opportunities per Employee"
-msgstr "Oportunidades de Venta por Empleado"
+msgstr "Oportunidades de venta por empleado"
 
 msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
-msgstr "Oportunidades por Empleado"
+msgstr "Oportunidades por empleado"
 
 msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr "Oportunidades de Venta por Mes"
+msgstr "Oportunidades de venta por mes"
 
 msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr "Oportunidades de Ventas por Mes"
+msgstr "Oportunidades de venta por mes"
 
 msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index f493634..39cc7e7 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "¡La Probabilidad debe ser entre 0 y 100!"
+msgid "Probability must be between 0 and 100."
+msgstr "La Probabilidad debe ser entre 0 y 100!"
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr "¡La oportunidad de Venta \"%s\" debe ser cancelada antes de eliminar!"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
+msgstr "La Oportunidad de Venta \"%s\" debe ser cancelada antes de ser eliminada."
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -36,7 +36,7 @@ msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Gestión de Monedas"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
@@ -52,7 +52,7 @@ msgstr "Empleado"
 
 msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
-msgstr "Fecha final"
+msgstr "Fecha Final"
 
 msgctxt "field:sale.opportunity,history:"
 msgid "History"
@@ -76,7 +76,7 @@ msgstr "Terceros"
 
 msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
-msgstr "Término de pago"
+msgstr "Forma de Pago"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
@@ -92,7 +92,7 @@ msgstr "Venta"
 
 msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha Inicio"
 
 msgctxt "field:sale.opportunity,state:"
 msgid "State"
@@ -128,7 +128,7 @@ msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr "Modificar fecha"
+msgstr "Modificar Fecha"
 
 msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
@@ -140,7 +140,7 @@ msgstr "Empleado"
 
 msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
-msgstr "Fecha final"
+msgstr "Fecha Final"
 
 msgctxt "field:sale.opportunity.history,id:"
 msgid "ID"
@@ -172,7 +172,7 @@ msgstr "Nombre"
 
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha Inicio"
 
 msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
@@ -220,7 +220,7 @@ msgstr "Nombre"
 
 msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
-msgstr "Línea de venta"
+msgstr "Línea de Venta"
 
 msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
@@ -276,7 +276,7 @@ msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Gestión de Monedas"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
@@ -300,7 +300,7 @@ msgstr "Número"
 
 msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity_employee,write_date:"
 msgid "Write Date"
@@ -312,7 +312,7 @@ msgstr "Modificado por Usuario"
 
 msgctxt "field:sale.opportunity_employee.open.start,end_date:"
 msgid "End Date"
-msgstr "Fecha final"
+msgstr "Fecha Final"
 
 msgctxt "field:sale.opportunity_employee.open.start,id:"
 msgid "ID"
@@ -320,7 +320,7 @@ msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee.open.start,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha Inicio"
 
 msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
@@ -356,7 +356,7 @@ msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Gestión de Monedas"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
@@ -432,7 +432,7 @@ msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Gestión de Monedas"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
@@ -476,7 +476,7 @@ msgstr "Año-Mes"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr "Cantidad de los ingresos estimados"
+msgstr "Cantidad estimada de ingresos"
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
@@ -526,30 +526,40 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr "Iniciativas/Oportunidades de Ventas"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Canceladas"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Oportunidades por Mes"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunidades Convertidas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Todo"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciativas Abiertas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Cancelado"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Perdidas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Convertido"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Iniciativas"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Perdido"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
 msgstr "Oportunidades"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Oportunidades por Mes"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Oportunidades por Empleado por Mes"
@@ -562,26 +572,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Iniciativas y Oportunidades"
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Canceladas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunidades Convertidas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciativas Abiertas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas y Oportunidades Perdidas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Oportunidades"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Oportunidades por Mes"
@@ -699,10 +689,6 @@ msgid "Mark as Lost"
 msgstr "Marcar como Perdido"
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr "Restablecer como Iniciativa"
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Iniciativa/Oportunidad de Venta"
 
diff --git a/locale/es_ES.po b/locale/es_ES.po
index de604b7..1933e0c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "La probabilidad debe ser entre 0 y 100."
+msgid "Probability must be between 0 and 100."
+msgstr "La probabilidad debe estar entre 0 y 100."
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr "La oportunidad \"%s\" debe ser cancelada antes de eliminarla."
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
+msgstr "Debe cancelar la oportunidad \"%s\" antes de borrar."
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -526,30 +526,40 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr "Iniciativas/Oportunidades"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas y oportunidades canceladas"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Oportunidades por mes"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Todo"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Cancelada"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunidades convertidas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Convertida"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciativas abiertas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Iniciativas"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas y oportunidades perdidas"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Perdida"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
 msgstr "Oportunidades"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Oportunidades por mes"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Oportunidades por empleado y mes"
@@ -562,26 +572,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Iniciativas y oportunidades"
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas/Oportunidades canceladas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Oportunidades convertidas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Iniciativas abiertas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas/Oportunidades perdidas"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Oportunidades"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Oportunidades por mes"
@@ -699,10 +689,6 @@ msgid "Mark as Lost"
 msgstr "Marcar como perdida"
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr "Restablecer a iniciativa"
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Iniciativas/Oportunidades"
 
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 7cebd20..627f76c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,12 +3,12 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr "La probabilité doit être entre 0 et 100 !"
+msgid "Probability must be between 0 and 100."
+msgstr "La probabilité doit être entre 0 et 100."
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr "L'opportunité de vente \"%s\" doit être annulée avant suppression"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
+msgstr "L'opportunité de vente \"%s\" doit être annulée avant sa suppression."
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -526,30 +526,40 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr "Contacts commerciaux / Opportunités de vente"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Opportunités annulées"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Opportunités par mois"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Opportunités converties"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Toutes"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Contacts commerciaux ouverts"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Annulée"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Opportunités perdues"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Convertie"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Leads"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
 msgid "Opportunities"
 msgstr "Opportunités"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr "Opportunités par mois"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Opportunités par employé par mois"
@@ -562,26 +572,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Contacts et opportunités de vente"
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr "Opportunités annulées"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr "Opportunités converties"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr "Contacts commerciaux ouverts"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr "Opportunités perdues"
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr "Opportunités"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Opportunités par mois"
@@ -699,10 +689,6 @@ msgid "Mark as Lost"
 msgstr "Marquer comme perdue"
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr "Reconvertir en contact"
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Contact commercial / Opportunité de vente"
 
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index fcb58e5..ba8c17a 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,11 +3,11 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
+msgid "Probability must be between 0 and 100."
 msgstr ""
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
 msgstr ""
 
 #, fuzzy
@@ -593,28 +593,38 @@ msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
-msgid "Opportunities"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
+msgid "Opportunities"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
@@ -629,26 +639,6 @@ msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr ""
@@ -768,10 +758,6 @@ msgid "Mark as Lost"
 msgstr ""
 
 msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr ""
-
-msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr ""
 
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 549d8a9..f0c2acb 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,788 +3,723 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
-msgid "Probability must be between 0 and 100!"
-msgstr ""
+msgid "Probability must be between 0 and 100."
+msgstr "Вероятность должна быть от 0 до 100."
 
 msgctxt "error:sale.opportunity:"
-msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr ""
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion."
+msgstr "Продажа Возможной \"%s\" должна быть отменена перед удалением."
 
-#, fuzzy
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Адрес"
 
 msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Комментарии"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,company:"
 msgid "Company"
-msgstr "Учет.орг."
+msgstr "Организация"
 
 msgctxt "field:sale.opportunity,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 msgctxt "field:sale.opportunity,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Валюты"
+msgstr "Валюта"
 
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Описание"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Дата окончания"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,history:"
 msgid "History"
-msgstr "Переписка"
+msgstr "История"
 
 msgctxt "field:sale.opportunity,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Строки"
 
 msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Причина потери"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,party:"
 msgid "Party"
-msgstr "Организации"
+msgstr "Контрагент"
 
 msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Правило оплаты"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Вероятность обращения"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
-msgstr ""
+msgstr "Продажа"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Дата начала"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,state:"
 msgid "State"
-msgstr "Статус"
+msgstr "Состояние"
 
 msgctxt "field:sale.opportunity,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
 
 msgctxt "field:sale.opportunity,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Адрес"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Комментарии"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
-msgstr "Учет.орг."
+msgstr "Организация"
 
 msgctxt "field:sale.opportunity.history,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 msgctxt "field:sale.opportunity.history,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
 
 msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr ""
+msgstr "Дата изменения"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Описание"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Дата окончания"
 
 msgctxt "field:sale.opportunity.history,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Строки"
 
 msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Причина потери"
 
 msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Продажа Возможной"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
-msgstr "Организации"
+msgstr "Контрагент"
 
 msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Вероятность обращения"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Дата начала"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
-msgstr "Статус"
+msgstr "Состояние"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Пользователь"
 
 msgctxt "field:sale.opportunity.history,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
 
 msgctxt "field:sale.opportunity.history,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
 
 msgctxt "field:sale.opportunity.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 msgctxt "field:sale.opportunity.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
 
 msgctxt "field:sale.opportunity.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Возможная продажа"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
-msgstr "Товарно материальные ценности (ТМЦ)"
+msgstr "Продукт"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Кол-во"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
-msgstr ""
+msgstr "Строка продажи"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
-msgstr "Штука"
+msgstr "Единица измерения"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Группа цифр"
+msgstr "Кол-во цифр после запятой"
 
 msgctxt "field:sale.opportunity.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
 
 msgctxt "field:sale.opportunity.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
 
 msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
-msgstr "Учет.орг."
+msgstr "Организация"
 
 msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Общая частота обращения"
 
 msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Частота обращения"
 
 msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Обращенные"
 
 msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Кол-во обращенных"
 
 msgctxt "field:sale.opportunity_employee,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 msgctxt "field:sale.opportunity_employee,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Валюты"
+msgstr "Валюта"
 
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
 msgctxt "field:sale.opportunity_employee,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Утраченная"
 
 msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
-msgstr ""
+msgstr "Номер"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:sale.opportunity_employee,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
 
 msgctxt "field:sale.opportunity_employee,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee.open.start,end_date:"
 msgid "End Date"
 msgstr "Дата окончания"
 
 msgctxt "field:sale.opportunity_employee.open.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee.open.start,start_date:"
 msgid "Start Date"
 msgstr "Дата начала"
 
 msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
-msgstr "Учет.орг."
+msgstr "Организация"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Общая частота обращения"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Частота обращения"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Обращенные"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Кол-во обращенных"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Валюты"
+msgstr "Валюта"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
 msgctxt "field:sale.opportunity_employee_monthly,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Утраченная"
 
 msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
-msgstr ""
+msgstr "Номер"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
 
 msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
-msgstr "Учет.орг."
+msgstr "Организация"
 
 msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Общая частота обращения"
 
 msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Частота обращения"
 
 msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Обращенные"
 
 msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Кол-во обращенных"
 
 msgctxt "field:sale.opportunity_monthly,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 msgctxt "field:sale.opportunity_monthly,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Валюты"
+msgstr "Валюта"
 
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Кол-во цифр валюты"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Утраченная"
 
 msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
-msgstr ""
+msgstr "Номер"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
 msgctxt "field:sale.opportunity_monthly,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
 
 msgctxt "field:sale.opportunity_monthly,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
 
 msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
-msgstr ""
+msgstr "Год-Месяц"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr ""
+msgstr "Оценочная прибыль"
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
-msgstr ""
+msgstr "Процент от 0 до 100"
 
 msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
-msgstr ""
+msgstr "в %"
 
 msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
-msgstr ""
+msgstr "в %"
 
 msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr ""
+msgstr "в %"
 
 msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
-msgstr ""
+msgstr "в %"
 
 msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr ""
+msgstr "в %"
 
 msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
-msgstr ""
+msgstr "в %"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Возможные продажи по сотруднику"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Возможные продажи по сотрудникам по месяцам"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Возможные продажи по сотруднику"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Неопределенные и Возможные"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Продажи Неопределенных/Возможных"
 
-msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Возможные продажи по месяцам"
 
-msgctxt "model:ir.action,name:act_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_all"
+msgid "All"
+msgstr "Все"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_cancelled"
+msgid "Cancelled"
+msgstr "Отмененно"
 
-msgctxt "model:ir.action,name:act_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_converted"
+msgid "Converted"
+msgstr "Обращенные"
 
-msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_leads"
+msgid "Leads"
+msgstr "Неопределенные"
 
-msgctxt "model:ir.action,name:act_opportunity_monthly_form"
-msgid "Opportunities per Month"
-msgstr ""
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_lost"
+msgid "Lost"
+msgstr "Утраченная"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_opportunity_form_domain_opportunities"
+msgid "Opportunities"
+msgstr "Возможные продажи"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Возможные продажи по сотрудникам по месяцам"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Возможные продажи по сотруднику"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
-msgid "Cancelled Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
-msgid "Converted Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
-msgid "Opened Leads"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
-msgid "Lost Leads and Opportunities"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
-msgid "Opportunities"
-msgstr ""
+msgstr "Неопределенные и Возможные"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
+msgstr "Возможные продажи по месяцам"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr "Отчетность"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Продажа Возможной"
 
 msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Продажа Возможной"
 
 msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr ""
+msgstr "История продажи Возможных"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr ""
+msgstr "Строка продажи Возможных"
 
 msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
-msgstr ""
+msgstr "Продажа Возможной по сотрудникам"
 
 msgctxt "model:sale.opportunity_employee.open.start,name:"
 msgid "Open Sale Opportunity per Employee"
-msgstr ""
+msgstr "Открыть продажи Возможных для сотрудника "
 
 msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
-msgstr ""
+msgstr "Продажа Возможной по сотрудникам по месяцам"
 
 msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
-msgstr ""
+msgstr "Продажа Возможной по месяцам"
 
-#, fuzzy
 msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Отмененно"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Обращенные"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Неопределенная"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Утраченная"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Возможная продажа"
 
-#, fuzzy
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Отмененно"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Обращенные"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Неопределенная"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Утраченная"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Возможная продажа"
 
-#, fuzzy
 msgctxt "view:sale.opportunity.history:"
 msgid "History"
-msgstr "Переписка"
+msgstr "История"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Неопределенная/Возможная"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr ""
+msgstr "Строка продажи Неопределенных/Возможных"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr ""
+msgstr "Строки продаж Неопределенных/Возможных"
 
-#, fuzzy
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Отменить"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Обратить в Возможный"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr ""
+msgstr "Обратить в Продажу"
 
 msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Неопределенная/Возможная"
 
 msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
-msgstr ""
-
-msgctxt "view:sale.opportunity:"
-msgid "Reset as Lead"
-msgstr ""
+msgstr "Отметить как утраченную"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
-msgstr ""
+msgstr "Продажа Неопределенных/Возможных"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Продажи Неопределенных/Возможных"
 
 msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
-msgstr ""
+msgstr "Отметить как Неопределенную"
 
 msgctxt "view:sale.opportunity_employee.open.start:"
 msgid "Sale Opportunities per Employee"
-msgstr ""
+msgstr "Продажа Возможных по сотрудникам"
 
 msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Возможные продажи по сотруднику"
 
 msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Продажа Возможных по месяцам"
 
 msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Продажа Возможных по месяцам"
 
-#, fuzzy
 msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Отменить"
 
-#, fuzzy
 msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Открыть"
diff --git a/opportunity.py b/opportunity.py
index e6ecd59..f88c6ba 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -98,11 +98,11 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
         cls._sql_constraints += [
             ('check_percentage',
                 'CHECK(probability >= 0 AND probability <= 100)',
-                'Probability must be between 0 and 100!')
+                'Probability must be between 0 and 100.')
             ]
         cls._error_messages.update({
-                'delete_cancel': 'Sale Opportunity "%s" must be cancelled '\
-                    'before deletion!',
+                'delete_cancel': ('Sale Opportunity "%s" must be cancelled '
+                    'before deletion.'),
                 })
         cls._transitions |= set((
                 ('lead', 'opportunity'),
@@ -440,9 +440,9 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
             '"%s".id' % table,
             'COALESCE("%s".write_uid, "%s".create_uid)' % (table, table),
         ] + ['"%s"."%s"' % (table, name)
-                for name, field in cls._fields.iteritems()
-                if name not in ('id', 'opportunity', 'date', 'user')
-                and not hasattr(field, 'set')]
+            for name, field in cls._fields.iteritems()
+            if (name not in ('id', 'opportunity', 'date', 'user')
+                and not hasattr(field, 'set'))]
 
     @classmethod
     def table_query(cls):
@@ -518,23 +518,23 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
             clause += 'AND start_date <= %s '
             args.append(Transaction().context['end_date'])
         return ('SELECT DISTINCT(employee) AS id, '
-                    'MAX(create_uid) AS create_uid, '
-                    'MAX(create_date) AS create_date, '
-                    'MAX(write_uid) AS write_uid, '
-                    'MAX(write_date) AS write_date, '
-                    'employee, '
-                    'company, '
-                    'COUNT(1) AS number, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._converted_state()) + ') '
-                        'THEN 1 ELSE 0 END) AS converted, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._lost_state()) + ') '
-                        'THEN 1 ELSE 0 END) AS lost, '
-                    'SUM(amount) AS amount, '
-                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._converted_state()) + ') '
-                        'THEN amount ELSE 0 END) AS converted_amount '
+                'MAX(create_uid) AS create_uid, '
+                'MAX(create_date) AS create_date, '
+                'MAX(write_uid) AS write_uid, '
+                'MAX(write_date) AS write_date, '
+                'employee, '
+                'company, '
+                'COUNT(1) AS number, '
+                'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._converted_state()) + ') '
+                    'THEN 1 ELSE 0 END) AS converted, '
+                'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._lost_state()) + ') '
+                    'THEN 1 ELSE 0 END) AS lost, '
+                'SUM(amount) AS amount, '
+                'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._converted_state()) + ') '
+                    'THEN amount ELSE 0 END) AS converted_amount '
             'FROM "' + Opportunity._table + '" '
             'WHERE %s ' + clause +
             'GROUP BY employee, company', args)
@@ -628,33 +628,33 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
         type_id = FIELDS[cls.id._type].sql_type(cls.id)[0]
         type_year = FIELDS[cls.year._type].sql_type(cls.year)[0]
         return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
-                    'create_date, write_uid, write_date, '
-                    'CAST(year AS ' + type_year + ') AS year, month, company, '
-                    'number, converted, lost, amount, converted_amount '
-                'FROM ('
-                    'SELECT EXTRACT(MONTH FROM start_date) + '
-                            'EXTRACT(YEAR FROM start_date) * 100 AS id, '
-                        'MAX(create_uid) AS create_uid, '
-                        'MAX(create_date) AS create_date, '
-                        'MAX(write_uid) AS write_uid, '
-                        'MAX(write_date) AS write_date, '
-                        'EXTRACT(YEAR FROM start_date) AS year, '
-                        'EXTRACT(MONTH FROM start_date) AS month, '
-                        'company, '
-                        'COUNT(1) AS number, '
-                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._converted_state()) + ') '
-                        'THEN 1 ELSE 0 END) AS converted, '
-                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._lost_state()) + ') '
-                        'THEN 1 ELSE 0 END) AS lost, '
-                        'SUM(amount) AS amount, '
-                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._converted_state()) + ') '
-                        'THEN amount ELSE 0 END) AS converted_amount '
-                    'FROM "' + Opportunity._table + '" '
-                    'GROUP BY year, month, company) AS "' + cls._table + '"',
-                [])
+                'create_date, write_uid, write_date, '
+                'CAST(year AS ' + type_year + ') AS year, month, company, '
+                'number, converted, lost, amount, converted_amount '
+            'FROM ('
+                'SELECT EXTRACT(MONTH FROM start_date) + '
+                        'EXTRACT(YEAR FROM start_date) * 100 AS id, '
+                    'MAX(create_uid) AS create_uid, '
+                    'MAX(create_date) AS create_date, '
+                    'MAX(write_uid) AS write_uid, '
+                    'MAX(write_date) AS write_date, '
+                    'EXTRACT(YEAR FROM start_date) AS year, '
+                    'EXTRACT(MONTH FROM start_date) AS month, '
+                    'company, '
+                    'COUNT(1) AS number, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._converted_state()) + ') '
+                    'THEN 1 ELSE 0 END) AS converted, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._lost_state()) + ') '
+                    'THEN 1 ELSE 0 END) AS lost, '
+                    'SUM(amount) AS amount, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._converted_state()) + ') '
+                    'THEN amount ELSE 0 END) AS converted_amount '
+                'FROM "' + Opportunity._table + '" '
+                'GROUP BY year, month, company) AS "' + cls._table + '"',
+            [])
 
     def get_conversion_rate(self, name):
         if self.number:
@@ -723,36 +723,36 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
         type_id = FIELDS[cls.id._type].sql_type(cls.id)[0]
         type_year = FIELDS[cls.year._type].sql_type(cls.year)[0]
         return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
-                    'create_date, write_uid, write_date, '
-                    'CAST(year AS ' + type_year + ') AS year, month, '
-                    'employee, company, number, converted, lost, amount, '
-                    'converted_amount '
-                'FROM ('
-                    'SELECT EXTRACT(MONTH FROM start_date) + '
-                            'EXTRACT(YEAR FROM start_date) * 100 + '
-                            'employee * 1000000 AS id, '
-                        'MAX(create_uid) AS create_uid, '
-                        'MAX(create_date) AS create_date, '
-                        'MAX(write_uid) AS write_uid, '
-                        'MAX(write_date) AS write_date, '
-                        'EXTRACT(YEAR FROM start_date) AS year, '
-                        'EXTRACT(MONTH FROM start_date) AS month, '
-                        'employee, '
-                        'company, '
-                        'COUNT(1) AS number, '
-                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._converted_state()) + ') '
-                        'THEN 1 ELSE 0 END) AS converted, '
-                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._lost_state()) + ') '
-                        'THEN 1 ELSE 0 END) AS lost, '
-                        'SUM(amount) AS amount, '
-                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in cls._converted_state()) + ') '
-                        'THEN amount ELSE 0 END) AS converted_amount '
-                    'FROM "' + Opportunity._table + '" '
-                    'GROUP BY year, month, employee, company) '
-                'AS "' + cls._table + '"', [])
+                'create_date, write_uid, write_date, '
+                'CAST(year AS ' + type_year + ') AS year, month, '
+                'employee, company, number, converted, lost, amount, '
+                'converted_amount '
+            'FROM ('
+                'SELECT EXTRACT(MONTH FROM start_date) + '
+                        'EXTRACT(YEAR FROM start_date) * 100 + '
+                        'employee * 1000000 AS id, '
+                    'MAX(create_uid) AS create_uid, '
+                    'MAX(create_date) AS create_date, '
+                    'MAX(write_uid) AS write_uid, '
+                    'MAX(write_date) AS write_date, '
+                    'EXTRACT(YEAR FROM start_date) AS year, '
+                    'EXTRACT(MONTH FROM start_date) AS month, '
+                    'employee, '
+                    'company, '
+                    'COUNT(1) AS number, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._converted_state()) + ') '
+                    'THEN 1 ELSE 0 END) AS converted, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._lost_state()) + ') '
+                    'THEN 1 ELSE 0 END) AS lost, '
+                    'SUM(amount) AS amount, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                    for x in cls._converted_state()) + ') '
+                    'THEN amount ELSE 0 END) AS converted_amount '
+                'FROM "' + Opportunity._table + '" '
+                'GROUP BY year, month, employee, company) '
+            'AS "' + cls._table + '"', [])
 
     def get_conversion_rate(self, name):
         if self.number:
diff --git a/opportunity.xml b/opportunity.xml
index c43001b..9a73526 100644
--- a/opportunity.xml
+++ b/opportunity.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <menuitem name="Reporting" parent="sale.menu_sale"
@@ -15,87 +17,13 @@
         <record model="ir.ui.view" id="opportunity_view_form">
             <field name="model">sale.opportunity</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Sale Lead/Opportunity">
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="address"/>
-                    <field name="address"/>
-                    <label name="amount"/>
-                    <group col="2" id="amount_currency">
-                        <field name="amount"/>
-                        <field name="currency"/>
-                    </group>
-                    <label name="probability"/>
-                    <field name="probability"/>
-                    <label name="description"/>
-                    <field name="description" colspan="3"/>
-                    <notebook colspan="4">
-                        <page string="Lead/Opportunity" id="opportunity">
-                            <label name="company"/>
-                            <field name="company"/>
-                            <label name="employee"/>
-                            <field name="employee"/>
-                            <label name="start_date"/>
-                            <field name="start_date"/>
-                            <label name="end_date"/>
-                            <field name="end_date"/>
-                            <label name="payment_term"/>
-                            <field name="payment_term"/>
-                            <label name="sale"/>
-                            <field name="sale"/>
-                            <separator name="comment" colspan="4"/>
-                            <field name="comment" colspan="4"/>
-                            <separator name="lost_reason" colspan="4"/>
-                            <field name="lost_reason" colspan="4"/>
-                            <group col="2" colspan="2" id="state">
-                                <label name="state"/>
-                                <field name="state"/>
-                            </group>
-                            <group col="5" colspan="2" id="buttons">
-                                <button name="cancel" string="Cancel"
-                                    icon="tryton-cancel"/>
-                                <button name="lost" string="Mark as Lost"
-                                    icon="tryton-cancel"/>
-                                <button name="lead" string="Set as Lead"
-                                    icon="tryton-go-previous"/>
-                                <button name="opportunity"
-                                    string="Convert to Opportunity"
-                                    icon="tryton-go-next"/>
-                                <button name="convert" string="Convert to Sale"
-                                    icon="tryton-go-next"/>
-                            </group>
-                        </page>
-                        <page name="lines">
-                            <field name="lines"/>
-                        </page>
-                        <page name="history">
-                            <field name="history"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">opportunity_form</field>
         </record>
 
         <record model="ir.ui.view" id="opportunity_view_tree">
             <field name="model">sale.opportunity</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Sales Leads/Opportunities">
-                    <field name="start_date"/>
-                    <field name="end_date"/>
-                    <field name="description"/>
-                    <field name="party"/>
-                    <field name="amount"/>
-                    <field name="currency"/>
-                    <field name="state"/>
-                    <field name="probability"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">opportunity_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_opportunity_form">
@@ -112,98 +40,50 @@
             <field name="view" ref="opportunity_view_form"/>
             <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <menuitem parent="sale.menu_sale" action="act_opportunity_form"
-            id="menu_opportunity_form" sequence="5"/>
-
-        <record model="ir.action.act_window" id="act_opportunity_form_lead">
-            <field name="name">Opened Leads</field>
-            <field name="res_model">sale.opportunity</field>
-            <field name="domain">[("state", "=", "lead")]</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_lead_view1">
+        <record model="ir.action.act_window.domain"
+            id="act_opportunity_form_domain_leads">
+            <field name="name">Leads</field>
             <field name="sequence" eval="10"/>
-            <field name="view" ref="opportunity_view_tree"/>
-            <field name="act_window" ref="act_opportunity_form_lead"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_lead_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="opportunity_view_form"/>
-            <field name="act_window" ref="act_opportunity_form_lead"/>
+            <field name="domain">[("state", "=", "lead")]</field>
+            <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_lead"
-            id="menu_opportunity_form_lead" sequence="20"/>
-
-        <record model="ir.action.act_window" id="act_opportunity_form_opportunity">
+        <record model="ir.action.act_window.domain"
+            id="act_opportunity_form_domain_opportunities">
             <field name="name">Opportunities</field>
-            <field name="res_model">sale.opportunity</field>
-            <field name="domain">[("state", "=", "opportunity")]</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_opportunity_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="opportunity_view_tree"/>
-            <field name="act_window" ref="act_opportunity_form_opportunity"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_opportunity_view2">
             <field name="sequence" eval="20"/>
-            <field name="view" ref="opportunity_view_form"/>
-            <field name="act_window" ref="act_opportunity_form_opportunity"/>
+            <field name="domain">[("state", "=", "opportunity")]</field>
+            <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_opportunity"
-            id="menu_opportunity_form_opportunity" sequence="30"/>
-
-        <record model="ir.action.act_window" id="act_opportunity_form_converted">
-            <field name="name">Converted Opportunities</field>
-            <field name="res_model">sale.opportunity</field>
+        <record model="ir.action.act_window.domain"
+            id="act_opportunity_form_domain_converted">
+            <field name="name">Converted</field>
+            <field name="sequence" eval="30"/>
             <field name="domain">[("state", "=", "converted")]</field>
+            <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_converted_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="opportunity_view_tree"/>
-            <field name="act_window" ref="act_opportunity_form_converted"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_converted_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="opportunity_view_form"/>
-            <field name="act_window" ref="act_opportunity_form_converted"/>
-        </record>
-        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_converted"
-            id="menu_opportunity_form_converted" sequence="40"/>
-
-        <record model="ir.action.act_window" id="act_opportunity_form_cancelled">
-            <field name="name">Cancelled Leads and Opportunities</field>
-            <field name="res_model">sale.opportunity</field>
+        <record model="ir.action.act_window.domain"
+            id="act_opportunity_form_domain_cancelled">
+            <field name="name">Cancelled</field>
+            <field name="sequence" eval="40"/>
             <field name="domain">[("state", "=", "cancelled")]</field>
+            <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_cancelled_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="opportunity_view_tree"/>
-            <field name="act_window" ref="act_opportunity_form_cancelled"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_cancelled_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="opportunity_view_form"/>
-            <field name="act_window" ref="act_opportunity_form_cancelled"/>
-        </record>
-        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_cancelled"
-            id="menu_opportunity_form_cancelled" sequence="50"/>
-
-        <record model="ir.action.act_window" id="act_opportunity_form_lost">
-            <field name="name">Lost Leads and Opportunities</field>
-            <field name="res_model">sale.opportunity</field>
+        <record model="ir.action.act_window.domain"
+            id="act_opportunity_form_domain_lost">
+            <field name="name">Lost</field>
+            <field name="sequence" eval="50"/>
             <field name="domain">[("state", "=", "lost")]</field>
+            <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_lost_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="opportunity_view_tree"/>
-            <field name="act_window" ref="act_opportunity_form_lost"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_lost_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="opportunity_view_form"/>
-            <field name="act_window" ref="act_opportunity_form_lost"/>
+        <record model="ir.action.act_window.domain"
+            id="act_opportunity_form_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_opportunity_form"/>
         </record>
-        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_lost"
-            id="menu_opportunity_form_lost" sequence="60"/>
+        <menuitem parent="sale.menu_sale" action="act_opportunity_form"
+            id="menu_opportunity_form" sequence="5"/>
 
         <record model="ir.model.access" id="access_opportunity">
             <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
@@ -284,48 +164,19 @@
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_group_opportunity1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_opportunity"/>
         </record>
 
         <record model="ir.ui.view" id="opportunity_line_view_form">
             <field name="model">sale.opportunity.line</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Sale Lead/Opportunity Line">
-                    <label name="opportunity"/>
-                    <field name="opportunity" colspan="3"/>
-                    <label name="product"/>
-                    <field name="product"/>
-                    <label name="sequence"/>
-                    <field name="sequence"/>
-                    <label name="quantity"/>
-                    <field name="quantity"/>
-                    <label name="unit"/>
-                    <field name="unit"/>
-                    <label name="sale_line"/>
-                    <field name="sale_line"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">opportunity_line_form</field>
         </record>
         <record model="ir.ui.view" id="opportunity_line_view_tree">
             <field name="model">sale.opportunity.line</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Sales Leads/Opportunities Lines" sequence="sequence">
-                    <field name="opportunity"/>
-                    <field name="product"/>
-                    <field name="quantity"/>
-                    <field name="unit" expand="1"/>
-                    <field name="sequence" tree_invisible="1"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">opportunity_line_tree</field>
         </record>
 
         <record model="ir.model.access" id="access_opportunity_line">
@@ -355,67 +206,12 @@
         <record model="ir.ui.view" id="opportunity_history_view_form">
             <field name="model">sale.opportunity.history</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="History">
-                    <label name="opportunity"/>
-                    <field name="opportunity" colspan="3"/>
-                    <label name="user"/>
-                    <field name="user"/>
-                    <label name="date"/>
-                    <field name="date"/>
-                    <label name="party"/>
-                    <field name="party"/>
-                    <label name="address"/>
-                    <field name="address"/>
-                    <label name="description"/>
-                    <field name="description"/>
-                    <label name="probability"/>
-                    <field name="probability"/>
-                    <notebook colspan="4">
-                        <page string="Lead/Opportunity" id="opportunity">
-                            <label name="company"/>
-                            <field name="company"/>
-                            <label name="employee"/>
-                            <field name="employee"/>
-                            <label name="start_date"/>
-                            <field name="start_date"/>
-                            <label name="end_date"/>
-                            <field name="end_date"/>
-                            <separator name="comment" colspan="4"/>
-                            <field name="comment" colspan="4"/>
-                            <separator name="lost_reason" colspan="4"/>
-                            <field name="lost_reason" colspan="4"/>
-                            <group col="2" colspan="2" id="state">
-                                <label name="state"/>
-                                <field name="state"/>
-                            </group>
-                        </page>
-                        <page name="lines">
-                            <field name="lines"/>
-                        </page>
-                    </notebook>
-                </form>
-                ]]>
-            </field>
+            <field name="name">opportunity_history_form</field>
         </record>
         <record model="ir.ui.view" id="opportunity_history_view_tree">
             <field name="model">sale.opportunity.history</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="History">
-                    <field name="date"/>
-                    <field name="user"/>
-                    <field name="start_date"/>
-                    <field name="end_date"/>
-                    <field name="description"/>
-                    <field name="party"/>
-                    <field name="state"/>
-                    <field name="probability"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">opportunity_history_tree</field>
         </record>
 
         <record model="ir.model.access" id="access_opportunity_history">
@@ -447,67 +243,26 @@
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_group_opportunity_history1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity.history')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_opportunity_history"/>
         </record>
 
         <record model="ir.ui.view" id="opportunity_employee_view_tree">
             <field name="model">sale.opportunity_employee</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Opportunities per Employee">
-                    <field name="employee"/>
-                    <field name="number"/>
-                    <field name="converted"/>
-                    <field name="lost"/>
-                    <field name="conversion_rate"/>
-                    <field name="amount"/>
-                    <field name="converted_amount"/>
-                    <field name="currency"/>
-                    <field name="conversion_amount_rate"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">opportunity_employee_tree</field>
         </record>
 
         <record model="ir.ui.view" id="opportunity_employee_view_graph1">
             <field name="model">sale.opportunity_employee</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Opportunities per Employee">
-                    <x>
-                        <field name="employee"/>
-                    </x>
-                    <y>
-                        <field name="number"/>
-                        <field name="converted"/>
-                        <field name="lost"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">opportunity_employee_graph1</field>
         </record>
 
         <record model="ir.ui.view" id="opportunity_employee_view_graph2">
             <field name="model">sale.opportunity_employee</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Opportunities per Employee">
-                    <x>
-                        <field name="employee"/>
-                    </x>
-                    <y>
-                        <field name="amount"/>
-                        <field name="converted_amount"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">opportunity_employee_graph2</field>
         </record>
 
         <record model="ir.action.act_window" id="act_opportunity_employee_form">
@@ -538,25 +293,14 @@
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_group_opportunity_employee1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity_employee')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_opportunity_employee"/>
         </record>
 
         <record model="ir.ui.view" id="opportunity_employee_open_start_view_form">
             <field name="model">sale.opportunity_employee.open.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Sale Opportunities per Employee">
-                    <label name="start_date"/>
-                    <field name="start_date"/>
-                    <label name="end_date"/>
-                    <field name="end_date"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">opportunity_employee_open_start_form</field>
         </record>
 
         <record model="ir.action.wizard" id="act_opportunity_employee_open">
@@ -569,59 +313,19 @@
         <record model="ir.ui.view" id="opportunity_monthly_view_tree">
             <field name="model">sale.opportunity_monthly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Sale Opportunities per Month">
-                    <field name="year"/>
-                    <field name="month"/>
-                    <field name="number"/>
-                    <field name="converted"/>
-                    <field name="lost"/>
-                    <field name="conversion_rate"/>
-                    <field name="amount"/>
-                    <field name="converted_amount"/>
-                    <field name="currency"/>
-                    <field name="conversion_amount_rate"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">opportunity_monthly_tree</field>
         </record>
 
         <record model="ir.ui.view" id="opportunity_monthly_view_graph1">
             <field name="model">sale.opportunity_monthly</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Sale Opportunities per Month">
-                    <x>
-                        <field name="year_month"/>
-                    </x>
-                    <y>
-                        <field name="number"/>
-                        <field name="converted"/>
-                        <field name="lost"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">opportunity_monthly_graph1</field>
         </record>
 
         <record model="ir.ui.view" id="opportunity_monthly_view_graph2">
             <field name="model">sale.opportunity_monthly</field>
             <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <graph string="Sale Opportunities per Month">
-                    <x>
-                        <field name="year_month"/>
-                    </x>
-                    <y>
-                        <field name="amount"/>
-                        <field name="converted_amount"/>
-                    </y>
-                </graph>
-                ]]>
-            </field>
+            <field name="name">opportunity_monthly_graph2</field>
         </record>
 
         <record model="ir.action.act_window" id="act_opportunity_monthly_form">
@@ -655,32 +359,14 @@
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_group_opportunity_monthly1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity_monthly')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_opportunity_monthly"/>
         </record>
 
         <record model="ir.ui.view" id="opportunity_employee_monthly_view_tree">
             <field name="model">sale.opportunity_employee_monthly</field>
             <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <tree string="Sale Opportunities per Month">
-                    <field name="year"/>
-                    <field name="month"/>
-                    <field name="employee"/>
-                    <field name="number"/>
-                    <field name="converted"/>
-                    <field name="lost"/>
-                    <field name="conversion_rate"/>
-                    <field name="amount"/>
-                    <field name="converted_amount"/>
-                    <field name="currency"/>
-                    <field name="conversion_amount_rate"/>
-                </tree>
-                ]]>
-            </field>
+            <field name="name">opportunity_employee_monthly_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_opportunity_employee_monthly_form">
@@ -703,9 +389,7 @@
             <field name="global_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_group_opportunity_employee_monthly1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity_employee_monthly')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
+            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
             <field name="rule_group" ref="rule_group_opportunity_employee_monthly"/>
         </record>
 
diff --git a/setup.py b/setup.py
index 46c7fc3..33c89a6 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
-                (dep, major_version, minor_version, major_version,
-                    minor_version + 1))
+            (dep, major_version, minor_version, major_version,
+                minor_version + 1))
 requires.append('trytond >= %s.%s, < %s.%s' %
-        (major_version, minor_version, major_version, minor_version + 1))
+    (major_version, minor_version, major_version, minor_version + 1))
 
 setup(name='trytond_sale_opportunity',
     version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_sale_opportunity',
     long_description=read('README'),
     author='Tryton',
     url='http://www.tryton.org/',
-    download_url="http://downloads.tryton.org/" + \
-        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+    download_url=("http://downloads.tryton.org/" +
+        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
     package_dir={'trytond.modules.sale_opportunity': '.'},
     packages=[
         'trytond.modules.sale_opportunity',
         'trytond.modules.sale_opportunity.tests',
         ],
     package_data={
-        'trytond.modules.sale_opportunity': info.get('xml', []) \
-            + ['tryton.cfg', 'locale/*.po'],
+        'trytond.modules.sale_opportunity': (info.get('xml', [])
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_sale_opportunity',
         'Intended Audience :: Legal Industry',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
+        'Natural Language :: Catalan',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index f748840..8e6a7b8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.8.0
 depends:
     account
     company
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 5f7fe88..5af84d7 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.6.1
+Version: 2.8.0
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
 Description: trytond_sale_opportunity
         ========================
         
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 0e681b1..8534870 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -23,11 +23,27 @@ locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
 tests/__init__.py
+tests/__init__.pyc
 tests/test_sale_opportunity.py
+tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
 trytond_sale_opportunity.egg-info/entry_points.txt
 trytond_sale_opportunity.egg-info/not-zip-safe
 trytond_sale_opportunity.egg-info/requires.txt
-trytond_sale_opportunity.egg-info/top_level.txt
\ No newline at end of file
+trytond_sale_opportunity.egg-info/top_level.txt
+view/opportunity_employee_graph1.xml
+view/opportunity_employee_graph2.xml
+view/opportunity_employee_monthly_tree.xml
+view/opportunity_employee_open_start_form.xml
+view/opportunity_employee_tree.xml
+view/opportunity_form.xml
+view/opportunity_history_form.xml
+view/opportunity_history_tree.xml
+view/opportunity_line_form.xml
+view/opportunity_line_tree.xml
+view/opportunity_monthly_graph1.xml
+view/opportunity_monthly_graph2.xml
+view/opportunity_monthly_tree.xml
+view/opportunity_tree.xml
\ No newline at end of file
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index 7f7b5e9..b2fbc4c 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_account >= 2.6, < 2.7
-trytond_company >= 2.6, < 2.7
-trytond_currency >= 2.6, < 2.7
-trytond_party >= 2.6, < 2.7
-trytond_product >= 2.6, < 2.7
-trytond_sale >= 2.6, < 2.7
-trytond_stock >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account >= 2.8, < 2.9
+trytond_company >= 2.8, < 2.9
+trytond_currency >= 2.8, < 2.9
+trytond_party >= 2.8, < 2.9
+trytond_product >= 2.8, < 2.9
+trytond_sale >= 2.8, < 2.9
+trytond_stock >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/opportunity_employee_graph1.xml b/view/opportunity_employee_graph1.xml
new file mode 100644
index 0000000..8c7fc4a
--- /dev/null
+++ b/view/opportunity_employee_graph1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<graph string="Opportunities per Employee">
+    <x>
+        <field name="employee"/>
+    </x>
+    <y>
+        <field name="number"/>
+        <field name="converted"/>
+        <field name="lost"/>
+    </y>
+</graph>
diff --git a/view/opportunity_employee_graph2.xml b/view/opportunity_employee_graph2.xml
new file mode 100644
index 0000000..5b700dd
--- /dev/null
+++ b/view/opportunity_employee_graph2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<graph string="Opportunities per Employee">
+    <x>
+        <field name="employee"/>
+    </x>
+    <y>
+        <field name="amount"/>
+        <field name="converted_amount"/>
+    </y>
+</graph>
diff --git a/view/opportunity_employee_monthly_tree.xml b/view/opportunity_employee_monthly_tree.xml
new file mode 100644
index 0000000..83a8bf1
--- /dev/null
+++ b/view/opportunity_employee_monthly_tree.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Sale Opportunities per Month">
+    <field name="year"/>
+    <field name="month"/>
+    <field name="employee"/>
+    <field name="number"/>
+    <field name="converted"/>
+    <field name="lost"/>
+    <field name="conversion_rate"/>
+    <field name="amount"/>
+    <field name="converted_amount"/>
+    <field name="currency"/>
+    <field name="conversion_amount_rate"/>
+</tree>
diff --git a/view/opportunity_employee_open_start_form.xml b/view/opportunity_employee_open_start_form.xml
new file mode 100644
index 0000000..eedd179
--- /dev/null
+++ b/view/opportunity_employee_open_start_form.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Sale Opportunities per Employee">
+    <label name="start_date"/>
+    <field name="start_date"/>
+    <label name="end_date"/>
+    <field name="end_date"/>
+</form>
diff --git a/view/opportunity_employee_tree.xml b/view/opportunity_employee_tree.xml
new file mode 100644
index 0000000..edb2259
--- /dev/null
+++ b/view/opportunity_employee_tree.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Opportunities per Employee">
+    <field name="employee"/>
+    <field name="number"/>
+    <field name="converted"/>
+    <field name="lost"/>
+    <field name="conversion_rate"/>
+    <field name="amount"/>
+    <field name="converted_amount"/>
+    <field name="currency"/>
+    <field name="conversion_amount_rate"/>
+</tree>
diff --git a/view/opportunity_form.xml b/view/opportunity_form.xml
new file mode 100644
index 0000000..f517cb9
--- /dev/null
+++ b/view/opportunity_form.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Sale Lead/Opportunity">
+    <label name="party"/>
+    <field name="party"/>
+    <label name="address"/>
+    <field name="address"/>
+    <label name="amount"/>
+    <group col="2" id="amount_currency">
+        <field name="amount"/>
+        <field name="currency"/>
+    </group>
+    <label name="probability"/>
+    <field name="probability"/>
+    <label name="description"/>
+    <field name="description" colspan="3"/>
+    <notebook colspan="4">
+        <page string="Lead/Opportunity" id="opportunity">
+            <label name="company"/>
+            <field name="company"/>
+            <label name="employee"/>
+            <field name="employee"/>
+            <label name="start_date"/>
+            <field name="start_date"/>
+            <label name="end_date"/>
+            <field name="end_date"/>
+            <label name="payment_term"/>
+            <field name="payment_term"/>
+            <label name="sale"/>
+            <field name="sale"/>
+            <separator name="comment" colspan="4"/>
+            <field name="comment" colspan="4"/>
+            <separator name="lost_reason" colspan="4"/>
+            <field name="lost_reason" colspan="4"/>
+            <group col="2" colspan="2" id="state">
+                <label name="state"/>
+                <field name="state"/>
+            </group>
+            <group col="5" colspan="2" id="buttons">
+                <button name="cancel" string="Cancel"
+                    icon="tryton-cancel"/>
+                <button name="lost" string="Mark as Lost"
+                    icon="tryton-cancel"/>
+                <button name="lead" string="Set as Lead"
+                    icon="tryton-go-previous"/>
+                <button name="opportunity"
+                    string="Convert to Opportunity"
+                    icon="tryton-go-next"/>
+                <button name="convert" string="Convert to Sale"
+                    icon="tryton-go-next"/>
+            </group>
+        </page>
+        <page name="lines">
+            <field name="lines"/>
+        </page>
+        <page name="history">
+            <field name="history"/>
+        </page>
+    </notebook>
+</form>
diff --git a/view/opportunity_history_form.xml b/view/opportunity_history_form.xml
new file mode 100644
index 0000000..f00a9ec
--- /dev/null
+++ b/view/opportunity_history_form.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="History">
+    <label name="opportunity"/>
+    <field name="opportunity" colspan="3"/>
+    <label name="user"/>
+    <field name="user"/>
+    <label name="date"/>
+    <field name="date"/>
+    <label name="party"/>
+    <field name="party"/>
+    <label name="address"/>
+    <field name="address"/>
+    <label name="description"/>
+    <field name="description"/>
+    <label name="probability"/>
+    <field name="probability"/>
+    <notebook colspan="4">
+        <page string="Lead/Opportunity" id="opportunity">
+            <label name="company"/>
+            <field name="company"/>
+            <label name="employee"/>
+            <field name="employee"/>
+            <label name="start_date"/>
+            <field name="start_date"/>
+            <label name="end_date"/>
+            <field name="end_date"/>
+            <separator name="comment" colspan="4"/>
+            <field name="comment" colspan="4"/>
+            <separator name="lost_reason" colspan="4"/>
+            <field name="lost_reason" colspan="4"/>
+            <group col="2" colspan="2" id="state">
+                <label name="state"/>
+                <field name="state"/>
+            </group>
+        </page>
+        <page name="lines">
+            <field name="lines"/>
+        </page>
+    </notebook>
+</form>
diff --git a/view/opportunity_history_tree.xml b/view/opportunity_history_tree.xml
new file mode 100644
index 0000000..82892f0
--- /dev/null
+++ b/view/opportunity_history_tree.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="History">
+    <field name="date"/>
+    <field name="user"/>
+    <field name="start_date"/>
+    <field name="end_date"/>
+    <field name="description"/>
+    <field name="party"/>
+    <field name="state"/>
+    <field name="probability"/>
+</tree>
diff --git a/view/opportunity_line_form.xml b/view/opportunity_line_form.xml
new file mode 100644
index 0000000..ab8d82d
--- /dev/null
+++ b/view/opportunity_line_form.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<form string="Sale Lead/Opportunity Line">
+    <label name="opportunity"/>
+    <field name="opportunity" colspan="3"/>
+    <label name="product"/>
+    <field name="product"/>
+    <label name="sequence"/>
+    <field name="sequence"/>
+    <label name="quantity"/>
+    <field name="quantity"/>
+    <label name="unit"/>
+    <field name="unit"/>
+    <label name="sale_line"/>
+    <field name="sale_line"/>
+</form>
diff --git a/view/opportunity_line_tree.xml b/view/opportunity_line_tree.xml
new file mode 100644
index 0000000..02cd81e
--- /dev/null
+++ b/view/opportunity_line_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Sales Leads/Opportunities Lines" sequence="sequence">
+    <field name="opportunity"/>
+    <field name="product"/>
+    <field name="quantity"/>
+    <field name="unit" expand="1"/>
+    <field name="sequence" tree_invisible="1"/>
+</tree>
diff --git a/view/opportunity_monthly_graph1.xml b/view/opportunity_monthly_graph1.xml
new file mode 100644
index 0000000..335b42c
--- /dev/null
+++ b/view/opportunity_monthly_graph1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<graph string="Sale Opportunities per Month">
+    <x>
+        <field name="year_month"/>
+    </x>
+    <y>
+        <field name="number"/>
+        <field name="converted"/>
+        <field name="lost"/>
+    </y>
+</graph>
diff --git a/view/opportunity_monthly_graph2.xml b/view/opportunity_monthly_graph2.xml
new file mode 100644
index 0000000..97141fc
--- /dev/null
+++ b/view/opportunity_monthly_graph2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<graph string="Sale Opportunities per Month">
+    <x>
+        <field name="year_month"/>
+    </x>
+    <y>
+        <field name="amount"/>
+        <field name="converted_amount"/>
+    </y>
+</graph>
diff --git a/view/opportunity_monthly_tree.xml b/view/opportunity_monthly_tree.xml
new file mode 100644
index 0000000..12cbbf5
--- /dev/null
+++ b/view/opportunity_monthly_tree.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Sale Opportunities per Month">
+    <field name="year"/>
+    <field name="month"/>
+    <field name="number"/>
+    <field name="converted"/>
+    <field name="lost"/>
+    <field name="conversion_rate"/>
+    <field name="amount"/>
+    <field name="converted_amount"/>
+    <field name="currency"/>
+    <field name="conversion_amount_rate"/>
+</tree>
diff --git a/view/opportunity_tree.xml b/view/opportunity_tree.xml
new file mode 100644
index 0000000..e205677
--- /dev/null
+++ b/view/opportunity_tree.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree string="Sales Leads/Opportunities">
+    <field name="start_date"/>
+    <field name="end_date"/>
+    <field name="description"/>
+    <field name="party"/>
+    <field name="amount"/>
+    <field name="currency"/>
+    <field name="state"/>
+    <field name="probability"/>
+</tree>
commit 4fb658aae218a967f561e2bc5ce4cf8e11f03a0e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Feb 15 20:50:54 2013 +0100

    Adding upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 45dbb07..3d508d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-02-12
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 7311d06..de69bd6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/opportunity.py b/opportunity.py
index ac605d1..e6ecd59 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -200,7 +200,6 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
             res['payment_term'] = self.default_payment_term()
             res['payment_term.rec_name'] = PaymentTerm(
                 res['payment_term']).rec_name
-        print res
         return res
 
     def _get_sale_line_opportunity_line(self, sale):
diff --git a/tryton.cfg b/tryton.cfg
index d7988e3..f748840 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     account
     company
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index aa0fa78..5f7fe88 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 0879139..0e681b1 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -23,9 +23,7 @@ locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
 tests/__init__.py
-tests/__init__.pyc
 tests/test_sale_opportunity.py
-tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
commit bb45b3d86372ac9640ff71b12bd4b9707e40cf4e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 23 19:53:44 2012 +0200

    Adding upstream version 2.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 420ea57..45dbb07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.0 - 2012-04-24
 * Bug fixes (see mercurial logs for details)
 * Remove warehouse
diff --git a/MANIFEST.in b/MANIFEST.in
index 1192bab..ee9dbd4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
 include COPYRIGHT
 include CHANGELOG
 include LICENSE
+include tryton.cfg
 include *.xml
 include *.odt
 include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index b755b16..7311d06 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,19 +1,48 @@
 Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 2.4.0
-Summary: Provides:
-    - Leads
-    - Leads to Opportunities conversion
-    - Conversion Management
-    - Record of lost leads
-    - Opportunities to sale orders
-
-Home-page: http://www.openlabs.co.in/
-Author: Sharoon Thomas, Openlabs
-Author-email: info at openlabs.co.in
+Version: 2.6.0
+Summary: Tryton module with leads and opportunities
+Home-page: http://www.tryton.org/
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_sale_opportunity
+        ========================
+        
+        The sale_opportunity module of the Tryton application platform.
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/README b/README
index 97b9604..5830409 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_sale_opportunity
 ========================
 
 The sale_opportunity module of the Tryton application platform.
-See __tryton__.py
 
 Installing
 ----------
diff --git a/__init__.py b/__init__.py
index 85e38ee..538945e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,20 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
+from trytond.pool import Pool
 from .opportunity import *
+
+
+def register():
+    Pool.register(
+        SaleOpportunity,
+        SaleOpportunityLine,
+        SaleOpportunityHistory,
+        SaleOpportunityEmployee,
+        OpenSaleOpportunityEmployeeStart,
+        SaleOpportunityMonthly,
+        SaleOpportunityEmployeeMonthly,
+        module='sale_opportunity', type_='model')
+    Pool.register(
+        OpenSaleOpportunityEmployee,
+        module='sale_opportunity', type_='wizard')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 590147f..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
-    'name': 'Sales Leads and Opportunities',
-    'name_bg_BG': 'Инициативи и възможности за продажба',
-    'name_ca_ES': 'Iniciatives i oportunitats comercials',
-    'name_de_DE': 'Verkauf Interessenten und Chancen',
-    'name_es_AR': 'Ventas: Iniciativas y Oportunidades',
-    'name_es_ES': 'Iniciativas y oportunidades comerciales',
-    'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '2.4.0',
-    'author': 'Sharoon Thomas, Openlabs',
-    'email': 'info at openlabs.co.in',
-    'website': 'http://www.openlabs.co.in/',
-    'description': '''Provides:
-    - Leads
-    - Leads to Opportunities conversion
-    - Conversion Management
-    - Record of lost leads
-    - Opportunities to sale orders
-''',
-    'description_bg_BG': '''Дава възможност за:
-    - Инициативи
-    - Превръшане на инициативи във възможности
-    - Запис на неосъществени инициативи
-    - Превръщане на възможности в поръчки за продажба
-''',
-    'description_ca_ES': '''Aquest mòdul permet la gestió de:
-    - Iniciatives comercials
-    - Conversió d'iniciatives a oportunitats
-    - Gestió de les conversions
-    - Registre d'iniciatives perdudes
-    - Oportunitats a comandes de venda
-''',
-    'description_de_DE': '''Ermöglicht:
-    - die Anlage von Interessenten (Leads)
-    - die Umwandlung von Interessenten zu Verkaufschancen (Opportunities)
-    - die Umwandlung von Chancen zu Verkäufen
-    - die Verfolgung von Interessentenverlusten
-''',
-    'description_es_AR': '''Provee:
-    - Iniciativas comerciales
-    - Conversión de iniciativas a oportunidades
-    - Gestión de conversiones
-    - Registro de iniciativas perdidas
-    - Oportunidades a órdenes de venta
-''',
-    'description_es_ES': '''Este módulo permite la gestión de:
-    - Iniciativas comerciales
-    - Conversión de iniciativas a oportunidades
-    - Gestión de las conversiones
-    - Registro de iniciativas perdidas
-    - Oportunidades a pedidos de venta
-''',
-    'description_fr_FR': '''Fourni :
-- Contacts commerciaux
-- Conversion des contacts commerciaux en opportunités
-- Gestion des conversions
-- Enregistrement des contacts commerciaux perdus
-- Conversion des opportunités en ordres de ventes.
-''',
-    'depends': [
-        'party',
-        'company',
-        'product',
-        'sale',
-        'account',
-        'stock',
-        'currency',
-    ],
-    'xml': [
-        'opportunity.xml',
-        'party.xml',
-    ],
-    'translation': [
-        'locale/bg_BG.po',
-        'locale/ca_ES.po',
-        'locale/cs_CZ.po',
-        'locale/de_DE.po',
-        'locale/es_AR.po',
-        'locale/es_CO.po',
-        'locale/es_ES.po',
-        'locale/fr_FR.po',
-        'locale/nl_NL.po',
-        'locale/ru_RU.po',
-    ],
-}
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index e4a7536..5261bae 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -9,6 +9,7 @@ msgstr "Вероятността трябва да бъде между 0 и 100!
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
 msgstr ""
+"Преди да бъде изтрита възможност за продажба \"%s\" трябва да бъде отказана!"
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -612,7 +613,7 @@ msgstr "Възможност за продажба за служител"
 
 msgctxt "model:sale.opportunity_employee.open.start,name:"
 msgid "Open Sale Opportunity per Employee"
-msgstr ""
+msgstr "Отворени възможности за продажба по потребител"
 
 msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 2d5623f..67c3d2e 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,813 +4,732 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
-msgstr ""
+msgstr "L'oportunitat ha de ser entre 0 i 100."
 
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr ""
+msgstr "L'oportunitat \"%s\" ha de ser cancel·lada abans d'eliminar-la."
 
-#, fuzzy
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adreça"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
-msgstr "Quantitat"
+msgstr "Import"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Comentari"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Empresa"
 
 msgctxt "field:sale.opportunity,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Gestió de divises"
+msgstr "Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígits de la divisa"
+msgstr "Decimals de la moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Descripció"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Empleat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Data final"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,history:"
 msgid "History"
-msgstr "Històric"
+msgstr "Historial"
 
 msgctxt "field:sale.opportunity,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Línies"
 
 msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Motius de la pèrdua"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,party:"
 msgid "Party"
-msgstr "Tercers"
+msgstr "Tercer"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr "Termini de pagament"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Probabilitat de conversió"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
-msgstr "Vendes"
+msgstr "Venda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Data inici"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Estat"
 
 msgctxt "field:sale.opportunity,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
 
 msgctxt "field:sale.opportunity,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Adreça"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Comentari"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Empresa"
 
 msgctxt "field:sale.opportunity.history,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr ""
+msgstr "Data modificació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Descripció"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Empleat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Data final"
 
 msgctxt "field:sale.opportunity.history,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Línies"
 
 msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Motius de la pèrdua"
 
 msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
-msgstr "Tercers"
+msgstr "Tercer"
 
 msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Probabilitat de conversió"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Data inici"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Estat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Usuari"
 
 msgctxt "field:sale.opportunity.history,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
 
 msgctxt "field:sale.opportunity.history,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
 
 msgctxt "field:sale.opportunity.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
 msgctxt "field:sale.opportunity.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
-msgstr "Productes"
+msgstr "Producte"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Línia de venda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Seqüència"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Unitat"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígits unitaris"
+msgstr "Decimals de la unitat"
 
 msgctxt "field:sale.opportunity.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
 
 msgctxt "field:sale.opportunity.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
-msgstr "Quantitat"
+msgstr "Import"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Taxa d'import convertit"
 
 msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Taxa de conversió"
 
 msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertit"
 
 msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Import convertit"
 
 msgctxt "field:sale.opportunity_employee,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Gestió de divises"
+msgstr "Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígits de la divisa"
+msgstr "Decimals de la moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Empleat"
 
 msgctxt "field:sale.opportunity_employee,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
 msgctxt "field:sale.opportunity_employee,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
 
 msgctxt "field:sale.opportunity_employee,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee.open.start,end_date:"
 msgid "End Date"
 msgstr "Data final"
 
 msgctxt "field:sale.opportunity_employee.open.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee.open.start,start_date:"
 msgid "Start Date"
 msgstr "Data inici"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
-msgstr "Quantitat"
+msgstr "Import"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Taxa d'import convertit"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Taxa de conversió"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertit"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Import convertit"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Gestió de divises"
+msgstr "Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígits de la divisa"
+msgstr "Decimals de la moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Empleat"
 
 msgctxt "field:sale.opportunity_employee_monthly,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Any"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
-msgstr "Quantitat"
+msgstr "Import"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Empresa"
 
 msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Taxa d'import convertit"
 
 msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Taxa de conversió"
 
 msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertit"
 
 msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Import convertit"
 
 msgctxt "field:sale.opportunity_monthly,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,create_uid:"
 msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Gestió de divises"
+msgstr "Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígits de la divisa"
+msgstr "Decimals de la moneda"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
-msgstr "Nom del camp"
+msgstr "Nom"
 
 msgctxt "field:sale.opportunity_monthly,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
 
 msgctxt "field:sale.opportunity_monthly,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Any"
 
 msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
-msgstr ""
+msgstr "Any-Mes"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr ""
+msgstr "Import estimats d'ingressos."
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
-msgstr ""
+msgstr "Percentatge entre 0 i 100."
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
 msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
 msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunitats per empleat"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Oportunitats per treballador per mes"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunitats per empleat"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Iniciatives/Oportunitats"
 
 msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats cancel·lades"
 
 msgctxt "model:ir.action,name:act_opportunity_form_converted"
 msgid "Converted Opportunities"
-msgstr ""
+msgstr "Oportunitats convertides"
 
 msgctxt "model:ir.action,name:act_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr ""
+msgstr "Iniciatives obertes"
 
 msgctxt "model:ir.action,name:act_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats perdudes"
 
 msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunitats"
 
 msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
+msgstr "Oportunitats per mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Oportunitats per treballador per mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunitats per empleat"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats cancelades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
 msgid "Converted Opportunities"
-msgstr ""
+msgstr "Oportunitats convertides"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr ""
+msgstr "Iniciatives obertes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr ""
+msgstr "Iniciatives i oportunitats  perdudes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunitats"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
+msgstr "Oportunitats per mes"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr "Informes"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunitats"
 
 msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
 msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr ""
+msgstr "Historial d'oportunitats"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr ""
+msgstr "Línia d'oportunitat"
 
 msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
-msgstr ""
+msgstr "Oportunitats per empleat"
 
 msgctxt "model:sale.opportunity_employee.open.start,name:"
 msgid "Open Sale Opportunity per Employee"
-msgstr ""
+msgstr "Obre oportunitats per empleat"
 
 msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
-msgstr ""
+msgstr "Oportunitats per empleat i mes"
 
 msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
-msgstr ""
+msgstr "Oportunitats per mes"
 
-#, fuzzy
 msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertit"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Oportunitat"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
-#, fuzzy
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertit"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Oportunitat"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdut"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunitat"
 
-#, fuzzy
 msgctxt "view:sale.opportunity.history:"
 msgid "History"
-msgstr "Històric"
+msgstr "Historial"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunitat"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr ""
+msgstr "Línias Iniciatives/Oportunitats"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr ""
+msgstr "Línias Iniciatives/Oportunitats"
 
-#, fuzzy
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Converteix a oportunitat"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr ""
+msgstr "Converteix a comanda"
 
 msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunitat"
 
 msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
-msgstr ""
+msgstr "Marca com a perdut"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunitat"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Iniciatives/Oportunitats"
 
 msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
-msgstr ""
+msgstr "Convertir a iniciativa"
 
 msgctxt "view:sale.opportunity_employee.open.start:"
 msgid "Sale Opportunities per Employee"
-msgstr ""
+msgstr "Oportunitats per empleat"
 
 msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunitats per empleat"
 
 msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Oportunitats per mes"
 
 msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Oportunitats per mes"
 
-#, fuzzy
 msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
-msgstr "Cancel·lar"
+msgstr "Cancel·la"
 
-#, fuzzy
 msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
-msgstr "Obrir"
+msgstr "Obre"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 35645cf..ceb38b3 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -8,7 +8,7 @@ msgstr "¡La Probabilidad debe ser entre 0 y 100!"
 
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr "¡Oportunidad de Venta \"%s\" debe ser cancelada antes de eliminar!"
+msgstr "¡Oportunidad de Venta «%s» debe ser cancelada antes de eliminar!"
 
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
@@ -84,7 +84,7 @@ msgstr "Probabilidad de Conversión"
 
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
@@ -168,7 +168,7 @@ msgstr "Probabilidad de Conversión"
 
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
@@ -216,7 +216,7 @@ msgstr "Cantidad"
 
 msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
@@ -300,7 +300,7 @@ msgstr "Número"
 
 msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity_employee,write_date:"
 msgid "Write Date"
@@ -384,7 +384,7 @@ msgstr "Número"
 
 msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_date:"
 msgid "Write Date"
@@ -456,7 +456,7 @@ msgstr "Número"
 
 msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity_monthly,write_date:"
 msgid "Write Date"
@@ -476,7 +476,7 @@ msgstr "Año-Mes"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr "Importe de los ingresos estimados"
+msgstr "Importe estimado de ingreso"
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 72e2f53..f493634 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,817 +4,736 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
-msgstr ""
+msgstr "¡La Probabilidad debe ser entre 0 y 100!"
 
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
-msgstr ""
+msgstr "¡La oportunidad de Venta \"%s\" debe ser cancelada antes de eliminar!"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Dirección"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Comentario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,company:"
 msgid "Company"
-msgstr "Compañía"
+msgstr "Compañia"
 
 msgctxt "field:sale.opportunity,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,create_uid:"
 msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Gestión de Monedas"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de la Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Descripción"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
-msgstr "Fecha Final"
+msgstr "Fecha final"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,history:"
 msgid "History"
-msgstr "Historia"
+msgstr "Histórico"
 
 msgctxt "field:sale.opportunity,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
-msgstr "Líneas de Inventario"
+msgstr "Líneas"
 
 msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Motivo de la pérdida"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Terceros"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
-msgstr "Término de Pago"
+msgstr "Término de pago"
 
 msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Probabilidad de Conversión"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
-msgstr "Ventas"
+msgstr "Venta"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha inicio"
 
-#, fuzzy
 msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Estado"
 
 msgctxt "field:sale.opportunity,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
 
 msgctxt "field:sale.opportunity,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Dirección"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Comentario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
-msgstr "Compañía"
+msgstr "Compañia"
 
 msgctxt "field:sale.opportunity.history,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,create_uid:"
 msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr ""
+msgstr "Modificar fecha"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Descripción"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
-msgstr "Fecha Final"
+msgstr "Fecha final"
 
 msgctxt "field:sale.opportunity.history,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
-msgstr "Líneas de Inventario"
+msgstr "Líneas"
 
 msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Motivo de pérdida"
 
 msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunidad de Venta"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Terceros"
 
 msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Probabilidad de Conversión"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha inicio"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Usuario"
 
 msgctxt "field:sale.opportunity.history,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
 
 msgctxt "field:sale.opportunity.history,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
 
 msgctxt "field:sale.opportunity.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,create_uid:"
 msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
 
 msgctxt "field:sale.opportunity.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
-msgstr "Productos"
+msgstr "Producto"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
-msgstr "Línea de Venta"
+msgstr "Línea de venta"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Unidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígitos de Unidad"
+msgstr "Decimales de la Unidad"
 
 msgctxt "field:sale.opportunity.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
 
 msgctxt "field:sale.opportunity.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
-msgstr "Compañía"
+msgstr "Compañia"
 
 msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Tasa de Cantidad de Conversiones"
 
 msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Tasa de Conversión"
 
 msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertido"
 
 msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Cantidad Convertida"
 
 msgctxt "field:sale.opportunity_employee,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,create_uid:"
 msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Gestión de Monedas"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de la Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
 msgctxt "field:sale.opportunity_employee,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdido"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre del campo"
 
 msgctxt "field:sale.opportunity_employee,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
 
 msgctxt "field:sale.opportunity_employee,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee.open.start,end_date:"
 msgid "End Date"
-msgstr "Fecha Final"
+msgstr "Fecha final"
 
 msgctxt "field:sale.opportunity_employee.open.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee.open.start,start_date:"
 msgid "Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha inicio"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
-msgstr "Compañía"
+msgstr "Compañia"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Tasa de Cantidad de Conversiones"
 
 msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Tasa de Conversión"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertido"
 
 msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Cantidad Convertida"
 
 msgctxt "field:sale.opportunity_employee_monthly,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
 msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Gestión de Monedas"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de la Moneda"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
 msgctxt "field:sale.opportunity_employee_monthly,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdido"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
 
 msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Año"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
-msgstr "Compañía"
+msgstr "Compañia"
 
 msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Tasa de Cantidad de Conversiones"
 
 msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Tasa de Conversión"
 
 msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertidas"
 
 msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Cantidad Convertida"
 
 msgctxt "field:sale.opportunity_monthly,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,create_uid:"
 msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Moneda"
+msgstr "Gestión de Monedas"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Gestión de Moneda"
+msgstr "Decimales de la Moneda"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdido"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
-msgstr "Nombre de Contacto"
+msgstr "Nombre"
 
 msgctxt "field:sale.opportunity_monthly,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
 
 msgctxt "field:sale.opportunity_monthly,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Año"
 
 msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
-msgstr ""
+msgstr "Año-Mes"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr ""
+msgstr "Cantidad de los ingresos estimados"
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
-msgstr ""
+msgstr "Porcentaje entre 0 y 100"
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr "en %"
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr "en %"
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "en %"
 
-#, fuzzy
 msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr "en %"
 
-#, fuzzy
 msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "en %"
 
-#, fuzzy
 msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr "en %"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por Empleado"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Oportunidades por Empleado por Mes"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por Empleado"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y Oportunidades"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Iniciativas/Oportunidades de Ventas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y Oportunidades Canceladas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_converted"
 msgid "Converted Opportunities"
-msgstr ""
+msgstr "Oportunidades Convertidas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr ""
+msgstr "Iniciativas Abiertas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y Oportunidades Perdidas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades por Mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Oportunidades por Empleado por Mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por Empleado"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y Oportunidades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y Oportunidades Canceladas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
 msgid "Converted Opportunities"
-msgstr ""
+msgstr "Oportunidades Convertidas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr ""
+msgstr "Iniciativas Abiertas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y Oportunidades Perdidas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades por Mes"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
-msgstr "Reportes"
+msgstr "Informes"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunidad de Venta"
 
 msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunidad de Venta"
 
 msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr ""
+msgstr "Historial de la Oportunidad de Venta"
 
 msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr ""
+msgstr "Línea de Oportunidad de Venta"
 
 msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
-msgstr ""
+msgstr "Oportunidad de Venta por Empleado"
 
 msgctxt "model:sale.opportunity_employee.open.start,name:"
 msgid "Open Sale Opportunity per Employee"
-msgstr ""
+msgstr "Oportunidad de Venta Abierta por Empleado"
 
 msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
-msgstr ""
+msgstr "Oportunidad de Venta por Empleado por Mes"
 
 msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
-msgstr ""
+msgstr "Oportunidad de Venta por Mes"
 
-#, fuzzy
 msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Cancelado"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertido"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdido"
 
 msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-#, fuzzy
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Cancelado"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertido"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdido"
 
 msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-#, fuzzy
 msgctxt "view:sale.opportunity.history:"
 msgid "History"
-msgstr "Historia"
+msgstr "Histórico"
 
 msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunidad"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr ""
+msgstr "Línea de Iniciativa/Oportunidad de Venta"
 
 msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr ""
+msgstr "Líneas de Iniciativas/Oportunidades de Ventas"
 
-#, fuzzy
 msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Cancelar"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Convertir a Oportunidad"
 
 msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr ""
+msgstr "Convertir a Venta"
 
 msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunidad"
 
 msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
-msgstr ""
+msgstr "Marcar como Perdido"
 
 msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
-msgstr ""
+msgstr "Restablecer como Iniciativa"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunidad de Venta"
 
 msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Iniciativas/Oportunidades de Ventas"
 
 msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
-msgstr ""
+msgstr "Establecer como Iniciativa"
 
 msgctxt "view:sale.opportunity_employee.open.start:"
 msgid "Sale Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades de Venta por Empleado"
 
 msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por Empleado"
 
 msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades de Venta por Mes"
 
 msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades de Ventas por Mes"
 
-#, fuzzy
 msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#, fuzzy
 msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Abrir"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 75825af..de604b7 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
-msgstr "La probabilidad debe ser entre 0 a 100."
+msgstr "La probabilidad debe ser entre 0 y 100."
 
 msgctxt "error:sale.opportunity:"
 msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
@@ -36,11 +36,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
 
 msgctxt "field:sale.opportunity,description:"
 msgid "Description"
@@ -232,7 +232,7 @@ msgstr "Unidad"
 
 msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígitos de la unidad"
+msgstr "Decimales de la unidad"
 
 msgctxt "field:sale.opportunity.line,write_date:"
 msgid "Write Date"
@@ -276,11 +276,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
 
 msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
@@ -356,11 +356,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
 
 msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
@@ -432,11 +432,11 @@ msgstr "Usuario creación"
 
 msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
 
 msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Decimales de la moneda"
 
 msgctxt "field:sale.opportunity_monthly,id:"
 msgid "ID"
@@ -476,7 +476,7 @@ msgstr "Año-Mes"
 
 msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr "Importe estimados de ingresos."
+msgstr "Importe estimado de ingresos."
 
 msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
@@ -564,7 +564,7 @@ msgstr "Iniciativas y oportunidades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr "Iniciativas y oportunidades canceladas"
+msgstr "Iniciativas/Oportunidades canceladas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
 msgid "Converted Opportunities"
@@ -576,7 +576,7 @@ msgstr "Iniciativas abiertas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr "Iniciativas y oportunidades perdidas"
+msgstr "Iniciativas/Oportunidades perdidas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
 msgid "Opportunities"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index ffaa069..7cebd20 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -572,7 +572,7 @@ msgstr "Opportunités converties"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr "Contatcs commerciaux ouverts"
+msgstr "Contacts commerciaux ouverts"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
diff --git a/opportunity.py b/opportunity.py
index dbb6207..ac605d1 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -5,11 +5,16 @@ import datetime
 import time
 from trytond.model import ModelView, ModelSQL, Workflow, fields
 from trytond.wizard import Wizard, StateView, StateAction, Button
-from trytond.backend import FIELDS
+from trytond.backend import FIELDS, TableHandler
 from trytond.pyson import Equal, Eval, Not, In, If, Get, PYSONEncoder
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 
+__all__ = ['SaleOpportunity', 'SaleOpportunityLine',
+    'SaleOpportunityHistory', 'SaleOpportunityEmployee',
+    'OpenSaleOpportunityEmployeeStart', 'OpenSaleOpportunityEmployee',
+    'SaleOpportunityMonthly', 'SaleOpportunityEmployeeMonthly']
+
 STATES = [
     ('lead', 'Lead'),
     ('opportunity', 'Opportunity'),
@@ -29,13 +34,11 @@ _DEPENDS_STOP = ['state']
 
 class SaleOpportunity(Workflow, ModelSQL, ModelView):
     'Sale Opportunity'
-    _name = "sale.opportunity"
-    _description = __doc__
+    __name__ = "sale.opportunity"
     _history = True
     _rec_name = 'description'
-
     party = fields.Many2One('party.party', 'Party', required=True, select=True,
-            states=_STATES_STOP, depends=_DEPENDS_STOP)
+        on_change=['party'], states=_STATES_STOP, depends=_DEPENDS_STOP)
     address = fields.Many2One('party.address', 'Address',
         domain=[('party', '=', Eval('party'))],
         select=True, depends=['party', 'state'],
@@ -88,19 +91,20 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
             'invisible': Eval('state') != 'converted',
             }, depends=['state'])
 
-    def __init__(self):
-        super(SaleOpportunity, self).__init__()
-        self._order.insert(0, ('start_date', 'DESC'))
-        self._sql_constraints += [
+    @classmethod
+    def __setup__(cls):
+        super(SaleOpportunity, cls).__setup__()
+        cls._order.insert(0, ('start_date', 'DESC'))
+        cls._sql_constraints += [
             ('check_percentage',
                 'CHECK(probability >= 0 AND probability <= 100)',
                 'Probability must be between 0 and 100!')
-        ]
-        self._error_messages.update({
+            ]
+        cls._error_messages.update({
                 'delete_cancel': 'Sale Opportunity "%s" must be cancelled '\
                     'before deletion!',
                 })
-        self._transitions |= set((
+        cls._transitions |= set((
                 ('lead', 'opportunity'),
                 ('lead', 'lost'),
                 ('lead', 'cancelled'),
@@ -111,7 +115,7 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
                 ('lost', 'lead'),
                 ('cancelled', 'lead'),
                 ))
-        self._buttons.update({
+        cls._buttons.update({
                 'lead': {
                     'invisible': ~Eval('state').in_(
                         ['cancelled', 'lost', 'opportunity']),
@@ -132,292 +136,257 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
                     },
                 })
 
-    def default_state(self):
+    @staticmethod
+    def default_state():
         return 'lead'
 
-    def default_start_date(self):
-        date_obj = Pool().get('ir.date')
-        return date_obj.today()
+    @staticmethod
+    def default_start_date():
+        Date = Pool().get('ir.date')
+        return Date.today()
 
-    def default_probability(self):
+    @staticmethod
+    def default_probability():
         return 50
 
-    def default_company(self):
+    @staticmethod
+    def default_company():
         return Transaction().context.get('company')
 
-    def default_employee(self):
-        user_obj = Pool().get('res.user')
+    @staticmethod
+    def default_employee():
+        User = Pool().get('res.user')
 
         if Transaction().context.get('employee'):
             return Transaction().context['employee']
         else:
-            user = user_obj.browse(Transaction().user)
+            user = User(Transaction().user)
             if user.employee:
                 return user.employee.id
 
-    def default_payment_term(self):
-        payment_term_obj = Pool().get('account.invoice.payment_term')
-        payment_term_ids = payment_term_obj.search(self.payment_term.domain)
-        if len(payment_term_ids) == 1:
-            return payment_term_ids[0]
-
-    def get_currency(self, ids, name):
-        res = {}
-        for opportunity in self.browse(ids):
-            res[opportunity.id] = opportunity.company.currency.id
-        return res
+    @classmethod
+    def default_payment_term(cls):
+        PaymentTerm = Pool().get('account.invoice.payment_term')
+        payment_terms = PaymentTerm.search(cls.payment_term.domain)
+        if len(payment_terms) == 1:
+            return payment_terms[0].id
 
-    def get_currency_digits(self, ids, name):
-        res = {}
-        for opportunity in self.browse(ids):
-            res[opportunity.id] = opportunity.company.currency.digits
-        return res
+    def get_currency(self, name):
+        return self.company.currency.id
 
-    def on_change_company(self, values):
-        company_obj = Pool().get('company.company')
+    def get_currency_digits(self, name):
+        return self.company.currency.digits
 
+    def on_change_company(self):
         res = {}
-        if values.get('company'):
-            company = company_obj.browse(values['company'])
-            res['currency'] = company.currency.id
-            res['currency.rec_name'] = company.currency.rec_name
-            res['currency_digits'] = company.currency.digits
+        if self.company:
+            res['currency'] = self.company.currency.id
+            res['currency.rec_name'] = self.company.currency.rec_name
+            res['currency_digits'] = self.company.currency.digits
         return res
 
-    def on_change_party(self, values):
-        party_obj = Pool().get('party.party')
-        payment_term_obj = Pool().get('account.invoice.payment_term')
+    def on_change_party(self):
+        PaymentTerm = Pool().get('account.invoice.payment_term')
 
         res = {
             'payment_term': None,
-        }
-        if values.get('party'):
-            party = party_obj.browse(values['party'])
-            if party.customer_payment_term:
-                res['payment_term'] = party.customer_payment_term.id
+            }
+        if self.party:
+            if self.party.customer_payment_term:
+                res['payment_term'] = self.party.customer_payment_term.id
+                res['payment_term.rec_name'] = \
+                    self.party.customer_payment_term.rec_name
         if not res['payment_term']:
             res['payment_term'] = self.default_payment_term()
-        if res['payment_term']:
-            res['payment_term.rec_name'] = payment_term_obj.browse(
-                    res['payment_term']).rec_name
+            res['payment_term.rec_name'] = PaymentTerm(
+                res['payment_term']).rec_name
+        print res
         return res
 
-    def _get_sale_line_opportunity_line(self, opportunity):
+    def _get_sale_line_opportunity_line(self, sale):
         '''
-        Return sale line values for each opportunity line
-
-        :param opportunity: the BrowseRecord of opportunity
-
-        :return: a dictionary with opportunity line id as key
-            and a dictionary of sale line values as value
+        Return sale lines for each opportunity line
         '''
-        line_obj = Pool().get('sale.opportunity.line')
         res = {}
-        for line in opportunity.lines:
+        for line in self.lines:
             if line.sale_line:
                 continue
-            val = line_obj.get_sale_line(line)
-            if val:
-                res[line.id] = val
+            sale_line = line.get_sale_line(sale)
+            if sale_line:
+                res[line.id] = sale_line
         return res
 
-    def _get_sale_opportunity(self, opportunity):
+    def _get_sale_opportunity(self):
         '''
-        Return sale values for an opportunity
-
-        :param opportunity: the BrowseRecord of the opportunity
-
-        :return: a dictionary with sale fields as key and sale values as value
+        Return sale for an opportunity
         '''
-        res = {
-            'description': opportunity.description,
-            'party': opportunity.party.id,
-            'payment_term': opportunity.payment_term.id,
-            'company': opportunity.company.id,
-            'invoice_address': opportunity.address and opportunity.address.id,
-            'shipment_address': opportunity.address and opportunity.address.id,
-            'currency': opportunity.company.currency.id,
-            'comment': opportunity.comment,
-        }
-        return res
-
-    def create_sale(self, opportunity):
+        Sale = Pool().get('sale.sale')
+        with Transaction().set_user(0, set_context=True):
+            return Sale(
+                description=self.description,
+                party=self.party,
+                payment_term=self.payment_term,
+                company=self.company,
+                invoice_address=self.address,
+                shipment_address=self.address,
+                currency=self.company.currency,
+                comment=self.comment,
+                sale_date=None,
+                )
+
+    def create_sale(self):
         '''
-        Create a sale for the opportunity and return the sale id
+        Create a sale for the opportunity and return the sale
         '''
-        pool = Pool()
-        sale_obj = pool.get('sale.sale')
-        sale_line_obj = pool.get('sale.line')
-        line_obj = pool.get('sale.opportunity.line')
+        Line = Pool().get('sale.opportunity.line')
 
-        if opportunity.sale:
+        if self.sale:
             return
 
-        values = self._get_sale_opportunity(opportunity)
-        sale_line_values = self._get_sale_line_opportunity_line(opportunity)
+        sale = self._get_sale_opportunity()
+        sale_lines = self._get_sale_line_opportunity_line(sale)
+        sale.save()
 
-        with Transaction().set_user(0, set_context=True):
-            sale_id = sale_obj.create(values)
-
-        for line_id, values in sale_line_values.iteritems():
-            values['sale'] = sale_id
-            with Transaction().set_user(0, set_context=True):
-                sale_line_id = sale_line_obj.create(values)
-            line_obj.write(line_id, {
-                'sale_line': sale_line_id,
-                })
+        for line_id, sale_line in sale_lines.iteritems():
+            sale_line.sale = sale
+            sale_line.save()
+            Line.write([Line(line_id)], {
+                    'sale_line': sale_line.id,
+                    })
 
-        self.write(opportunity.id, {
-            'sale': sale_id,
-            })
-        return sale_id
+        self.write([self], {
+                'sale': sale.id,
+                })
+        return sale
 
-    def delete(self, ids):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
+    @classmethod
+    def delete(cls, opportunities):
         # Cancel before delete
-        self.cancel(ids)
-        for opportunity in self.browse(ids):
+        cls.cancel(opportunities)
+        for opportunity in opportunities:
             if opportunity.state != 'cancel':
-                self.raise_user_error('delete_cancel', opportunity.rec_name)
-        return super(SaleOpportunity, self).delete(ids)
+                cls.raise_user_error('delete_cancel', opportunity.rec_name)
+        super(SaleOpportunity, cls).delete(opportunities)
 
+    @classmethod
     @ModelView.button
     @Workflow.transition('lead')
-    def lead(self, ids):
+    def lead(cls, opportunities):
         pass
 
+    @classmethod
     @ModelView.button
     @Workflow.transition('opportunity')
-    def opportunity(self, ids):
+    def opportunity(cls, opportunities):
         pass
 
+    @classmethod
     @ModelView.button
     @Workflow.transition('converted')
-    def convert(self, ids):
-        date_obj = Pool().get('ir.date')
-        self.write(ids, {
-                'end_date': date_obj.today(),
+    def convert(cls, opportunities):
+        Date = Pool().get('ir.date')
+        cls.write(opportunities, {
+                'end_date': Date.today(),
                 })
-        for opportunity in self.browse(ids):
-            self.create_sale(opportunity)
+        for opportunity in opportunities:
+            opportunity.create_sale()
 
+    @classmethod
     @ModelView.button
     @Workflow.transition('lost')
-    def lost(self, ids):
-        date_obj = Pool().get('ir.date')
-        self.write(ids, {
-                'end_date': date_obj.today(),
+    def lost(cls, opportunities):
+        Date = Pool().get('ir.date')
+        cls.write(opportunities, {
+                'end_date': Date.today(),
                 })
 
+    @classmethod
     @ModelView.button
     @Workflow.transition('cancelled')
-    def cancel(self, ids):
-        date_obj = Pool().get('ir.date')
-        self.write(ids, {
-                'end_date': date_obj.today(),
+    def cancel(cls, opportunities):
+        Date = Pool().get('ir.date')
+        cls.write(opportunities, {
+                'end_date': Date.today(),
                 })
 
-SaleOpportunity()
-
 
 class SaleOpportunityLine(ModelSQL, ModelView):
     'Sale Opportunity Line'
-    _name = "sale.opportunity.line"
-    _description = __doc__
+    __name__ = "sale.opportunity.line"
     _rec_name = "product"
     _history = True
-
     opportunity = fields.Many2One('sale.opportunity', 'Opportunity')
-    sequence = fields.Integer('Sequence', required=True)
+    sequence = fields.Integer('Sequence',
+        order_field='(%(table)s.sequence IS NULL) %(order)s, '
+        '%(table)s.sequence %(order)s')
     product = fields.Many2One('product.product', 'Product', required=True,
             domain=[('salable', '=', True)], on_change=['product', 'unit'])
     quantity = fields.Float('Quantity', required=True,
             digits=(16, Eval('unit_digits', 2)), depends=['unit_digits'])
     unit = fields.Many2One('product.uom', 'Unit', required=True)
     unit_digits = fields.Function(fields.Integer('Unit Digits',
-        on_change_with=['unit']), 'get_unit_digits')
+        on_change_with=['unit']), 'on_change_with_unit_digits')
     sale_line = fields.Many2One('sale.line', 'Sale Line', readonly=True,
         states={
             'invisible': (Eval('_parent_opportunity', {}).get('state')
                 != 'converted'),
             })
 
-    def __init__(self):
-        super(SaleOpportunityLine, self).__init__()
-        self._order.insert(0, ('sequence', 'ASC'))
+    @classmethod
+    def __setup__(cls):
+        super(SaleOpportunityLine, cls).__setup__()
+        cls._order.insert(0, ('sequence', 'ASC'))
 
-    def on_change_with_unit_digits(self, vals):
-        uom_obj = Pool().get('product.uom')
-        if vals.get('unit'):
-            uom = uom_obj.browse(vals['unit'])
-            return uom.digits
-        return 2
+    @classmethod
+    def __register__(cls, module_name):
+        cursor = Transaction().cursor
+        table = TableHandler(cursor, cls, module_name)
 
-    def get_unit_digits(self, ids, name):
-        res = {}
-        for line in self.browse(ids):
-            if line.unit:
-                res[line.id] = line.unit.digits
-            else:
-                res[line.id] = 2
-        return res
+        super(SaleOpportunityLine, cls).__register__(module_name)
+
+        # Migration from 2.4: drop required on sequence
+        table.not_null_action('sequence', action='remove')
 
-    def on_change_product(self, vals):
-        product_obj = Pool().get('product.product')
+    def on_change_with_unit_digits(self, name=None):
+        if self.unit:
+            return self.unit.digits
+        return 2
 
-        if not vals.get('product'):
+    def on_change_product(self):
+        if not self.product:
             return {}
         res = {}
 
-        product = product_obj.browse(vals['product'])
-        category = product.sale_uom.category
-        if not vals.get('unit') \
-                or vals.get('unit') not in [x.id for x in category.uoms]:
-            res['unit'] = product.sale_uom.id
-            res['unit.rec_name'] = product.sale_uom.rec_name
-            res['unit_digits'] = product.sale_uom.digits
+        category = self.product.sale_uom.category
+        if (not self.unit
+                or self.unit not in category.uoms):
+            res['unit'] = self.product.sale_uom.id
+            res['unit.rec_name'] = self.product.sale_uom.rec_name
+            res['unit_digits'] = self.product.sale_uom.digits
         return res
 
-    def get_sale_line(self, line):
+    def get_sale_line(self, sale):
         '''
-        Return sale line values for opportunity line
-
-        :param line: the BrowseRecord of the line
-
-        :return: a dictionary with sale line fields as key
-            and sale line values as value
+        Return sale line for opportunity line
         '''
-        sale_line_obj = Pool().get('sale.line')
-        res = {
-            'type': 'line',
-            'quantity': line.quantity,
-            'unit': line.unit.id,
-            'product': line.product.id,
-        }
-        res.update(sale_line_obj.on_change_product({
-            'product': line.product.id,
-            'unit': line.unit.id,
-            'quantity': line.quantity,
-            '_parent_sale.party': line.opportunity.party.id,
-            '_parent_sale.currency': line.opportunity.company.currency.id,
-            }))
-        for field_name, field in sale_line_obj._columns.iteritems():
-            if field._type not in ('one2many', 'many2many'):
-                continue
-            if field_name not in res:
-                continue
-            res[field_name] = [('add', res[field_name])]
-        return res
-
-SaleOpportunityLine()
+        SaleLine = Pool().get('sale.line')
+        with Transaction().set_user(0, set_context=True):
+            sale_line = SaleLine(
+                type='line',
+                quantity=self.quantity,
+                unit=self.unit,
+                product=self.product,
+                sale=sale,
+                description=None,
+                )
+        for k, v in sale_line.on_change_product().iteritems():
+            setattr(sale_line, k, v)
+        return sale_line
 
 
 class SaleOpportunityHistory(ModelSQL, ModelView):
     'Sale Opportunity History'
-    _name = 'sale.opportunity.history'
-    _description = __doc__
-
+    __name__ = 'sale.opportunity.history'
     date = fields.DateTime('Change Date')
     opportunity = fields.Many2One('sale.opportunity', 'Sale Opportunity')
     user = fields.Many2One('res.user', 'User')
@@ -443,13 +412,15 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
         'invisible': Not(Equal(Eval('state'), 'lost')),
     }, depends=['state'])
 
-    def __init__(self):
-        super(SaleOpportunityHistory, self).__init__()
-        self._order.insert(0, ('date', 'DESC'))
+    @classmethod
+    def __setup__(cls):
+        super(SaleOpportunityHistory, cls).__setup__()
+        cls._order.insert(0, ('date', 'DESC'))
 
-    def _table_query_fields(self):
-        opportunity_obj = Pool().get('sale.opportunity')
-        table = '%s__history' % opportunity_obj._table
+    @classmethod
+    def _table_query_fields(cls):
+        Opportunity = Pool().get('sale.opportunity')
+        table = '%s__history' % Opportunity._table
         return [
             'MIN("%s".__id) AS id' % table,
             '"%s".id AS opportunity' % table,
@@ -458,44 +429,42 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
             ('COALESCE("%s".write_uid, "%s".create_uid) AS user'
                 % (table, table)),
             ] + ['"%s"."%s"' % (table, name)
-                for name, field in self._columns.iteritems()
+                for name, field in cls._fields.iteritems()
                 if name not in ('id', 'opportunity', 'date', 'user')
                 and not hasattr(field, 'set')]
 
-    def _table_query_group(self):
-        opportunity_obj = Pool().get('sale.opportunity')
-        table = '%s__history' % opportunity_obj._table
+    @classmethod
+    def _table_query_group(cls):
+        Opportunity = Pool().get('sale.opportunity')
+        table = '%s__history' % Opportunity._table
         return [
             '"%s".id' % table,
             'COALESCE("%s".write_uid, "%s".create_uid)' % (table, table),
         ] + ['"%s"."%s"' % (table, name)
-                for name, field in self._columns.iteritems()
+                for name, field in cls._fields.iteritems()
                 if name not in ('id', 'opportunity', 'date', 'user')
                 and not hasattr(field, 'set')]
 
-    def table_query(self):
-        opportunity_obj = Pool().get('sale.opportunity')
-        return (('SELECT ' + \
-                (', '.join(self._table_query_fields())) + \
-                ' FROM "%s__history" '
-                'GROUP BY ' + \
-                (', '.join(self._table_query_group()))) % \
-                opportunity_obj._table, [])
-
-    def get_lines(self, ids, name):
-        line_obj = Pool().get('sale.opportunity.line')
-        histories = self.browse(ids)
-        result = {}
+    @classmethod
+    def table_query(cls):
+        Opportunity = Pool().get('sale.opportunity')
+        return (('SELECT ' + (', '.join(cls._table_query_fields()))
+                + ' FROM "%s__history" GROUP BY '
+                + (', '.join(cls._table_query_group())))
+            % Opportunity._table, [])
+
+    def get_lines(self, name):
+        Line = Pool().get('sale.opportunity.line')
         # We will always have only one id per call due to datetime_field
-        for history in histories:
-            result[history.id] = line_obj.search([
-                ('opportunity', '=', history.opportunity.id),
-            ])
-        return result
+        lines = Line.search([
+                ('opportunity', '=', self.opportunity.id),
+                ])
+        return [l.id for l in lines]
 
-    def read(self, ids, fields_names=None):
-        res = super(SaleOpportunityHistory, self).read(ids,
-                fields_names=fields_names)
+    @classmethod
+    def read(cls, ids, fields_names=None):
+        res = super(SaleOpportunityHistory, cls).read(ids,
+            fields_names=fields_names)
 
         # Remove microsecond from timestamp
         for values in res:
@@ -507,14 +476,10 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 values['date'] = values['date'].replace(microsecond=0)
         return res
 
-SaleOpportunityHistory()
-
 
 class SaleOpportunityEmployee(ModelSQL, ModelView):
     'Sale Opportunity per Employee'
-    _name = 'sale.opportunity_employee'
-    _description = __doc__
-
+    __name__ = 'sale.opportunity_employee'
     employee = fields.Many2One('company.employee', 'Employee')
     number = fields.Integer('Number')
     converted = fields.Integer('Converted')
@@ -534,14 +499,17 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
     conversion_amount_rate = fields.Function(fields.Float(
         'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
 
-    def _converted_state(self):
+    @staticmethod
+    def _converted_state():
         return ['converted']
 
-    def _lost_state(self):
+    @staticmethod
+    def _lost_state():
         return ['lost']
 
-    def table_query(self):
-        opportunity_obj = Pool().get('sale.opportunity')
+    @classmethod
+    def table_query(cls):
+        Opportunity = Pool().get('sale.opportunity')
         clause = ' '
         args = [True]
         if Transaction().context.get('start_date'):
@@ -559,69 +527,48 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
                     'company, '
                     'COUNT(1) AS number, '
                     'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state()) + ') '
+                        for x in cls._converted_state()) + ') '
                         'THEN 1 ELSE 0 END) AS converted, '
                     'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._lost_state()) + ') '
+                        for x in cls._lost_state()) + ') '
                         'THEN 1 ELSE 0 END) AS lost, '
                     'SUM(amount) AS amount, '
                     'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state()) + ') '
+                        for x in cls._converted_state()) + ') '
                         'THEN amount ELSE 0 END) AS converted_amount '
-                'FROM "' + opportunity_obj._table + '" '
-                'WHERE %s ' \
-                + clause + \
-                'GROUP BY employee, company', args)
+            'FROM "' + Opportunity._table + '" '
+            'WHERE %s ' + clause +
+            'GROUP BY employee, company', args)
 
-    def get_conversion_rate(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            if record.number:
-                res[record.id] = (float(record.converted)
-                    / record.number * 100.0)
-            else:
-                res[record.id] = 0.0
-        return res
-
-    def get_currency(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = record.company.currency.id
-        return res
+    def get_conversion_rate(self, name):
+        if self.number:
+            return float(self.converted) / self.number * 100.0
+        else:
+            return 0.0
 
-    def get_currency_digits(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = record.company.currency.digits
-        return res
+    def get_currency(self, name):
+        return self.company.currency.id
 
-    def get_conversion_amount_rate(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            if record.amount:
-                res[record.id] = (float(record.converted_amount) /
-                        float(record.amount) * 100.0)
-            else:
-                res[record.id] = 0.0
-        return res
+    def get_currency_digits(self, name):
+        return self.company.currency.digits
 
-SaleOpportunityEmployee()
+    def get_conversion_amount_rate(self, name):
+        if self.amount:
+            return float(self.converted_amount) / float(self.amount) * 100.0
+        else:
+            return 0.0
 
 
 class OpenSaleOpportunityEmployeeStart(ModelView):
     'Open Sale Opportunity per Employee'
-    _name = 'sale.opportunity_employee.open.start'
-    _description = __doc__
+    __name__ = 'sale.opportunity_employee.open.start'
     start_date = fields.Date('Start Date')
     end_date = fields.Date('End Date')
 
-OpenSaleOpportunityEmployeeStart()
-
 
 class OpenSaleOpportunityEmployee(Wizard):
     'Open Sale Opportunity per Employee'
-    _name = 'sale.opportunity_employee.open'
-
+    __name__ = 'sale.opportunity_employee.open'
     start = StateView('sale.opportunity_employee.open.start',
         'sale_opportunity.opportunity_employee_open_start_view_form', [
             Button('Cancel', 'end', 'tryton-cancel'),
@@ -629,21 +576,17 @@ class OpenSaleOpportunityEmployee(Wizard):
             ])
     open_ = StateAction('sale_opportunity.act_opportunity_employee_form')
 
-    def do_open_(self, session, action):
+    def do_open_(self, action):
         action['pyson_context'] = PYSONEncoder().encode({
-                'start_date': session.start.start_date,
-                'end_date': session.start.end_date,
+                'start_date': self.start.start_date,
+                'end_date': self.start.end_date,
                 })
         return action, {}
 
-OpenSaleOpportunityEmployee()
-
 
 class SaleOpportunityMonthly(ModelSQL, ModelView):
     'Sale Opportunity per Month'
-    _name = 'sale.opportunity_monthly'
-    _description = __doc__
-
+    __name__ = 'sale.opportunity_monthly'
     year = fields.Char('Year')
     month = fields.Integer('Month')
     year_month = fields.Function(fields.Char('Year-Month'),
@@ -666,21 +609,25 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
     conversion_amount_rate = fields.Function(fields.Float(
         'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
 
-    def __init__(self):
-        super(SaleOpportunityMonthly, self).__init__()
-        self._order.insert(0, ('year', 'DESC'))
-        self._order.insert(1, ('month', 'DESC'))
+    @classmethod
+    def __setup__(cls):
+        super(SaleOpportunityMonthly, cls).__setup__()
+        cls._order.insert(0, ('year', 'DESC'))
+        cls._order.insert(1, ('month', 'DESC'))
 
-    def _converted_state(self):
+    @staticmethod
+    def _converted_state():
         return ['converted']
 
-    def _lost_state(self):
+    @staticmethod
+    def _lost_state():
         return ['lost']
 
-    def table_query(self):
-        opportunity_obj = Pool().get('sale.opportunity')
-        type_id = FIELDS[self.id._type].sql_type(self.id)[0]
-        type_year = FIELDS[self.year._type].sql_type(self.year)[0]
+    @classmethod
+    def table_query(cls):
+        Opportunity = Pool().get('sale.opportunity')
+        type_id = FIELDS[cls.id._type].sql_type(cls.id)[0]
+        type_year = FIELDS[cls.year._type].sql_type(cls.year)[0]
         return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
                     'create_date, write_uid, write_date, '
                     'CAST(year AS ' + type_year + ') AS year, month, company, '
@@ -697,65 +644,44 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
                         'company, '
                         'COUNT(1) AS number, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state()) + ') '
+                        for x in cls._converted_state()) + ') '
                         'THEN 1 ELSE 0 END) AS converted, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._lost_state()) + ') '
+                        for x in cls._lost_state()) + ') '
                         'THEN 1 ELSE 0 END) AS lost, '
                         'SUM(amount) AS amount, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state()) + ') '
+                        for x in cls._converted_state()) + ') '
                         'THEN amount ELSE 0 END) AS converted_amount '
-                    'FROM "' + opportunity_obj._table + '" '
-                    'GROUP BY year, month, company) AS "' + self._table + '"',
+                    'FROM "' + Opportunity._table + '" '
+                    'GROUP BY year, month, company) AS "' + cls._table + '"',
                 [])
 
-    def get_conversion_rate(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            if record.number:
-                res[record.id] = (float(record.converted)
-                    / record.number * 100.0)
-            else:
-                res[record.id] = 0.0
-        return res
+    def get_conversion_rate(self, name):
+        if self.number:
+            return float(self.converted) / self.number * 100.0
+        else:
+            return 0.0
 
-    def get_year_month(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = '%s-%s' % (record.year, int(record.month))
-        return res
+    def get_year_month(self, name):
+        return '%s-%s' % (self.year, int(self.month))
 
-    def get_currency(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = record.company.currency.id
-        return res
+    def get_currency(self, name):
+        return self.company.currency.id
 
-    def get_currency_digits(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = record.company.currency.digits
-        return res
-
-    def get_conversion_amount_rate(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            if record.amount:
-                res[record.id] = (float(record.converted_amount) /
-                        float(record.amount) * 100.0)
-            else:
-                res[record.id] = 0.0
-        return res
+    def get_currency_digits(self, name):
+        return self.company.currency.digits
 
-SaleOpportunityMonthly()
+    def get_conversion_amount_rate(self, name):
+        if self.amount:
+            return float(self.converted_amount) / float(self.amount) * 100.0
+        else:
+            return 0.0
 
 
 class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
     'Sale Opportunity per Employee per Month'
-    _name = 'sale.opportunity_employee_monthly'
-    _description = __doc__
-
+    __name__ = 'sale.opportunity_employee_monthly'
     year = fields.Char('Year')
     month = fields.Integer('Month')
     employee = fields.Many2One('company.employee', 'Employee')
@@ -777,22 +703,26 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
     conversion_amount_rate = fields.Function(fields.Float(
         'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
 
-    def __init__(self):
-        super(SaleOpportunityEmployeeMonthly, self).__init__()
-        self._order.insert(0, ('year', 'DESC'))
-        self._order.insert(1, ('month', 'DESC'))
-        self._order.insert(2, ('employee', 'ASC'))
+    @classmethod
+    def __setup__(cls):
+        super(SaleOpportunityEmployeeMonthly, cls).__setup__()
+        cls._order.insert(0, ('year', 'DESC'))
+        cls._order.insert(1, ('month', 'DESC'))
+        cls._order.insert(2, ('employee', 'ASC'))
 
-    def _converted_state(self):
+    @staticmethod
+    def _converted_state():
         return ['converted']
 
-    def _lost_state(self):
+    @staticmethod
+    def _lost_state():
         return ['lost']
 
-    def table_query(self):
-        opportunity_obj = Pool().get('sale.opportunity')
-        type_id = FIELDS[self.id._type].sql_type(self.id)[0]
-        type_year = FIELDS[self.year._type].sql_type(self.year)[0]
+    @classmethod
+    def table_query(cls):
+        Opportunity = Pool().get('sale.opportunity')
+        type_id = FIELDS[cls.id._type].sql_type(cls.id)[0]
+        type_year = FIELDS[cls.year._type].sql_type(cls.year)[0]
         return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
                     'create_date, write_uid, write_date, '
                     'CAST(year AS ' + type_year + ') AS year, month, '
@@ -812,49 +742,33 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
                         'company, '
                         'COUNT(1) AS number, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state()) + ') '
+                        for x in cls._converted_state()) + ') '
                         'THEN 1 ELSE 0 END) AS converted, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._lost_state()) + ') '
+                        for x in cls._lost_state()) + ') '
                         'THEN 1 ELSE 0 END) AS lost, '
                         'SUM(amount) AS amount, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state()) + ') '
+                        for x in cls._converted_state()) + ') '
                         'THEN amount ELSE 0 END) AS converted_amount '
-                    'FROM "' + opportunity_obj._table + '" '
+                    'FROM "' + Opportunity._table + '" '
                     'GROUP BY year, month, employee, company) '
-                'AS "' + self._table + '"', [])
+                'AS "' + cls._table + '"', [])
 
-    def get_conversion_rate(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            if record.number:
-                res[record.id] = (float(record.converted)
-                    / record.number * 100.0)
-            else:
-                res[record.id] = 0.0
-        return res
+    def get_conversion_rate(self, name):
+        if self.number:
+            return float(self.converted) / self.number * 100.0
+        else:
+            return 0.0
 
-    def get_currency(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = record.company.currency.id
-        return res
+    def get_currency(self, name):
+        return self.company.currency.id
 
-    def get_currency_digits(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            res[record.id] = record.company.currency.digits
-        return res
+    def get_currency_digits(self, name):
+        return self.company.currency.digits
 
-    def get_conversion_amount_rate(self, ids, name):
-        res = {}
-        for record in self.browse(ids):
-            if record.amount:
-                res[record.id] = (float(record.converted_amount) /
-                        float(record.amount) * 100.0)
-            else:
-                res[record.id] = 0.0
-        return res
-
-SaleOpportunityEmployeeMonthly()
+    def get_conversion_amount_rate(self, name):
+        if self.amount:
+            return float(self.converted_amount) / float(self.amount) * 100.0
+        else:
+            return 0.0
diff --git a/opportunity.xml b/opportunity.xml
index 2841fc8..c43001b 100644
--- a/opportunity.xml
+++ b/opportunity.xml
@@ -54,20 +54,16 @@
                                 <field name="state"/>
                             </group>
                             <group col="5" colspan="2" id="buttons">
-                                <button name="cancel" type="object"
-                                    string="Cancel"
+                                <button name="cancel" string="Cancel"
                                     icon="tryton-cancel"/>
-                                <button name="lost" type="object"
-                                    string="Mark as Lost"
+                                <button name="lost" string="Mark as Lost"
                                     icon="tryton-cancel"/>
-                                <button name="lead" type="object"
-                                    string="Set as Lead"
+                                <button name="lead" string="Set as Lead"
                                     icon="tryton-go-previous"/>
-                                <button name="opportunity" type="object"
+                                <button name="opportunity"
                                     string="Convert to Opportunity"
                                     icon="tryton-go-next"/>
-                                <button name="convert" type="object"
-                                    string="Convert to Sale"
+                                <button name="convert" string="Convert to Sale"
                                     icon="tryton-go-next"/>
                             </group>
                         </page>
diff --git a/setup.py b/setup.py
index 0ef2771..46c7fc3 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
 
 from setuptools import setup
 import re
+import os
+import ConfigParser
 
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+    if key in info:
+        info[key] = info[key].strip().splitlines()
 major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
 
 setup(name='trytond_sale_opportunity',
     version=info.get('version', '0.0.1'),
-    description=info.get('description', ''),
-    author=info.get('author', ''),
-    author_email=info.get('email', ''),
-    url=info.get('website', ''),
+    description='Tryton module with leads and opportunities',
+    long_description=read('README'),
+    author='Tryton',
+    url='http://www.tryton.org/',
     download_url="http://downloads.tryton.org/" + \
-            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
     package_dir={'trytond.modules.sale_opportunity': '.'},
     packages=[
         'trytond.modules.sale_opportunity',
         'trytond.modules.sale_opportunity.tests',
-    ],
+        ],
     package_data={
         'trytond.modules.sale_opportunity': info.get('xml', []) \
-                + info.get('translation', []),
-    },
+            + ['tryton.cfg', 'locale/*.po'],
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -56,7 +67,7 @@ setup(name='trytond_sale_opportunity',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
-    ],
+        ],
     license='GPL-3',
     install_requires=requires,
     zip_safe=False,
@@ -66,4 +77,4 @@ setup(name='trytond_sale_opportunity',
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-)
+    )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..d7988e3
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,13 @@
+[tryton]
+version=2.6.0
+depends:
+    account
+    company
+    currency
+    party
+    product
+    sale
+    stock
+xml:
+    opportunity.xml
+    party.xml
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index fc9ca65..aa0fa78 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,19 +1,48 @@
 Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 2.4.0
-Summary: Provides:
-    - Leads
-    - Leads to Opportunities conversion
-    - Conversion Management
-    - Record of lost leads
-    - Opportunities to sale orders
-
-Home-page: http://www.openlabs.co.in/
-Author: Sharoon Thomas, Openlabs
-Author-email: info at openlabs.co.in
+Version: 2.6.0
+Summary: Tryton module with leads and opportunities
+Home-page: http://www.tryton.org/
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_sale_opportunity
+        ========================
+        
+        The sale_opportunity module of the Tryton application platform.
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index b20f35c..0879139 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -7,8 +7,8 @@ README
 opportunity.xml
 party.xml
 setup.py
+tryton.cfg
 ./__init__.py
-./__tryton__.py
 ./opportunity.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index c49e422..7f7b5e9 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_party >= 2.4, < 2.5
-trytond_company >= 2.4, < 2.5
-trytond_product >= 2.4, < 2.5
-trytond_sale >= 2.4, < 2.5
-trytond_account >= 2.4, < 2.5
-trytond_stock >= 2.4, < 2.5
-trytond_currency >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_account >= 2.6, < 2.7
+trytond_company >= 2.6, < 2.7
+trytond_currency >= 2.6, < 2.7
+trytond_party >= 2.6, < 2.7
+trytond_product >= 2.6, < 2.7
+trytond_sale >= 2.6, < 2.7
+trytond_stock >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit ecba9b67b5cc316efc80c996c40b8f34ed0717b2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 24 19:31:03 2012 +0200

    Adding upstream version 2.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index 63636d2..420ea57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
-Version 2.2.1 - 2011-12-26
+Version 2.4.0 - 2012-04-24
 * Bug fixes (see mercurial logs for details)
+* Remove warehouse
 
 Version 2.2.0 - 2011-10-25
 * Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index c4ea653..1dfd029 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2010-2011 Open Labs Business Solutions.
-Copyright (C) 2010-2011 Cédric Krier.
-Copyright (C) 2010-2011 B2CK SPRL.
+Copyright (C) 2010-2012 Cédric Krier.
+Copyright (C) 2010-2012 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index a21783c..8162037 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_sale_opportunity
 Prerequisites
 -------------
 
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_party (http://www.tryton.org/)
  * trytond_company (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index f60dff6..b755b16 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 2.2.1
+Version: 2.4.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,7 +12,7 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index edddece..85e38ee 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from opportunity import *
+from .opportunity import *
diff --git a/__tryton__.py b/__tryton__.py
index 96e8d0d..590147f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,9 +3,12 @@
 {
     'name': 'Sales Leads and Opportunities',
     'name_bg_BG': 'Инициативи и възможности за продажба',
+    'name_ca_ES': 'Iniciatives i oportunitats comercials',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
+    'name_es_AR': 'Ventas: Iniciativas y Oportunidades',
+    'name_es_ES': 'Iniciativas y oportunidades comerciales',
     'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '2.2.1',
+    'version': '2.4.0',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
@@ -22,12 +25,33 @@
     - Запис на неосъществени инициативи
     - Превръщане на възможности в поръчки за продажба
 ''',
+    'description_ca_ES': '''Aquest mòdul permet la gestió de:
+    - Iniciatives comercials
+    - Conversió d'iniciatives a oportunitats
+    - Gestió de les conversions
+    - Registre d'iniciatives perdudes
+    - Oportunitats a comandes de venda
+''',
     'description_de_DE': '''Ermöglicht:
     - die Anlage von Interessenten (Leads)
     - die Umwandlung von Interessenten zu Verkaufschancen (Opportunities)
     - die Umwandlung von Chancen zu Verkäufen
     - die Verfolgung von Interessentenverlusten
 ''',
+    'description_es_AR': '''Provee:
+    - Iniciativas comerciales
+    - Conversión de iniciativas a oportunidades
+    - Gestión de conversiones
+    - Registro de iniciativas perdidas
+    - Oportunidades a órdenes de venta
+''',
+    'description_es_ES': '''Este módulo permite la gestión de:
+    - Iniciativas comerciales
+    - Conversión de iniciativas a oportunidades
+    - Gestión de las conversiones
+    - Registro de iniciativas perdidas
+    - Oportunidades a pedidos de venta
+''',
     'description_fr_FR': '''Fourni :
 - Contacts commerciaux
 - Conversion des contacts commerciaux en opportunités
@@ -50,8 +74,10 @@
     ],
     'translation': [
         'locale/bg_BG.po',
+        'locale/ca_ES.po',
         'locale/cs_CZ.po',
         'locale/de_DE.po',
+        'locale/es_AR.po',
         'locale/es_CO.po',
         'locale/es_ES.po',
         'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 36cf9d4..e4a7536 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,390 +2,510 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr "Вероятността трябва да бъде между 0 и 100!"
 
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Крайна дата"
-
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Начална дата"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr ""
 
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Адрес"
 
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr "Сума"
 
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Коментар"
 
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Фирма"
 
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr "Валута"
 
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr "Цифри за валута"
 
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Описание"
 
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Служител"
 
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Крайна дата"
 
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr "Изтория"
 
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Редове"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr "Причина за загуба"
 
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Партньор"
 
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr "Условие за плащане"
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr "Вероятност за преобразуване"
 
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Продажба"
 
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Начална дата"
 
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Състояние"
 
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Склад"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
 
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Адрес"
 
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Коментар"
 
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Фирма"
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr "Промяна на дата"
 
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Описание"
 
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Служител"
 
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Крайна дата"
 
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Редове"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr "Причина за загуба"
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr "Възможност за продажба"
 
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Партньор"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr "Вероятност за преобразуване"
 
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Начална дата"
 
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Състояние"
 
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Потребител"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr "Възможност"
 
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Продукт"
 
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Количество"
 
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Ред от продажба"
 
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Последователност"
 
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Единица"
 
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr "Десетични единици"
 
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr "Сума"
 
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Фирма"
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Обменен курс"
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Обменен курс"
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr "Конвертиран"
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr "Конвертирана сума"
 
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr "Валута"
 
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr "Цифри за валута"
 
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Служител"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr "Изгубен"
 
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Номер"
 
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Крайна дата"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Начална дата"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr "Сума"
 
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Фирма"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Обменен курс"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Обменен курс"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr "Конвертиран"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr "Конвертирана сума"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr "Валута"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Цифри за валута"
 
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Служител"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr "Изгубен"
 
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Месец"
 
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Номер"
 
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Година"
 
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr "Сума"
 
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Фирма"
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Обменен курс"
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Обменен курс"
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr "Конвертиран"
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr "Конвертирана сума"
 
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr "Валута"
 
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Цифри за валута"
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr "Изгубен"
 
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Месец"
 
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Номер"
 
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Име"
 
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Година"
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr "Година-Месец"
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr "Очаквани приходи"
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr "Процент между 0 и 100"
 
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr "В %"
 
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr "В %"
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "В %"
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr "В %"
 
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "В %"
 
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr "В %"
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr "Възможности по служител"
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr "Възможности по служител"
@@ -394,6 +514,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Възможности по служител по месец"
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Възможности по служител"
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Инициативи и възможности"
@@ -426,14 +550,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Възможности по месец"
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr "Възможности по служител"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Възможности по служител по месец"
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Възможности по служител"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Инициативи и възможности"
@@ -470,170 +594,146 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr "Възможност за продажба"
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr "Начално отваряне на възможмост за продажба по служител"
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr "Възможност за продажба"
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr "История на възможност за продажба"
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr "Ред от възможност за продажба"
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr "Възможност за продажба за служител"
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
 msgstr "Възможност за продажба за служител за месец"
 
-msgctxt "model:sale.opportunity_monthly,name:0"
+msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
 msgstr "Възможност за продажа по месец"
 
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr "Работен процес на възможност за продажба"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
-msgid "Cancelled"
-msgstr "Отказан"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
-msgid "Converted"
-msgstr "Конвертиран"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
-msgid "Lead"
-msgstr "Възможност"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
-msgid "Lost"
-msgstr "Изгубен"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
-msgid "Opportunity"
-msgstr "Възможност"
-
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Отказан"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr "Конвертиран"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr "Инициатива"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr "Изгубен"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr "Възможност"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Отказан"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr "Конвертиран"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr "Инициатива"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr "Изгубен"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr "Възможност"
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr "Възможности за продажба по служител"
-
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr "Изтория"
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr "Инициатива/Възможност"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr "Ред на инициатива/възможност за продажба"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr "Редове от инициативи/възможности за продажба"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Отказ"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr "Превръщане във възможност"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr "Прехвърлено в продажба"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr "Инициатива/Възможност"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr "Отбелязване като загубен"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr "Прехвърляне в инициатива"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Инициатива/Възможност за продажба"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr "Инициативи/Възможности за продажба"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr "Прехвърляне в инициатива"
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr "Възможности за продажба по служител"
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr "Възможности по служител"
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr "Възможности за продажба по месец"
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr "Възможности за продажба по месец"
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Отказ"
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Отваряне"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..2d5623f
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,816 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:"
+msgid "Probability must be between 0 and 100!"
+msgstr ""
+
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,address:"
+msgid "Address"
+msgstr "Adreça"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,amount:"
+msgid "Amount"
+msgstr "Quantitat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,comment:"
+msgid "Comment"
+msgstr "Comentari"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency:"
+msgid "Currency"
+msgstr "Gestió de divises"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígits de la divisa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,description:"
+msgid "Description"
+msgstr "Descripció"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,end_date:"
+msgid "End Date"
+msgstr "Data final"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,history:"
+msgid "History"
+msgstr "Històric"
+
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,lines:"
+msgid "Lines"
+msgstr "Línies"
+
+msgctxt "field:sale.opportunity,lost_reason:"
+msgid "Reason for loss"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,party:"
+msgid "Party"
+msgstr "Tercers"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,payment_term:"
+msgid "Payment Term"
+msgstr "Termini de pagament"
+
+msgctxt "field:sale.opportunity,probability:"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,sale:"
+msgid "Sale"
+msgstr "Vendes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,start_date:"
+msgid "Start Date"
+msgstr "Data inici"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,state:"
+msgid "State"
+msgstr "Estat"
+
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,address:"
+msgid "Address"
+msgstr "Adreça"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,comment:"
+msgid "Comment"
+msgstr "Comentari"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:sale.opportunity.history,date:"
+msgid "Change Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,description:"
+msgid "Description"
+msgstr "Descripció"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,end_date:"
+msgid "End Date"
+msgstr "Data final"
+
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,lines:"
+msgid "Lines"
+msgstr "Línies"
+
+msgctxt "field:sale.opportunity.history,lost_reason:"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,opportunity:"
+msgid "Sale Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,party:"
+msgid "Party"
+msgstr "Tercers"
+
+msgctxt "field:sale.opportunity.history,probability:"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,start_date:"
+msgid "Start Date"
+msgstr "Data inici"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,state:"
+msgid "State"
+msgstr "Estat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,user:"
+msgid "User"
+msgstr "Usuari"
+
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,opportunity:"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,product:"
+msgid "Product"
+msgstr "Productes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,quantity:"
+msgid "Quantity"
+msgstr "Quantitat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sale_line:"
+msgid "Sale Line"
+msgstr "Línia de venda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit:"
+msgid "Unit"
+msgstr "Unitat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit_digits:"
+msgid "Unit Digits"
+msgstr "Dígits unitaris"
+
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,amount:"
+msgid "Amount"
+msgstr "Quantitat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted:"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted_amount:"
+msgid "Converted Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency:"
+msgid "Currency"
+msgstr "Gestió de divises"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígits de la divisa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,lost:"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,number:"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Data final"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Data inici"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
+msgid "Amount"
+msgstr "Quantitat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
+msgid "Converted Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
+msgid "Currency"
+msgstr "Gestió de divises"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígits de la divisa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
+msgid "Employee"
+msgstr "Empleat"
+
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,month:"
+msgid "Month"
+msgstr "Mes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,number:"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,year:"
+msgid "Year"
+msgstr "Any"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,amount:"
+msgid "Amount"
+msgstr "Quantitat"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted:"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
+msgid "Converted Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency:"
+msgid "Currency"
+msgstr "Gestió de divises"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígits de la divisa"
+
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,month:"
+msgid "Month"
+msgstr "Mes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,number:"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,rec_name:"
+msgid "Name"
+msgstr "Nom del camp"
+
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,year:"
+msgid "Year"
+msgstr "Any"
+
+msgctxt "field:sale.opportunity_monthly,year_month:"
+msgid "Year-Month"
+msgstr ""
+
+msgctxt "help:sale.opportunity,amount:"
+msgid "Estimated revenue amount"
+msgstr ""
+
+msgctxt "help:sale.opportunity,probability:"
+msgid "Percentage between 0 and 100"
+msgstr ""
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Informes"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity,name:"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity.history,name:"
+msgid "Sale Opportunity History"
+msgstr ""
+
+msgctxt "model:sale.opportunity.line,name:"
+msgid "Sale Opportunity Line"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee,name:"
+msgid "Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:"
+msgid "Sale Opportunity per Employee per Month"
+msgstr ""
+
+msgctxt "model:sale.opportunity_monthly,name:"
+msgid "Sale Opportunity per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity,state:"
+msgid "Cancelled"
+msgstr "Cancel·lat"
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Cancelled"
+msgstr "Cancel·lat"
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity.history:"
+msgid "History"
+msgstr "Històric"
+
+msgctxt "view:sale.opportunity.history:"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:"
+msgid "Sale Lead/Opportunity Line"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:"
+msgid "Sales Leads/Opportunities Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+msgctxt "view:sale.opportunity:"
+msgid "Convert to Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:"
+msgid "Convert to Sale"
+msgstr ""
+
+msgctxt "view:sale.opportunity:"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:"
+msgid "Mark as Lost"
+msgstr ""
+
+msgctxt "view:sale.opportunity:"
+msgid "Sale Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "view:sale.opportunity:"
+msgid "Set as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee_monthly:"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "view:sale.opportunity_monthly:"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
+msgid "Cancel"
+msgstr "Cancel·lar"
+
+#, fuzzy
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
+msgid "Open"
+msgstr "Obrir"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 36effab..7df9ef6 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,390 +2,510 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr ""
 
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr ""
-
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
 msgstr ""
 
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr ""
 
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr ""
 
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr ""
 
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr ""
 
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr ""
 
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr ""
 
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr ""
 
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr ""
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr ""
 
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr ""
 
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr ""
 
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr ""
 
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr ""
 
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr ""
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr ""
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr ""
@@ -394,6 +514,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -426,14 +550,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -470,170 +594,146 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr ""
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr ""
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
-msgid "Sale Opportunity per Employee per Month"
-msgstr ""
-
-msgctxt "model:sale.opportunity_monthly,name:0"
-msgid "Sale Opportunity per Month"
-msgstr ""
-
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
-msgid "Cancelled"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
-msgid "Converted"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
-msgid "Lead"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
-msgid "Lost"
+msgctxt "model:sale.opportunity_employee_monthly,name:"
+msgid "Sale Opportunity per Employee per Month"
 msgstr ""
 
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
-msgid "Opportunity"
+msgctxt "model:sale.opportunity_monthly,name:"
+msgid "Sale Opportunity per Month"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr ""
-
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr ""
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr ""
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 3b53c3a..c512d40 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,390 +2,512 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr "Wahrscheinlichkeit muss zwischen 0 und 100 liegen!"
 
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Enddatum"
-
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Anfangsdatum"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr ""
+"Verkaufschance \"%s\" muss annulliert werden, bevor sie gelöscht werden "
+"kann."
 
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adresse"
 
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr "Betrag"
 
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Kommentar"
 
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Unternehmen"
 
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr "Währung"
 
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr "Währung (signifikante Stellen)"
 
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Bezeichnung"
 
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Mitarbeiter"
 
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Enddatum"
 
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr "Verlauf"
 
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Positionen"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr "Ursache für Verlust"
 
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Partei"
 
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr "Zahlungsbedingung"
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr "Umwandlungswahrscheinlichkeit"
 
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Verkauf"
 
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Status"
 
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Warenlager"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
 
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Adresse"
 
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Kommentar"
 
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Unternehmen"
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr "Änderungsdatum"
 
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Bezeichnung"
 
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Mitarbeiter"
 
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Enddatum"
 
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Positionen"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr "Ursache für Verlust"
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr "Verkaufschance"
 
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Partei"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr "Umwandlungswahrscheinlichkeit"
 
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Status"
 
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Benutzer"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr "Verkaufschance"
 
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Artikel"
 
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Position Verkauf"
 
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Reihenfolge"
 
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Einheit"
 
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr "Einheit Anzahl Stellen"
 
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr "Betrag"
 
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Unternehmen"
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Umwandlungsrate Betrag"
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Umwandlungsrate"
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr "Umgewandelt"
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr "Umgewandelter Betrag"
 
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr "Währung"
 
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr "Währung (signifikante Stellen)"
 
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Mitarbeiter"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr "Verlust"
 
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Nummer"
 
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Enddatum"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr "Betrag"
 
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Unternehmen"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Umwandlungsrate Betrag"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Umwandlungsrate"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr "Umgewandelt"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr "Umgewandelter Betrag"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr "Währung"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Währung (signifikante Stellen)"
 
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Mitarbeiter"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr "Verlust"
 
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Monat"
 
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Nummer"
 
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Jahr"
 
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr "Betrag"
 
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Unternehmen"
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Umwandlungsrate Betrag"
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Umwandlungsrate"
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr "Umgewandelt"
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr "Umgewandelter Betrag"
 
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr "Währung"
 
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Währung (signifikante Stellen)"
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr "Verlust"
 
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Monat"
 
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Nummer"
 
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Jahr"
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr "Jahr-Monat"
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr "Geschätzter Ertrag"
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr "Prozentsatz zwischen 0 und 100"
 
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr "Verkaufschancen pro Mitarbeiter"
@@ -394,6 +516,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Interessenten und Verkaufschancen"
@@ -426,14 +552,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Verkaufschancen pro Monat"
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Interessenten und Verkaufschancen"
@@ -470,170 +596,146 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr "Verkaufschance"
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr "Verkaufschancen pro Mitarbeiter Öffnen"
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr "Verkaufschance"
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr "Verkaufschancen Verlauf"
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr "Verkaufschance Position"
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr "Verkaufschance pro Mitarbeiter"
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
+msgstr " Verkaufschancen pro Mitarbeiter Öffnen"
+
+msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
 msgstr "Verkaufschance pro Mitarbeiter pro Monat"
 
-msgctxt "model:sale.opportunity_monthly,name:0"
+msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
 msgstr "Verkaufschance pro Monat"
 
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr "Verkaufschancen Workflow"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Annulliert"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr "Umgewandelt"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr "Interessent"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr "Verlust"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr "Verkaufschance"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Annulliert"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr "Umgewandelt"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr "Interessent"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr "Verlust"
 
-msgctxt "selection:sale.opportunity,state:0"
-msgid "Opportunity"
-msgstr "Verkaufschance"
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Cancelled"
-msgstr "Annulliert"
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Converted"
-msgstr "Umgewandelt"
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Lead"
-msgstr "Interessent"
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Lost"
-msgstr "Verlust"
-
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr "Chance"
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr "Verkaufschancen pro Mitarbeiter"
-
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr "Verlauf"
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr "Interessent/Chance"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr "Interessent/Verkaufschance"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr "Interessenten/Verkaufschancen"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Annullieren"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr "In Verkaufschance umwandeln"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr "In Verkauf umwandeln"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr "Interessent/Chance"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr "Als Verlust markieren"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr "Auf Interessent zurücksetzen"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Interessent/Verkaufschance"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr "Interessenten/Verkaufschancen"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr "Auf Interessent setzen"
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr "Verkaufschancen pro Mitarbeiter"
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr "Verkaufschancen pro Monat"
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr "Verkaufschancen pro Mitarbeiter"
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
-msgstr "Annullieren"
+msgstr "Abbrechen"
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Öffnen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..35645cf
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,739 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:"
+msgid "Probability must be between 0 and 100!"
+msgstr "¡La Probabilidad debe ser entre 0 y 100!"
+
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr "¡Oportunidad de Venta \"%s\" debe ser cancelada antes de eliminar!"
+
+msgctxt "field:sale.opportunity,address:"
+msgid "Address"
+msgstr "Dirección"
+
+msgctxt "field:sale.opportunity,amount:"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:sale.opportunity,comment:"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:sale.opportunity,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity,currency:"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+msgctxt "field:sale.opportunity,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+msgctxt "field:sale.opportunity,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:sale.opportunity,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:sale.opportunity,history:"
+msgid "History"
+msgstr "Histórico"
+
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:sale.opportunity,lost_reason:"
+msgid "Reason for loss"
+msgstr "Motivo de la pérdida"
+
+msgctxt "field:sale.opportunity,party:"
+msgid "Party"
+msgstr "Entidades"
+
+msgctxt "field:sale.opportunity,payment_term:"
+msgid "Payment Term"
+msgstr "Término de pago"
+
+msgctxt "field:sale.opportunity,probability:"
+msgid "Conversion Probability"
+msgstr "Probabilidad de Conversión"
+
+msgctxt "field:sale.opportunity,rec_name:"
+msgid "Name"
+msgstr "Nombre del campo"
+
+msgctxt "field:sale.opportunity,sale:"
+msgid "Sale"
+msgstr "Venta"
+
+msgctxt "field:sale.opportunity,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+msgctxt "field:sale.opportunity,state:"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity.history,address:"
+msgid "Address"
+msgstr "Dirección"
+
+msgctxt "field:sale.opportunity.history,comment:"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:sale.opportunity.history,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity.history,date:"
+msgid "Change Date"
+msgstr "Modificar fecha"
+
+msgctxt "field:sale.opportunity.history,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:sale.opportunity.history,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity.history,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.history,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:sale.opportunity.history,lost_reason:"
+msgid "Reason for loss"
+msgstr "Motivo de pérdida"
+
+msgctxt "field:sale.opportunity.history,opportunity:"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de Venta"
+
+msgctxt "field:sale.opportunity.history,party:"
+msgid "Party"
+msgstr "Entidades"
+
+msgctxt "field:sale.opportunity.history,probability:"
+msgid "Conversion Probability"
+msgstr "Probabilidad de Conversión"
+
+msgctxt "field:sale.opportunity.history,rec_name:"
+msgid "Name"
+msgstr "Nombre del campo"
+
+msgctxt "field:sale.opportunity.history,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+msgctxt "field:sale.opportunity.history,state:"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:sale.opportunity.history,user:"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.line,opportunity:"
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+msgctxt "field:sale.opportunity.line,product:"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:sale.opportunity.line,quantity:"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:sale.opportunity.line,rec_name:"
+msgid "Name"
+msgstr "Nombre del campo"
+
+msgctxt "field:sale.opportunity.line,sale_line:"
+msgid "Sale Line"
+msgstr "Línea de venta"
+
+msgctxt "field:sale.opportunity.line,sequence:"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:sale.opportunity.line,unit:"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "field:sale.opportunity.line,unit_digits:"
+msgid "Unit Digits"
+msgstr "Dígitos unitarios"
+
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity_employee,amount:"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:sale.opportunity_employee,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
+msgid "Conversion Amount Rate"
+msgstr "Tasa de Cantidad de Conversiones"
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
+msgid "Conversion Rate"
+msgstr "Tasa de Conversión"
+
+msgctxt "field:sale.opportunity_employee,converted:"
+msgid "Converted"
+msgstr "Convertido"
+
+msgctxt "field:sale.opportunity_employee,converted_amount:"
+msgid "Converted Amount"
+msgstr "Cantidad Convertida"
+
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity_employee,currency:"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+msgctxt "field:sale.opportunity_employee,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+msgctxt "field:sale.opportunity_employee,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee,lost:"
+msgid "Lost"
+msgstr "Perdido"
+
+msgctxt "field:sale.opportunity_employee,number:"
+msgid "Number"
+msgstr "Número"
+
+msgctxt "field:sale.opportunity_employee,rec_name:"
+msgid "Name"
+msgstr "Nombre del campo"
+
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:sale.opportunity_employee_monthly,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
+msgid "Conversion Amount Rate"
+msgstr "Tasa de Cantidad de Conversiones"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
+msgid "Conversion Rate"
+msgstr "Tasa de Conversión"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
+msgid "Converted"
+msgstr "Convertido"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
+msgid "Converted Amount"
+msgstr "Cantidad Convertida"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
+msgid "Lost"
+msgstr "Perdido"
+
+msgctxt "field:sale.opportunity_employee_monthly,month:"
+msgid "Month"
+msgstr "Mes"
+
+msgctxt "field:sale.opportunity_employee_monthly,number:"
+msgid "Number"
+msgstr "Número"
+
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
+msgid "Name"
+msgstr "Nombre del campo"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:sale.opportunity_monthly,amount:"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:sale.opportunity_monthly,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
+msgid "Conversion Amount Rate"
+msgstr "Tasa de Cantidad de Conversiones"
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
+msgid "Conversion Rate"
+msgstr "Tasa de Conversión"
+
+msgctxt "field:sale.opportunity_monthly,converted:"
+msgid "Converted"
+msgstr "Convertidas"
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
+msgid "Converted Amount"
+msgstr "Cantidad Convertida"
+
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity_monthly,currency:"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_monthly,lost:"
+msgid "Lost"
+msgstr "Perdido"
+
+msgctxt "field:sale.opportunity_monthly,month:"
+msgid "Month"
+msgstr "Mes"
+
+msgctxt "field:sale.opportunity_monthly,number:"
+msgid "Number"
+msgstr "Número"
+
+msgctxt "field:sale.opportunity_monthly,rec_name:"
+msgid "Name"
+msgstr "Nombre del campo"
+
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity_monthly,year:"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:sale.opportunity_monthly,year_month:"
+msgid "Year-Month"
+msgstr "Año-Mes"
+
+msgctxt "help:sale.opportunity,amount:"
+msgid "Estimated revenue amount"
+msgstr "Importe de los ingresos estimados"
+
+msgctxt "help:sale.opportunity,probability:"
+msgid "Percentage between 0 and 100"
+msgstr "Porcentaje entre 0 y 100"
+
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr "Oportunidades por Empleado"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Oportunidades por Empleado por Mes"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Oportunidades por Empleado"
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Iniciativas y Oportunidades"
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr "Iniciativas/Oportunidades de Ventas"
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Iniciativas y Oportunidades Canceladas"
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Oportunidades Convertidas"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Iniciativas Abiertas"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Iniciativas y Oportunidades Perdidas"
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Oportunidades por Mes"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Oportunidades por Empleado por Mes"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Oportunidades por Empleado"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Iniciativas y Oportunidades"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Iniciativas y Oportunidades Canceladas"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Oportunidades Convertidas"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Iniciativas Abiertas"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Iniciativas y Oportunidades Perdidas"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Oportunidades por Mes"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Informes"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de Venta"
+
+msgctxt "model:sale.opportunity,name:"
+msgid "Sale Opportunity"
+msgstr "Oportunidad de Venta"
+
+msgctxt "model:sale.opportunity.history,name:"
+msgid "Sale Opportunity History"
+msgstr "Historial de la Oportunidad de Venta"
+
+msgctxt "model:sale.opportunity.line,name:"
+msgid "Sale Opportunity Line"
+msgstr "Línea de Oportunidad de Venta"
+
+msgctxt "model:sale.opportunity_employee,name:"
+msgid "Sale Opportunity per Employee"
+msgstr "Oportunidad de Venta por Empleado"
+
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
+msgstr "Oportunidad de Venta Abierta por Empleado"
+
+msgctxt "model:sale.opportunity_employee_monthly,name:"
+msgid "Sale Opportunity per Employee per Month"
+msgstr "Oportunidad de Venta por Empleado por Mes"
+
+msgctxt "model:sale.opportunity_monthly,name:"
+msgid "Sale Opportunity per Month"
+msgstr "Oportunidad de Venta por Mes"
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Converted"
+msgstr "Convertido"
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Lead"
+msgstr "Iniciativa"
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Lost"
+msgstr "Perdido"
+
+msgctxt "selection:sale.opportunity,state:"
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Converted"
+msgstr "Convertido"
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Lead"
+msgstr "Iniciativa"
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Lost"
+msgstr "Perdido"
+
+msgctxt "selection:sale.opportunity.history,state:"
+msgid "Opportunity"
+msgstr "Oportunidad"
+
+msgctxt "view:sale.opportunity.history:"
+msgid "History"
+msgstr "Histórico"
+
+msgctxt "view:sale.opportunity.history:"
+msgid "Lead/Opportunity"
+msgstr "Iniciativa/Oportunidad"
+
+msgctxt "view:sale.opportunity.line:"
+msgid "Sale Lead/Opportunity Line"
+msgstr "Línea de Iniciativa/Oportunidad de Venta"
+
+msgctxt "view:sale.opportunity.line:"
+msgid "Sales Leads/Opportunities Lines"
+msgstr "Líneas de Iniciativas/Oportunidades de Ventas"
+
+msgctxt "view:sale.opportunity:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:sale.opportunity:"
+msgid "Convert to Opportunity"
+msgstr "Convertir a Oportunidad"
+
+msgctxt "view:sale.opportunity:"
+msgid "Convert to Sale"
+msgstr "Convertir a Venta"
+
+msgctxt "view:sale.opportunity:"
+msgid "Lead/Opportunity"
+msgstr "Iniciativa/Oportunidad"
+
+msgctxt "view:sale.opportunity:"
+msgid "Mark as Lost"
+msgstr "Marcar como Perdido"
+
+msgctxt "view:sale.opportunity:"
+msgid "Reset as Lead"
+msgstr "Restablecer como Iniciativa"
+
+msgctxt "view:sale.opportunity:"
+msgid "Sale Lead/Opportunity"
+msgstr "Iniciativa/Oportunidad de Venta"
+
+msgctxt "view:sale.opportunity:"
+msgid "Sales Leads/Opportunities"
+msgstr "Iniciativas/Oportunidades de Ventas"
+
+msgctxt "view:sale.opportunity:"
+msgid "Set as Lead"
+msgstr "Establecer como Iniciativa"
+
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr "Oportunidades de Venta por Empleado"
+
+msgctxt "view:sale.opportunity_employee:"
+msgid "Opportunities per Employee"
+msgstr "Oportunidades por Empleado"
+
+msgctxt "view:sale.opportunity_employee_monthly:"
+msgid "Sale Opportunities per Month"
+msgstr "Oportunidades de Venta por Mes"
+
+msgctxt "view:sale.opportunity_monthly:"
+msgid "Sale Opportunities per Month"
+msgstr "Oportunidades de Ventas por Mes"
+
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
+msgid "Open"
+msgstr "Abrir"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 3af37d4..72e2f53 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,459 +2,584 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr ""
 
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Fecha Final"
-
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Fecha Inicio"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Dirección"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Comentario"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Compañía"
 
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
 #, fuzzy
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr "Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr "Gestión de Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Descripción"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Fecha Final"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr "Historia"
 
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Líneas de Inventario"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Terceros"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr "Término de Pago"
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nombre de Contacto"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Ventas"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Fecha Inicio"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Depósito"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Dirección"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Comentario"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Descripción"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Fecha Final"
 
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Líneas de Inventario"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Terceros"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Nombre de Contacto"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Fecha Inicio"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Estado"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Usuario"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Productos"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Cantidad"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Nombre de Contacto"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Línea de Venta"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Secuencia"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Unidad"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr "Dígitos de Unidad"
 
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr "Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr "Gestión de Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Número"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Nombre de Contacto"
 
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Fecha Final"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Fecha Inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr "Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Gestión de Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Nombre de Contacto"
 
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Año"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr "Cantidad"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Compañía"
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr "Moneda"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Gestión de Moneda"
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Nombre de Contacto"
 
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Año"
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr ""
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr ""
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr ""
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr "en %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr "en %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "en %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr "en %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "en %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr "en %"
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr ""
@@ -463,6 +588,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -495,14 +624,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -540,177 +669,152 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr ""
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr ""
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
-msgid "Sale Opportunity per Employee per Month"
-msgstr ""
-
-msgctxt "model:sale.opportunity_monthly,name:0"
-msgid "Sale Opportunity per Month"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr ""
-
-#, fuzzy
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
-msgid "Cancelled"
-msgstr "Cancelado"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
-msgid "Converted"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
-msgid "Lead"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
-msgid "Lost"
+msgctxt "model:sale.opportunity_employee_monthly,name:"
+msgid "Sale Opportunity per Employee per Month"
 msgstr ""
 
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
-msgid "Opportunity"
+msgctxt "model:sale.opportunity_monthly,name:"
+msgid "Sale Opportunity per Month"
 msgstr ""
 
 #, fuzzy
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Cancelado"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr ""
-
 #, fuzzy
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr "Historia"
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr ""
 
 #, fuzzy
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Cancelar"
 
 #, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Abrir"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 721fb11..75825af 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,715 +2,738 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
-msgstr ""
+msgstr "La probabilidad debe ser entre 0 a 100."
 
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Fecha final"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr "La oportunidad \"%s\" debe ser cancelada antes de eliminarla."
 
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#, fuzzy
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Dirección"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Comentario"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Empresa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Decimales de la divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Descripción"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Fecha final"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
-msgstr "Histórico"
+msgstr "Historial"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Líneas"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Motivos de la pérdida"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
-msgstr "Terceros"
+msgstr "Tercero"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
-msgstr "Término de pago"
+msgstr "Plazo de pago"
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Probabilidad de conversión"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Venta"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha inicial"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Depósito"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Dirección"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Comentario"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
-msgstr ""
+msgstr "Fecha modificación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Descripción"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Fecha final"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Líneas"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
-msgstr ""
+msgstr "Motivos de la pérdida"
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
-msgstr "Terceros"
+msgstr "Tercero"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
-msgstr ""
+msgstr "Probabilidad de conversión"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
-msgstr "Fecha inicio"
+msgstr "Fecha inicial"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Estado"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Usuario"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Producto"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Línea de venta"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Secuencia"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Unidad"
 
-#, fuzzy
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Dígitos unitarios"
+msgstr "Dígitos de la unidad"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Tasa de importe convertido"
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Tasa de conversión"
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertida"
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Importe convertido"
+
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Decimales de la divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdida"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
+
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Fecha final"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Tasa de importe convertido"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Tasa de conversión"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertida"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Importe convertido"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Decimales de la divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Empleado"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdida"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Año"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Empresa"
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
-msgstr ""
+msgstr "Tasa de importe convertido"
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
-msgstr ""
+msgstr "Tasa de conversión"
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertida"
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
-msgstr ""
+msgstr "Importe convertido"
+
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
-msgstr "Gestión de divisas"
+msgstr "Divisa"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
-msgstr "Dígitos de la divisa"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr "ID"
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdida"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Mes"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Número"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
-msgstr "Nombre del campo"
+msgstr "Nombre"
+
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
 
-#, fuzzy
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Año"
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
-msgstr ""
+msgstr "Año-Mes"
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
-msgstr ""
+msgstr "Importe estimados de ingresos."
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
-msgstr ""
+msgstr "Porcentaje entre 0 y 100."
 
-#, fuzzy
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
-msgstr "en %"
+msgstr "En %."
 
-#, fuzzy
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
-msgstr "en %"
-
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
+msgstr "En %."
 
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por empleado"
 
 msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Oportunidades por empleado y mes"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Oportunidades por empleado"
 
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades"
 
 msgctxt "model:ir.action,name:act_opportunity_form2"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Iniciativas/Oportunidades"
 
 msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades canceladas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_converted"
 msgid "Converted Opportunities"
-msgstr ""
+msgstr "Oportunidades convertidas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr ""
+msgstr "Iniciativas abiertas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades perdidas"
 
 msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por mes"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
-msgstr ""
+msgstr "Oportunidades por empleado y mes"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Oportunidades por empleado"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
 msgid "Cancelled Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades canceladas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
 msgid "Converted Opportunities"
-msgstr ""
+msgstr "Oportunidades convertidas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
 msgid "Opened Leads"
-msgstr ""
+msgstr "Iniciativas abiertas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
 msgid "Lost Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades perdidas"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
 msgid "Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades por mes"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_reporting"
 msgid "Reporting"
 msgstr "Informes"
 
 msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunidades"
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr ""
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
-msgstr ""
+msgstr "Historial de oportunidades"
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
-msgstr ""
+msgstr "Línia de oportunidad"
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
-msgstr ""
+msgstr "Oportunidades por empleado"
+
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
+msgstr "Abrir oportunidades por empleado"
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
-msgstr ""
+msgstr "Oportunidades por empleado y mes"
 
-msgctxt "model:sale.opportunity_monthly,name:0"
+msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
-msgstr ""
-
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr ""
+msgstr "Oportunidades por mes"
 
-#, fuzzy
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertida"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdida"
 
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
-#, fuzzy
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
-msgstr ""
+msgstr "Convertida"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
-msgstr ""
+msgstr "Perdida"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
-msgstr ""
-
-#, fuzzy
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Cancelled"
-msgstr "Cancelado"
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Converted"
-msgstr ""
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Lead"
-msgstr ""
+msgstr "Oportunidad"
 
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Lost"
-msgstr ""
-
-msgctxt "selection:sale.opportunity.history,state:0"
-msgid "Opportunity"
-msgstr ""
-
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr ""
-
-#, fuzzy
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
-msgstr "Histórico"
+msgstr "Historial"
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunidad"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
-msgstr ""
+msgstr "Línia iniciativa/oportunidad"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
-msgstr ""
+msgstr "Línias Iniciativas/Oportunidades"
 
-#, fuzzy
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Convertir a oportunidad"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
-msgstr ""
+msgstr "Convertir a pedido"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativa/Oportunidad"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
-msgstr ""
+msgstr "Marcar como perdida"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
-msgstr ""
+msgstr "Restablecer a iniciativa"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
-msgstr ""
+msgstr "Iniciativas/Oportunidades"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
-msgstr ""
+msgstr "Iniciativas/Oportunidades"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
-msgstr ""
+msgstr "Convertir a iniciativa"
+
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr "Oportunidades por empleado"
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
-msgstr ""
+msgstr "Oportunidades por empleado"
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades por mes"
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
-msgstr ""
+msgstr "Oportunidades por mes"
 
-#, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Abrir"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index a7541ed..ffaa069 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,390 +2,510 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr "La probabilité doit être entre 0 et 100 !"
 
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Date de fin"
-
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Date de début"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr "L'opportunité de vente \"%s\" doit être annulée avant suppression"
 
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adresse"
 
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr "Montant"
 
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Commentaire"
 
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Société"
 
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr "Devise"
 
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr "Décimales de la devise"
 
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Description"
 
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Employé"
 
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Date de fin"
 
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr "Historique"
 
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Lignes"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr "Raison de la perte"
 
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Tiers"
 
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr "Conditions de paiement"
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr "Probabilité de conversion"
 
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Vente"
 
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Date de début"
 
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "État"
 
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Entrepôt"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
 
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Adresse"
 
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Commentaire"
 
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Société"
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr "Date de modification"
 
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Description"
 
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Employé"
 
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Date de fin"
 
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Lignes"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr "Raison de la perte"
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr "Opportunité de vente"
 
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Tiers"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr "Probabilité de conversion"
 
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Date de début"
 
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "État"
 
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Utilisateur"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr "Opportunité"
 
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Produit"
 
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Ligne de vente"
 
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Séquence"
 
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Unité"
 
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr "Décimales de l'unité"
 
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr "Montant"
 
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Société"
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Taux de conversion des montants"
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Taux de conversion"
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr "Convertie"
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr "Montant convertit"
 
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr "Devise"
 
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr "Décimales de la devise"
 
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Employé"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr "Perdue"
 
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Nombre"
 
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Date de fin"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Date de début"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr "Montant"
 
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Société"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Taux de conversion des montants"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Taux de conversion"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr "Convertie"
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr "Montant converti"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr "Devise"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Décimales de la devise"
 
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Employé"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr "Perdue"
 
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Mois"
 
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Nombre"
 
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Année"
 
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr "Montant"
 
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Société"
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr "Taux de conversion des montants"
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr "Taux de conversion"
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr "Convertie"
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr "Montant converti"
 
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr "Devise"
 
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Décimales de la devise"
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr "Perdue"
 
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Mois"
 
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Nombre"
 
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Nom"
 
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Année"
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr "Année-Mois"
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr "Revenu estimé"
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr "Pourcentage entre 0 et 100"
 
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr "En %"
 
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr "En %"
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "En %"
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr "En %"
 
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "En %"
 
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr "En %"
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr "Opportunités par employé"
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr "Opportunités par employé"
@@ -394,6 +514,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Opportunités par employé par mois"
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Opportunités par employé"
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Opportunités"
@@ -426,14 +550,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr "Opportunités par mois"
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr "Opportunités par employé"
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr "Opportunités par employé par mois"
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr "Opportunités par employé"
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr "Contacts et opportunités de vente"
@@ -470,170 +594,146 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr "Opportunités de vente"
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr "Opportunités de vente par employé - Init"
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr "Opportunités de vente"
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr "Historique des opportunités de vente"
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr "Ligne d'opportunité de vente"
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr "Opportunités de vente par employé"
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
+msgstr "Ouvrir les opportunités de vente par employé"
+
+msgctxt "model:sale.opportunity_employee_monthly,name:"
 msgid "Sale Opportunity per Employee per Month"
 msgstr "Opportunités de vente par employé par mois"
 
-msgctxt "model:sale.opportunity_monthly,name:0"
+msgctxt "model:sale.opportunity_monthly,name:"
 msgid "Sale Opportunity per Month"
 msgstr "Opportunités de vente par mois"
 
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr "Workflow opportunité de vente"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
-msgid "Cancelled"
-msgstr "Annulée"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
-msgid "Converted"
-msgstr "Convertie"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
-msgid "Lead"
-msgstr "Contact"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
-msgid "Lost"
-msgstr "Perdue"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
-msgid "Opportunity"
-msgstr "Opportunité"
-
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Annulée"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr "Convertie"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr "Contact"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr "Perdue"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr "Opportunité"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Annulée"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr "Convertie"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr "Contact"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr "Perdue"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr "Opportunité"
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr "Opportunités de vente par employé"
-
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr "Historique"
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr "Contact / Opportunité"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr "Ligne de contact / Opportunité de vente"
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr "Lignes de contacts / Opportunités de vente"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Annuler"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr "Convertir en opportunité"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr "Convertir en vente"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr "Contact / Opportunité"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr "Marquer comme perdue"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr "Reconvertir en contact"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr "Contact commercial / Opportunité de vente"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr "Contacts commerciaux / Opportunités"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr "Reconvertir en contact"
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr "Opportunités de vente par employé"
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr "Opportunités par employé"
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr "Opportunités de vente par mois"
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr "Opportunités de vente par mois"
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Annuler"
 
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Ouvrir"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 5aaf1a2..fcb58e5 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,458 +2,577 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr ""
 
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Eind datum"
-
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Start datum"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Adres"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr "Bedrag"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Opmerking"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr "Valuta"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr "Valuta decimalen"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Specificatie"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Werknemer"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Eind datum"
 
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr ""
 
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Regels"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Relaties"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr "Betalingstermijn"
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr "Verkoop"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Start datum"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Status"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Magazijn"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Adres"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Opmerking"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Specificatie"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Werknemer"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Eind datum"
 
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Regels"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Relaties"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Start datum"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Status"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Gebruiker"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Producten"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr "Offerteregel"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Reeks"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Eenheid"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr "Decimalen eenheid"
 
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr "Bedrag"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr "Valuta"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr "Valuta decimalen"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Werknemer"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr "Nummer"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Eind datum"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Start datum"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr "Bedrag"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr "Valuta"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Valuta decimalen"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Werknemer"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr "Maand"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr "Nummer"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr "Jaar"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr "Bedrag"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Bedrijf"
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr "Valuta"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr "Valuta decimalen"
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr "Maand"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr "Nummer"
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Naam bijlage"
 
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr "Jaar"
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr ""
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr ""
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr ""
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr "In %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr "In %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "In %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr "In %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr "In %"
 
 #, fuzzy
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr "In %"
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr ""
@@ -462,6 +581,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -494,14 +617,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -539,173 +662,149 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr ""
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr ""
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
-msgid "Sale Opportunity per Employee per Month"
-msgstr ""
-
-msgctxt "model:sale.opportunity_monthly,name:0"
-msgid "Sale Opportunity per Month"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
-msgid "Cancelled"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
-msgid "Converted"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
-msgid "Lead"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
-msgid "Lost"
+msgctxt "model:sale.opportunity_employee_monthly,name:"
+msgid "Sale Opportunity per Employee per Month"
 msgstr ""
 
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
-msgid "Opportunity"
+msgctxt "model:sale.opportunity_monthly,name:"
+msgid "Sale Opportunity per Month"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr ""
-
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr ""
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr ""
 
 #, fuzzy
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Annuleren"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Annuleren"
 
 #, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Open"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 2ed56eb..549d8a9 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,435 +2,554 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:sale.opportunity:0"
+msgctxt "error:sale.opportunity:"
 msgid "Probability must be between 0 and 100!"
 msgstr ""
 
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
-msgid "End Date"
-msgstr "Дата окончания"
-
-#, fuzzy
-msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
-msgid "Start Date"
-msgstr "Дата начала"
+msgctxt "error:sale.opportunity:"
+msgid "Sale Opportunity \"%s\" must be cancelled before deletion!"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,address:0"
+msgctxt "field:sale.opportunity,address:"
 msgid "Address"
 msgstr "Адрес"
 
-msgctxt "field:sale.opportunity,amount:0"
+msgctxt "field:sale.opportunity,amount:"
 msgid "Amount"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,comment:0"
+msgctxt "field:sale.opportunity,comment:"
 msgid "Comment"
 msgstr "Комментарии"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,company:0"
+msgctxt "field:sale.opportunity,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
+msgctxt "field:sale.opportunity,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity,currency:0"
+msgctxt "field:sale.opportunity,currency:"
 msgid "Currency"
 msgstr "Валюты"
 
-msgctxt "field:sale.opportunity,currency_digits:0"
+msgctxt "field:sale.opportunity,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,description:0"
+msgctxt "field:sale.opportunity,description:"
 msgid "Description"
 msgstr "Описание"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,employee:0"
+msgctxt "field:sale.opportunity,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,end_date:0"
+msgctxt "field:sale.opportunity,end_date:"
 msgid "End Date"
 msgstr "Дата окончания"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,history:0"
+msgctxt "field:sale.opportunity,history:"
 msgid "History"
 msgstr "Переписка"
 
+msgctxt "field:sale.opportunity,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity,lines:0"
+msgctxt "field:sale.opportunity,lines:"
 msgid "Lines"
 msgstr "Строки"
 
-msgctxt "field:sale.opportunity,lost_reason:0"
+msgctxt "field:sale.opportunity,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,party:0"
+msgctxt "field:sale.opportunity,party:"
 msgid "Party"
 msgstr "Организации"
 
-msgctxt "field:sale.opportunity,payment_term:0"
+msgctxt "field:sale.opportunity,payment_term:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:sale.opportunity,probability:0"
+msgctxt "field:sale.opportunity,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,rec_name:0"
+msgctxt "field:sale.opportunity,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:sale.opportunity,sale:0"
+msgctxt "field:sale.opportunity,sale:"
 msgid "Sale"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity,start_date:0"
+msgctxt "field:sale.opportunity,start_date:"
 msgid "Start Date"
 msgstr "Дата начала"
 
 #, fuzzy
-msgctxt "field:sale.opportunity,state:0"
+msgctxt "field:sale.opportunity,state:"
 msgid "State"
 msgstr "Статус"
 
-#, fuzzy
-msgctxt "field:sale.opportunity,warehouse:0"
-msgid "Warehouse"
-msgstr "Товарный склад"
+msgctxt "field:sale.opportunity,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,write_uid:"
+msgid "Write User"
+msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,address:0"
+msgctxt "field:sale.opportunity.history,address:"
 msgid "Address"
 msgstr "Адрес"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,comment:0"
+msgctxt "field:sale.opportunity.history,comment:"
 msgid "Comment"
 msgstr "Комментарии"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,company:0"
+msgctxt "field:sale.opportunity.history,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:sale.opportunity.history,date:0"
+msgctxt "field:sale.opportunity.history,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,date:"
 msgid "Change Date"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,description:0"
+msgctxt "field:sale.opportunity.history,description:"
 msgid "Description"
 msgstr "Описание"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,employee:0"
+msgctxt "field:sale.opportunity.history,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,end_date:0"
+msgctxt "field:sale.opportunity.history,end_date:"
 msgid "End Date"
 msgstr "Дата окончания"
 
+msgctxt "field:sale.opportunity.history,id:"
+msgid "ID"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity.history,lines:0"
+msgctxt "field:sale.opportunity.history,lines:"
 msgid "Lines"
 msgstr "Строки"
 
-msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgctxt "field:sale.opportunity.history,lost_reason:"
 msgid "Reason for loss"
 msgstr ""
 
-msgctxt "field:sale.opportunity.history,opportunity:0"
+msgctxt "field:sale.opportunity.history,opportunity:"
 msgid "Sale Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,party:0"
+msgctxt "field:sale.opportunity.history,party:"
 msgid "Party"
 msgstr "Организации"
 
-msgctxt "field:sale.opportunity.history,probability:0"
+msgctxt "field:sale.opportunity.history,probability:"
 msgid "Conversion Probability"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,rec_name:0"
+msgctxt "field:sale.opportunity.history,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,start_date:0"
+msgctxt "field:sale.opportunity.history,start_date:"
 msgid "Start Date"
 msgstr "Дата начала"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,state:0"
+msgctxt "field:sale.opportunity.history,state:"
 msgid "State"
 msgstr "Статус"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.history,user:0"
+msgctxt "field:sale.opportunity.history,user:"
 msgid "User"
 msgstr "Пользователь"
 
-msgctxt "field:sale.opportunity.line,opportunity:0"
+msgctxt "field:sale.opportunity.history,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,opportunity:"
 msgid "Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,product:0"
+msgctxt "field:sale.opportunity.line,product:"
 msgid "Product"
 msgstr "Товарно материальные ценности (ТМЦ)"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,quantity:0"
+msgctxt "field:sale.opportunity.line,quantity:"
 msgid "Quantity"
 msgstr "Кол-во"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,rec_name:0"
+msgctxt "field:sale.opportunity.line,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:sale.opportunity.line,sale_line:0"
+msgctxt "field:sale.opportunity.line,sale_line:"
 msgid "Sale Line"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,sequence:0"
+msgctxt "field:sale.opportunity.line,sequence:"
 msgid "Sequence"
 msgstr "Последовательность"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,unit:0"
+msgctxt "field:sale.opportunity.line,unit:"
 msgid "Unit"
 msgstr "Штука"
 
 #, fuzzy
-msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgctxt "field:sale.opportunity.line,unit_digits:"
 msgid "Unit Digits"
 msgstr "Группа цифр"
 
-msgctxt "field:sale.opportunity_employee,amount:0"
+msgctxt "field:sale.opportunity.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,amount:"
 msgid "Amount"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,company:0"
+msgctxt "field:sale.opportunity_employee,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted:0"
+msgctxt "field:sale.opportunity_employee,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgctxt "field:sale.opportunity_employee,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_employee,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,currency:0"
+msgctxt "field:sale.opportunity_employee,currency:"
 msgid "Currency"
 msgstr "Валюты"
 
-msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgctxt "field:sale.opportunity_employee,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,employee:0"
+msgctxt "field:sale.opportunity_employee,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
-msgctxt "field:sale.opportunity_employee,lost:0"
+msgctxt "field:sale.opportunity_employee,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,lost:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee,number:0"
+msgctxt "field:sale.opportunity_employee,number:"
 msgid "Number"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgctxt "field:sale.opportunity_employee,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgctxt "field:sale.opportunity_employee,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,write_uid:"
+msgid "Write User"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee.open.start,end_date:"
+msgid "End Date"
+msgstr "Дата окончания"
+
+msgctxt "field:sale.opportunity_employee.open.start,id:"
+msgid "ID"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee.open.start,start_date:"
+msgid "Start Date"
+msgstr "Дата начала"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:"
 msgid "Amount"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgctxt "field:sale.opportunity_employee_monthly,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_employee_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency:"
 msgid "Currency"
 msgstr "Валюты"
 
-msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgctxt "field:sale.opportunity_employee_monthly,employee:"
 msgid "Employee"
 msgstr "Сотрудник"
 
-msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgctxt "field:sale.opportunity_employee_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgctxt "field:sale.opportunity_employee_monthly,month:"
 msgid "Month"
 msgstr ""
 
-msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgctxt "field:sale.opportunity_employee_monthly,number:"
 msgid "Number"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgctxt "field:sale.opportunity_employee_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,year:"
 msgid "Year"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,amount:0"
+msgctxt "field:sale.opportunity_monthly,amount:"
 msgid "Amount"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,company:0"
+msgctxt "field:sale.opportunity_monthly,company:"
 msgid "Company"
 msgstr "Учет.орг."
 
-msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "Conversion Amount Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "field:sale.opportunity_monthly,conversion_rate:"
 msgid "Conversion Rate"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted:0"
+msgctxt "field:sale.opportunity_monthly,converted:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgctxt "field:sale.opportunity_monthly,converted_amount:"
 msgid "Converted Amount"
 msgstr ""
 
+msgctxt "field:sale.opportunity_monthly,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,create_uid:"
+msgid "Create User"
+msgstr ""
+
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,currency:0"
+msgctxt "field:sale.opportunity_monthly,currency:"
 msgid "Currency"
 msgstr "Валюты"
 
-msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgctxt "field:sale.opportunity_monthly,currency_digits:"
 msgid "Currency Digits"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,lost:0"
+msgctxt "field:sale.opportunity_monthly,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,month:0"
+msgctxt "field:sale.opportunity_monthly,month:"
 msgid "Month"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,number:0"
+msgctxt "field:sale.opportunity_monthly,number:"
 msgid "Number"
 msgstr ""
 
 #, fuzzy
-msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgctxt "field:sale.opportunity_monthly,rec_name:"
 msgid "Name"
 msgstr "Наименование"
 
-msgctxt "field:sale.opportunity_monthly,year:0"
+msgctxt "field:sale.opportunity_monthly,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,year:"
 msgid "Year"
 msgstr ""
 
-msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgctxt "field:sale.opportunity_monthly,year_month:"
 msgid "Year-Month"
 msgstr ""
 
-msgctxt "help:sale.opportunity,amount:0"
+msgctxt "help:sale.opportunity,amount:"
 msgid "Estimated revenue amount"
 msgstr ""
 
-msgctxt "help:sale.opportunity,probability:0"
+msgctxt "help:sale.opportunity,probability:"
 msgid "Percentage between 0 and 100"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee,conversion_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgctxt "help:sale.opportunity_monthly,conversion_rate:"
 msgid "In %"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.action,name:act_opportunity_employee_form"
 msgid "Opportunities per Employee"
 msgstr ""
@@ -439,6 +558,10 @@ msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.action,name:act_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -471,14 +594,14 @@ msgctxt "model:ir.action,name:act_opportunity_monthly_form"
 msgid "Opportunities per Month"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
-msgid "Opportunities per Employee"
-msgstr ""
-
 msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
 msgid "Opportunities per Employee per Month"
 msgstr ""
 
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_open"
+msgid "Opportunities per Employee"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
 msgid "Leads and Opportunities"
 msgstr ""
@@ -516,177 +639,152 @@ msgctxt "model:res.group,name:group_opportunity"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.open_opportunity_employee.init,name:0"
-msgid "Open Sale Opportunity per Employee Init"
-msgstr ""
-
-msgctxt "model:sale.opportunity,name:0"
+msgctxt "model:sale.opportunity,name:"
 msgid "Sale Opportunity"
 msgstr ""
 
-msgctxt "model:sale.opportunity.history,name:0"
+msgctxt "model:sale.opportunity.history,name:"
 msgid "Sale Opportunity History"
 msgstr ""
 
-msgctxt "model:sale.opportunity.line,name:0"
+msgctxt "model:sale.opportunity.line,name:"
 msgid "Sale Opportunity Line"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee,name:0"
+msgctxt "model:sale.opportunity_employee,name:"
 msgid "Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:sale.opportunity_employee_monthly,name:0"
-msgid "Sale Opportunity per Employee per Month"
-msgstr ""
-
-msgctxt "model:sale.opportunity_monthly,name:0"
-msgid "Sale Opportunity per Month"
+msgctxt "model:sale.opportunity_employee.open.start,name:"
+msgid "Open Sale Opportunity per Employee"
 msgstr ""
 
-msgctxt "model:workflow,name:opportunity_workflow"
-msgid "Sales Opportunity Workflow"
-msgstr ""
-
-#, fuzzy
-msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
-msgid "Cancelled"
-msgstr "Отмененно"
-
-msgctxt "model:workflow.activity,name:opportunity_activity_converted"
-msgid "Converted"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lead"
-msgid "Lead"
-msgstr ""
-
-msgctxt "model:workflow.activity,name:opportunity_activity_lost"
-msgid "Lost"
+msgctxt "model:sale.opportunity_employee_monthly,name:"
+msgid "Sale Opportunity per Employee per Month"
 msgstr ""
 
-msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
-msgid "Opportunity"
+msgctxt "model:sale.opportunity_monthly,name:"
+msgid "Sale Opportunity per Month"
 msgstr ""
 
 #, fuzzy
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Cancelled"
 msgstr "Отмененно"
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity,state:0"
+msgctxt "selection:sale.opportunity,state:"
 msgid "Opportunity"
 msgstr ""
 
 #, fuzzy
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Cancelled"
 msgstr "Отмененно"
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Converted"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lead"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Lost"
 msgstr ""
 
-msgctxt "selection:sale.opportunity.history,state:0"
+msgctxt "selection:sale.opportunity.history,state:"
 msgid "Opportunity"
 msgstr ""
 
-msgctxt "view:sale.open_opportunity_employee.init:0"
-msgid "Sale Opportunities per Employee"
-msgstr ""
-
 #, fuzzy
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "History"
 msgstr "Переписка"
 
-msgctxt "view:sale.opportunity.history:0"
+msgctxt "view:sale.opportunity.history:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sale Lead/Opportunity Line"
 msgstr ""
 
-msgctxt "view:sale.opportunity.line:0"
+msgctxt "view:sale.opportunity.line:"
 msgid "Sales Leads/Opportunities Lines"
 msgstr ""
 
 #, fuzzy
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Cancel"
 msgstr "Отменить"
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Convert to Sale"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Mark as Lost"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Reset as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sale Lead/Opportunity"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Sales Leads/Opportunities"
 msgstr ""
 
-msgctxt "view:sale.opportunity:0"
+msgctxt "view:sale.opportunity:"
 msgid "Set as Lead"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee:0"
+msgctxt "view:sale.opportunity_employee.open.start:"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:"
 msgid "Opportunities per Employee"
 msgstr ""
 
-msgctxt "view:sale.opportunity_employee_monthly:0"
+msgctxt "view:sale.opportunity_employee_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
-msgctxt "view:sale.opportunity_monthly:0"
+msgctxt "view:sale.opportunity_monthly:"
 msgid "Sale Opportunities per Month"
 msgstr ""
 
 #, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,end:"
 msgid "Cancel"
 msgstr "Отменить"
 
 #, fuzzy
-msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgctxt "wizard_button:sale.opportunity_employee.open,start,open_:"
 msgid "Open"
 msgstr "Открыть"
diff --git a/opportunity.py b/opportunity.py
index 0529f84..dbb6207 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -3,8 +3,8 @@
 "Sales extension for managing leads and opportunities"
 import datetime
 import time
-from trytond.model import ModelView, ModelSQL, ModelWorkflow, fields
-from trytond.wizard import Wizard
+from trytond.model import ModelView, ModelSQL, Workflow, fields
+from trytond.wizard import Wizard, StateView, StateAction, Button
 from trytond.backend import FIELDS
 from trytond.pyson import Equal, Eval, Not, In, If, Get, PYSONEncoder
 from trytond.transaction import Transaction
@@ -27,21 +27,21 @@ _STATES_STOP = {
 _DEPENDS_STOP = ['state']
 
 
-class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
+class SaleOpportunity(Workflow, ModelSQL, ModelView):
     'Sale Opportunity'
     _name = "sale.opportunity"
     _description = __doc__
     _history = True
     _rec_name = 'description'
 
-    party = fields.Many2One('party.party', 'Party', required=True, select=1,
+    party = fields.Many2One('party.party', 'Party', required=True, select=True,
             states=_STATES_STOP, depends=_DEPENDS_STOP)
     address = fields.Many2One('party.address', 'Address',
         domain=[('party', '=', Eval('party'))],
-        select=2, depends=['party', 'state'],
+        select=True, depends=['party', 'state'],
         states=_STATES_STOP)
     company = fields.Many2One('company.company', 'Company', required=True,
-        select=1, states=_STATES_STOP, domain=[
+        select=True, states=_STATES_STOP, domain=[
             ('id', If(In('company', Eval('context', {})), '=', '!='),
                 Get(Eval('context', {}), 'company', 0)),
             ], on_change=['company'], depends=_DEPENDS_STOP)
@@ -51,13 +51,6 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
             'get_currency_digits')
     amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
             depends=['currency_digits'], help='Estimated revenue amount')
-    warehouse = fields.Many2One('stock.location', 'Warehouse',
-        domain=[('type', '=', 'warehouse')], states={
-            'required': Eval('state') == 'converted',
-            'readonly': In(Eval('state'),
-                ['converted', 'lost', 'cancelled']),
-            },
-        depends=['state'])
     payment_term = fields.Many2One('account.invoice.payment_term',
         'Payment Term', states={
             'required': Eval('state') == 'converted',
@@ -68,9 +61,9 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
     employee = fields.Many2One('company.employee', 'Employee', required=True,
             states=_STATES_STOP, depends=['state', 'company'],
             domain=[('company', '=', Eval('company'))])
-    start_date = fields.Date('Start Date', required=True, select=1,
+    start_date = fields.Date('Start Date', required=True, select=True,
         states=_STATES_START, depends=_DEPENDS_START)
-    end_date = fields.Date('End Date', select=2, readonly=True, states={
+    end_date = fields.Date('End Date', select=True, readonly=True, states={
         'invisible': Not(In(Eval('state'),
             ['converted', 'cancelled', 'lost'])),
     }, depends=['state'])
@@ -80,9 +73,9 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         depends=_DEPENDS_STOP)
     lines = fields.One2Many('sale.opportunity.line', 'opportunity', 'Lines',
         states=_STATES_STOP, depends=_DEPENDS_STOP)
-    state = fields.Selection(STATES, 'State', required=True, select=1,
+    state = fields.Selection(STATES, 'State', required=True, select=True,
             sort=False, readonly=True)
-    probability = fields.Integer('Conversion Probability',
+    probability = fields.Integer('Conversion Probability', required=True,
             states={
                 'readonly': Not(In(Eval('state'), ['opportunity', 'lead'])),
             }, depends=['state'], help="Percentage between 0 and 100")
@@ -103,9 +96,41 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
                 'CHECK(probability >= 0 AND probability <= 100)',
                 'Probability must be between 0 and 100!')
         ]
-        self._rpc.update({
-            'button_lead': True,
-        })
+        self._error_messages.update({
+                'delete_cancel': 'Sale Opportunity "%s" must be cancelled '\
+                    'before deletion!',
+                })
+        self._transitions |= set((
+                ('lead', 'opportunity'),
+                ('lead', 'lost'),
+                ('lead', 'cancelled'),
+                ('opportunity', 'converted'),
+                ('opportunity', 'lead'),
+                ('opportunity', 'lost'),
+                ('opportunity', 'cancelled'),
+                ('lost', 'lead'),
+                ('cancelled', 'lead'),
+                ))
+        self._buttons.update({
+                'lead': {
+                    'invisible': ~Eval('state').in_(
+                        ['cancelled', 'lost', 'opportunity']),
+                    'icon': If(Eval('state').in_(['cancelled', 'lost']),
+                        'tryton-clear', 'tryton-go-previous'),
+                    },
+                'opportunity': {
+                    'invisible': ~Eval('state').in_(['lead']),
+                    },
+                'convert': {
+                    'invisible': ~Eval('state').in_(['opportunity']),
+                    },
+                'lost': {
+                    'invisible': ~Eval('state').in_(['lead', 'opportunity']),
+                    },
+                'cancel': {
+                    'invisible': ~Eval('state').in_(['lead', 'opportunity']),
+                    },
+                })
 
     def default_state(self):
         return 'lead'
@@ -118,34 +143,23 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         return 50
 
     def default_company(self):
-        return Transaction().context.get('company') or False
+        return Transaction().context.get('company')
 
     def default_employee(self):
         user_obj = Pool().get('res.user')
-        employee_obj = Pool().get('company.employee')
 
-        employee_id = False
         if Transaction().context.get('employee'):
-            employee_id = Transaction().context['employee']
+            return Transaction().context['employee']
         else:
             user = user_obj.browse(Transaction().user)
             if user.employee:
-                employee_id = user.employee.id
-        return employee_id
+                return user.employee.id
 
     def default_payment_term(self):
         payment_term_obj = Pool().get('account.invoice.payment_term')
         payment_term_ids = payment_term_obj.search(self.payment_term.domain)
         if len(payment_term_ids) == 1:
             return payment_term_ids[0]
-        return False
-
-    def default_warehouse(self):
-        location_obj = Pool().get('stock.location')
-        location_ids = location_obj.search(self.warehouse.domain)
-        if len(location_ids) == 1:
-            return location_ids[0]
-        return False
 
     def get_currency(self, ids, name):
         res = {}
@@ -175,12 +189,12 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         payment_term_obj = Pool().get('account.invoice.payment_term')
 
         res = {
-            'payment_term': False,
+            'payment_term': None,
         }
         if values.get('party'):
             party = party_obj.browse(values['party'])
-            if party.payment_term:
-                res['payment_term'] = party.payment_term.id
+            if party.customer_payment_term:
+                res['payment_term'] = party.customer_payment_term.id
         if not res['payment_term']:
             res['payment_term'] = self.default_payment_term()
         if res['payment_term']:
@@ -188,10 +202,6 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
                     res['payment_term']).rec_name
         return res
 
-    def button_lead(self, ids):
-        self.workflow_trigger_create(ids)
-        return True
-
     def _get_sale_line_opportunity_line(self, opportunity):
         '''
         Return sale line values for each opportunity line
@@ -204,6 +214,8 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         line_obj = Pool().get('sale.opportunity.line')
         res = {}
         for line in opportunity.lines:
+            if line.sale_line:
+                continue
             val = line_obj.get_sale_line(line)
             if val:
                 res[line.id] = val
@@ -222,7 +234,6 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
             'party': opportunity.party.id,
             'payment_term': opportunity.payment_term.id,
             'company': opportunity.company.id,
-            'warehouse': opportunity.warehouse.id,
             'invoice_address': opportunity.address and opportunity.address.id,
             'shipment_address': opportunity.address and opportunity.address.id,
             'currency': opportunity.company.currency.id,
@@ -230,18 +241,17 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         }
         return res
 
-    def create_sale(self, opportunity_id):
+    def create_sale(self, opportunity):
         '''
-        Create a sale for the opportunity
-
-        :param opportunity_id: the id of the opportunity
+        Create a sale for the opportunity and return the sale id
         '''
         pool = Pool()
         sale_obj = pool.get('sale.sale')
         sale_line_obj = pool.get('sale.line')
         line_obj = pool.get('sale.opportunity.line')
 
-        opportunity = self.browse(opportunity_id)
+        if opportunity.sale:
+            return
 
         values = self._get_sale_opportunity(opportunity)
         sale_line_values = self._get_sale_line_opportunity_line(opportunity)
@@ -257,37 +267,55 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
                 'sale_line': sale_line_id,
                 })
 
-        self.write(opportunity_id, {
+        self.write(opportunity.id, {
             'sale': sale_id,
             })
         return sale_id
 
-    def wkf_lead(self, opportunity):
-        self.write(opportunity.id, {'state': 'lead'})
-
-    def wkf_opportunity(self, opportunity):
-        self.write(opportunity.id, {'state': 'opportunity'})
-
-    def wkf_converted(self, opportunity):
+    def delete(self, ids):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # Cancel before delete
+        self.cancel(ids)
+        for opportunity in self.browse(ids):
+            if opportunity.state != 'cancel':
+                self.raise_user_error('delete_cancel', opportunity.rec_name)
+        return super(SaleOpportunity, self).delete(ids)
+
+    @ModelView.button
+    @Workflow.transition('lead')
+    def lead(self, ids):
+        pass
+
+    @ModelView.button
+    @Workflow.transition('opportunity')
+    def opportunity(self, ids):
+        pass
+
+    @ModelView.button
+    @Workflow.transition('converted')
+    def convert(self, ids):
         date_obj = Pool().get('ir.date')
-        self.write(opportunity.id, {
+        self.write(ids, {
                 'end_date': date_obj.today(),
-                'state': 'converted',
                 })
-        self.create_sale(opportunity.id)
+        for opportunity in self.browse(ids):
+            self.create_sale(opportunity)
 
-    def wkf_cancelled(self, opportunity):
+    @ModelView.button
+    @Workflow.transition('lost')
+    def lost(self, ids):
         date_obj = Pool().get('ir.date')
-        self.write(opportunity.id, {
+        self.write(ids, {
                 'end_date': date_obj.today(),
-                'state': 'cancelled',
                 })
 
-    def wkf_lost(self, opportunity):
+    @ModelView.button
+    @Workflow.transition('cancelled')
+    def cancel(self, ids):
         date_obj = Pool().get('ir.date')
-        self.write(opportunity.id, {
+        self.write(ids, {
                 'end_date': date_obj.today(),
-                'state': 'lost',
                 })
 
 SaleOpportunity()
@@ -301,7 +329,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
     _history = True
 
     opportunity = fields.Many2One('sale.opportunity', 'Opportunity')
-    sequence = fields.Integer('Sequence')
+    sequence = fields.Integer('Sequence', required=True)
     product = fields.Many2One('product.product', 'Product', required=True,
             domain=[('salable', '=', True)], on_change=['product', 'unit'])
     quantity = fields.Float('Quantity', required=True,
@@ -311,7 +339,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         on_change_with=['unit']), 'get_unit_digits')
     sale_line = fields.Many2One('sale.line', 'Sale Line', readonly=True,
         states={
-            'invisible': (Eval('_parent_opportunity', {}).get( 'state')
+            'invisible': (Eval('_parent_opportunity', {}).get('state')
                 != 'converted'),
             })
 
@@ -407,15 +435,14 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
     }, depends=['state'])
     description = fields.Char('Description')
     comment = fields.Text('Comment')
-    lines = fields.Function(fields.One2Many('sale.opportunity.line', None, 'Lines',
-            datetime_field='date'), 'get_lines')
+    lines = fields.Function(fields.One2Many('sale.opportunity.line', None,
+            'Lines', datetime_field='date'), 'get_lines')
     state = fields.Selection(STATES, 'State')
     probability = fields.Integer('Conversion Probability')
     lost_reason = fields.Text('Reason for loss', states={
         'invisible': Not(Equal(Eval('state'), 'lost')),
     }, depends=['state'])
 
-
     def __init__(self):
         super(SaleOpportunityHistory, self).__init__()
         self._order.insert(0, ('date', 'DESC'))
@@ -426,9 +453,12 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
         return [
             'MIN("%s".__id) AS id' % table,
             '"%s".id AS opportunity' % table,
-            'MIN(COALESCE("%s".write_date, "%s".create_date)) AS date' % (table, table),
-            'COALESCE("%s".write_uid, "%s".create_uid) AS user' % (table, table),
-        ] + ['"%s"."%s"' % (table, name) for name, field in self._columns.iteritems()
+            ('MIN(COALESCE("%s".write_date, "%s".create_date)) AS date'
+                % (table, table)),
+            ('COALESCE("%s".write_uid, "%s".create_uid) AS user'
+                % (table, table)),
+            ] + ['"%s"."%s"' % (table, name)
+                for name, field in self._columns.iteritems()
                 if name not in ('id', 'opportunity', 'date', 'user')
                 and not hasattr(field, 'set')]
 
@@ -463,7 +493,6 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
             ])
         return result
 
-
     def read(self, ids, fields_names=None):
         res = super(SaleOpportunityHistory, self).read(ids,
                 fields_names=fields_names)
@@ -548,7 +577,8 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
         res = {}
         for record in self.browse(ids):
             if record.number:
-                res[record.id] = float(record.converted) / record.number * 100.0
+                res[record.id] = (float(record.converted)
+                    / record.number * 100.0)
             else:
                 res[record.id] = 0.0
         return res
@@ -578,50 +608,33 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
 SaleOpportunityEmployee()
 
 
-class OpenSaleOpportunityEmployeeInit(ModelView):
-    'Open Sale Opportunity per Employee Init'
-    _name = 'sale.open_opportunity_employee.init'
+class OpenSaleOpportunityEmployeeStart(ModelView):
+    'Open Sale Opportunity per Employee'
+    _name = 'sale.opportunity_employee.open.start'
     _description = __doc__
     start_date = fields.Date('Start Date')
     end_date = fields.Date('End Date')
 
-OpenSaleOpportunityEmployeeInit()
+OpenSaleOpportunityEmployeeStart()
 
 
 class OpenSaleOpportunityEmployee(Wizard):
     'Open Sale Opportunity per Employee'
-    _name = 'sale.open_opportunity_employee'
-    states = {
-        'init': {
-            'result': {
-                'type': 'form',
-                'object': 'sale.open_opportunity_employee.init',
-                'state': [
-                    ('end', 'Cancel', 'tryton-cancel'),
-                    ('open', 'Open', 'tryton-ok', True),
-                ],
-            },
-        },
-        'open': {
-            'result': {
-                'type': 'action',
-                'action': '_action_open',
-                'state': 'end',
-            },
-        },
-    }
+    _name = 'sale.opportunity_employee.open'
 
-    def _action_open(self, data):
-        model_data_obj = Pool().get('ir.model.data')
-        act_window_obj = Pool().get('ir.action.act_window')
-        act_window_id = model_data_obj.get_id('sale_opportunity',
-                'act_opportunity_employee_form')
-        res = act_window_obj.read(act_window_id)
-        res['pyson_context'] = PYSONEncoder().encode({
-            'start_date': data['form']['start_date'],
-            'end_date': data['form']['end_date'],
-            })
-        return res
+    start = StateView('sale.opportunity_employee.open.start',
+        'sale_opportunity.opportunity_employee_open_start_view_form', [
+            Button('Cancel', 'end', 'tryton-cancel'),
+            Button('Open', 'open_', 'tryton-ok', default=True),
+            ])
+    open_ = StateAction('sale_opportunity.act_opportunity_employee_form')
+
+    def do_open_(self, session, action):
+        action['pyson_context'] = PYSONEncoder().encode({
+                'start_date': session.start.start_date,
+                'end_date': session.start.end_date,
+                })
+        return action, {}
 
 OpenSaleOpportunityEmployee()
 
@@ -701,7 +714,8 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
         res = {}
         for record in self.browse(ids):
             if record.number:
-                res[record.id] = float(record.converted) / record.number * 100.0
+                res[record.id] = (float(record.converted)
+                    / record.number * 100.0)
             else:
                 res[record.id] = 0.0
         return res
@@ -815,7 +829,8 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
         res = {}
         for record in self.browse(ids):
             if record.number:
-                res[record.id] = float(record.converted) / record.number * 100.0
+                res[record.id] = (float(record.converted)
+                    / record.number * 100.0)
             else:
                 res[record.id] = 0.0
         return res
diff --git a/opportunity.xml b/opportunity.xml
index f91f1e3..2841fc8 100644
--- a/opportunity.xml
+++ b/opportunity.xml
@@ -41,8 +41,6 @@
                             <field name="start_date"/>
                             <label name="end_date"/>
                             <field name="end_date"/>
-                            <label name="warehouse"/>
-                            <field name="warehouse"/>
                             <label name="payment_term"/>
                             <field name="payment_term"/>
                             <label name="sale"/>
@@ -55,26 +53,22 @@
                                 <label name="state"/>
                                 <field name="state"/>
                             </group>
-                            <group col="6" colspan="2" id="buttons">
-                                <button name="cancelled" string="Cancel"
-                                    states="{'invisible': Not(In(Eval('state'), ['lead', 'opportunity']))}"
+                            <group col="5" colspan="2" id="buttons">
+                                <button name="cancel" type="object"
+                                    string="Cancel"
                                     icon="tryton-cancel"/>
-                                <button name="lost_lead" string="Mark as Lost"
-                                    states="{'invisible':Not(In(Eval('state'), ['lead','opportunity']))}"
+                                <button name="lost" type="object"
+                                    string="Mark as Lost"
                                     icon="tryton-cancel"/>
-                                <button name="set_as_lead" string="Set as Lead"
-                                    states="{'invisible':Not(In(Eval('state'), ['opportunity']))}"
+                                <button name="lead" type="object"
+                                    string="Set as Lead"
                                     icon="tryton-go-previous"/>
-                                <button name="convert_to_opportunity" string="Convert to Opportunity"
-                                    states="{'invisible': Not(In(Eval('state'), ['lead']))}"
+                                <button name="opportunity" type="object"
+                                    string="Convert to Opportunity"
                                     icon="tryton-go-next"/>
-                                <button name="convert_to_sale" string="Convert to Sale"
-                                    states="{'invisible': Not(In(Eval('state'), ['opportunity']))}"
+                                <button name="convert" type="object"
+                                    string="Convert to Sale"
                                     icon="tryton-go-next"/>
-                                <button name="button_lead" string="Reset as Lead"
-                                    type="object"
-                                    states="{'invisible': Not(In(Eval('state'), ['lost', 'cancelled']))}"
-                                    icon="tryton-clear"/>
                             </group>
                         </page>
                         <page name="lines">
@@ -239,100 +233,65 @@
             <field name="perm_delete" eval="True"/>
         </record>
 
-        <record model="ir.rule.group" id="rule_group_opportunity">
+        <record model="ir.model.button" id="opportunity_lead_button">
+            <field name="name">lead</field>
             <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
-            <field name="global_p" eval="True"/>
         </record>
-        <record model="ir.rule" id="rule_group_opportunity1">
-            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity')]"/>
-            <field name="operator">=</field>
-            <field name="operand">User/Current Company</field>
-            <field name="rule_group" ref="rule_group_opportunity"/>
+        <record model="ir.model.button-res.group"
+            id="opportunity_lead_button_group_opportinity">
+            <field name="button" ref="opportunity_lead_button"/>
+            <field name="group" ref="group_opportunity"/>
         </record>
 
-        <record model="workflow" id="opportunity_workflow">
-            <field name="name">Sales Opportunity Workflow</field>
-            <field name="model">sale.opportunity</field>
-            <field name="on_create" eval="True" />
-        </record>
-
-        <record model="workflow.activity" id="opportunity_activity_lead">
-            <field name="name">Lead</field>
-            <field name="workflow" ref="opportunity_workflow"/>
-            <field name="method">wkf_lead</field>
-            <field name="flow_start" eval="True"/>
-        </record>
-        <record model="workflow.activity" id="opportunity_activity_opportunity">
-            <field name="name">Opportunity</field>
-            <field name="workflow" ref="opportunity_workflow"/>
-            <field name="method">wkf_opportunity</field>
-        </record>
-        <record model="workflow.activity" id="opportunity_activity_converted">
-            <field name="name">Converted</field>
-            <field name="workflow" ref="opportunity_workflow"/>
-            <field name="method">wkf_converted</field>
-            <field name="flow_stop" eval="True"/>
-        </record>
-        <record model="workflow.activity" id="opportunity_activity_cancelled">
-            <field name="name">Cancelled</field>
-            <field name="workflow" ref="opportunity_workflow"/>
-            <field name="method">wkf_cancelled</field>
-            <field name="flow_stop" eval="True"/>
-        </record>
-        <record model="workflow.activity" id="opportunity_activity_lost">
-            <field name="name">Lost</field>
-            <field name="workflow" ref="opportunity_workflow"/>
-            <field name="method">wkf_lost</field>
-            <field name="flow_stop" eval="True"/>
-        </record>
-
-        <record model="workflow.transition" id="opportunity_transition_lead_opportunity">
-            <field name="act_from" ref="opportunity_activity_lead"/>
-            <field name="act_to" ref="opportunity_activity_opportunity"/>
-            <field name="signal">convert_to_opportunity</field>
-            <field name="group" ref="sale.group_sale"/>
+        <record model="ir.model.button" id="opportunity_opportunity_button">
+            <field name="name">opportunity</field>
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_opportunity_converted">
-            <field name="act_from" ref="opportunity_activity_opportunity"/>
-            <field name="act_to" ref="opportunity_activity_converted"/>
-            <field name="signal">convert_to_sale</field>
-            <field name="group" ref="sale.group_sale"/>
+        <record model="ir.model.button-res.group"
+            id="opportunity_opportunity_button_group_opportunity">
+            <field name="button" ref="opportunity_opportunity_button"/>
+            <field name="group" ref="group_opportunity"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_opportunity_lead">
-            <field name="act_from" ref="opportunity_activity_opportunity"/>
-            <field name="act_to" ref="opportunity_activity_lead"/>
-            <field name="signal">set_as_lead</field>
-            <field name="group" ref="sale.group_sale"/>
+
+        <record model="ir.model.button" id="opportunity_convert_button">
+            <field name="name">convert</field>
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_cancelled_lead">
-            <field name="act_from" ref="opportunity_activity_cancelled"/>
-            <field name="act_to" ref="opportunity_activity_lead"/>
-            <field name="signal">set_as_lead</field>
-            <field name="group" ref="sale.group_sale"/>
+        <record model="ir.model.button-res.group"
+            id="opportunity_convert_button_group_opportinity">
+            <field name="button" ref="opportunity_convert_button"/>
+            <field name="group" ref="group_opportunity"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_lead_lost">
-            <field name="act_from" ref="opportunity_activity_lead"/>
-            <field name="act_to" ref="opportunity_activity_lost"/>
-            <field name="signal">lost_lead</field>
-            <field name="group" ref="sale.group_sale"/>
+
+        <record model="ir.model.button" id="opportunity_lost_button">
+            <field name="name">lost</field>
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_opportunity_lost">
-            <field name="act_from" ref="opportunity_activity_opportunity"/>
-            <field name="act_to" ref="opportunity_activity_lost"/>
-            <field name="signal">lost_lead</field>
-            <field name="group" ref="sale.group_sale"/>
+        <record model="ir.model.button-res.group"
+            id="opportunity_lost_button_group_opportinity">
+            <field name="button" ref="opportunity_lost_button"/>
+            <field name="group" ref="group_opportunity"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_lead_cancelled">
-            <field name="act_from" ref="opportunity_activity_lead"/>
-            <field name="act_to" ref="opportunity_activity_cancelled"/>
-            <field name="signal">cancelled</field>
-            <field name="group" ref="sale.group_sale"/>
+
+        <record model="ir.model.button" id="opportunity_cancel_button">
+            <field name="name">cancel</field>
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
         </record>
-        <record model="workflow.transition" id="opportunity_transition_opp_cancelled">
-            <field name="act_from" ref="opportunity_activity_opportunity"/>
-            <field name="act_to" ref="opportunity_activity_cancelled"/>
-            <field name="signal">cancelled</field>
-            <field name="group" ref="sale.group_sale"/>
+        <record model="ir.model.button-res.group"
+            id="opportunity_cancel_button_group_opportinity">
+            <field name="button" ref="opportunity_cancel_button"/>
+            <field name="group" ref="group_opportunity"/>
+        </record>
+
+        <record model="ir.rule.group" id="rule_group_opportunity">
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_group_opportunity1">
+            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity')]"/>
+            <field name="operator">=</field>
+            <field name="operand">User/Current Company</field>
+            <field name="rule_group" ref="rule_group_opportunity"/>
         </record>
 
         <record model="ir.ui.view" id="opportunity_line_view_form">
@@ -362,11 +321,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <![CDATA[
-                <tree string="Sales Leads/Opportunities Lines" fill="1" sequence="sequence">
+                <tree string="Sales Leads/Opportunities Lines" sequence="sequence">
                     <field name="opportunity"/>
                     <field name="product"/>
                     <field name="quantity"/>
-                    <field name="unit"/>
+                    <field name="unit" expand="1"/>
                     <field name="sequence" tree_invisible="1"/>
                 </tree>
                 ]]>
@@ -589,8 +548,8 @@
             <field name="rule_group" ref="rule_group_opportunity_employee"/>
         </record>
 
-        <record model="ir.ui.view" id="open_sale_opportunity_employee_init_view_form">
-            <field name="model">sale.open_opportunity_employee.init</field>
+        <record model="ir.ui.view" id="opportunity_employee_open_start_view_form">
+            <field name="model">sale.opportunity_employee.open.start</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <![CDATA[
@@ -604,12 +563,12 @@
             </field>
         </record>
 
-        <record model="ir.action.wizard" id="act_open_sale_opportunity_employee">
+        <record model="ir.action.wizard" id="act_opportunity_employee_open">
             <field name="name">Opportunities per Employee</field>
-            <field name="wiz_name">sale.open_opportunity_employee</field>
+            <field name="wiz_name">sale.opportunity_employee.open</field>
         </record>
-        <menuitem parent="menu_reporting" action="act_open_sale_opportunity_employee"
-            icon="tryton-list" id="menu_open_sale_opportunity_employee"/>
+        <menuitem parent="menu_reporting" action="act_opportunity_employee_open"
+            icon="tryton-list" id="menu_opportunity_employee_open"/>
 
         <record model="ir.ui.view" id="opportunity_monthly_view_tree">
             <field name="model">sale.opportunity_monthly</field>
diff --git a/setup.py b/setup.py
index d0738ce..0ef2771 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
 
 requires = []
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
                 (dep, major_version, minor_version, major_version,
                     minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 0a37d9e..3edddbc 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_sale_opportunity import suite
+from .test_sale_opportunity import suite
diff --git a/tests/test_sale_opportunity.py b/tests/test_sale_opportunity.py
index b260192..3141d51 100644
--- a/tests/test_sale_opportunity.py
+++ b/tests/test_sale_opportunity.py
@@ -2,7 +2,8 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-import sys, os
+import sys
+import os
 DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
     '..', '..', '..', '..', '..', 'trytond')))
 if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class SaleOpportunityTestCase(unittest.TestCase):
         '''
         test_depends()
 
+
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 85a1599..fc9ca65 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 2.2.1
+Version: 2.4.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,7 +12,7 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 04924ae..b20f35c 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -13,15 +13,19 @@ setup.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
 locale/bg_BG.po
+locale/ca_ES.po
 locale/cs_CZ.po
 locale/de_DE.po
+locale/es_AR.po
 locale/es_CO.po
 locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
 tests/__init__.py
+tests/__init__.pyc
 tests/test_sale_opportunity.py
+tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index 3ecbf68..c49e422 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_party >= 2.2, < 2.3
-trytond_company >= 2.2, < 2.3
-trytond_product >= 2.2, < 2.3
-trytond_sale >= 2.2, < 2.3
-trytond_account >= 2.2, < 2.3
-trytond_stock >= 2.2, < 2.3
-trytond_currency >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_party >= 2.4, < 2.5
+trytond_company >= 2.4, < 2.5
+trytond_product >= 2.4, < 2.5
+trytond_sale >= 2.4, < 2.5
+trytond_account >= 2.4, < 2.5
+trytond_stock >= 2.4, < 2.5
+trytond_currency >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit c35496190e37da68a0051dd7aa8bb420cba0e4d1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 26 13:35:53 2011 +0100

    Adding upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index 1de3b84..63636d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2011-12-26
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-25
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 1212add..f60dff6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.2.0
+Version: 2.2.1
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
diff --git a/__tryton__.py b/__tryton__.py
index 5d8e7db..96e8d0d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
     'name_bg_BG': 'Инициативи и възможности за продажба',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
     'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '2.2.0',
+    'version': '2.2.1',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
diff --git a/opportunity.py b/opportunity.py
index 40f13c3..0529f84 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -177,8 +177,8 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         res = {
             'payment_term': False,
         }
-        if vals.get('party'):
-            party = party_obj.browse(vals['party'])
+        if values.get('party'):
+            party = party_obj.browse(values['party'])
             if party.payment_term:
                 res['payment_term'] = party.payment_term.id
         if not res['payment_term']:
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index b5f4ee5..85a1599 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.2.0
+Version: 2.2.1
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index fc79201..04924ae 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -21,9 +21,7 @@ locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
 tests/__init__.py
-tests/__init__.pyc
 tests/test_sale_opportunity.py
-tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
commit 91195d2affd871290df517e4dea7aaa714b05ced
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 31 16:21:22 2011 +0100

    Adding upstream version 2.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index c032139..1de3b84 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.0.1 - 2011-10-01
+Version 2.2.0 - 2011-10-25
 * Bug fixes (see mercurial logs for details)
 
 Version 2.0.0 - 2011-04-27
diff --git a/MANIFEST.in b/MANIFEST.in
index b2a140e..1192bab 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,6 @@ include CHANGELOG
 include LICENSE
 include *.xml
 include *.odt
-include *.csv
+include locale/*.po
 include tests/*
 include doc/*
diff --git a/PKG-INFO b/PKG-INFO
index 73f413e..1212add 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 2.0.1
+Version: 2.2.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,21 +12,25 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 8180590..5d8e7db 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
     'name_bg_BG': 'Инициативи и възможности за продажба',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
     'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '2.0.1',
+    'version': '2.2.0',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
@@ -49,8 +49,13 @@
         'party.xml',
     ],
     'translation': [
-        'bg_BG.csv',
-        'de_DE.csv',
-        'fr_FR.csv',
+        'locale/bg_BG.po',
+        'locale/cs_CZ.po',
+        'locale/de_DE.po',
+        'locale/es_CO.po',
+        'locale/es_ES.po',
+        'locale/fr_FR.po',
+        'locale/nl_NL.po',
+        'locale/ru_RU.po',
     ],
 }
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 64c42eb..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,162 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,sale.opportunity,0,Probability must be between 0 and 100!,Вероятността трябва да бъде между 0 и 100!,0
-field,"sale.open_opportunity_employee.init,end_date",0,End Date,Крайна дата,0
-field,"sale.open_opportunity_employee.init,start_date",0,Start Date,Начална дата,0
-field,"sale.opportunity,address",0,Address,Адрес,0
-field,"sale.opportunity,amount",0,Amount,Сума,0
-field,"sale.opportunity,comment",0,Comment,Коментар,0
-field,"sale.opportunity,company",0,Company,Фирма,0
-field,"sale.opportunity,currency",0,Currency,Валута,0
-field,"sale.opportunity,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"sale.opportunity,description",0,Description,Описание,0
-field,"sale.opportunity,employee",0,Employee,Служител,0
-field,"sale.opportunity,end_date",0,End Date,Крайна дата,0
-field,"sale.opportunity,history",0,History,Изтория,0
-field,"sale.opportunity,lines",0,Lines,Редове,0
-field,"sale.opportunity,lost_reason",0,Reason for loss,Причина за загуба,0
-field,"sale.opportunity,party",0,Party,Партньор,0
-field,"sale.opportunity,payment_term",0,Payment Term,Условие за плащане,0
-field,"sale.opportunity,probability",0,Conversion Probability,Вероятност за преобразуване,0
-field,"sale.opportunity,rec_name",0,Name,Име,0
-field,"sale.opportunity,sale",0,Sale,Продажба,0
-field,"sale.opportunity,start_date",0,Start Date,Начална дата,0
-field,"sale.opportunity,state",0,State,Състояние,0
-field,"sale.opportunity,warehouse",0,Warehouse,Склад,0
-field,"sale.opportunity.history,address",0,Address,Адрес,0
-field,"sale.opportunity.history,comment",0,Comment,Коментар,0
-field,"sale.opportunity.history,company",0,Company,Фирма,0
-field,"sale.opportunity.history,date",0,Change Date,Промяна на дата,0
-field,"sale.opportunity.history,description",0,Description,Описание,0
-field,"sale.opportunity.history,employee",0,Employee,Служител,0
-field,"sale.opportunity.history,end_date",0,End Date,Крайна дата,0
-field,"sale.opportunity.history,lines",0,Lines,Редове,0
-field,"sale.opportunity.history,lost_reason",0,Reason for loss,Причина за загуба,0
-field,"sale.opportunity.history,opportunity",0,Sale Opportunity,Възможност за продажба,0
-field,"sale.opportunity.history,party",0,Party,Партньор,0
-field,"sale.opportunity.history,probability",0,Conversion Probability,Вероятност за преобразуване,0
-field,"sale.opportunity.history,rec_name",0,Name,Име,0
-field,"sale.opportunity.history,start_date",0,Start Date,Начална дата,0
-field,"sale.opportunity.history,state",0,State,Състояние,0
-field,"sale.opportunity.history,user",0,User,Потребител,0
-field,"sale.opportunity.line,opportunity",0,Opportunity,Възможност,0
-field,"sale.opportunity.line,product",0,Product,Продукт,0
-field,"sale.opportunity.line,quantity",0,Quantity,Количество,0
-field,"sale.opportunity.line,rec_name",0,Name,Име,0
-field,"sale.opportunity.line,sale_line",0,Sale Line,Ред от продажба,0
-field,"sale.opportunity.line,sequence",0,Sequence,Последователност,0
-field,"sale.opportunity.line,unit",0,Unit,Единица,0
-field,"sale.opportunity.line,unit_digits",0,Unit Digits,Десетични единици,0
-field,"sale.opportunity_employee,amount",0,Amount,Сума,0
-field,"sale.opportunity_employee,company",0,Company,Фирма,0
-field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Обменен курс,0
-field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Обменен курс,0
-field,"sale.opportunity_employee,converted",0,Converted,Конвертиран,0
-field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Конвертирана сума,0
-field,"sale.opportunity_employee,currency",0,Currency,Валута,0
-field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"sale.opportunity_employee,employee",0,Employee,Служител,0
-field,"sale.opportunity_employee,lost",0,Lost,Изгубен,0
-field,"sale.opportunity_employee,number",0,Number,Номер,0
-field,"sale.opportunity_employee,rec_name",0,Name,Име,0
-field,"sale.opportunity_employee_monthly,amount",0,Amount,Сума,0
-field,"sale.opportunity_employee_monthly,company",0,Company,Фирма,0
-field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Обменен курс,0
-field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Обменен курс,0
-field,"sale.opportunity_employee_monthly,converted",0,Converted,Конвертиран,0
-field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Конвертирана сума,0
-field,"sale.opportunity_employee_monthly,currency",0,Currency,Валута,0
-field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"sale.opportunity_employee_monthly,employee",0,Employee,Служител,0
-field,"sale.opportunity_employee_monthly,lost",0,Lost,Изгубен,0
-field,"sale.opportunity_employee_monthly,month",0,Month,Месец,0
-field,"sale.opportunity_employee_monthly,number",0,Number,Номер,0
-field,"sale.opportunity_employee_monthly,rec_name",0,Name,Име,0
-field,"sale.opportunity_employee_monthly,year",0,Year,Година,0
-field,"sale.opportunity_monthly,amount",0,Amount,Сума,0
-field,"sale.opportunity_monthly,company",0,Company,Фирма,0
-field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Обменен курс,0
-field,"sale.opportunity_monthly,conversion_rate",0,Conversion Rate,Обменен курс,0
-field,"sale.opportunity_monthly,converted",0,Converted,Конвертиран,0
-field,"sale.opportunity_monthly,converted_amount",0,Converted Amount,Конвертирана сума,0
-field,"sale.opportunity_monthly,currency",0,Currency,Валута,0
-field,"sale.opportunity_monthly,currency_digits",0,Currency Digits,Цифри за валута,0
-field,"sale.opportunity_monthly,lost",0,Lost,Изгубен,0
-field,"sale.opportunity_monthly,month",0,Month,Месец,0
-field,"sale.opportunity_monthly,number",0,Number,Номер,0
-field,"sale.opportunity_monthly,rec_name",0,Name,Име,0
-field,"sale.opportunity_monthly,year",0,Year,Година,0
-field,"sale.opportunity_monthly,year_month",0,Year-Month,Година-Месец,0
-help,"sale.opportunity,amount",0,Estimated revenue amount,Очаквани приходи,0
-help,"sale.opportunity,probability",0,Percentage between 0 and 100,Процент между 0 и 100,0
-help,"sale.opportunity_employee,conversion_amount_rate",0,In %,В %,0
-help,"sale.opportunity_employee,conversion_rate",0,In %,В %,0
-help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,В %,0
-help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,В %,0
-help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,В %,0
-help,"sale.opportunity_monthly,conversion_rate",0,In %,В %,0
-model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Възможности по служител,0
-model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Възможности по служител,0
-model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Възможности по служител по месец,0
-model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Инициативи и възможности,0
-model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Инициативи/Възможности за продажба,0
-model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Отказани инициативи и възможности,0
-model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Конвертирани възможности,0
-model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Отворени инициативи,0
-model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Изгубени ициативи и възможности,0
-model,"ir.action,name",act_opportunity_form_new,New Lead,Нова инициатива,0
-model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Възможности,0
-model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Възможности по месец,0
-model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Възможности по служител,0
-model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Възможности по служител по месец,0
-model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Инициативи и възможности,0
-model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Отказани инициативи и възможности,0
-model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Конвертирани възможности,0
-model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Отворени инициативи,0
-model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Изгубени ициативи и възможности,0
-model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Нова инициатива,0
-model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Възможности,0
-model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Възможности по месец,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Справки,0
-model,"res.group,name",group_opportunity,Sale Opportunity,Възможност за продажба,0
-model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Начално отваряне на възможмост за продажба по служител,0
-model,"sale.opportunity,name",0,Sale Opportunity,Възможност за продажба,0
-model,"sale.opportunity.history,name",0,Sale Opportunity History,История на възможност за продажба,0
-model,"sale.opportunity.line,name",0,Sale Opportunity Line,Ред от възможност за продажба,0
-model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Възможност за продажба за служител,0
-model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Възможност за продажба за служител за месец,0
-model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Възможност за продажа по месец,0
-model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Работен процес на възможност за продажба,0
-model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Отказан,0
-model,"workflow.activity,name",opportunity_activity_converted,Converted,Конвертиран,0
-model,"workflow.activity,name",opportunity_activity_lead,Lead,Възможност,0
-model,"workflow.activity,name",opportunity_activity_lost,Lost,Изгубен,0
-model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Възможност,0
-selection,"sale.opportunity,state",0,Cancelled,Отказан,0
-selection,"sale.opportunity,state",0,Converted,Конвертиран,0
-selection,"sale.opportunity,state",0,Lead,Инициатива,0
-selection,"sale.opportunity,state",0,Lost,Изгубен,0
-selection,"sale.opportunity,state",0,Opportunity,Възможност,0
-selection,"sale.opportunity.history,state",0,Cancelled,Отказан,0
-selection,"sale.opportunity.history,state",0,Converted,Конвертиран,0
-selection,"sale.opportunity.history,state",0,Lead,Инициатива,0
-selection,"sale.opportunity.history,state",0,Lost,Изгубен,0
-selection,"sale.opportunity.history,state",0,Opportunity,Възможност,0
-view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Възможности за продажба по служител,0
-view,sale.opportunity,0,Cancel,Отказ,0
-view,sale.opportunity,0,Convert to Opportunity,Превръщане във възможност,0
-view,sale.opportunity,0,Convert to Sale,Прехвърлено в продажба,0
-view,sale.opportunity,0,Lead/Opportunity,Инициатива/Възможност,0
-view,sale.opportunity,0,Mark as Lost,Отбелязване като загубен,0
-view,sale.opportunity,0,Reset as Lead,Прехвърляне в инициатива,0
-view,sale.opportunity,0,Sale Lead/Opportunity,Инициатива/Възможност за продажба,0
-view,sale.opportunity,0,Sales Leads/Opportunities,Инициативи/Възможности за продажба,0
-view,sale.opportunity,0,Set as Lead,Прехвърляне в инициатива,0
-view,sale.opportunity.history,0,History,Изтория,0
-view,sale.opportunity.history,0,Lead/Opportunity,Инициатива/Възможност,0
-view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Ред на инициатива/възможност за продажба,0
-view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Редове от инициативи/възможности за продажба,0
-view,sale.opportunity_employee,0,Opportunities per Employee,Възможности по служител,0
-view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Възможности за продажба по месец,0
-view,sale.opportunity_monthly,0,Sale Opportunities per Month,Възможности за продажба по месец,0
-wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Отказ,0
-wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Отваряне,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 5dc1e5d..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,162 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,sale.opportunity,0,Probability must be between 0 and 100!,Wahrscheinlichkeit muss zwischen 0 und 100 liegen!,0
-field,"sale.open_opportunity_employee.init,end_date",0,End Date,Enddatum,0
-field,"sale.open_opportunity_employee.init,start_date",0,Start Date,Anfangsdatum,0
-field,"sale.opportunity,address",0,Address,Adresse,0
-field,"sale.opportunity,amount",0,Amount,Betrag,0
-field,"sale.opportunity,comment",0,Comment,Kommentar,0
-field,"sale.opportunity,company",0,Company,Unternehmen,0
-field,"sale.opportunity,currency",0,Currency,Währung,0
-field,"sale.opportunity,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.opportunity,description",0,Description,Bezeichnung,0
-field,"sale.opportunity,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity,end_date",0,End Date,Enddatum,0
-field,"sale.opportunity,history",0,History,Verlauf,0
-field,"sale.opportunity,lines",0,Lines,Positionen,0
-field,"sale.opportunity,lost_reason",0,Reason for loss,Ursache für Verlust,0
-field,"sale.opportunity,party",0,Party,Partei,0
-field,"sale.opportunity,payment_term",0,Payment Term,Zahlungsbedingung,0
-field,"sale.opportunity,probability",0,Conversion Probability,Umwandlungswahrscheinlichkeit,0
-field,"sale.opportunity,rec_name",0,Name,Name,0
-field,"sale.opportunity,sale",0,Sale,Verkauf,0
-field,"sale.opportunity,start_date",0,Start Date,Anfangsdatum,0
-field,"sale.opportunity,state",0,State,Status,0
-field,"sale.opportunity,warehouse",0,Warehouse,Warenlager,0
-field,"sale.opportunity.history,address",0,Address,Adresse,0
-field,"sale.opportunity.history,comment",0,Comment,Kommentar,0
-field,"sale.opportunity.history,company",0,Company,Unternehmen,0
-field,"sale.opportunity.history,date",0,Change Date,Änderungsdatum,0
-field,"sale.opportunity.history,description",0,Description,Bezeichnung,0
-field,"sale.opportunity.history,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity.history,end_date",0,End Date,Enddatum,0
-field,"sale.opportunity.history,lines",0,Lines,Positionen,0
-field,"sale.opportunity.history,lost_reason",0,Reason for loss,Ursache für Verlust,0
-field,"sale.opportunity.history,opportunity",0,Sale Opportunity,Verkaufschance,0
-field,"sale.opportunity.history,party",0,Party,Partei,0
-field,"sale.opportunity.history,probability",0,Conversion Probability,Umwandlungswahrscheinlichkeit,0
-field,"sale.opportunity.history,rec_name",0,Name,Name,0
-field,"sale.opportunity.history,start_date",0,Start Date,Anfangsdatum,0
-field,"sale.opportunity.history,state",0,State,Status,0
-field,"sale.opportunity.history,user",0,User,Benutzer,0
-field,"sale.opportunity.line,opportunity",0,Opportunity,Verkaufschance,0
-field,"sale.opportunity.line,product",0,Product,Artikel,0
-field,"sale.opportunity.line,quantity",0,Quantity,Anzahl,0
-field,"sale.opportunity.line,rec_name",0,Name,Name,0
-field,"sale.opportunity.line,sale_line",0,Sale Line,Position Verkauf,0
-field,"sale.opportunity.line,sequence",0,Sequence,Reihenfolge,0
-field,"sale.opportunity.line,unit",0,Unit,Einheit,0
-field,"sale.opportunity.line,unit_digits",0,Unit Digits,Einheit Anzahl Stellen,0
-field,"sale.opportunity_employee,amount",0,Amount,Betrag,0
-field,"sale.opportunity_employee,company",0,Company,Unternehmen,0
-field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
-field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
-field,"sale.opportunity_employee,converted",0,Converted,Umgewandelt,0
-field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
-field,"sale.opportunity_employee,currency",0,Currency,Währung,0
-field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.opportunity_employee,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity_employee,lost",0,Lost,Verlust,0
-field,"sale.opportunity_employee,number",0,Number,Nummer,0
-field,"sale.opportunity_employee,rec_name",0,Name,Name,0
-field,"sale.opportunity_employee_monthly,amount",0,Amount,Betrag,0
-field,"sale.opportunity_employee_monthly,company",0,Company,Unternehmen,0
-field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
-field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
-field,"sale.opportunity_employee_monthly,converted",0,Converted,Umgewandelt,0
-field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
-field,"sale.opportunity_employee_monthly,currency",0,Currency,Währung,0
-field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.opportunity_employee_monthly,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity_employee_monthly,lost",0,Lost,Verlust,0
-field,"sale.opportunity_employee_monthly,month",0,Month,Monat,0
-field,"sale.opportunity_employee_monthly,number",0,Number,Nummer,0
-field,"sale.opportunity_employee_monthly,rec_name",0,Name,Name,0
-field,"sale.opportunity_employee_monthly,year",0,Year,Jahr,0
-field,"sale.opportunity_monthly,amount",0,Amount,Betrag,0
-field,"sale.opportunity_monthly,company",0,Company,Unternehmen,0
-field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
-field,"sale.opportunity_monthly,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
-field,"sale.opportunity_monthly,converted",0,Converted,Umgewandelt,0
-field,"sale.opportunity_monthly,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
-field,"sale.opportunity_monthly,currency",0,Currency,Währung,0
-field,"sale.opportunity_monthly,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.opportunity_monthly,lost",0,Lost,Verlust,0
-field,"sale.opportunity_monthly,month",0,Month,Monat,0
-field,"sale.opportunity_monthly,number",0,Number,Nummer,0
-field,"sale.opportunity_monthly,rec_name",0,Name,Name,0
-field,"sale.opportunity_monthly,year",0,Year,Jahr,0
-field,"sale.opportunity_monthly,year_month",0,Year-Month,Jahr-Monat,0
-help,"sale.opportunity,amount",0,Estimated revenue amount,Geschätzter Ertrag,0
-help,"sale.opportunity,probability",0,Percentage between 0 and 100,Prozentsatz zwischen 0 und 100,0
-help,"sale.opportunity_employee,conversion_amount_rate",0,In %,In %,0
-help,"sale.opportunity_employee,conversion_rate",0,In %,In %,0
-help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,In %,0
-help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,In %,0
-help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,In %,0
-help,"sale.opportunity_monthly,conversion_rate",0,In %,In %,0
-model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
-model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
-model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
-model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Annullierte Interessenten und Verkaufschancen,0
-model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Umgewandelte Verkaufschancen,0
-model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Offene Interessenten,0
-model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Verluste Interessenten und Verkaufschancen,0
-model,"ir.action,name",act_opportunity_form_new,New Lead,Neuer Interessent,0
-model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
-model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
-model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
-model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
-model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Annullierte Interessenten und Verkaufschancen,0
-model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Umgewandelte Verkaufschancen,0
-model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Offene Interessenten,0
-model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Verluste Interessenten und Verkaufschancen,0
-model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Neuer Interessent,0
-model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
-model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Auswertungen,0
-model,"res.group,name",group_opportunity,Sale Opportunity,Verkaufschance,0
-model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Verkaufschancen pro Mitarbeiter Öffnen,0
-model,"sale.opportunity,name",0,Sale Opportunity,Verkaufschance,0
-model,"sale.opportunity.history,name",0,Sale Opportunity History,Verkaufschancen Verlauf,0
-model,"sale.opportunity.line,name",0,Sale Opportunity Line,Verkaufschance Position,0
-model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Verkaufschance pro Mitarbeiter,0
-model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Verkaufschance pro Mitarbeiter pro Monat,0
-model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Verkaufschance pro Monat,0
-model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Verkaufschancen Workflow,0
-model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Annulliert,0
-model,"workflow.activity,name",opportunity_activity_converted,Converted,Umgewandelt,0
-model,"workflow.activity,name",opportunity_activity_lead,Lead,Interessent,0
-model,"workflow.activity,name",opportunity_activity_lost,Lost,Verlust,0
-model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Verkaufschance,0
-selection,"sale.opportunity,state",0,Cancelled,Annulliert,0
-selection,"sale.opportunity,state",0,Converted,Umgewandelt,0
-selection,"sale.opportunity,state",0,Lead,Interessent,0
-selection,"sale.opportunity,state",0,Lost,Verlust,0
-selection,"sale.opportunity,state",0,Opportunity,Verkaufschance,0
-selection,"sale.opportunity.history,state",0,Cancelled,Annulliert,0
-selection,"sale.opportunity.history,state",0,Converted,Umgewandelt,0
-selection,"sale.opportunity.history,state",0,Lead,Interessent,0
-selection,"sale.opportunity.history,state",0,Lost,Verlust,0
-selection,"sale.opportunity.history,state",0,Opportunity,Chance,0
-view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-view,sale.opportunity,0,Cancel,Annullieren,0
-view,sale.opportunity,0,Convert to Opportunity,In Verkaufschance umwandeln,0
-view,sale.opportunity,0,Convert to Sale,In Verkauf umwandeln,0
-view,sale.opportunity,0,Lead/Opportunity,Interessent/Chance,0
-view,sale.opportunity,0,Mark as Lost,Als Verlust markieren,0
-view,sale.opportunity,0,Reset as Lead,Auf Interessent zurücksetzen,0
-view,sale.opportunity,0,Sale Lead/Opportunity,Interessent/Verkaufschance,0
-view,sale.opportunity,0,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
-view,sale.opportunity,0,Set as Lead,Auf Interessent setzen,0
-view,sale.opportunity.history,0,History,Verlauf,0
-view,sale.opportunity.history,0,Lead/Opportunity,Interessent/Chance,0
-view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Interessent/Verkaufschance,0
-view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Interessenten/Verkaufschancen,0
-view,sale.opportunity_employee,0,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Monat,0
-view,sale.opportunity_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Mitarbeiter,0
-wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Annullieren,0
-wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Öffnen,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index a4140b0..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,162 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,sale.opportunity,0,Probability must be between 0 and 100!,La probabilité doit être entre 0 et 100 !,0
-field,"sale.open_opportunity_employee.init,end_date",0,End Date,Date de fin,0
-field,"sale.open_opportunity_employee.init,start_date",0,Start Date,Date de début,0
-field,"sale.opportunity,address",0,Address,Adresse,0
-field,"sale.opportunity,amount",0,Amount,Montant,0
-field,"sale.opportunity,comment",0,Comment,Commentaire,0
-field,"sale.opportunity,company",0,Company,Société,0
-field,"sale.opportunity,currency",0,Currency,Devise,0
-field,"sale.opportunity,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"sale.opportunity,description",0,Description,Description,0
-field,"sale.opportunity,employee",0,Employee,Employé,0
-field,"sale.opportunity,end_date",0,End Date,Date de fin,0
-field,"sale.opportunity,history",0,History,Historique,0
-field,"sale.opportunity,lines",0,Lines,Lignes,0
-field,"sale.opportunity,lost_reason",0,Reason for loss,Raison de la perte,0
-field,"sale.opportunity,party",0,Party,Tiers,0
-field,"sale.opportunity,payment_term",0,Payment Term,Conditions de paiement,0
-field,"sale.opportunity,probability",0,Conversion Probability,Probabilité de conversion,0
-field,"sale.opportunity,rec_name",0,Name,Nom,0
-field,"sale.opportunity,sale",0,Sale,Vente,0
-field,"sale.opportunity,start_date",0,Start Date,Date de début,0
-field,"sale.opportunity,state",0,State,État,0
-field,"sale.opportunity,warehouse",0,Warehouse,Entrepôt,0
-field,"sale.opportunity.history,address",0,Address,Adresse,0
-field,"sale.opportunity.history,comment",0,Comment,Commentaire,0
-field,"sale.opportunity.history,company",0,Company,Société,0
-field,"sale.opportunity.history,date",0,Change Date,Date de modification,0
-field,"sale.opportunity.history,description",0,Description,Description,0
-field,"sale.opportunity.history,employee",0,Employee,Employé,0
-field,"sale.opportunity.history,end_date",0,End Date,Date de fin,0
-field,"sale.opportunity.history,lines",0,Lines,Lignes,0
-field,"sale.opportunity.history,lost_reason",0,Reason for loss,Raison de la perte,0
-field,"sale.opportunity.history,opportunity",0,Sale Opportunity,Opportunité de vente,0
-field,"sale.opportunity.history,party",0,Party,Tiers,0
-field,"sale.opportunity.history,probability",0,Conversion Probability,Probabilité de conversion,0
-field,"sale.opportunity.history,rec_name",0,Name,Nom,0
-field,"sale.opportunity.history,start_date",0,Start Date,Date de début,0
-field,"sale.opportunity.history,state",0,State,État,0
-field,"sale.opportunity.history,user",0,User,Utilisateur,0
-field,"sale.opportunity.line,opportunity",0,Opportunity,Opportunité,0
-field,"sale.opportunity.line,product",0,Product,Produit,0
-field,"sale.opportunity.line,quantity",0,Quantity,Quantité,0
-field,"sale.opportunity.line,rec_name",0,Name,Nom,0
-field,"sale.opportunity.line,sale_line",0,Sale Line,Ligne de vente,0
-field,"sale.opportunity.line,sequence",0,Sequence,Séquence,0
-field,"sale.opportunity.line,unit",0,Unit,Unité,0
-field,"sale.opportunity.line,unit_digits",0,Unit Digits,Décimales de l'unité,0
-field,"sale.opportunity_employee,amount",0,Amount,Montant,0
-field,"sale.opportunity_employee,company",0,Company,Société,0
-field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
-field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Taux de conversion,0
-field,"sale.opportunity_employee,converted",0,Converted,Convertie,0
-field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Montant convertit,0
-field,"sale.opportunity_employee,currency",0,Currency,Devise,0
-field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"sale.opportunity_employee,employee",0,Employee,Employé,0
-field,"sale.opportunity_employee,lost",0,Lost,Perdue,0
-field,"sale.opportunity_employee,number",0,Number,Nombre,0
-field,"sale.opportunity_employee,rec_name",0,Name,Nom,0
-field,"sale.opportunity_employee_monthly,amount",0,Amount,Montant,0
-field,"sale.opportunity_employee_monthly,company",0,Company,Société,0
-field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
-field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Taux de conversion,0
-field,"sale.opportunity_employee_monthly,converted",0,Converted,Convertie,0
-field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Montant converti,0
-field,"sale.opportunity_employee_monthly,currency",0,Currency,Devise,0
-field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"sale.opportunity_employee_monthly,employee",0,Employee,Employé,0
-field,"sale.opportunity_employee_monthly,lost",0,Lost,Perdue,0
-field,"sale.opportunity_employee_monthly,month",0,Month,Mois,0
-field,"sale.opportunity_employee_monthly,number",0,Number,Nombre,0
-field,"sale.opportunity_employee_monthly,rec_name",0,Name,Nom,0
-field,"sale.opportunity_employee_monthly,year",0,Year,Année,0
-field,"sale.opportunity_monthly,amount",0,Amount,Montant,0
-field,"sale.opportunity_monthly,company",0,Company,Société,0
-field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
-field,"sale.opportunity_monthly,conversion_rate",0,Conversion Rate,Taux de conversion,0
-field,"sale.opportunity_monthly,converted",0,Converted,Convertie,0
-field,"sale.opportunity_monthly,converted_amount",0,Converted Amount,Montant converti,0
-field,"sale.opportunity_monthly,currency",0,Currency,Devise,0
-field,"sale.opportunity_monthly,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"sale.opportunity_monthly,lost",0,Lost,Perdue,0
-field,"sale.opportunity_monthly,month",0,Month,Mois,0
-field,"sale.opportunity_monthly,number",0,Number,Nombre,0
-field,"sale.opportunity_monthly,rec_name",0,Name,Nom,0
-field,"sale.opportunity_monthly,year",0,Year,Année,0
-field,"sale.opportunity_monthly,year_month",0,Year-Month,Année-Mois,0
-help,"sale.opportunity,amount",0,Estimated revenue amount,Revenu estimé,0
-help,"sale.opportunity,probability",0,Percentage between 0 and 100,Pourcentage entre 0 et 100,0
-help,"sale.opportunity_employee,conversion_amount_rate",0,In %,En %,0
-help,"sale.opportunity_employee,conversion_rate",0,In %,En %,0
-help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,En %,0
-help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,En %,0
-help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,En %,0
-help,"sale.opportunity_monthly,conversion_rate",0,In %,En %,0
-model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
-model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Opportunités par employé,0
-model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
-model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Opportunités,0
-model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Contacts commerciaux / Opportunités de vente,0
-model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Opportunités annulées,0
-model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Opportunités converties,0
-model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Contacts commerciaux ouverts,0
-model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Opportunités perdues,0
-model,"ir.action,name",act_opportunity_form_new,New Lead,Nouveau contact commercial,0
-model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Opportunités,0
-model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Opportunités par mois,0
-model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
-model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
-model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Contacts et opportunités de vente,0
-model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Opportunités annulées,0
-model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Opportunités converties,0
-model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Contatcs commerciaux ouverts,0
-model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Opportunités perdues,0
-model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Nouveau contact commercial,0
-model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Opportunités,0
-model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Opportunités par mois,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
-model,"res.group,name",group_opportunity,Sale Opportunity,Opportunités de vente,0
-model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Opportunités de vente par employé - Init,0
-model,"sale.opportunity,name",0,Sale Opportunity,Opportunités de vente,0
-model,"sale.opportunity.history,name",0,Sale Opportunity History,Historique des opportunités de vente,0
-model,"sale.opportunity.line,name",0,Sale Opportunity Line,Ligne d'opportunité de vente,0
-model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Opportunités de vente par employé,0
-model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Opportunités de vente par employé par mois,0
-model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Opportunités de vente par mois,0
-model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Workflow opportunité de vente,0
-model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Annulée,0
-model,"workflow.activity,name",opportunity_activity_converted,Converted,Convertie,0
-model,"workflow.activity,name",opportunity_activity_lead,Lead,Contact,0
-model,"workflow.activity,name",opportunity_activity_lost,Lost,Perdue,0
-model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Opportunité,0
-selection,"sale.opportunity,state",0,Cancelled,Annulée,0
-selection,"sale.opportunity,state",0,Converted,Convertie,0
-selection,"sale.opportunity,state",0,Lead,Contact,0
-selection,"sale.opportunity,state",0,Lost,Perdue,0
-selection,"sale.opportunity,state",0,Opportunity,Opportunité,0
-selection,"sale.opportunity.history,state",0,Cancelled,Annulée,0
-selection,"sale.opportunity.history,state",0,Converted,Convertie,0
-selection,"sale.opportunity.history,state",0,Lead,Contact,0
-selection,"sale.opportunity.history,state",0,Lost,Perdue,0
-selection,"sale.opportunity.history,state",0,Opportunity,Opportunité,0
-view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Opportunités de vente par employé,0
-view,sale.opportunity,0,Cancel,Annuler,0
-view,sale.opportunity,0,Convert to Opportunity,Convertir en opportunité,0
-view,sale.opportunity,0,Convert to Sale,Convertir en vente,0
-view,sale.opportunity,0,Lead/Opportunity,Contact / Opportunité,0
-view,sale.opportunity,0,Mark as Lost,Marquer comme perdue,0
-view,sale.opportunity,0,Reset as Lead,Reconvertir en contact,0
-view,sale.opportunity,0,Sale Lead/Opportunity,Contact commercial / Opportunité de vente,0
-view,sale.opportunity,0,Sales Leads/Opportunities,Contacts commerciaux / Opportunités,0
-view,sale.opportunity,0,Set as Lead,Reconvertir en contact,0
-view,sale.opportunity.history,0,History,Historique,0
-view,sale.opportunity.history,0,Lead/Opportunity,Contact / Opportunité,0
-view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Ligne de contact / Opportunité de vente,0
-view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Lignes de contacts / Opportunités de vente,0
-view,sale.opportunity_employee,0,Opportunities per Employee,Opportunités par employé,0
-view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
-view,sale.opportunity_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
-wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Annuler,0
-wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Ouvrir,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..36cf9d4
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,639 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr "Вероятността трябва да бъде между 0 и 100!"
+
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Крайна дата"
+
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Начална дата"
+
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Адрес"
+
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Коментар"
+
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Валута"
+
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Описание"
+
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Крайна дата"
+
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr "Изтория"
+
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Редове"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr "Причина за загуба"
+
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Партньор"
+
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr "Условие за плащане"
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr "Вероятност за преобразуване"
+
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr "Продажба"
+
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Начална дата"
+
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "Състояние"
+
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Склад"
+
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Адрес"
+
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Коментар"
+
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr "Промяна на дата"
+
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Описание"
+
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Крайна дата"
+
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Редове"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr "Причина за загуба"
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr "Възможност за продажба"
+
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Партньор"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr "Вероятност за преобразуване"
+
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Начална дата"
+
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "Състояние"
+
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Потребител"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr "Възможност"
+
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Продукт"
+
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Количество"
+
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr "Ред от продажба"
+
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Последователност"
+
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Единица"
+
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Десетични единици"
+
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Обменен курс"
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Обменен курс"
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr "Конвертиран"
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Конвертирана сума"
+
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Валута"
+
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr "Номер"
+
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Обменен курс"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Обменен курс"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr "Конвертиран"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Конвертирана сума"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Валута"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Служител"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr "Месец"
+
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr "Номер"
+
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr "Година"
+
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr "Сума"
+
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Фирма"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Обменен курс"
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Обменен курс"
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr "Конвертиран"
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Конвертирана сума"
+
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Валута"
+
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Цифри за валута"
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr "Месец"
+
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr "Номер"
+
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr "Година"
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr "Година-Месец"
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr "Очаквани приходи"
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr "Процент между 0 и 100"
+
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr "В %"
+
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr "В %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "В %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "В %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "В %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "В %"
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr "Възможности по служител"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr "Възможности по служител"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Възможности по служител по месец"
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Инициативи и възможности"
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr "Инициативи/Възможности за продажба"
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Отказани инициативи и възможности"
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Конвертирани възможности"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Отворени инициативи"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Изгубени ициативи и възможности"
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Възможности"
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Възможности по месец"
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr "Възможности по служител"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Възможности по служител по месец"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Инициативи и възможности"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Отказани инициативи и възможности"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Конвертирани възможности"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Отворени инициативи"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Изгубени ициативи и възможности"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Възможности"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Възможности по месец"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Справки"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr "Възможност за продажба"
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr "Начално отваряне на възможмост за продажба по служител"
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr "Възможност за продажба"
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr "История на възможност за продажба"
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr "Ред от възможност за продажба"
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr "Възможност за продажба за служител"
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr "Възможност за продажба за служител за месец"
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr "Възможност за продажа по месец"
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr "Работен процес на възможност за продажба"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr "Отказан"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr "Конвертиран"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr "Възможност"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr "Възможност"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr "Отказан"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr "Конвертиран"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr "Инициатива"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr "Възможност"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr "Отказан"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr "Конвертиран"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr "Инициатива"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr "Изгубен"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr "Възможност"
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr "Възможности за продажба по служител"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr "Изтория"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr "Инициатива/Възможност"
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr "Ред на инициатива/възможност за продажба"
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr "Редове от инициативи/възможности за продажба"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr "Превръщане във възможност"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr "Прехвърлено в продажба"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr "Инициатива/Възможност"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr "Отбелязване като загубен"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr "Прехвърляне в инициатива"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr "Инициатива/Възможност за продажба"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr "Инициативи/Възможности за продажба"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr "Прехвърляне в инициатива"
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr "Възможности по служител"
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr "Възможности за продажба по месец"
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr "Възможности за продажба по месец"
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Отказ"
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Отваряне"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..36effab
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,639 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr ""
+
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr ""
+
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr ""
+
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr ""
+
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr ""
+
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr ""
+
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr ""
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr ""
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr ""
+
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr ""
+
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr ""
+
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr ""
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr ""
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr ""
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr ""
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr ""
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr ""
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr ""
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr ""
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..3b53c3a
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,639 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr "Wahrscheinlichkeit muss zwischen 0 und 100 liegen!"
+
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Enddatum"
+
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Adresse"
+
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Kommentar"
+
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Bezeichnung"
+
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Enddatum"
+
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr "Verlauf"
+
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Positionen"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr "Ursache für Verlust"
+
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Partei"
+
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr "Zahlungsbedingung"
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr "Umwandlungswahrscheinlichkeit"
+
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr "Verkauf"
+
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "Status"
+
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Warenlager"
+
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Adresse"
+
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Kommentar"
+
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr "Änderungsdatum"
+
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Bezeichnung"
+
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Enddatum"
+
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Positionen"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr "Ursache für Verlust"
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Partei"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr "Umwandlungswahrscheinlichkeit"
+
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "Status"
+
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Benutzer"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Artikel"
+
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Anzahl"
+
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr "Position Verkauf"
+
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Reihenfolge"
+
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Einheit"
+
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Einheit Anzahl Stellen"
+
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Umwandlungsrate Betrag"
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Umwandlungsrate"
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr "Umgewandelt"
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Umgewandelter Betrag"
+
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr "Verlust"
+
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr "Nummer"
+
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Umwandlungsrate Betrag"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Umwandlungsrate"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr "Umgewandelt"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Umgewandelter Betrag"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Mitarbeiter"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr "Verlust"
+
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr "Monat"
+
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr "Nummer"
+
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr "Jahr"
+
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr "Betrag"
+
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Unternehmen"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Umwandlungsrate Betrag"
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Umwandlungsrate"
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr "Umgewandelt"
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Umgewandelter Betrag"
+
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Währung"
+
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Währung (signifikante Stellen)"
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr "Verlust"
+
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr "Monat"
+
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr "Nummer"
+
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr "Jahr"
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr "Jahr-Monat"
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr "Geschätzter Ertrag"
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr "Prozentsatz zwischen 0 und 100"
+
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Interessenten und Verkaufschancen"
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr "Interessenten/Verkaufschancen"
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Annullierte Interessenten und Verkaufschancen"
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Umgewandelte Verkaufschancen"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Offene Interessenten"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Verluste Interessenten und Verkaufschancen"
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Verkaufschancen"
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Verkaufschancen pro Monat"
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Verkaufschancen pro Mitarbeiter pro Monat"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Interessenten und Verkaufschancen"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Annullierte Interessenten und Verkaufschancen"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Umgewandelte Verkaufschancen"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Offene Interessenten"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Verluste Interessenten und Verkaufschancen"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Verkaufschancen"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Verkaufschancen pro Monat"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Auswertungen"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr "Verkaufschancen pro Mitarbeiter Öffnen"
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr "Verkaufschancen Verlauf"
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr "Verkaufschance Position"
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr "Verkaufschance pro Mitarbeiter"
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr "Verkaufschance pro Mitarbeiter pro Monat"
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr "Verkaufschance pro Monat"
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr "Verkaufschancen Workflow"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr "Annulliert"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr "Umgewandelt"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr "Interessent"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr "Verlust"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr "Annulliert"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr "Umgewandelt"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr "Interessent"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr "Verlust"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr "Verkaufschance"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr "Annulliert"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr "Umgewandelt"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr "Interessent"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr "Verlust"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr "Chance"
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr "Verlauf"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr "Interessent/Chance"
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr "Interessent/Verkaufschance"
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr "Interessenten/Verkaufschancen"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Annullieren"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr "In Verkaufschance umwandeln"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr "In Verkauf umwandeln"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr "Interessent/Chance"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr "Als Verlust markieren"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr "Auf Interessent zurücksetzen"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr "Interessent/Verkaufschance"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr "Interessenten/Verkaufschancen"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr "Auf Interessent setzen"
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr "Verkaufschancen pro Monat"
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr "Verkaufschancen pro Mitarbeiter"
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Annullieren"
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Öffnen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..3af37d4
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,716 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Fecha Final"
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Fecha Inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Dirección"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Fecha Final"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr "Historia"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Líneas de Inventario"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Terceros"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr "Término de Pago"
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr "Ventas"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Fecha Inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "Estado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Depósito"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Dirección"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Fecha Final"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Líneas de Inventario"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Terceros"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Fecha Inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "Estado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Productos"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr "Línea de Venta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Unidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Dígitos de Unidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr "Mes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr "Año"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Gestión de Moneda"
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr "Mes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nombre de Contacto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr ""
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr ""
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr ""
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Reportes"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr ""
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr ""
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr ""
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr ""
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr "Historia"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Abrir"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..721fb11
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,716 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Fecha final"
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Dirección"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Fecha final"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr "Histórico"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Terceros"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr "Término de pago"
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Nombre del campo"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr "Venta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "Estado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Depósito"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Dirección"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Fecha final"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Terceros"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Nombre del campo"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "Estado"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Usuario"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Producto"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre del campo"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr "Línea de venta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Unidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Dígitos unitarios"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Nombre del campo"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Empleado"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr "Mes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nombre del campo"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr "Año"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Gestión de divisas"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de la divisa"
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr "Mes"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr "Número"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nombre del campo"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr "Año"
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr ""
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr ""
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr ""
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "en %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "en %"
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Informes"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr ""
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr ""
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr ""
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr ""
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr "Histórico"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Abrir"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..a7541ed
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,639 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr "La probabilité doit être entre 0 et 100 !"
+
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Date de fin"
+
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Date de début"
+
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Adresse"
+
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Commentaire"
+
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Devise"
+
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Description"
+
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Date de fin"
+
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr "Historique"
+
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Lignes"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr "Raison de la perte"
+
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Tiers"
+
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr "Conditions de paiement"
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr "Probabilité de conversion"
+
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr "Vente"
+
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Date de début"
+
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "État"
+
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Adresse"
+
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Commentaire"
+
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr "Date de modification"
+
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Description"
+
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Date de fin"
+
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Lignes"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr "Raison de la perte"
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr "Opportunité de vente"
+
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Tiers"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr "Probabilité de conversion"
+
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Date de début"
+
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "État"
+
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Utilisateur"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr "Opportunité"
+
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Produit"
+
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Quantité"
+
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr "Ligne de vente"
+
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Séquence"
+
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Unité"
+
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Décimales de l'unité"
+
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Taux de conversion des montants"
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Taux de conversion"
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr "Convertie"
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Montant convertit"
+
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Devise"
+
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr "Nombre"
+
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Taux de conversion des montants"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Taux de conversion"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr "Convertie"
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Montant converti"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Devise"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Employé"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr "Mois"
+
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr "Nombre"
+
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr "Année"
+
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr "Montant"
+
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Société"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr "Taux de conversion des montants"
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr "Taux de conversion"
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr "Convertie"
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr "Montant converti"
+
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Devise"
+
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Décimales de la devise"
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr "Mois"
+
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr "Nombre"
+
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr "Année"
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr "Année-Mois"
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr "Revenu estimé"
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr "Pourcentage entre 0 et 100"
+
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr "En %"
+
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr "En %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "En %"
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "En %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "En %"
+
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "En %"
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr "Opportunités par employé"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr "Opportunités par employé"
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Opportunités par employé par mois"
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Opportunités"
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr "Contacts commerciaux / Opportunités de vente"
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Opportunités annulées"
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Opportunités converties"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Contacts commerciaux ouverts"
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Opportunités perdues"
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Opportunités"
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Opportunités par mois"
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr "Opportunités par employé"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr "Opportunités par employé par mois"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr "Contacts et opportunités de vente"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr "Opportunités annulées"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr "Opportunités converties"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr "Contatcs commerciaux ouverts"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr "Opportunités perdues"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr "Opportunités"
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr "Opportunités par mois"
+
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Rapports"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr "Opportunités de vente"
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr "Opportunités de vente par employé - Init"
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr "Opportunités de vente"
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr "Historique des opportunités de vente"
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr "Ligne d'opportunité de vente"
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr "Opportunités de vente par employé"
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr "Opportunités de vente par employé par mois"
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr "Opportunités de vente par mois"
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr "Workflow opportunité de vente"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr "Annulée"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr "Convertie"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr "Contact"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr "Opportunité"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr "Annulée"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr "Convertie"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr "Contact"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr "Opportunité"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr "Annulée"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr "Convertie"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr "Contact"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr "Perdue"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr "Opportunité"
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr "Opportunités de vente par employé"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr "Historique"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr "Contact / Opportunité"
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr "Ligne de contact / Opportunité de vente"
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr "Lignes de contacts / Opportunités de vente"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr "Convertir en opportunité"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr "Convertir en vente"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr "Contact / Opportunité"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr "Marquer comme perdue"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr "Reconvertir en contact"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr "Contact commercial / Opportunité de vente"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr "Contacts commerciaux / Opportunités"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr "Reconvertir en contact"
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr "Opportunités par employé"
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr "Opportunités de vente par mois"
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr "Opportunités de vente par mois"
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Annuler"
+
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Ouvrir"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..5aaf1a2
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,711 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Eind datum"
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Start datum"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Adres"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr "Bedrag"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Opmerking"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Valuta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Specificatie"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Eind datum"
+
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Regels"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Relaties"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr "Betalingstermijn"
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr "Verkoop"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Start datum"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "Status"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Adres"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Opmerking"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Specificatie"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Eind datum"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Regels"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Relaties"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Start datum"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "Status"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Gebruiker"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Producten"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr "Offerteregel"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Reeks"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Eenheid"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Decimalen eenheid"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr "Bedrag"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Valuta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr "Nummer"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr "Bedrag"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Valuta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Werknemer"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr "Maand"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr "Nummer"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr "Jaar"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr "Bedrag"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Bedrijf"
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Valuta"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Valuta decimalen"
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr "Maand"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr "Nummer"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr "Jaar"
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr ""
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr ""
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr ""
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr "In %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr "In %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "In %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "In %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr "In %"
+
+#, fuzzy
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr "In %"
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Rapportage"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr ""
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr ""
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr ""
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr ""
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr ""
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Open"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..2ed56eb
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,692 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:sale.opportunity:0"
+msgid "Probability must be between 0 and 100!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,end_date:0"
+msgid "End Date"
+msgstr "Дата окончания"
+
+#, fuzzy
+msgctxt "field:sale.open_opportunity_employee.init,start_date:0"
+msgid "Start Date"
+msgstr "Дата начала"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,address:0"
+msgid "Address"
+msgstr "Адрес"
+
+msgctxt "field:sale.opportunity,amount:0"
+msgid "Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,comment:0"
+msgid "Comment"
+msgstr "Комментарии"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+#, fuzzy
+msgctxt "field:sale.opportunity,currency:0"
+msgid "Currency"
+msgstr "Валюты"
+
+msgctxt "field:sale.opportunity,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,description:0"
+msgid "Description"
+msgstr "Описание"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,end_date:0"
+msgid "End Date"
+msgstr "Дата окончания"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,history:0"
+msgid "History"
+msgstr "Переписка"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,lines:0"
+msgid "Lines"
+msgstr "Строки"
+
+msgctxt "field:sale.opportunity,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,party:0"
+msgid "Party"
+msgstr "Организации"
+
+msgctxt "field:sale.opportunity,payment_term:0"
+msgid "Payment Term"
+msgstr ""
+
+msgctxt "field:sale.opportunity,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:sale.opportunity,sale:0"
+msgid "Sale"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity,start_date:0"
+msgid "Start Date"
+msgstr "Дата начала"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,state:0"
+msgid "State"
+msgstr "Статус"
+
+#, fuzzy
+msgctxt "field:sale.opportunity,warehouse:0"
+msgid "Warehouse"
+msgstr "Товарный склад"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,address:0"
+msgid "Address"
+msgstr "Адрес"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,comment:0"
+msgid "Comment"
+msgstr "Комментарии"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+msgctxt "field:sale.opportunity.history,date:0"
+msgid "Change Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,description:0"
+msgid "Description"
+msgstr "Описание"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,end_date:0"
+msgid "End Date"
+msgstr "Дата окончания"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,lines:0"
+msgid "Lines"
+msgstr "Строки"
+
+msgctxt "field:sale.opportunity.history,lost_reason:0"
+msgid "Reason for loss"
+msgstr ""
+
+msgctxt "field:sale.opportunity.history,opportunity:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,party:0"
+msgid "Party"
+msgstr "Организации"
+
+msgctxt "field:sale.opportunity.history,probability:0"
+msgid "Conversion Probability"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,start_date:0"
+msgid "Start Date"
+msgstr "Дата начала"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,state:0"
+msgid "State"
+msgstr "Статус"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.history,user:0"
+msgid "User"
+msgstr "Пользователь"
+
+msgctxt "field:sale.opportunity.line,opportunity:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,product:0"
+msgid "Product"
+msgstr "Товарно материальные ценности (ТМЦ)"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,quantity:0"
+msgid "Quantity"
+msgstr "Кол-во"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:sale.opportunity.line,sale_line:0"
+msgid "Sale Line"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,sequence:0"
+msgid "Sequence"
+msgstr "Последовательность"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit:0"
+msgid "Unit"
+msgstr "Штука"
+
+#, fuzzy
+msgctxt "field:sale.opportunity.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Группа цифр"
+
+msgctxt "field:sale.opportunity_employee,amount:0"
+msgid "Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+msgctxt "field:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,currency:0"
+msgid "Currency"
+msgstr "Валюты"
+
+msgctxt "field:sale.opportunity_employee,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+msgctxt "field:sale.opportunity_employee,lost:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee,number:0"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:sale.opportunity_employee_monthly,amount:0"
+msgid "Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,currency:0"
+msgid "Currency"
+msgstr "Валюты"
+
+msgctxt "field:sale.opportunity_employee_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,employee:0"
+msgid "Employee"
+msgstr "Сотрудник"
+
+msgctxt "field:sale.opportunity_employee_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,month:0"
+msgid "Month"
+msgstr ""
+
+msgctxt "field:sale.opportunity_employee_monthly,number:0"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_employee_monthly,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:sale.opportunity_employee_monthly,year:0"
+msgid "Year"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,amount:0"
+msgid "Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,company:0"
+msgid "Company"
+msgstr "Учет.орг."
+
+msgctxt "field:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "Conversion Amount Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,conversion_rate:0"
+msgid "Conversion Rate"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,converted_amount:0"
+msgid "Converted Amount"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,currency:0"
+msgid "Currency"
+msgstr "Валюты"
+
+msgctxt "field:sale.opportunity_monthly,currency_digits:0"
+msgid "Currency Digits"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,lost:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,month:0"
+msgid "Month"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,number:0"
+msgid "Number"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:sale.opportunity_monthly,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:sale.opportunity_monthly,year:0"
+msgid "Year"
+msgstr ""
+
+msgctxt "field:sale.opportunity_monthly,year_month:0"
+msgid "Year-Month"
+msgstr ""
+
+msgctxt "help:sale.opportunity,amount:0"
+msgid "Estimated revenue amount"
+msgstr ""
+
+msgctxt "help:sale.opportunity,probability:0"
+msgid "Percentage between 0 and 100"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee,conversion_amount_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee,conversion_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_employee_monthly,conversion_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_monthly,conversion_amount_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "help:sale.opportunity_monthly,conversion_rate:0"
+msgid "In %"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_form"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form2"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_open_sale_opportunity_employee"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_employee_monthly_form"
+msgid "Opportunities per Employee per Month"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form"
+msgid "Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_cancelled"
+msgid "Cancelled Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_converted"
+msgid "Converted Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lead"
+msgid "Opened Leads"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_lost"
+msgid "Lost Leads and Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_form_opportunity"
+msgid "Opportunities"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_opportunity_monthly_form"
+msgid "Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_reporting"
+msgid "Reporting"
+msgstr "Отчетность"
+
+msgctxt "model:res.group,name:group_opportunity"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.open_opportunity_employee.init,name:0"
+msgid "Open Sale Opportunity per Employee Init"
+msgstr ""
+
+msgctxt "model:sale.opportunity,name:0"
+msgid "Sale Opportunity"
+msgstr ""
+
+msgctxt "model:sale.opportunity.history,name:0"
+msgid "Sale Opportunity History"
+msgstr ""
+
+msgctxt "model:sale.opportunity.line,name:0"
+msgid "Sale Opportunity Line"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee,name:0"
+msgid "Sale Opportunity per Employee"
+msgstr ""
+
+msgctxt "model:sale.opportunity_employee_monthly,name:0"
+msgid "Sale Opportunity per Employee per Month"
+msgstr ""
+
+msgctxt "model:sale.opportunity_monthly,name:0"
+msgid "Sale Opportunity per Month"
+msgstr ""
+
+msgctxt "model:workflow,name:opportunity_workflow"
+msgid "Sales Opportunity Workflow"
+msgstr ""
+
+#, fuzzy
+msgctxt "model:workflow.activity,name:opportunity_activity_cancelled"
+msgid "Cancelled"
+msgstr "Отмененно"
+
+msgctxt "model:workflow.activity,name:opportunity_activity_converted"
+msgid "Converted"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lead"
+msgid "Lead"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_lost"
+msgid "Lost"
+msgstr ""
+
+msgctxt "model:workflow.activity,name:opportunity_activity_opportunity"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Cancelled"
+msgstr "Отмененно"
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity,state:0"
+msgid "Opportunity"
+msgstr ""
+
+#, fuzzy
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Cancelled"
+msgstr "Отмененно"
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Converted"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lead"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Lost"
+msgstr ""
+
+msgctxt "selection:sale.opportunity.history,state:0"
+msgid "Opportunity"
+msgstr ""
+
+msgctxt "view:sale.open_opportunity_employee.init:0"
+msgid "Sale Opportunities per Employee"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity.history:0"
+msgid "History"
+msgstr "Переписка"
+
+msgctxt "view:sale.opportunity.history:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sale Lead/Opportunity Line"
+msgstr ""
+
+msgctxt "view:sale.opportunity.line:0"
+msgid "Sales Leads/Opportunities Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "view:sale.opportunity:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Convert to Sale"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Mark as Lost"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Reset as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sale Lead/Opportunity"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Sales Leads/Opportunities"
+msgstr ""
+
+msgctxt "view:sale.opportunity:0"
+msgid "Set as Lead"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee:0"
+msgid "Opportunities per Employee"
+msgstr ""
+
+msgctxt "view:sale.opportunity_employee_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+msgctxt "view:sale.opportunity_monthly:0"
+msgid "Sale Opportunities per Month"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,end:0"
+msgid "Cancel"
+msgstr "Отменить"
+
+#, fuzzy
+msgctxt "wizard_button:sale.open_opportunity_employee,init,open:0"
+msgid "Open"
+msgstr "Открыть"
diff --git a/opportunity.py b/opportunity.py
index 99895ce..40f13c3 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -1,7 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 "Sales extension for managing leads and opportunities"
-from __future__ import with_statement
 import datetime
 import time
 from trytond.model import ModelView, ModelSQL, ModelWorkflow, fields
@@ -9,6 +8,7 @@ from trytond.wizard import Wizard
 from trytond.backend import FIELDS
 from trytond.pyson import Equal, Eval, Not, In, If, Get, PYSONEncoder
 from trytond.transaction import Transaction
+from trytond.pool import Pool
 
 STATES = [
     ('lead', 'Lead'),
@@ -18,11 +18,13 @@ STATES = [
     ('lost', 'Lost'),
 ]
 _STATES_START = {
-    'readonly': Not(Equal(Eval('state'), 'lead')),
-}
+    'readonly': Eval('state') != 'lead',
+    }
+_DEPENDS_START = ['state']
 _STATES_STOP = {
     'readonly': In(Eval('state'), ['converted', 'lost', 'cancelled']),
 }
+_DEPENDS_STOP = ['state']
 
 
 class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
@@ -33,16 +35,16 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
     _rec_name = 'description'
 
     party = fields.Many2One('party.party', 'Party', required=True, select=1,
-            states=_STATES_STOP, depends=['state'])
+            states=_STATES_STOP, depends=_DEPENDS_STOP)
     address = fields.Many2One('party.address', 'Address',
-            domain=[('party', '=', Eval('party'))],
-            select=2, depends=['party', 'state'],
-            states=_STATES_STOP)
+        domain=[('party', '=', Eval('party'))],
+        select=2, depends=['party', 'state'],
+        states=_STATES_STOP)
     company = fields.Many2One('company.company', 'Company', required=True,
-            select=1, states=_STATES_STOP, domain=[
-                ('id', If(In('company', Eval('context', {})), '=', '!='),
-                    Get(Eval('context', {}), 'company', 0)),
-            ], on_change=['company'], depends=['state'])
+        select=1, states=_STATES_STOP, domain=[
+            ('id', If(In('company', Eval('context', {})), '=', '!='),
+                Get(Eval('context', {}), 'company', 0)),
+            ], on_change=['company'], depends=_DEPENDS_STOP)
     currency = fields.Function(fields.Many2One('currency.currency',
         'Currency'), 'get_currency')
     currency_digits = fields.Function(fields.Integer('Currency Digits'),
@@ -50,31 +52,34 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
     amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
             depends=['currency_digits'], help='Estimated revenue amount')
     warehouse = fields.Many2One('stock.location', 'Warehouse',
-            domain=[('type', '=', 'warehouse')], states={
-                'required': Equal(Eval('state'), 'converted'),
-                'readonly': In(Eval('state'),
-                    ['converted', 'lost', 'cancelled']),
-            })
+        domain=[('type', '=', 'warehouse')], states={
+            'required': Eval('state') == 'converted',
+            'readonly': In(Eval('state'),
+                ['converted', 'lost', 'cancelled']),
+            },
+        depends=['state'])
     payment_term = fields.Many2One('account.invoice.payment_term',
-            'Payment Term', states={
-                'required': Equal(Eval('state'), 'converted'),
-                'readonly': In(Eval('state'),
-                    ['converted', 'lost', 'cancelled']),
-            })
+        'Payment Term', states={
+            'required': Eval('state') == 'converted',
+            'readonly': In(Eval('state'),
+                ['converted', 'lost', 'cancelled']),
+            },
+        depends=['state'])
     employee = fields.Many2One('company.employee', 'Employee', required=True,
             states=_STATES_STOP, depends=['state', 'company'],
             domain=[('company', '=', Eval('company'))])
     start_date = fields.Date('Start Date', required=True, select=1,
-            states=_STATES_START, depends=['state'])
+        states=_STATES_START, depends=_DEPENDS_START)
     end_date = fields.Date('End Date', select=2, readonly=True, states={
         'invisible': Not(In(Eval('state'),
             ['converted', 'cancelled', 'lost'])),
     }, depends=['state'])
     description = fields.Char('Description', required=True,
-            states=_STATES_STOP, depends=['state'])
-    comment = fields.Text('Comment', states=_STATES_STOP)
+        states=_STATES_STOP, depends=_DEPENDS_STOP)
+    comment = fields.Text('Comment', states=_STATES_STOP,
+        depends=_DEPENDS_STOP)
     lines = fields.One2Many('sale.opportunity.line', 'opportunity', 'Lines',
-            states=_STATES_STOP, depends=['state'])
+        states=_STATES_STOP, depends=_DEPENDS_STOP)
     state = fields.Selection(STATES, 'State', required=True, select=1,
             sort=False, readonly=True)
     probability = fields.Integer('Conversion Probability',
@@ -84,11 +89,11 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
     history = fields.One2Many('sale.opportunity.history', 'opportunity',
             'History', readonly=True)
     lost_reason = fields.Text('Reason for loss', states={
-        'invisible': Not(Equal(Eval('state'), 'lost')),
-    }, depends=['state'])
+            'invisible': Eval('state') != 'lost',
+            }, depends=['state'])
     sale = fields.Many2One('sale.sale', 'Sale', readonly=True, states={
-        'invisible': Not(Equal(Eval('state'), 'converted')),
-        }, depends=['state'])
+            'invisible': Eval('state') != 'converted',
+            }, depends=['state'])
 
     def __init__(self):
         super(SaleOpportunity, self).__init__()
@@ -106,7 +111,7 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         return 'lead'
 
     def default_start_date(self):
-        date_obj = self.pool.get('ir.date')
+        date_obj = Pool().get('ir.date')
         return date_obj.today()
 
     def default_probability(self):
@@ -116,8 +121,8 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         return Transaction().context.get('company') or False
 
     def default_employee(self):
-        user_obj = self.pool.get('res.user')
-        employee_obj = self.pool.get('company.employee')
+        user_obj = Pool().get('res.user')
+        employee_obj = Pool().get('company.employee')
 
         employee_id = False
         if Transaction().context.get('employee'):
@@ -129,14 +134,14 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         return employee_id
 
     def default_payment_term(self):
-        payment_term_obj = self.pool.get('account.invoice.payment_term')
+        payment_term_obj = Pool().get('account.invoice.payment_term')
         payment_term_ids = payment_term_obj.search(self.payment_term.domain)
         if len(payment_term_ids) == 1:
             return payment_term_ids[0]
         return False
 
     def default_warehouse(self):
-        location_obj = self.pool.get('stock.location')
+        location_obj = Pool().get('stock.location')
         location_ids = location_obj.search(self.warehouse.domain)
         if len(location_ids) == 1:
             return location_ids[0]
@@ -155,7 +160,7 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         return res
 
     def on_change_company(self, values):
-        company_obj = self.pool.get('company.company')
+        company_obj = Pool().get('company.company')
 
         res = {}
         if values.get('company'):
@@ -166,8 +171,8 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         return res
 
     def on_change_party(self, values):
-        party_obj = self.pool.get('party.party')
-        payment_term_obj = self.pool.get('account.invoice.payment_term')
+        party_obj = Pool().get('party.party')
+        payment_term_obj = Pool().get('account.invoice.payment_term')
 
         res = {
             'payment_term': False,
@@ -183,19 +188,6 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
                     res['payment_term']).rec_name
         return res
 
-    def set_end_date(self, opportunity_id, state):
-        """
-        This will fill the end_date for a lead/opportunity and change the state
-
-        :param opportunity_id: the id of the opportunity
-        :param state: the target state
-        """
-        date_obj = self.pool.get('ir.date')
-        self.write(opportunity_id, {
-            'end_date': date_obj.today(),
-            'state': state,
-            })
-
     def button_lead(self, ids):
         self.workflow_trigger_create(ids)
         return True
@@ -209,7 +201,7 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         :return: a dictionary with opportunity line id as key
             and a dictionary of sale line values as value
         '''
-        line_obj = self.pool.get('sale.opportunity.line')
+        line_obj = Pool().get('sale.opportunity.line')
         res = {}
         for line in opportunity.lines:
             val = line_obj.get_sale_line(line)
@@ -244,9 +236,10 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
 
         :param opportunity_id: the id of the opportunity
         '''
-        sale_obj = self.pool.get('sale.sale')
-        sale_line_obj = self.pool.get('sale.line')
-        line_obj = self.pool.get('sale.opportunity.line')
+        pool = Pool()
+        sale_obj = pool.get('sale.sale')
+        sale_line_obj = pool.get('sale.line')
+        line_obj = pool.get('sale.opportunity.line')
 
         opportunity = self.browse(opportunity_id)
 
@@ -269,6 +262,34 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
             })
         return sale_id
 
+    def wkf_lead(self, opportunity):
+        self.write(opportunity.id, {'state': 'lead'})
+
+    def wkf_opportunity(self, opportunity):
+        self.write(opportunity.id, {'state': 'opportunity'})
+
+    def wkf_converted(self, opportunity):
+        date_obj = Pool().get('ir.date')
+        self.write(opportunity.id, {
+                'end_date': date_obj.today(),
+                'state': 'converted',
+                })
+        self.create_sale(opportunity.id)
+
+    def wkf_cancelled(self, opportunity):
+        date_obj = Pool().get('ir.date')
+        self.write(opportunity.id, {
+                'end_date': date_obj.today(),
+                'state': 'cancelled',
+                })
+
+    def wkf_lost(self, opportunity):
+        date_obj = Pool().get('ir.date')
+        self.write(opportunity.id, {
+                'end_date': date_obj.today(),
+                'state': 'lost',
+                })
+
 SaleOpportunity()
 
 
@@ -289,9 +310,9 @@ class SaleOpportunityLine(ModelSQL, ModelView):
     unit_digits = fields.Function(fields.Integer('Unit Digits',
         on_change_with=['unit']), 'get_unit_digits')
     sale_line = fields.Many2One('sale.line', 'Sale Line', readonly=True,
-            states={
-                'invisible': Not(Equal(Get(Eval('_parent_opportunity', {}),
-                        'state'), 'converted')),
+        states={
+            'invisible': (Eval('_parent_opportunity', {}).get( 'state')
+                != 'converted'),
             })
 
     def __init__(self):
@@ -299,7 +320,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         self._order.insert(0, ('sequence', 'ASC'))
 
     def on_change_with_unit_digits(self, vals):
-        uom_obj = self.pool.get('product.uom')
+        uom_obj = Pool().get('product.uom')
         if vals.get('unit'):
             uom = uom_obj.browse(vals['unit'])
             return uom.digits
@@ -315,7 +336,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         return res
 
     def on_change_product(self, vals):
-        product_obj = self.pool.get('product.product')
+        product_obj = Pool().get('product.product')
 
         if not vals.get('product'):
             return {}
@@ -339,7 +360,7 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         :return: a dictionary with sale line fields as key
             and sale line values as value
         '''
-        sale_line_obj = self.pool.get('sale.line')
+        sale_line_obj = Pool().get('sale.line')
         res = {
             'type': 'line',
             'quantity': line.quantity,
@@ -400,7 +421,7 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
         self._order.insert(0, ('date', 'DESC'))
 
     def _table_query_fields(self):
-        opportunity_obj = self.pool.get('sale.opportunity')
+        opportunity_obj = Pool().get('sale.opportunity')
         table = '%s__history' % opportunity_obj._table
         return [
             'MIN("%s".__id) AS id' % table,
@@ -412,7 +433,7 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 and not hasattr(field, 'set')]
 
     def _table_query_group(self):
-        opportunity_obj = self.pool.get('sale.opportunity')
+        opportunity_obj = Pool().get('sale.opportunity')
         table = '%s__history' % opportunity_obj._table
         return [
             '"%s".id' % table,
@@ -423,7 +444,7 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 and not hasattr(field, 'set')]
 
     def table_query(self):
-        opportunity_obj = self.pool.get('sale.opportunity')
+        opportunity_obj = Pool().get('sale.opportunity')
         return (('SELECT ' + \
                 (', '.join(self._table_query_fields())) + \
                 ' FROM "%s__history" '
@@ -432,7 +453,7 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 opportunity_obj._table, [])
 
     def get_lines(self, ids, name):
-        line_obj = self.pool.get('sale.opportunity.line')
+        line_obj = Pool().get('sale.opportunity.line')
         histories = self.browse(ids)
         result = {}
         # We will always have only one id per call due to datetime_field
@@ -491,7 +512,7 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
         return ['lost']
 
     def table_query(self):
-        opportunity_obj = self.pool.get('sale.opportunity')
+        opportunity_obj = Pool().get('sale.opportunity')
         clause = ' '
         args = [True]
         if Transaction().context.get('start_date'):
@@ -591,8 +612,8 @@ class OpenSaleOpportunityEmployee(Wizard):
     }
 
     def _action_open(self, data):
-        model_data_obj = self.pool.get('ir.model.data')
-        act_window_obj = self.pool.get('ir.action.act_window')
+        model_data_obj = Pool().get('ir.model.data')
+        act_window_obj = Pool().get('ir.action.act_window')
         act_window_id = model_data_obj.get_id('sale_opportunity',
                 'act_opportunity_employee_form')
         res = act_window_obj.read(act_window_id)
@@ -644,7 +665,7 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
         return ['lost']
 
     def table_query(self):
-        opportunity_obj = self.pool.get('sale.opportunity')
+        opportunity_obj = Pool().get('sale.opportunity')
         type_id = FIELDS[self.id._type].sql_type(self.id)[0]
         type_year = FIELDS[self.year._type].sql_type(self.year)[0]
         return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
@@ -755,7 +776,7 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
         return ['lost']
 
     def table_query(self):
-        opportunity_obj = self.pool.get('sale.opportunity')
+        opportunity_obj = Pool().get('sale.opportunity')
         type_id = FIELDS[self.id._type].sql_type(self.id)[0]
         type_year = FIELDS[self.year._type].sql_type(self.year)[0]
         return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
diff --git a/opportunity.xml b/opportunity.xml
index c7a41ce..f91f1e3 100644
--- a/opportunity.xml
+++ b/opportunity.xml
@@ -7,8 +7,9 @@
         <record model="res.group" id="group_opportunity">
             <field name="name">Sale Opportunity</field>
         </record>
-        <record model="res.user" id="res.user_admin">
-            <field name="groups" eval="[('add', ref('group_opportunity'))]"/>
+        <record model="res.user-res.group" id="user_admin_group_opportunity">
+            <field name="user" ref="res.user_admin"/>
+            <field name="group" ref="group_opportunity"/>
         </record>
 
         <record model="ir.ui.view" id="opportunity_view_form">
@@ -94,14 +95,14 @@
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Sales Leads/Opportunities">
-                    <field name="start_date" select="2"/>
-                    <field name="end_date" select="2"/>
-                    <field name="description" select="2"/>
-                    <field name="party" select="1"/>
-                    <field name="amount" select="1"/>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="description"/>
+                    <field name="party"/>
+                    <field name="amount"/>
                     <field name="currency"/>
-                    <field name="state" select="1"/>
-                    <field name="probability" select="2"/>
+                    <field name="state"/>
+                    <field name="probability"/>
                 </tree>
                 ]]>
             </field>
@@ -124,23 +125,6 @@
         <menuitem parent="sale.menu_sale" action="act_opportunity_form"
             id="menu_opportunity_form" sequence="5"/>
 
-        <record model="ir.action.act_window" id="act_opportunity_form_new">
-            <field name="name">New Lead</field>
-            <field name="res_model">sale.opportunity</field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_new_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="opportunity_view_form"/>
-            <field name="act_window" ref="act_opportunity_form_new"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_opportunity_form_new_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="opportunity_view_tree"/>
-            <field name="act_window" ref="act_opportunity_form_new"/>
-        </record>
-        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_new"
-            id="menu_opportunity_form_new" sequence="10"/>
-
         <record model="ir.action.act_window" id="act_opportunity_form_lead">
             <field name="name">Opened Leads</field>
             <field name="res_model">sale.opportunity</field>
@@ -233,6 +217,14 @@
 
         <record model="ir.model.access" id="access_opportunity">
             <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_opportunity_sale">
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="group" ref="sale.group_sale"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
@@ -267,36 +259,30 @@
         <record model="workflow.activity" id="opportunity_activity_lead">
             <field name="name">Lead</field>
             <field name="workflow" ref="opportunity_workflow"/>
-            <field name="kind">function</field>
-            <field name="action">write({'state': 'lead'})</field>
+            <field name="method">wkf_lead</field>
             <field name="flow_start" eval="True"/>
         </record>
         <record model="workflow.activity" id="opportunity_activity_opportunity">
             <field name="name">Opportunity</field>
             <field name="workflow" ref="opportunity_workflow"/>
-            <field name="kind">function</field>
-            <field name="action">write({'state': 'opportunity'})</field>
+            <field name="method">wkf_opportunity</field>
         </record>
         <record model="workflow.activity" id="opportunity_activity_converted">
             <field name="name">Converted</field>
             <field name="workflow" ref="opportunity_workflow"/>
-            <field name="kind">function</field>
-            <field name="action">set_end_date('converted')
-create_sale()</field>
+            <field name="method">wkf_converted</field>
             <field name="flow_stop" eval="True"/>
         </record>
         <record model="workflow.activity" id="opportunity_activity_cancelled">
             <field name="name">Cancelled</field>
             <field name="workflow" ref="opportunity_workflow"/>
-            <field name="kind">function</field>
-            <field name="action">set_end_date('cancelled')</field>
+            <field name="method">wkf_cancelled</field>
             <field name="flow_stop" eval="True"/>
         </record>
         <record model="workflow.activity" id="opportunity_activity_lost">
             <field name="name">Lost</field>
             <field name="workflow" ref="opportunity_workflow"/>
-            <field name="kind">function</field>
-            <field name="action">set_end_date('lost')</field>
+            <field name="method">wkf_lost</field>
             <field name="flow_stop" eval="True"/>
         </record>
 
@@ -377,10 +363,10 @@ create_sale()</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Sales Leads/Opportunities Lines" fill="1" sequence="sequence">
-                    <field name="opportunity" select="1"/>
-                    <field name="product" select="1"/>
-                    <field name="quantity" select="2"/>
-                    <field name="unit" select="2"/>
+                    <field name="opportunity"/>
+                    <field name="product"/>
+                    <field name="quantity"/>
+                    <field name="unit"/>
                     <field name="sequence" tree_invisible="1"/>
                 </tree>
                 ]]>
@@ -389,10 +375,18 @@ create_sale()</field>
 
         <record model="ir.model.access" id="access_opportunity_line">
             <field name="model" search="[('model', '=', 'sale.opportunity.line')]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_opportunity_line_sale">
+            <field name="model" search="[('model', '=', 'sale.opportunity.line')]"/>
+            <field name="group" ref="sale.group_sale"/>
             <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_delete" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
         </record>
         <record model="ir.model.access" id="access_opportunity_line_opportunity">
             <field name="model" search="[('model', '=', 'sale.opportunity.line')]"/>
@@ -410,7 +404,7 @@ create_sale()</field>
                 <![CDATA[
                 <form string="History">
                     <label name="opportunity"/>
-                    <field name="opportunity" colspan="4"/>
+                    <field name="opportunity" colspan="3"/>
                     <label name="user"/>
                     <field name="user"/>
                     <label name="date"/>
@@ -456,14 +450,14 @@ create_sale()</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="History">
-                    <field name="date" select="1"/>
-                    <field name="user" select="1"/>
-                    <field name="start_date" select="2"/>
-                    <field name="end_date" select="2"/>
-                    <field name="description" select="2"/>
-                    <field name="party" select="2"/>
-                    <field name="state" select="1"/>
-                    <field name="probability" select="2"/>
+                    <field name="date"/>
+                    <field name="user"/>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="description"/>
+                    <field name="party"/>
+                    <field name="state"/>
+                    <field name="probability"/>
                 </tree>
                 ]]>
             </field>
@@ -471,10 +465,18 @@ create_sale()</field>
 
         <record model="ir.model.access" id="access_opportunity_history">
             <field name="model" search="[('model', '=', 'sale.opportunity.history')]"/>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_opportunity_history_sale">
+            <field name="model" search="[('model', '=', 'sale.opportunity.history')]"/>
+            <field name="group" ref="sale.group_sale"/>
             <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_delete" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
         </record>
         <record model="ir.model.access" id="access_opportunity_history_opportunity">
             <field name="model" search="[('model', '=', 'sale.opportunity.history')]"/>
@@ -502,14 +504,14 @@ create_sale()</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Opportunities per Employee">
-                    <field name="employee" select="1"/>
-                    <field name="number" select="1"/>
-                    <field name="converted" select="2"/>
-                    <field name="lost" select="2"/>
+                    <field name="employee"/>
+                    <field name="number"/>
+                    <field name="converted"/>
+                    <field name="lost"/>
                     <field name="conversion_rate"/>
-                    <field name="amount" select="1"/>
-                    <field name="converted_amount" select="2"/>
-                    <field name="currency" select="2"/>
+                    <field name="amount"/>
+                    <field name="converted_amount"/>
+                    <field name="currency"/>
                     <field name="conversion_amount_rate"/>
                 </tree>
                 ]]>
@@ -615,14 +617,14 @@ create_sale()</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Sale Opportunities per Month">
-                    <field name="year" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="number" select="2"/>
-                    <field name="converted" select="2"/>
-                    <field name="lost" select="2"/>
+                    <field name="year"/>
+                    <field name="month"/>
+                    <field name="number"/>
+                    <field name="converted"/>
+                    <field name="lost"/>
                     <field name="conversion_rate"/>
-                    <field name="amount" select="2"/>
-                    <field name="converted_amount" select="2"/>
+                    <field name="amount"/>
+                    <field name="converted_amount"/>
                     <field name="currency"/>
                     <field name="conversion_amount_rate"/>
                 </tree>
@@ -710,15 +712,15 @@ create_sale()</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Sale Opportunities per Month">
-                    <field name="year" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="employee" select="1"/>
-                    <field name="number" select="2"/>
-                    <field name="converted" select="2"/>
-                    <field name="lost" select="2"/>
+                    <field name="year"/>
+                    <field name="month"/>
+                    <field name="employee"/>
+                    <field name="number"/>
+                    <field name="converted"/>
+                    <field name="lost"/>
                     <field name="conversion_rate"/>
-                    <field name="amount" select="2"/>
-                    <field name="converted_amount" select="2"/>
+                    <field name="amount"/>
+                    <field name="converted_amount"/>
                     <field name="currency"/>
                     <field name="conversion_amount_rate"/>
                 </tree>
diff --git a/party.xml b/party.xml
index 678f5b9..1489849 100644
--- a/party.xml
+++ b/party.xml
@@ -11,7 +11,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.keyword"
                 id="act_open_sale_keyword1">
             <field name="keyword">form_relate</field>
-            <field name="model">party.party,0</field>
+            <field name="model">party.party,-1</field>
             <field name="action" ref="act_opportunity_form2"/>
         </record>
 
diff --git a/setup.py b/setup.py
index 15339c1..d0738ce 100644
--- a/setup.py
+++ b/setup.py
@@ -39,16 +39,20 @@ setup(name='trytond_sale_opportunity',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
+        'Framework :: Tryton',
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
+        'Natural Language :: Czech',
+        'Natural Language :: Dutch',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
+        'Natural Language :: Russian',
+        'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
diff --git a/tests/test_sale_opportunity.py b/tests/test_sale_opportunity.py
index b92dc76..b260192 100644
--- a/tests/test_sale_opportunity.py
+++ b/tests/test_sale_opportunity.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
 
 
 class SaleOpportunityTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class SaleOpportunityTestCase(unittest.TestCase):
         '''
         test_view('sale_opportunity')
 
+    def test0006depends(self):
+        '''
+        Test depends.
+        '''
+        test_depends()
+
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 1bd9b22..b5f4ee5 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 2.0.1
+Version: 2.2.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,21 +12,25 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 4d14d30..fc79201 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -4,9 +4,6 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
-bg_BG.csv
-de_DE.csv
-fr_FR.csv
 opportunity.xml
 party.xml
 setup.py
@@ -15,8 +12,18 @@ setup.py
 ./opportunity.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
 tests/__init__.py
+tests/__init__.pyc
 tests/test_sale_opportunity.py
+tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index a64aa5e..3ecbf68 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_party >= 2.0, < 2.1
-trytond_company >= 2.0, < 2.1
-trytond_product >= 2.0, < 2.1
-trytond_sale >= 2.0, < 2.1
-trytond_account >= 2.0, < 2.1
-trytond_stock >= 2.0, < 2.1
-trytond_currency >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_party >= 2.2, < 2.3
+trytond_company >= 2.2, < 2.3
+trytond_product >= 2.2, < 2.3
+trytond_sale >= 2.2, < 2.3
+trytond_account >= 2.2, < 2.3
+trytond_stock >= 2.2, < 2.3
+trytond_currency >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit d2805d5725bcbdb53937694f640f1b2c8eb464a8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 3 14:15:59 2011 +0200

    Adding upstream version 2.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index 4e03266..c032139 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.1 - 2011-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.0.0 - 2011-04-27
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 81fa068..73f413e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 2.0.0
+Version: 2.0.1
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
diff --git a/__tryton__.py b/__tryton__.py
index 347fd4b..8180590 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
     'name_bg_BG': 'Инициативи и възможности за продажба',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
     'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '2.0.0',
+    'version': '2.0.1',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
diff --git a/opportunity.py b/opportunity.py
index 4a78605..99895ce 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -3,6 +3,7 @@
 "Sales extension for managing leads and opportunities"
 from __future__ import with_statement
 import datetime
+import time
 from trytond.model import ModelView, ModelSQL, ModelWorkflow, fields
 from trytond.wizard import Wizard
 from trytond.backend import FIELDS
@@ -289,8 +290,8 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         on_change_with=['unit']), 'get_unit_digits')
     sale_line = fields.Many2One('sale.line', 'Sale Line', readonly=True,
             states={
-                'invisible': Not(Equal(Eval('_parent_opportunity.state'),
-                    'converted')),
+                'invisible': Not(Equal(Get(Eval('_parent_opportunity', {}),
+                        'state'), 'converted')),
             })
 
     def __init__(self):
@@ -449,6 +450,10 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
         # Remove microsecond from timestamp
         for values in res:
             if 'date' in values:
+                if isinstance(values['date'], basestring):
+                    values['date'] = datetime.datetime(
+                        *time.strptime(values['date'],
+                            '%Y-%m-%d %H:%M:%S.%f')[:6])
                 values['date'] = values['date'].replace(microsecond=0)
         return res
 
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index 33bf87d..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/test_sale_opportunity.pyc b/tests/test_sale_opportunity.pyc
deleted file mode 100644
index 02d3956..0000000
Binary files a/tests/test_sale_opportunity.pyc and /dev/null differ
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index fdaa361..1bd9b22 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 2.0.0
+Version: 2.0.1
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 1f515e3..4d14d30 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -16,9 +16,7 @@ setup.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
 tests/__init__.py
-tests/__init__.pyc
 tests/test_sale_opportunity.py
-tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
commit 6b6f34c46ca680ba2651bc56c638ef5d98ca3809
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 19:13:01 2011 +0200

    Adding upstream version 2.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 92df4e7..4e03266 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 1.8.1 - 2011-02-13
+Version 2.0.0 - 2011-04-27
 * Bug fixes (see mercurial logs for details)
 
 Version 1.8.0 - 2010-11-01
diff --git a/PKG-INFO b/PKG-INFO
index 91314af..81fa068 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 1.8.1
+Version: 2.0.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,7 +12,7 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -21,9 +21,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 8edd909..347fd4b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,9 +2,10 @@
 #this repository contains the full copyright notices and license terms.
 {
     'name': 'Sales Leads and Opportunities',
+    'name_bg_BG': 'Инициативи и възможности за продажба',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
     'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '1.8.1',
+    'version': '2.0.0',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
@@ -15,6 +16,12 @@
     - Record of lost leads
     - Opportunities to sale orders
 ''',
+    'description_bg_BG': '''Дава възможност за:
+    - Инициативи
+    - Превръшане на инициативи във възможности
+    - Запис на неосъществени инициативи
+    - Превръщане на възможности в поръчки за продажба
+''',
     'description_de_DE': '''Ermöglicht:
     - die Anlage von Interessenten (Leads)
     - die Umwandlung von Interessenten zu Verkaufschancen (Opportunities)
@@ -42,6 +49,7 @@
         'party.xml',
     ],
     'translation': [
+        'bg_BG.csv',
         'de_DE.csv',
         'fr_FR.csv',
     ],
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..64c42eb
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,162 @@
+type,name,res_id,src,value,fuzzy
+error,sale.opportunity,0,Probability must be between 0 and 100!,Вероятността трябва да бъде между 0 и 100!,0
+field,"sale.open_opportunity_employee.init,end_date",0,End Date,Крайна дата,0
+field,"sale.open_opportunity_employee.init,start_date",0,Start Date,Начална дата,0
+field,"sale.opportunity,address",0,Address,Адрес,0
+field,"sale.opportunity,amount",0,Amount,Сума,0
+field,"sale.opportunity,comment",0,Comment,Коментар,0
+field,"sale.opportunity,company",0,Company,Фирма,0
+field,"sale.opportunity,currency",0,Currency,Валута,0
+field,"sale.opportunity,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"sale.opportunity,description",0,Description,Описание,0
+field,"sale.opportunity,employee",0,Employee,Служител,0
+field,"sale.opportunity,end_date",0,End Date,Крайна дата,0
+field,"sale.opportunity,history",0,History,Изтория,0
+field,"sale.opportunity,lines",0,Lines,Редове,0
+field,"sale.opportunity,lost_reason",0,Reason for loss,Причина за загуба,0
+field,"sale.opportunity,party",0,Party,Партньор,0
+field,"sale.opportunity,payment_term",0,Payment Term,Условие за плащане,0
+field,"sale.opportunity,probability",0,Conversion Probability,Вероятност за преобразуване,0
+field,"sale.opportunity,rec_name",0,Name,Име,0
+field,"sale.opportunity,sale",0,Sale,Продажба,0
+field,"sale.opportunity,start_date",0,Start Date,Начална дата,0
+field,"sale.opportunity,state",0,State,Състояние,0
+field,"sale.opportunity,warehouse",0,Warehouse,Склад,0
+field,"sale.opportunity.history,address",0,Address,Адрес,0
+field,"sale.opportunity.history,comment",0,Comment,Коментар,0
+field,"sale.opportunity.history,company",0,Company,Фирма,0
+field,"sale.opportunity.history,date",0,Change Date,Промяна на дата,0
+field,"sale.opportunity.history,description",0,Description,Описание,0
+field,"sale.opportunity.history,employee",0,Employee,Служител,0
+field,"sale.opportunity.history,end_date",0,End Date,Крайна дата,0
+field,"sale.opportunity.history,lines",0,Lines,Редове,0
+field,"sale.opportunity.history,lost_reason",0,Reason for loss,Причина за загуба,0
+field,"sale.opportunity.history,opportunity",0,Sale Opportunity,Възможност за продажба,0
+field,"sale.opportunity.history,party",0,Party,Партньор,0
+field,"sale.opportunity.history,probability",0,Conversion Probability,Вероятност за преобразуване,0
+field,"sale.opportunity.history,rec_name",0,Name,Име,0
+field,"sale.opportunity.history,start_date",0,Start Date,Начална дата,0
+field,"sale.opportunity.history,state",0,State,Състояние,0
+field,"sale.opportunity.history,user",0,User,Потребител,0
+field,"sale.opportunity.line,opportunity",0,Opportunity,Възможност,0
+field,"sale.opportunity.line,product",0,Product,Продукт,0
+field,"sale.opportunity.line,quantity",0,Quantity,Количество,0
+field,"sale.opportunity.line,rec_name",0,Name,Име,0
+field,"sale.opportunity.line,sale_line",0,Sale Line,Ред от продажба,0
+field,"sale.opportunity.line,sequence",0,Sequence,Последователност,0
+field,"sale.opportunity.line,unit",0,Unit,Единица,0
+field,"sale.opportunity.line,unit_digits",0,Unit Digits,Десетични единици,0
+field,"sale.opportunity_employee,amount",0,Amount,Сума,0
+field,"sale.opportunity_employee,company",0,Company,Фирма,0
+field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Обменен курс,0
+field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Обменен курс,0
+field,"sale.opportunity_employee,converted",0,Converted,Конвертиран,0
+field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Конвертирана сума,0
+field,"sale.opportunity_employee,currency",0,Currency,Валута,0
+field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"sale.opportunity_employee,employee",0,Employee,Служител,0
+field,"sale.opportunity_employee,lost",0,Lost,Изгубен,0
+field,"sale.opportunity_employee,number",0,Number,Номер,0
+field,"sale.opportunity_employee,rec_name",0,Name,Име,0
+field,"sale.opportunity_employee_monthly,amount",0,Amount,Сума,0
+field,"sale.opportunity_employee_monthly,company",0,Company,Фирма,0
+field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Обменен курс,0
+field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Обменен курс,0
+field,"sale.opportunity_employee_monthly,converted",0,Converted,Конвертиран,0
+field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Конвертирана сума,0
+field,"sale.opportunity_employee_monthly,currency",0,Currency,Валута,0
+field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"sale.opportunity_employee_monthly,employee",0,Employee,Служител,0
+field,"sale.opportunity_employee_monthly,lost",0,Lost,Изгубен,0
+field,"sale.opportunity_employee_monthly,month",0,Month,Месец,0
+field,"sale.opportunity_employee_monthly,number",0,Number,Номер,0
+field,"sale.opportunity_employee_monthly,rec_name",0,Name,Име,0
+field,"sale.opportunity_employee_monthly,year",0,Year,Година,0
+field,"sale.opportunity_monthly,amount",0,Amount,Сума,0
+field,"sale.opportunity_monthly,company",0,Company,Фирма,0
+field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Обменен курс,0
+field,"sale.opportunity_monthly,conversion_rate",0,Conversion Rate,Обменен курс,0
+field,"sale.opportunity_monthly,converted",0,Converted,Конвертиран,0
+field,"sale.opportunity_monthly,converted_amount",0,Converted Amount,Конвертирана сума,0
+field,"sale.opportunity_monthly,currency",0,Currency,Валута,0
+field,"sale.opportunity_monthly,currency_digits",0,Currency Digits,Цифри за валута,0
+field,"sale.opportunity_monthly,lost",0,Lost,Изгубен,0
+field,"sale.opportunity_monthly,month",0,Month,Месец,0
+field,"sale.opportunity_monthly,number",0,Number,Номер,0
+field,"sale.opportunity_monthly,rec_name",0,Name,Име,0
+field,"sale.opportunity_monthly,year",0,Year,Година,0
+field,"sale.opportunity_monthly,year_month",0,Year-Month,Година-Месец,0
+help,"sale.opportunity,amount",0,Estimated revenue amount,Очаквани приходи,0
+help,"sale.opportunity,probability",0,Percentage between 0 and 100,Процент между 0 и 100,0
+help,"sale.opportunity_employee,conversion_amount_rate",0,In %,В %,0
+help,"sale.opportunity_employee,conversion_rate",0,In %,В %,0
+help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,В %,0
+help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,В %,0
+help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,В %,0
+help,"sale.opportunity_monthly,conversion_rate",0,In %,В %,0
+model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Възможности по служител,0
+model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Възможности по служител,0
+model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Възможности по служител по месец,0
+model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Инициативи и възможности,0
+model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Инициативи/Възможности за продажба,0
+model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Отказани инициативи и възможности,0
+model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Конвертирани възможности,0
+model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Отворени инициативи,0
+model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Изгубени ициативи и възможности,0
+model,"ir.action,name",act_opportunity_form_new,New Lead,Нова инициатива,0
+model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Възможности,0
+model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Възможности по месец,0
+model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Възможности по служител,0
+model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Възможности по служител по месец,0
+model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Инициативи и възможности,0
+model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Отказани инициативи и възможности,0
+model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Конвертирани възможности,0
+model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Отворени инициативи,0
+model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Изгубени ициативи и възможности,0
+model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Нова инициатива,0
+model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Възможности,0
+model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Възможности по месец,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Справки,0
+model,"res.group,name",group_opportunity,Sale Opportunity,Възможност за продажба,0
+model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Начално отваряне на възможмост за продажба по служител,0
+model,"sale.opportunity,name",0,Sale Opportunity,Възможност за продажба,0
+model,"sale.opportunity.history,name",0,Sale Opportunity History,История на възможност за продажба,0
+model,"sale.opportunity.line,name",0,Sale Opportunity Line,Ред от възможност за продажба,0
+model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Възможност за продажба за служител,0
+model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Възможност за продажба за служител за месец,0
+model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Възможност за продажа по месец,0
+model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Работен процес на възможност за продажба,0
+model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Отказан,0
+model,"workflow.activity,name",opportunity_activity_converted,Converted,Конвертиран,0
+model,"workflow.activity,name",opportunity_activity_lead,Lead,Възможност,0
+model,"workflow.activity,name",opportunity_activity_lost,Lost,Изгубен,0
+model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Възможност,0
+selection,"sale.opportunity,state",0,Cancelled,Отказан,0
+selection,"sale.opportunity,state",0,Converted,Конвертиран,0
+selection,"sale.opportunity,state",0,Lead,Инициатива,0
+selection,"sale.opportunity,state",0,Lost,Изгубен,0
+selection,"sale.opportunity,state",0,Opportunity,Възможност,0
+selection,"sale.opportunity.history,state",0,Cancelled,Отказан,0
+selection,"sale.opportunity.history,state",0,Converted,Конвертиран,0
+selection,"sale.opportunity.history,state",0,Lead,Инициатива,0
+selection,"sale.opportunity.history,state",0,Lost,Изгубен,0
+selection,"sale.opportunity.history,state",0,Opportunity,Възможност,0
+view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Възможности за продажба по служител,0
+view,sale.opportunity,0,Cancel,Отказ,0
+view,sale.opportunity,0,Convert to Opportunity,Превръщане във възможност,0
+view,sale.opportunity,0,Convert to Sale,Прехвърлено в продажба,0
+view,sale.opportunity,0,Lead/Opportunity,Инициатива/Възможност,0
+view,sale.opportunity,0,Mark as Lost,Отбелязване като загубен,0
+view,sale.opportunity,0,Reset as Lead,Прехвърляне в инициатива,0
+view,sale.opportunity,0,Sale Lead/Opportunity,Инициатива/Възможност за продажба,0
+view,sale.opportunity,0,Sales Leads/Opportunities,Инициативи/Възможности за продажба,0
+view,sale.opportunity,0,Set as Lead,Прехвърляне в инициатива,0
+view,sale.opportunity.history,0,History,Изтория,0
+view,sale.opportunity.history,0,Lead/Opportunity,Инициатива/Възможност,0
+view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Ред на инициатива/възможност за продажба,0
+view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Редове от инициативи/възможности за продажба,0
+view,sale.opportunity_employee,0,Opportunities per Employee,Възможности по служител,0
+view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Възможности за продажба по месец,0
+view,sale.opportunity_monthly,0,Sale Opportunities per Month,Възможности за продажба по месец,0
+wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Отказ,0
+wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Отваряне,0
diff --git a/de_DE.csv b/de_DE.csv
index ae42331..5dc1e5d 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -116,7 +116,7 @@ model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,
 model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Neuer Interessent,0
 model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
 model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
-model,"ir.ui.menu,name",menu_reporting,Reporting,Berichte,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Auswertungen,0
 model,"res.group,name",group_opportunity,Sale Opportunity,Verkaufschance,0
 model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Verkaufschancen pro Mitarbeiter Öffnen,0
 model,"sale.opportunity,name",0,Sale Opportunity,Verkaufschance,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 813fab4..a4140b0 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -10,34 +10,18 @@ field,"sale.opportunity,currency",0,Currency,Devise,0
 field,"sale.opportunity,currency_digits",0,Currency Digits,Décimales de la devise,0
 field,"sale.opportunity,description",0,Description,Description,0
 field,"sale.opportunity,employee",0,Employee,Employé,0
-field,"sale.opportunity_employee,amount",0,Amount,Montant,0
-field,"sale.opportunity_employee,company",0,Company,Société,0
-field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
-field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Taux de conversion,0
-field,"sale.opportunity_employee,converted",0,Converted,Convertie,0
-field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Montant convertit,0
-field,"sale.opportunity_employee,currency",0,Currency,Devise,0
-field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"sale.opportunity_employee,employee",0,Employee,Employé,0
-field,"sale.opportunity_employee,lost",0,Lost,Perdue,0
-field,"sale.opportunity_employee_monthly,amount",0,Amount,Montant,0
-field,"sale.opportunity_employee_monthly,company",0,Company,Société,0
-field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
-field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Taux de conversion,0
-field,"sale.opportunity_employee_monthly,converted",0,Converted,Convertie,0
-field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Montant converti,0
-field,"sale.opportunity_employee_monthly,currency",0,Currency,Devise,0
-field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Décimales de la devise,0
-field,"sale.opportunity_employee_monthly,employee",0,Employee,Employé,0
-field,"sale.opportunity_employee_monthly,lost",0,Lost,Perdue,0
-field,"sale.opportunity_employee_monthly,month",0,Month,Mois,0
-field,"sale.opportunity_employee_monthly,number",0,Number,Nombre,0
-field,"sale.opportunity_employee_monthly,rec_name",0,Name,Nom,0
-field,"sale.opportunity_employee_monthly,year",0,Year,Année,0
-field,"sale.opportunity_employee,number",0,Number,Nombre,0
-field,"sale.opportunity_employee,rec_name",0,Name,Nom,0
 field,"sale.opportunity,end_date",0,End Date,Date de fin,0
 field,"sale.opportunity,history",0,History,Historique,0
+field,"sale.opportunity,lines",0,Lines,Lignes,0
+field,"sale.opportunity,lost_reason",0,Reason for loss,Raison de la perte,0
+field,"sale.opportunity,party",0,Party,Tiers,0
+field,"sale.opportunity,payment_term",0,Payment Term,Conditions de paiement,0
+field,"sale.opportunity,probability",0,Conversion Probability,Probabilité de conversion,0
+field,"sale.opportunity,rec_name",0,Name,Nom,0
+field,"sale.opportunity,sale",0,Sale,Vente,0
+field,"sale.opportunity,start_date",0,Start Date,Date de début,0
+field,"sale.opportunity,state",0,State,État,0
+field,"sale.opportunity,warehouse",0,Warehouse,Entrepôt,0
 field,"sale.opportunity.history,address",0,Address,Adresse,0
 field,"sale.opportunity.history,comment",0,Comment,Commentaire,0
 field,"sale.opportunity.history,company",0,Company,Société,0
@@ -58,12 +42,36 @@ field,"sale.opportunity.line,opportunity",0,Opportunity,Opportunité,0
 field,"sale.opportunity.line,product",0,Product,Produit,0
 field,"sale.opportunity.line,quantity",0,Quantity,Quantité,0
 field,"sale.opportunity.line,rec_name",0,Name,Nom,0
-field,"sale.opportunity,lines",0,Lines,Lignes,0
 field,"sale.opportunity.line,sale_line",0,Sale Line,Ligne de vente,0
 field,"sale.opportunity.line,sequence",0,Sequence,Séquence,0
 field,"sale.opportunity.line,unit",0,Unit,Unité,0
 field,"sale.opportunity.line,unit_digits",0,Unit Digits,Décimales de l'unité,0
-field,"sale.opportunity,lost_reason",0,Reason for loss,Raison de la perte,0
+field,"sale.opportunity_employee,amount",0,Amount,Montant,0
+field,"sale.opportunity_employee,company",0,Company,Société,0
+field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
+field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Taux de conversion,0
+field,"sale.opportunity_employee,converted",0,Converted,Convertie,0
+field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Montant convertit,0
+field,"sale.opportunity_employee,currency",0,Currency,Devise,0
+field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"sale.opportunity_employee,employee",0,Employee,Employé,0
+field,"sale.opportunity_employee,lost",0,Lost,Perdue,0
+field,"sale.opportunity_employee,number",0,Number,Nombre,0
+field,"sale.opportunity_employee,rec_name",0,Name,Nom,0
+field,"sale.opportunity_employee_monthly,amount",0,Amount,Montant,0
+field,"sale.opportunity_employee_monthly,company",0,Company,Société,0
+field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
+field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Taux de conversion,0
+field,"sale.opportunity_employee_monthly,converted",0,Converted,Convertie,0
+field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Montant converti,0
+field,"sale.opportunity_employee_monthly,currency",0,Currency,Devise,0
+field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"sale.opportunity_employee_monthly,employee",0,Employee,Employé,0
+field,"sale.opportunity_employee_monthly,lost",0,Lost,Perdue,0
+field,"sale.opportunity_employee_monthly,month",0,Month,Mois,0
+field,"sale.opportunity_employee_monthly,number",0,Number,Nombre,0
+field,"sale.opportunity_employee_monthly,rec_name",0,Name,Nom,0
+field,"sale.opportunity_employee_monthly,year",0,Year,Année,0
 field,"sale.opportunity_monthly,amount",0,Amount,Montant,0
 field,"sale.opportunity_monthly,company",0,Company,Société,0
 field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
@@ -78,69 +86,61 @@ field,"sale.opportunity_monthly,number",0,Number,Nombre,0
 field,"sale.opportunity_monthly,rec_name",0,Name,Nom,0
 field,"sale.opportunity_monthly,year",0,Year,Année,0
 field,"sale.opportunity_monthly,year_month",0,Year-Month,Année-Mois,0
-field,"sale.opportunity,party",0,Party,Tiers,0
-field,"sale.opportunity,payment_term",0,Payment Term,Conditions de paiement,0
-field,"sale.opportunity,probability",0,Conversion Probability,Probabilité de conversion,0
-field,"sale.opportunity,rec_name",0,Name,Nom,0
-field,"sale.opportunity,sale",0,Sale,Vente,0
-field,"sale.opportunity,start_date",0,Start Date,Date de début,0
-field,"sale.opportunity,state",0,State,État,0
-field,"sale.opportunity,warehouse",0,Warehouse,Entrepôt,0
 help,"sale.opportunity,amount",0,Estimated revenue amount,Revenu estimé,0
+help,"sale.opportunity,probability",0,Percentage between 0 and 100,Pourcentage entre 0 et 100,0
 help,"sale.opportunity_employee,conversion_amount_rate",0,In %,En %,0
 help,"sale.opportunity_employee,conversion_rate",0,In %,En %,0
 help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,En %,0
 help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,En %,0
 help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,En %,0
 help,"sale.opportunity_monthly,conversion_rate",0,In %,En %,0
-help,"sale.opportunity,probability",0,Percentage between 0 and 100,Pourcentage entre 0 et 100,0
+model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
+model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Opportunités par employé,0
+model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
+model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Opportunités,0
+model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Contacts commerciaux / Opportunités de vente,0
 model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Opportunités annulées,0
 model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Opportunités converties,0
-model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Opportunités,0
+model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Contacts commerciaux ouverts,0
 model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Opportunités perdues,0
 model,"ir.action,name",act_opportunity_form_new,New Lead,Nouveau contact commercial,0
-model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Contacts commerciaux ouverts,0
 model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Opportunités,0
-model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Opportunités par employé,0
-model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
-model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
 model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Opportunités par mois,0
-model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Contacts commerciaux / Opportunités de vente,0
+model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
+model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
+model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Contacts et opportunités de vente,0
 model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Opportunités annulées,0
 model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Opportunités converties,0
-model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Contacts et opportunités de vente,0
+model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Contatcs commerciaux ouverts,0
 model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Opportunités perdues,0
 model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Nouveau contact commercial,0
-model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Contatcs commerciaux ouverts,0
 model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Opportunités,0
-model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
-model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
 model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Opportunités par mois,0
 model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
 model,"res.group,name",group_opportunity,Sale Opportunity,Opportunités de vente,0
 model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Opportunités de vente par employé - Init,0
-model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Opportunités de vente par employé par mois,0
-model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Opportunités de vente par employé,0
+model,"sale.opportunity,name",0,Sale Opportunity,Opportunités de vente,0
 model,"sale.opportunity.history,name",0,Sale Opportunity History,Historique des opportunités de vente,0
 model,"sale.opportunity.line,name",0,Sale Opportunity Line,Ligne d'opportunité de vente,0
+model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Opportunités de vente par employé,0
+model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Opportunités de vente par employé par mois,0
 model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Opportunités de vente par mois,0
-model,"sale.opportunity,name",0,Sale Opportunity,Opportunités de vente,0
+model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Workflow opportunité de vente,0
 model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Annulée,0
 model,"workflow.activity,name",opportunity_activity_converted,Converted,Convertie,0
 model,"workflow.activity,name",opportunity_activity_lead,Lead,Contact,0
 model,"workflow.activity,name",opportunity_activity_lost,Lost,Perdue,0
 model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Opportunité,0
-model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Workflow opportunité de vente,0
-selection,"sale.opportunity.history,state",0,Cancelled,Annulée,0
-selection,"sale.opportunity.history,state",0,Converted,Convertie,0
-selection,"sale.opportunity.history,state",0,Lead,Contact,0
-selection,"sale.opportunity.history,state",0,Lost,Perdue,0
-selection,"sale.opportunity.history,state",0,Opportunity,Opportunité,0
 selection,"sale.opportunity,state",0,Cancelled,Annulée,0
 selection,"sale.opportunity,state",0,Converted,Convertie,0
 selection,"sale.opportunity,state",0,Lead,Contact,0
 selection,"sale.opportunity,state",0,Lost,Perdue,0
 selection,"sale.opportunity,state",0,Opportunity,Opportunité,0
+selection,"sale.opportunity.history,state",0,Cancelled,Annulée,0
+selection,"sale.opportunity.history,state",0,Converted,Convertie,0
+selection,"sale.opportunity.history,state",0,Lead,Contact,0
+selection,"sale.opportunity.history,state",0,Lost,Perdue,0
+selection,"sale.opportunity.history,state",0,Opportunity,Opportunité,0
 view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Opportunités de vente par employé,0
 view,sale.opportunity,0,Cancel,Annuler,0
 view,sale.opportunity,0,Convert to Opportunity,Convertir en opportunité,0
@@ -151,12 +151,12 @@ view,sale.opportunity,0,Reset as Lead,Reconvertir en contact,0
 view,sale.opportunity,0,Sale Lead/Opportunity,Contact commercial / Opportunité de vente,0
 view,sale.opportunity,0,Sales Leads/Opportunities,Contacts commerciaux / Opportunités,0
 view,sale.opportunity,0,Set as Lead,Reconvertir en contact,0
-view,sale.opportunity_employee,0,Opportunities per Employee,Opportunités par employé,0
-view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
 view,sale.opportunity.history,0,History,Historique,0
 view,sale.opportunity.history,0,Lead/Opportunity,Contact / Opportunité,0
 view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Ligne de contact / Opportunité de vente,0
 view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Lignes de contacts / Opportunités de vente,0
+view,sale.opportunity_employee,0,Opportunities per Employee,Opportunités par employé,0
+view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
 view,sale.opportunity_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
 wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Annuler,0
 wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Ouvrir,0
diff --git a/opportunity.py b/opportunity.py
index c9ed965..4a78605 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -363,18 +363,6 @@ class SaleOpportunityLine(ModelSQL, ModelView):
 SaleOpportunityLine()
 
 
-class One2ManyHistory(fields.One2Many):
-
-    def get(self, ids, model, name, values=None):
-        opportunity2id = {}
-        histories = model.browse(ids)
-        opportunity2id = dict((history.opportunity.id, history.id) for
-                history in histories)
-        res = super(One2ManyHistory, self).get(opportunity2id.keys(), model,
-                name, values=values)
-        return dict((opportunity2id[i], j) for i, j in res.iteritems())
-
-
 class SaleOpportunityHistory(ModelSQL, ModelView):
     'Sale Opportunity History'
     _name = 'sale.opportunity.history'
@@ -397,8 +385,8 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
     }, depends=['state'])
     description = fields.Char('Description')
     comment = fields.Text('Comment')
-    lines = One2ManyHistory('sale.opportunity.line', 'opportunity', 'Lines',
-            datetime_field='date')
+    lines = fields.Function(fields.One2Many('sale.opportunity.line', None, 'Lines',
+            datetime_field='date'), 'get_lines')
     state = fields.Selection(STATES, 'State')
     probability = fields.Integer('Conversion Probability')
     lost_reason = fields.Text('Reason for loss', states={
@@ -442,6 +430,18 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 (', '.join(self._table_query_group()))) % \
                 opportunity_obj._table, [])
 
+    def get_lines(self, ids, name):
+        line_obj = self.pool.get('sale.opportunity.line')
+        histories = self.browse(ids)
+        result = {}
+        # We will always have only one id per call due to datetime_field
+        for history in histories:
+            result[history.id] = line_obj.search([
+                ('opportunity', '=', history.opportunity.id),
+            ])
+        return result
+
+
     def read(self, ids, fields_names=None):
         res = super(SaleOpportunityHistory, self).read(ids,
                 fields_names=fields_names)
diff --git a/opportunity.xml b/opportunity.xml
index d3df37d..c7a41ce 100644
--- a/opportunity.xml
+++ b/opportunity.xml
@@ -110,7 +110,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form">
             <field name="name">Leads and Opportunities</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_view1">
             <field name="sequence" eval="10"/>
@@ -128,7 +127,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form_new">
             <field name="name">New Lead</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_new_view1">
             <field name="sequence" eval="10"/>
@@ -146,7 +144,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form_lead">
             <field name="name">Opened Leads</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
             <field name="domain">[("state", "=", "lead")]</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_lead_view1">
@@ -165,7 +162,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form_opportunity">
             <field name="name">Opportunities</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
             <field name="domain">[("state", "=", "opportunity")]</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_opportunity_view1">
@@ -184,7 +180,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form_converted">
             <field name="name">Converted Opportunities</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
             <field name="domain">[("state", "=", "converted")]</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_converted_view1">
@@ -203,7 +198,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form_cancelled">
             <field name="name">Cancelled Leads and Opportunities</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
             <field name="domain">[("state", "=", "cancelled")]</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_cancelled_view1">
@@ -222,7 +216,6 @@
         <record model="ir.action.act_window" id="act_opportunity_form_lost">
             <field name="name">Lost Leads and Opportunities</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
             <field name="domain">[("state", "=", "lost")]</field>
         </record>
         <record model="ir.action.act_window.view" id="act_opportunity_form_lost_view1">
@@ -563,7 +556,6 @@ create_sale()</field>
         <record model="ir.action.act_window" id="act_opportunity_employee_form">
             <field name="name">Opportunities per Employee</field>
             <field name="res_model">sale.opportunity_employee</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view"
             id="act_opportunity_employee_form_view1">
@@ -678,7 +670,6 @@ create_sale()</field>
         <record model="ir.action.act_window" id="act_opportunity_monthly_form">
             <field name="name">Opportunities per Month</field>
             <field name="res_model">sale.opportunity_monthly</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view"
             id="act_opportunity_monthly_form_view1">
@@ -738,7 +729,6 @@ create_sale()</field>
         <record model="ir.action.act_window" id="act_opportunity_employee_monthly_form">
             <field name="name">Opportunities per Employee per Month</field>
             <field name="res_model">sale.opportunity_employee_monthly</field>
-            <field name="view_type">form</field>
         </record>
         <record model="ir.action.act_window.view"
             id="act_opportunity_employee_monthly_form_view1">
diff --git a/party.xml b/party.xml
index d3bf018..678f5b9 100644
--- a/party.xml
+++ b/party.xml
@@ -6,7 +6,6 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_opportunity_form2">
             <field name="name">Sales Leads/Opportunities</field>
             <field name="res_model">sale.opportunity</field>
-            <field name="view_type">form</field>
             <field name="domain">[("party", "=", Eval('active_id'))]</field>
         </record>
         <record model="ir.action.keyword"
diff --git a/setup.py b/setup.py
index 3e49ab7..15339c1 100644
--- a/setup.py
+++ b/setup.py
@@ -43,11 +43,14 @@ setup(name='trytond_sale_opportunity',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: Bulgarian',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
     ],
     license='GPL-3',
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
new file mode 100644
index 0000000..33bf87d
Binary files /dev/null and b/tests/__init__.pyc differ
diff --git a/tests/test_sale_opportunity.pyc b/tests/test_sale_opportunity.pyc
new file mode 100644
index 0000000..02d3956
Binary files /dev/null and b/tests/test_sale_opportunity.pyc differ
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 60df0de..fdaa361 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 1.8.1
+Version: 2.0.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,7 +12,7 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -21,9 +21,12 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 735be89..1f515e3 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
+bg_BG.csv
 de_DE.csv
 fr_FR.csv
 opportunity.xml
@@ -15,7 +16,9 @@ setup.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
 tests/__init__.py
+tests/__init__.pyc
 tests/test_sale_opportunity.py
+tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index 8c9e7da..a64aa5e 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_party >= 1.8, < 1.9
-trytond_company >= 1.8, < 1.9
-trytond_product >= 1.8, < 1.9
-trytond_sale >= 1.8, < 1.9
-trytond_account >= 1.8, < 1.9
-trytond_stock >= 1.8, < 1.9
-trytond_currency >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_party >= 2.0, < 2.1
+trytond_company >= 2.0, < 2.1
+trytond_product >= 2.0, < 2.1
+trytond_sale >= 2.0, < 2.1
+trytond_account >= 2.0, < 2.1
+trytond_stock >= 2.0, < 2.1
+trytond_currency >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit c712fd2375e4ddd18e8cc9f1d5ea592b3524e65c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 15 11:46:30 2011 +0100

    Adding upstream version 1.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index f3b2ac0..92df4e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-02-13
+* Bug fixes (see mercurial logs for details)
+
 Version 1.8.0 - 2010-11-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 7bdae08..c4ea653 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2010 Open Labs Business Solutions.
-Copyright (C) 2010 Cédric Krier.
-Copyright (C) 2010 B2CK SPRL.
+Copyright (C) 2010-2011 Open Labs Business Solutions.
+Copyright (C) 2010-2011 Cédric Krier.
+Copyright (C) 2010-2011 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index e48501b..91314af 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 1.8.0
+Version: 1.8.1
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
diff --git a/__tryton__.py b/__tryton__.py
index d0543f5..8edd909 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,7 +4,7 @@
     'name': 'Sales Leads and Opportunities',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
     'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
-    'version': '1.8.0',
+    'version': '1.8.1',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
diff --git a/opportunity.py b/opportunity.py
index 959c8b5..c9ed965 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -352,6 +352,12 @@ class SaleOpportunityLine(ModelSQL, ModelView):
             '_parent_sale.party': line.opportunity.party.id,
             '_parent_sale.currency': line.opportunity.company.currency.id,
             }))
+        for field_name, field in sale_line_obj._columns.iteritems():
+            if field._type not in ('one2many', 'many2many'):
+                continue
+            if field_name not in res:
+                continue
+            res[field_name] = [('add', res[field_name])]
         return res
 
 SaleOpportunityLine()
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index bd7485d..60df0de 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 1.8.0
+Version: 1.8.1
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
commit 563f53dd6d3abfc8942699466af21f23d2e721db
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Nov 4 20:12:32 2010 +0100

    Adding upstream version 1.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 1cbe557..f3b2ac0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
 Version 1.6.0 - 2010-09-07
 * Initial release
diff --git a/INSTALL b/INSTALL
index 8912f21..a21783c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,12 +4,15 @@ Installing trytond_sale_opportunity
 Prerequisites
 -------------
 
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_party (http://www.tryton.org/)
  * trytond_company (http://www.tryton.org/)
  * trytond_product (http://www.tryton.org/)
  * trytond_sale (http://www.tryton.org/)
+ * trytond_account (http://www.tryton.org/)
+ * trytond_stock (http://www.tryton.org/)
+ * trytond_currency (http://www.tryton.org/)
 
 Installation
 ------------
diff --git a/PKG-INFO b/PKG-INFO
index 1ac4c6e..e48501b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_sale_opportunity
-Version: 1.6.0
+Version: 1.8.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,7 +12,7 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 2e6a8cb..d0543f5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,7 +3,8 @@
 {
     'name': 'Sales Leads and Opportunities',
     'name_de_DE': 'Verkauf Interessenten und Chancen',
-    'version': '1.6.0',
+    'name_fr_FR': 'Contacts commerciaux et opportunités de ventes',
+    'version': '1.8.0',
     'author': 'Sharoon Thomas, Openlabs',
     'email': 'info at openlabs.co.in',
     'website': 'http://www.openlabs.co.in/',
diff --git a/de_DE.csv b/de_DE.csv
index b9cddb0..ae42331 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -10,34 +10,18 @@ field,"sale.opportunity,currency",0,Currency,Währung,0
 field,"sale.opportunity,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
 field,"sale.opportunity,description",0,Description,Bezeichnung,0
 field,"sale.opportunity,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity_employee,amount",0,Amount,Betrag,0
-field,"sale.opportunity_employee,company",0,Company,Unternehmen,0
-field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
-field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
-field,"sale.opportunity_employee,converted",0,Converted,Umgewandelt,0
-field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
-field,"sale.opportunity_employee,currency",0,Currency,Währung,0
-field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.opportunity_employee,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity_employee,lost",0,Lost,Verlust,0
-field,"sale.opportunity_employee_monthly,amount",0,Amount,Betrag,0
-field,"sale.opportunity_employee_monthly,company",0,Company,Unternehmen,0
-field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
-field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
-field,"sale.opportunity_employee_monthly,converted",0,Converted,Umgewandelt,0
-field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
-field,"sale.opportunity_employee_monthly,currency",0,Currency,Währung,0
-field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.opportunity_employee_monthly,employee",0,Employee,Mitarbeiter,0
-field,"sale.opportunity_employee_monthly,lost",0,Lost,Verlust,0
-field,"sale.opportunity_employee_monthly,month",0,Month,Monat,0
-field,"sale.opportunity_employee_monthly,number",0,Number,Nummer,0
-field,"sale.opportunity_employee_monthly,rec_name",0,Name,Name,0
-field,"sale.opportunity_employee_monthly,year",0,Year,Jahr,0
-field,"sale.opportunity_employee,number",0,Number,Nummer,0
-field,"sale.opportunity_employee,rec_name",0,Name,Name,0
 field,"sale.opportunity,end_date",0,End Date,Enddatum,0
 field,"sale.opportunity,history",0,History,Verlauf,0
+field,"sale.opportunity,lines",0,Lines,Positionen,0
+field,"sale.opportunity,lost_reason",0,Reason for loss,Ursache für Verlust,0
+field,"sale.opportunity,party",0,Party,Partei,0
+field,"sale.opportunity,payment_term",0,Payment Term,Zahlungsbedingung,0
+field,"sale.opportunity,probability",0,Conversion Probability,Umwandlungswahrscheinlichkeit,0
+field,"sale.opportunity,rec_name",0,Name,Name,0
+field,"sale.opportunity,sale",0,Sale,Verkauf,0
+field,"sale.opportunity,start_date",0,Start Date,Anfangsdatum,0
+field,"sale.opportunity,state",0,State,Status,0
+field,"sale.opportunity,warehouse",0,Warehouse,Warenlager,0
 field,"sale.opportunity.history,address",0,Address,Adresse,0
 field,"sale.opportunity.history,comment",0,Comment,Kommentar,0
 field,"sale.opportunity.history,company",0,Company,Unternehmen,0
@@ -58,12 +42,36 @@ field,"sale.opportunity.line,opportunity",0,Opportunity,Verkaufschance,0
 field,"sale.opportunity.line,product",0,Product,Artikel,0
 field,"sale.opportunity.line,quantity",0,Quantity,Anzahl,0
 field,"sale.opportunity.line,rec_name",0,Name,Name,0
-field,"sale.opportunity,lines",0,Lines,Positionen,0
 field,"sale.opportunity.line,sale_line",0,Sale Line,Position Verkauf,0
 field,"sale.opportunity.line,sequence",0,Sequence,Reihenfolge,0
 field,"sale.opportunity.line,unit",0,Unit,Einheit,0
 field,"sale.opportunity.line,unit_digits",0,Unit Digits,Einheit Anzahl Stellen,0
-field,"sale.opportunity,lost_reason",0,Reason for loss,Ursache für Verlust,0
+field,"sale.opportunity_employee,amount",0,Amount,Betrag,0
+field,"sale.opportunity_employee,company",0,Company,Unternehmen,0
+field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
+field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
+field,"sale.opportunity_employee,converted",0,Converted,Umgewandelt,0
+field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
+field,"sale.opportunity_employee,currency",0,Currency,Währung,0
+field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.opportunity_employee,employee",0,Employee,Mitarbeiter,0
+field,"sale.opportunity_employee,lost",0,Lost,Verlust,0
+field,"sale.opportunity_employee,number",0,Number,Nummer,0
+field,"sale.opportunity_employee,rec_name",0,Name,Name,0
+field,"sale.opportunity_employee_monthly,amount",0,Amount,Betrag,0
+field,"sale.opportunity_employee_monthly,company",0,Company,Unternehmen,0
+field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
+field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
+field,"sale.opportunity_employee_monthly,converted",0,Converted,Umgewandelt,0
+field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
+field,"sale.opportunity_employee_monthly,currency",0,Currency,Währung,0
+field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.opportunity_employee_monthly,employee",0,Employee,Mitarbeiter,0
+field,"sale.opportunity_employee_monthly,lost",0,Lost,Verlust,0
+field,"sale.opportunity_employee_monthly,month",0,Month,Monat,0
+field,"sale.opportunity_employee_monthly,number",0,Number,Nummer,0
+field,"sale.opportunity_employee_monthly,rec_name",0,Name,Name,0
+field,"sale.opportunity_employee_monthly,year",0,Year,Jahr,0
 field,"sale.opportunity_monthly,amount",0,Amount,Betrag,0
 field,"sale.opportunity_monthly,company",0,Company,Unternehmen,0
 field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
@@ -78,69 +86,61 @@ field,"sale.opportunity_monthly,number",0,Number,Nummer,0
 field,"sale.opportunity_monthly,rec_name",0,Name,Name,0
 field,"sale.opportunity_monthly,year",0,Year,Jahr,0
 field,"sale.opportunity_monthly,year_month",0,Year-Month,Jahr-Monat,0
-field,"sale.opportunity,party",0,Party,Partei,0
-field,"sale.opportunity,payment_term",0,Payment Term,Zahlungsbedingung,0
-field,"sale.opportunity,probability",0,Conversion Probability,Umwandlungswahrscheinlichkeit,0
-field,"sale.opportunity,rec_name",0,Name,Name,0
-field,"sale.opportunity,sale",0,Sale,Verkauf,0
-field,"sale.opportunity,start_date",0,Start Date,Anfangsdatum,0
-field,"sale.opportunity,state",0,State,Status,0
-field,"sale.opportunity,warehouse",0,Warehouse,Warenlager,0
 help,"sale.opportunity,amount",0,Estimated revenue amount,Geschätzter Ertrag,0
+help,"sale.opportunity,probability",0,Percentage between 0 and 100,Prozentsatz zwischen 0 und 100,0
 help,"sale.opportunity_employee,conversion_amount_rate",0,In %,In %,0
 help,"sale.opportunity_employee,conversion_rate",0,In %,In %,0
 help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,In %,0
 help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,In %,0
 help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,In %,0
 help,"sale.opportunity_monthly,conversion_rate",0,In %,In %,0
-help,"sale.opportunity,probability",0,Percentage between 0 and 100,Prozentsatz zwischen 0 und 100,0
+model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
+model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
+model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
 model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Annullierte Interessenten und Verkaufschancen,0
 model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Umgewandelte Verkaufschancen,0
-model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
+model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Offene Interessenten,0
 model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Verluste Interessenten und Verkaufschancen,0
 model,"ir.action,name",act_opportunity_form_new,New Lead,Neuer Interessent,0
-model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Offene Interessenten,0
 model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
-model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
 model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
-model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
+model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
+model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
 model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Annullierte Interessenten und Verkaufschancen,0
 model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Umgewandelte Verkaufschancen,0
-model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
+model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Offene Interessenten,0
 model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Verluste Interessenten und Verkaufschancen,0
 model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Neuer Interessent,0
-model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Offene Interessenten,0
 model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
-model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
 model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
 model,"ir.ui.menu,name",menu_reporting,Reporting,Berichte,0
 model,"res.group,name",group_opportunity,Sale Opportunity,Verkaufschance,0
 model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Verkaufschancen pro Mitarbeiter Öffnen,0
-model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Verkaufschance pro Mitarbeiter pro Monat,0
-model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Verkaufschance pro Mitarbeiter,0
+model,"sale.opportunity,name",0,Sale Opportunity,Verkaufschance,0
 model,"sale.opportunity.history,name",0,Sale Opportunity History,Verkaufschancen Verlauf,0
 model,"sale.opportunity.line,name",0,Sale Opportunity Line,Verkaufschance Position,0
+model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Verkaufschance pro Mitarbeiter,0
+model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Verkaufschance pro Mitarbeiter pro Monat,0
 model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Verkaufschance pro Monat,0
-model,"sale.opportunity,name",0,Sale Opportunity,Verkaufschance,0
+model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Verkaufschancen Workflow,0
 model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Annulliert,0
 model,"workflow.activity,name",opportunity_activity_converted,Converted,Umgewandelt,0
 model,"workflow.activity,name",opportunity_activity_lead,Lead,Interessent,0
 model,"workflow.activity,name",opportunity_activity_lost,Lost,Verlust,0
 model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Verkaufschance,0
-model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Verkaufschancen Workflow,0
-selection,"sale.opportunity.history,state",0,Cancelled,Annulliert,0
-selection,"sale.opportunity.history,state",0,Converted,Umgewandelt,0
-selection,"sale.opportunity.history,state",0,Lead,Interessent,0
-selection,"sale.opportunity.history,state",0,Lost,Verlust,0
-selection,"sale.opportunity.history,state",0,Opportunity,Chance,0
 selection,"sale.opportunity,state",0,Cancelled,Annulliert,0
 selection,"sale.opportunity,state",0,Converted,Umgewandelt,0
 selection,"sale.opportunity,state",0,Lead,Interessent,0
 selection,"sale.opportunity,state",0,Lost,Verlust,0
 selection,"sale.opportunity,state",0,Opportunity,Verkaufschance,0
+selection,"sale.opportunity.history,state",0,Cancelled,Annulliert,0
+selection,"sale.opportunity.history,state",0,Converted,Umgewandelt,0
+selection,"sale.opportunity.history,state",0,Lead,Interessent,0
+selection,"sale.opportunity.history,state",0,Lost,Verlust,0
+selection,"sale.opportunity.history,state",0,Opportunity,Chance,0
 view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
 view,sale.opportunity,0,Cancel,Annullieren,0
 view,sale.opportunity,0,Convert to Opportunity,In Verkaufschance umwandeln,0
@@ -151,12 +151,12 @@ view,sale.opportunity,0,Reset as Lead,Auf Interessent zurücksetzen,0
 view,sale.opportunity,0,Sale Lead/Opportunity,Interessent/Verkaufschance,0
 view,sale.opportunity,0,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
 view,sale.opportunity,0,Set as Lead,Auf Interessent setzen,0
-view,sale.opportunity_employee,0,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
-view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Monat,0
 view,sale.opportunity.history,0,History,Verlauf,0
 view,sale.opportunity.history,0,Lead/Opportunity,Interessent/Chance,0
 view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Interessent/Verkaufschance,0
 view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Interessenten/Verkaufschancen,0
+view,sale.opportunity_employee,0,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Monat,0
 view,sale.opportunity_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Mitarbeiter,0
 wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Annullieren,0
 wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Öffnen,0
diff --git a/opportunity.py b/opportunity.py
index 17bc701..959c8b5 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -1,11 +1,13 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 "Sales extension for managing leads and opportunities"
+from __future__ import with_statement
 import datetime
 from trytond.model import ModelView, ModelSQL, ModelWorkflow, fields
 from trytond.wizard import Wizard
 from trytond.backend import FIELDS
 from trytond.pyson import Equal, Eval, Not, In, If, Get, PYSONEncoder
+from trytond.transaction import Transaction
 
 STATES = [
     ('lead', 'Lead'),
@@ -21,6 +23,7 @@ _STATES_STOP = {
     'readonly': In(Eval('state'), ['converted', 'lost', 'cancelled']),
 }
 
+
 class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
     'Sale Opportunity'
     _name = "sale.opportunity"
@@ -98,79 +101,70 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
             'button_lead': True,
         })
 
-    def default_state(self, cursor, user, context=None):
+    def default_state(self):
         return 'lead'
 
-    def default_start_date(self, cursor, user, context=None):
+    def default_start_date(self):
         date_obj = self.pool.get('ir.date')
-        return date_obj.today(cursor, user, context=context)
+        return date_obj.today()
 
-    def default_probability(self, cursor, user, context=None):
+    def default_probability(self):
         return 50
 
-    def default_company(self, cursor, user, context=None):
-        if context is None:
-            context = {}
-        return context.get('company', False)
+    def default_company(self):
+        return Transaction().context.get('company') or False
 
-    def default_employee(self, cursor, user_id, context=None):
+    def default_employee(self):
         user_obj = self.pool.get('res.user')
         employee_obj = self.pool.get('company.employee')
 
-        if context is None:
-            context = {}
-        employee_id = None
-        if context.get('employee'):
-            employee_id = context['employee']
+        employee_id = False
+        if Transaction().context.get('employee'):
+            employee_id = Transaction().context['employee']
         else:
-            user = user_obj.browse(cursor, user_id, user_id, context=context)
+            user = user_obj.browse(Transaction().user)
             if user.employee:
                 employee_id = user.employee.id
-        if employee_id:
-            return employee_id
-        return False
+        return employee_id
 
-    def default_payment_term(self, cursor, user, context=None):
+    def default_payment_term(self):
         payment_term_obj = self.pool.get('account.invoice.payment_term')
-        payment_term_ids = payment_term_obj.search(cursor, user,
-                self.payment_term.domain, context=context)
+        payment_term_ids = payment_term_obj.search(self.payment_term.domain)
         if len(payment_term_ids) == 1:
             return payment_term_ids[0]
         return False
 
-    def default_warehouse(self, cursor, user, context=None):
+    def default_warehouse(self):
         location_obj = self.pool.get('stock.location')
-        location_ids = location_obj.search(cursor, user,
-                self.warehouse.domain, context=context)
+        location_ids = location_obj.search(self.warehouse.domain)
         if len(location_ids) == 1:
             return location_ids[0]
         return False
 
-    def get_currency(self, cursor, user, ids, name, context=None):
+    def get_currency(self, ids, name):
         res = {}
-        for opportunity in self.browse(cursor, user, ids, context=context):
+        for opportunity in self.browse(ids):
             res[opportunity.id] = opportunity.company.currency.id
         return res
 
-    def get_currency_digits(self, cursor, user, ids, name, context=None):
+    def get_currency_digits(self, ids, name):
         res = {}
-        for opportunity in self.browse(cursor, user, ids, context=context):
+        for opportunity in self.browse(ids):
             res[opportunity.id] = opportunity.company.currency.digits
         return res
 
-    def on_change_company(self, cursor, user, values, context=None):
+    def on_change_company(self, values):
         company_obj = self.pool.get('company.company')
 
         res = {}
         if values.get('company'):
-            company = company_obj.browse(cursor, user, values['company'],
-                    context=context)
+            company = company_obj.browse(values['company'])
             res['currency'] = company.currency.id
             res['currency.rec_name'] = company.currency.rec_name
             res['currency_digits'] = company.currency.digits
         return res
 
-    def on_change_party(self, cursor, user, values, context=None):
+    def on_change_party(self, values):
         party_obj = self.pool.get('party.party')
         payment_term_obj = self.pool.get('account.invoice.payment_term')
 
@@ -178,47 +172,38 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
             'payment_term': False,
         }
         if vals.get('party'):
-            party = party_obj.browse(cursor, user, vals['party'],
-                    context=context)
+            party = party_obj.browse(vals['party'])
             if party.payment_term:
                 res['payment_term'] = party.payment_term.id
         if not res['payment_term']:
-            res['payment_term'] = self.default_payment_term(cursor, user,
-                    context=context)
+            res['payment_term'] = self.default_payment_term()
         if res['payment_term']:
-            res['payment_term.rec_name'] = payment_term_obj.browse(cursor, user,
-                    res['payment_term'], context=context).rec_name
+            res['payment_term.rec_name'] = payment_term_obj.browse(
+                    res['payment_term']).rec_name
         return res
 
-    def set_end_date(self, cursor, user, opportunity_id, state, context=None):
+    def set_end_date(self, opportunity_id, state):
         """
         This will fill the end_date for a lead/opportunity and change the state
 
-        :param cursor: the database cursor
-        :param user: the user id
         :param opportunity_id: the id of the opportunity
         :param state: the target state
-        :param context: the context
         """
         date_obj = self.pool.get('ir.date')
-        self.write(cursor, user, opportunity_id, {
-            'end_date': date_obj.today(cursor, user, context=context),
+        self.write(opportunity_id, {
+            'end_date': date_obj.today(),
             'state': state,
-            }, context=context)
+            })
 
-    def button_lead(self, cursor, user, ids, context=None):
-        self.workflow_trigger_create(cursor, user, ids, context=context)
+    def button_lead(self, ids):
+        self.workflow_trigger_create(ids)
         return True
 
-    def _get_sale_line_opportunity_line(self, cursor, user, opportunity,
-            context=None):
+    def _get_sale_line_opportunity_line(self, opportunity):
         '''
         Return sale line values for each opportunity line
 
-        :param cursor: the database cursor
-        :param user: the user id
         :param opportunity: the BrowseRecord of opportunity
-        :param context: the context
 
         :return: a dictionary with opportunity line id as key
             and a dictionary of sale line values as value
@@ -226,19 +211,16 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         line_obj = self.pool.get('sale.opportunity.line')
         res = {}
         for line in opportunity.lines:
-            val = line_obj.get_sale_line(cursor, user, line, context=context)
+            val = line_obj.get_sale_line(line)
             if val:
                 res[line.id] = val
         return res
 
-    def _get_sale_opportunity(self, cursor, user, opportunity, context=None):
+    def _get_sale_opportunity(self, opportunity):
         '''
         Return sale values for an opportunity
 
-        :param cursor: the database cursor
-        :param user: the user id
         :param opportunity: the BrowseRecord of the opportunity
-        :param context: the context
 
         :return: a dictionary with sale fields as key and sale values as value
         '''
@@ -255,45 +237,35 @@ class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
         }
         return res
 
-    def create_sale(self, cursor, user, opportunity_id, context=None):
+    def create_sale(self, opportunity_id):
         '''
         Create a sale for the opportunity
 
-        :param cursor: the database cursor
-        :param user: the user id
         :param opportunity_id: the id of the opportunity
-        :param context: the context
         '''
         sale_obj = self.pool.get('sale.sale')
         sale_line_obj = self.pool.get('sale.line')
         line_obj = self.pool.get('sale.opportunity.line')
 
-        if context is None:
-            context = {}
+        opportunity = self.browse(opportunity_id)
 
-        opportunity = self.browse(cursor, user, opportunity_id,
-                context=context)
+        values = self._get_sale_opportunity(opportunity)
+        sale_line_values = self._get_sale_line_opportunity_line(opportunity)
 
-        values = self._get_sale_opportunity(cursor, user, opportunity,
-                context=context)
-        sale_line_values = self._get_sale_line_opportunity_line(cursor, user,
-                opportunity, context=context)
-
-        ctx = context.copy()
-        ctx['user'] = user
-        sale_id = sale_obj.create(cursor, 0, values, context=ctx)
+        with Transaction().set_user(0, set_context=True):
+            sale_id = sale_obj.create(values)
 
         for line_id, values in sale_line_values.iteritems():
             values['sale'] = sale_id
-            sale_line_id = sale_line_obj.create(cursor, 0, values,
-                    context=ctx)
-            line_obj.write(cursor, user, line_id, {
+            with Transaction().set_user(0, set_context=True):
+                sale_line_id = sale_line_obj.create(values)
+            line_obj.write(line_id, {
                 'sale_line': sale_line_id,
-                }, context=context)
+                })
 
-        self.write(cursor, user, opportunity_id, {
+        self.write(opportunity_id, {
             'sale': sale_id,
-            }, context=context)
+            })
         return sale_id
 
 SaleOpportunity()
@@ -325,34 +297,30 @@ class SaleOpportunityLine(ModelSQL, ModelView):
         super(SaleOpportunityLine, self).__init__()
         self._order.insert(0, ('sequence', 'ASC'))
 
-    def on_change_with_unit_digits(self, cursor, user, vals, context=None):
+    def on_change_with_unit_digits(self, vals):
         uom_obj = self.pool.get('product.uom')
         if vals.get('unit'):
-            uom = uom_obj.browse(cursor, user, vals['unit'],
-                    context=context)
+            uom = uom_obj.browse(vals['unit'])
             return uom.digits
         return 2
 
-    def get_unit_digits(self, cursor, user, ids, name, context=None):
+    def get_unit_digits(self, ids, name):
         res = {}
-        for line in self.browse(cursor, user, ids, context=context):
+        for line in self.browse(ids):
             if line.unit:
                 res[line.id] = line.unit.digits
             else:
                 res[line.id] = 2
         return res
 
-    def on_change_product(self, cursor, user, vals, context=None):
+    def on_change_product(self, vals):
         product_obj = self.pool.get('product.product')
 
-        if context is None:
-            context = {}
         if not vals.get('product'):
             return {}
         res = {}
 
-        product = product_obj.browse(cursor, user, vals['product'],
-                context=context)
+        product = product_obj.browse(vals['product'])
         category = product.sale_uom.category
         if not vals.get('unit') \
                 or vals.get('unit') not in [x.id for x in category.uoms]:
@@ -361,14 +329,11 @@ class SaleOpportunityLine(ModelSQL, ModelView):
             res['unit_digits'] = product.sale_uom.digits
         return res
 
-    def get_sale_line(self, cursor, user, line, context=None):
+    def get_sale_line(self, line):
         '''
         Return sale line values for opportunity line
 
-        :param cursor: the database cursor
-        :param user: the user id
         :param line: the BrowseRecord of the line
-        :param context: the context
 
         :return: a dictionary with sale line fields as key
             and sale line values as value
@@ -380,13 +345,13 @@ class SaleOpportunityLine(ModelSQL, ModelView):
             'unit': line.unit.id,
             'product': line.product.id,
         }
-        res.update(sale_line_obj.on_change_product(cursor, user, {
+        res.update(sale_line_obj.on_change_product({
             'product': line.product.id,
             'unit': line.unit.id,
             'quantity': line.quantity,
             '_parent_sale.party': line.opportunity.party.id,
             '_parent_sale.currency': line.opportunity.company.currency.id,
-            }, context=context))
+            }))
         return res
 
 SaleOpportunityLine()
@@ -394,15 +359,13 @@ SaleOpportunityLine()
 
 class One2ManyHistory(fields.One2Many):
 
-    def get(self, cursor, user, ids, model, name, values=None,
-            context=None):
+    def get(self, ids, model, name, values=None):
         opportunity2id = {}
-        histories = model.browse(cursor, user, ids, context=context)
+        histories = model.browse(ids)
         opportunity2id = dict((history.opportunity.id, history.id) for
                 history in histories)
-        res = super(One2ManyHistory, self).get(cursor, user,
-                opportunity2id.keys(), model, name, values=values,
-                context=context)
+        res = super(One2ManyHistory, self).get(opportunity2id.keys(), model,
+                name, values=values)
         return dict((opportunity2id[i], j) for i, j in res.iteritems())
 
 
@@ -441,7 +404,7 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
         super(SaleOpportunityHistory, self).__init__()
         self._order.insert(0, ('date', 'DESC'))
 
-    def _table_query_fields(self, context=None):
+    def _table_query_fields(self):
         opportunity_obj = self.pool.get('sale.opportunity')
         table = '%s__history' % opportunity_obj._table
         return [
@@ -453,7 +416,7 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 if name not in ('id', 'opportunity', 'date', 'user')
                 and not hasattr(field, 'set')]
 
-    def _table_query_group(self, context=None):
+    def _table_query_group(self):
         opportunity_obj = self.pool.get('sale.opportunity')
         table = '%s__history' % opportunity_obj._table
         return [
@@ -464,18 +427,18 @@ class SaleOpportunityHistory(ModelSQL, ModelView):
                 if name not in ('id', 'opportunity', 'date', 'user')
                 and not hasattr(field, 'set')]
 
-    def table_query(self, context=None):
+    def table_query(self):
         opportunity_obj = self.pool.get('sale.opportunity')
         return (('SELECT ' + \
-                (', '.join(self._table_query_fields(context=context))) + \
+                (', '.join(self._table_query_fields())) + \
                 ' FROM "%s__history" '
                 'GROUP BY ' + \
-                (', '.join(self._table_query_group(context=context)))) % \
+                (', '.join(self._table_query_group()))) % \
                 opportunity_obj._table, [])
 
-    def read(self, cursor, user, ids, fields_names=None, context=None):
-        res = super(SaleOpportunityHistory, self).read(cursor, user, ids,
-                fields_names=fields_names, context=context)
+    def read(self, ids, fields_names=None):
+        res = super(SaleOpportunityHistory, self).read(ids,
+                fields_names=fields_names)
 
         # Remove microsecond from timestamp
         for values in res:
@@ -510,24 +473,22 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
     conversion_amount_rate = fields.Function(fields.Float(
         'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
 
-    def _converted_state(self, context=None):
+    def _converted_state(self):
         return ['converted']
 
-    def _lost_state(self, context=None):
+    def _lost_state(self):
         return ['lost']
 
-    def table_query(self, context=None):
+    def table_query(self):
         opportunity_obj = self.pool.get('sale.opportunity')
-        if context is None:
-            context = {}
         clause = ' '
         args = [True]
-        if context.get('start_date'):
+        if Transaction().context.get('start_date'):
             clause += 'AND start_date >= %s '
-            args.append(context['start_date'])
-        if context.get('end_date'):
+            args.append(Transaction().context['start_date'])
+        if Transaction().context.get('end_date'):
             clause += 'AND start_date <= %s '
-            args.append(context['end_date'])
+            args.append(Transaction().context['end_date'])
         return ('SELECT DISTINCT(employee) AS id, '
                     'MAX(create_uid) AS create_uid, '
                     'MAX(create_date) AS create_date, '
@@ -537,44 +498,44 @@ class SaleOpportunityEmployee(ModelSQL, ModelView):
                     'company, '
                     'COUNT(1) AS number, '
                     'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state(context=context)) + ') '
+                        for x in self._converted_state()) + ') '
                         'THEN 1 ELSE 0 END) AS converted, '
                     'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._lost_state(context=context)) + ') '
+                        for x in self._lost_state()) + ') '
                         'THEN 1 ELSE 0 END) AS lost, '
                     'SUM(amount) AS amount, '
                     'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state(context=context)) + ') '
+                        for x in self._converted_state()) + ') '
                         'THEN amount ELSE 0 END) AS converted_amount '
                 'FROM "' + opportunity_obj._table + '" '
                 'WHERE %s ' \
                 + clause + \
                 'GROUP BY employee, company', args)
 
-    def get_conversion_rate(self, cursor, user, ids, name, context=None):
+    def get_conversion_rate(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             if record.number:
                 res[record.id] = float(record.converted) / record.number * 100.0
             else:
                 res[record.id] = 0.0
         return res
 
-    def get_currency(self, cursor, user, ids, name, context=None):
+    def get_currency(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = record.company.currency.id
         return res
 
-    def get_currency_digits(self, cursor, user, ids, name, context=None):
+    def get_currency_digits(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = record.company.currency.digits
         return res
 
-    def get_conversion_amount_rate(self, cursor, user, ids, name, context=None):
+    def get_conversion_amount_rate(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             if record.amount:
                 res[record.id] = (float(record.converted_amount) /
                         float(record.amount) * 100.0)
@@ -618,12 +579,12 @@ class OpenSaleOpportunityEmployee(Wizard):
         },
     }
 
-    def _action_open(self, cursor, user, data, context=None):
+    def _action_open(self, data):
         model_data_obj = self.pool.get('ir.model.data')
         act_window_obj = self.pool.get('ir.action.act_window')
-        act_window_id = model_data_obj.get_id(cursor, user, 'sale_opportunity',
-                'act_opportunity_employee_form', context=context)
-        res = act_window_obj.read(cursor, user, act_window_id, context=context)
+        act_window_id = model_data_obj.get_id('sale_opportunity',
+                'act_opportunity_employee_form')
+        res = act_window_obj.read(act_window_id)
         res['pyson_context'] = PYSONEncoder().encode({
             'start_date': data['form']['start_date'],
             'end_date': data['form']['end_date'],
@@ -665,13 +626,13 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
         self._order.insert(0, ('year', 'DESC'))
         self._order.insert(1, ('month', 'DESC'))
 
-    def _converted_state(self, context=None):
+    def _converted_state(self):
         return ['converted']
 
-    def _lost_state(self, context=None):
+    def _lost_state(self):
         return ['lost']
 
-    def table_query(self, context=None):
+    def table_query(self):
         opportunity_obj = self.pool.get('sale.opportunity')
         type_id = FIELDS[self.id._type].sql_type(self.id)[0]
         type_year = FIELDS[self.year._type].sql_type(self.year)[0]
@@ -691,49 +652,49 @@ class SaleOpportunityMonthly(ModelSQL, ModelView):
                         'company, '
                         'COUNT(1) AS number, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state(context=context)) + ') '
+                        for x in self._converted_state()) + ') '
                         'THEN 1 ELSE 0 END) AS converted, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._lost_state(context=context)) + ') '
+                        for x in self._lost_state()) + ') '
                         'THEN 1 ELSE 0 END) AS lost, '
                         'SUM(amount) AS amount, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state(context=context)) + ') '
+                        for x in self._converted_state()) + ') '
                         'THEN amount ELSE 0 END) AS converted_amount '
                     'FROM "' + opportunity_obj._table + '" '
                     'GROUP BY year, month, company) AS "' + self._table + '"',
                 [])
 
-    def get_conversion_rate(self, cursor, user, ids, name, context=None):
+    def get_conversion_rate(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             if record.number:
                 res[record.id] = float(record.converted) / record.number * 100.0
             else:
                 res[record.id] = 0.0
         return res
 
-    def get_year_month(self, cursor, user, ids, name, context=None):
+    def get_year_month(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = '%s-%s' % (record.year, int(record.month))
         return res
 
-    def get_currency(self, cursor, user, ids, name, context=None):
+    def get_currency(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = record.company.currency.id
         return res
 
-    def get_currency_digits(self, cursor, user, ids, name, context=None):
+    def get_currency_digits(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = record.company.currency.digits
         return res
 
-    def get_conversion_amount_rate(self, cursor, user, ids, name, context=None):
+    def get_conversion_amount_rate(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             if record.amount:
                 res[record.id] = (float(record.converted_amount) /
                         float(record.amount) * 100.0)
@@ -776,13 +737,13 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
         self._order.insert(1, ('month', 'DESC'))
         self._order.insert(2, ('employee', 'ASC'))
 
-    def _converted_state(self, context=None):
+    def _converted_state(self):
         return ['converted']
 
-    def _lost_state(self, context=None):
+    def _lost_state(self):
         return ['lost']
 
-    def table_query(self, context=None):
+    def table_query(self):
         opportunity_obj = self.pool.get('sale.opportunity')
         type_id = FIELDS[self.id._type].sql_type(self.id)[0]
         type_year = FIELDS[self.year._type].sql_type(self.year)[0]
@@ -805,43 +766,43 @@ class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
                         'company, '
                         'COUNT(1) AS number, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state(context=context)) + ') '
+                        for x in self._converted_state()) + ') '
                         'THEN 1 ELSE 0 END) AS converted, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._lost_state(context=context)) + ') '
+                        for x in self._lost_state()) + ') '
                         'THEN 1 ELSE 0 END) AS lost, '
                         'SUM(amount) AS amount, '
                         'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
-                        for x in self._converted_state(context=context)) + ') '
+                        for x in self._converted_state()) + ') '
                         'THEN amount ELSE 0 END) AS converted_amount '
                     'FROM "' + opportunity_obj._table + '" '
                     'GROUP BY year, month, employee, company) '
                 'AS "' + self._table + '"', [])
 
-    def get_conversion_rate(self, cursor, user, ids, name, context=None):
+    def get_conversion_rate(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             if record.number:
                 res[record.id] = float(record.converted) / record.number * 100.0
             else:
                 res[record.id] = 0.0
         return res
 
-    def get_currency(self, cursor, user, ids, name, context=None):
+    def get_currency(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = record.company.currency.id
         return res
 
-    def get_currency_digits(self, cursor, user, ids, name, context=None):
+    def get_currency_digits(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             res[record.id] = record.company.currency.digits
         return res
 
-    def get_conversion_amount_rate(self, cursor, user, ids, name, context=None):
+    def get_conversion_amount_rate(self, ids, name):
         res = {}
-        for record in self.browse(cursor, user, ids, context=context):
+        for record in self.browse(ids):
             if record.amount:
                 res[record.id] = (float(record.converted_amount) /
                         float(record.amount) * 100.0)
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
deleted file mode 100644
index e4ecd90..0000000
Binary files a/tests/__init__.pyc and /dev/null differ
diff --git a/tests/test_sale_opportunity.pyc b/tests/test_sale_opportunity.pyc
deleted file mode 100644
index 428332a..0000000
Binary files a/tests/test_sale_opportunity.pyc and /dev/null differ
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index b1f7022..bd7485d 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-sale-opportunity
-Version: 1.6.0
+Version: 1.8.0
 Summary: Provides:
     - Leads
     - Leads to Opportunities conversion
@@ -12,7 +12,7 @@ Home-page: http://www.openlabs.co.in/
 Author: Sharoon Thomas, Openlabs
 Author-email: info at openlabs.co.in
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
index 24ed023..735be89 100644
--- a/trytond_sale_opportunity.egg-info/SOURCES.txt
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -15,9 +15,7 @@ setup.py
 ./tests/__init__.py
 ./tests/test_sale_opportunity.py
 tests/__init__.py
-tests/__init__.pyc
 tests/test_sale_opportunity.py
-tests/test_sale_opportunity.pyc
 trytond_sale_opportunity.egg-info/PKG-INFO
 trytond_sale_opportunity.egg-info/SOURCES.txt
 trytond_sale_opportunity.egg-info/dependency_links.txt
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
index 96fc22a..8c9e7da 100644
--- a/trytond_sale_opportunity.egg-info/requires.txt
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -1,8 +1,8 @@
-trytond_party >= 1.6, < 1.7
-trytond_company >= 1.6, < 1.7
-trytond_product >= 1.6, < 1.7
-trytond_sale >= 1.6, < 1.7
-trytond_account >= 1.6, < 1.7
-trytond_stock >= 1.6, < 1.7
-trytond_currency >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_party >= 1.8, < 1.9
+trytond_company >= 1.8, < 1.9
+trytond_product >= 1.8, < 1.9
+trytond_sale >= 1.8, < 1.9
+trytond_account >= 1.8, < 1.9
+trytond_stock >= 1.8, < 1.9
+trytond_currency >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 9416174eb40c8f7506cea321e313f16f839578c9
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Sep 7 23:41:48 2010 +0200

    Adding upstream version 1.6.0.

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..1cbe557
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.6.0 - 2010-09-07
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..7bdae08
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,16 @@
+Copyright (C) 2010 Open Labs Business Solutions.
+Copyright (C) 2010 Cédric Krier.
+Copyright (C) 2010 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..8912f21
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,33 @@
+Installing trytond_sale_opportunity
+===================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+ * trytond_company (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+ * trytond_sale (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked the trytond_sale_opportunity source
+release, enter the directory where the archive was unpacked, and run:
+
+    python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+  http://peak.telecommunity.com/DevCenter/EasyInstall
+  http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name sale_opportunity.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b2a140e
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
+include tests/*
+include doc/*
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..1ac4c6e
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,29 @@
+Metadata-Version: 1.0
+Name: trytond_sale_opportunity
+Version: 1.6.0
+Summary: Provides:
+    - Leads
+    - Leads to Opportunities conversion
+    - Conversion Management
+    - Record of lost leads
+    - Opportunities to sale orders
+
+Home-page: http://www.openlabs.co.in/
+Author: Sharoon Thomas, Openlabs
+Author-email: info at openlabs.co.in
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.6/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/README b/README
new file mode 100644
index 0000000..97b9604
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_sale_opportunity
+========================
+
+The sale_opportunity module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+  http://bugs.tryton.org/
+  http://groups.tryton.org/
+  http://wiki.tryton.org/
+  irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+  http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..edddece
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from opportunity import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..2e6a8cb
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,47 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+    'name': 'Sales Leads and Opportunities',
+    'name_de_DE': 'Verkauf Interessenten und Chancen',
+    'version': '1.6.0',
+    'author': 'Sharoon Thomas, Openlabs',
+    'email': 'info at openlabs.co.in',
+    'website': 'http://www.openlabs.co.in/',
+    'description': '''Provides:
+    - Leads
+    - Leads to Opportunities conversion
+    - Conversion Management
+    - Record of lost leads
+    - Opportunities to sale orders
+''',
+    'description_de_DE': '''Ermöglicht:
+    - die Anlage von Interessenten (Leads)
+    - die Umwandlung von Interessenten zu Verkaufschancen (Opportunities)
+    - die Umwandlung von Chancen zu Verkäufen
+    - die Verfolgung von Interessentenverlusten
+''',
+    'description_fr_FR': '''Fourni :
+- Contacts commerciaux
+- Conversion des contacts commerciaux en opportunités
+- Gestion des conversions
+- Enregistrement des contacts commerciaux perdus
+- Conversion des opportunités en ordres de ventes.
+''',
+    'depends': [
+        'party',
+        'company',
+        'product',
+        'sale',
+        'account',
+        'stock',
+        'currency',
+    ],
+    'xml': [
+        'opportunity.xml',
+        'party.xml',
+    ],
+    'translation': [
+        'de_DE.csv',
+        'fr_FR.csv',
+    ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..b9cddb0
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,162 @@
+type,name,res_id,src,value,fuzzy
+error,sale.opportunity,0,Probability must be between 0 and 100!,Wahrscheinlichkeit muss zwischen 0 und 100 liegen!,0
+field,"sale.open_opportunity_employee.init,end_date",0,End Date,Enddatum,0
+field,"sale.open_opportunity_employee.init,start_date",0,Start Date,Anfangsdatum,0
+field,"sale.opportunity,address",0,Address,Adresse,0
+field,"sale.opportunity,amount",0,Amount,Betrag,0
+field,"sale.opportunity,comment",0,Comment,Kommentar,0
+field,"sale.opportunity,company",0,Company,Unternehmen,0
+field,"sale.opportunity,currency",0,Currency,Währung,0
+field,"sale.opportunity,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.opportunity,description",0,Description,Bezeichnung,0
+field,"sale.opportunity,employee",0,Employee,Mitarbeiter,0
+field,"sale.opportunity_employee,amount",0,Amount,Betrag,0
+field,"sale.opportunity_employee,company",0,Company,Unternehmen,0
+field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
+field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
+field,"sale.opportunity_employee,converted",0,Converted,Umgewandelt,0
+field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
+field,"sale.opportunity_employee,currency",0,Currency,Währung,0
+field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.opportunity_employee,employee",0,Employee,Mitarbeiter,0
+field,"sale.opportunity_employee,lost",0,Lost,Verlust,0
+field,"sale.opportunity_employee_monthly,amount",0,Amount,Betrag,0
+field,"sale.opportunity_employee_monthly,company",0,Company,Unternehmen,0
+field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
+field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
+field,"sale.opportunity_employee_monthly,converted",0,Converted,Umgewandelt,0
+field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
+field,"sale.opportunity_employee_monthly,currency",0,Currency,Währung,0
+field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.opportunity_employee_monthly,employee",0,Employee,Mitarbeiter,0
+field,"sale.opportunity_employee_monthly,lost",0,Lost,Verlust,0
+field,"sale.opportunity_employee_monthly,month",0,Month,Monat,0
+field,"sale.opportunity_employee_monthly,number",0,Number,Nummer,0
+field,"sale.opportunity_employee_monthly,rec_name",0,Name,Name,0
+field,"sale.opportunity_employee_monthly,year",0,Year,Jahr,0
+field,"sale.opportunity_employee,number",0,Number,Nummer,0
+field,"sale.opportunity_employee,rec_name",0,Name,Name,0
+field,"sale.opportunity,end_date",0,End Date,Enddatum,0
+field,"sale.opportunity,history",0,History,Verlauf,0
+field,"sale.opportunity.history,address",0,Address,Adresse,0
+field,"sale.opportunity.history,comment",0,Comment,Kommentar,0
+field,"sale.opportunity.history,company",0,Company,Unternehmen,0
+field,"sale.opportunity.history,date",0,Change Date,Änderungsdatum,0
+field,"sale.opportunity.history,description",0,Description,Bezeichnung,0
+field,"sale.opportunity.history,employee",0,Employee,Mitarbeiter,0
+field,"sale.opportunity.history,end_date",0,End Date,Enddatum,0
+field,"sale.opportunity.history,lines",0,Lines,Positionen,0
+field,"sale.opportunity.history,lost_reason",0,Reason for loss,Ursache für Verlust,0
+field,"sale.opportunity.history,opportunity",0,Sale Opportunity,Verkaufschance,0
+field,"sale.opportunity.history,party",0,Party,Partei,0
+field,"sale.opportunity.history,probability",0,Conversion Probability,Umwandlungswahrscheinlichkeit,0
+field,"sale.opportunity.history,rec_name",0,Name,Name,0
+field,"sale.opportunity.history,start_date",0,Start Date,Anfangsdatum,0
+field,"sale.opportunity.history,state",0,State,Status,0
+field,"sale.opportunity.history,user",0,User,Benutzer,0
+field,"sale.opportunity.line,opportunity",0,Opportunity,Verkaufschance,0
+field,"sale.opportunity.line,product",0,Product,Artikel,0
+field,"sale.opportunity.line,quantity",0,Quantity,Anzahl,0
+field,"sale.opportunity.line,rec_name",0,Name,Name,0
+field,"sale.opportunity,lines",0,Lines,Positionen,0
+field,"sale.opportunity.line,sale_line",0,Sale Line,Position Verkauf,0
+field,"sale.opportunity.line,sequence",0,Sequence,Reihenfolge,0
+field,"sale.opportunity.line,unit",0,Unit,Einheit,0
+field,"sale.opportunity.line,unit_digits",0,Unit Digits,Einheit Anzahl Stellen,0
+field,"sale.opportunity,lost_reason",0,Reason for loss,Ursache für Verlust,0
+field,"sale.opportunity_monthly,amount",0,Amount,Betrag,0
+field,"sale.opportunity_monthly,company",0,Company,Unternehmen,0
+field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Umwandlungsrate Betrag,0
+field,"sale.opportunity_monthly,conversion_rate",0,Conversion Rate,Umwandlungsrate,0
+field,"sale.opportunity_monthly,converted",0,Converted,Umgewandelt,0
+field,"sale.opportunity_monthly,converted_amount",0,Converted Amount,Umgewandelter Betrag,0
+field,"sale.opportunity_monthly,currency",0,Currency,Währung,0
+field,"sale.opportunity_monthly,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.opportunity_monthly,lost",0,Lost,Verlust,0
+field,"sale.opportunity_monthly,month",0,Month,Monat,0
+field,"sale.opportunity_monthly,number",0,Number,Nummer,0
+field,"sale.opportunity_monthly,rec_name",0,Name,Name,0
+field,"sale.opportunity_monthly,year",0,Year,Jahr,0
+field,"sale.opportunity_monthly,year_month",0,Year-Month,Jahr-Monat,0
+field,"sale.opportunity,party",0,Party,Partei,0
+field,"sale.opportunity,payment_term",0,Payment Term,Zahlungsbedingung,0
+field,"sale.opportunity,probability",0,Conversion Probability,Umwandlungswahrscheinlichkeit,0
+field,"sale.opportunity,rec_name",0,Name,Name,0
+field,"sale.opportunity,sale",0,Sale,Verkauf,0
+field,"sale.opportunity,start_date",0,Start Date,Anfangsdatum,0
+field,"sale.opportunity,state",0,State,Status,0
+field,"sale.opportunity,warehouse",0,Warehouse,Warenlager,0
+help,"sale.opportunity,amount",0,Estimated revenue amount,Geschätzter Ertrag,0
+help,"sale.opportunity_employee,conversion_amount_rate",0,In %,In %,0
+help,"sale.opportunity_employee,conversion_rate",0,In %,In %,0
+help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,In %,0
+help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,In %,0
+help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,In %,0
+help,"sale.opportunity_monthly,conversion_rate",0,In %,In %,0
+help,"sale.opportunity,probability",0,Percentage between 0 and 100,Prozentsatz zwischen 0 und 100,0
+model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Annullierte Interessenten und Verkaufschancen,0
+model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Umgewandelte Verkaufschancen,0
+model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
+model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Verluste Interessenten und Verkaufschancen,0
+model,"ir.action,name",act_opportunity_form_new,New Lead,Neuer Interessent,0
+model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Offene Interessenten,0
+model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
+model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
+model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
+model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
+model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Annullierte Interessenten und Verkaufschancen,0
+model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Umgewandelte Verkaufschancen,0
+model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Interessenten und Verkaufschancen,0
+model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Verluste Interessenten und Verkaufschancen,0
+model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Neuer Interessent,0
+model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Offene Interessenten,0
+model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Verkaufschancen,0
+model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Verkaufschancen pro Mitarbeiter pro Monat,0
+model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Verkaufschancen pro Monat,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Berichte,0
+model,"res.group,name",group_opportunity,Sale Opportunity,Verkaufschance,0
+model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Verkaufschancen pro Mitarbeiter Öffnen,0
+model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Verkaufschance pro Mitarbeiter pro Monat,0
+model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Verkaufschance pro Mitarbeiter,0
+model,"sale.opportunity.history,name",0,Sale Opportunity History,Verkaufschancen Verlauf,0
+model,"sale.opportunity.line,name",0,Sale Opportunity Line,Verkaufschance Position,0
+model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Verkaufschance pro Monat,0
+model,"sale.opportunity,name",0,Sale Opportunity,Verkaufschance,0
+model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Annulliert,0
+model,"workflow.activity,name",opportunity_activity_converted,Converted,Umgewandelt,0
+model,"workflow.activity,name",opportunity_activity_lead,Lead,Interessent,0
+model,"workflow.activity,name",opportunity_activity_lost,Lost,Verlust,0
+model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Verkaufschance,0
+model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Verkaufschancen Workflow,0
+selection,"sale.opportunity.history,state",0,Cancelled,Annulliert,0
+selection,"sale.opportunity.history,state",0,Converted,Umgewandelt,0
+selection,"sale.opportunity.history,state",0,Lead,Interessent,0
+selection,"sale.opportunity.history,state",0,Lost,Verlust,0
+selection,"sale.opportunity.history,state",0,Opportunity,Chance,0
+selection,"sale.opportunity,state",0,Cancelled,Annulliert,0
+selection,"sale.opportunity,state",0,Converted,Umgewandelt,0
+selection,"sale.opportunity,state",0,Lead,Interessent,0
+selection,"sale.opportunity,state",0,Lost,Verlust,0
+selection,"sale.opportunity,state",0,Opportunity,Verkaufschance,0
+view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+view,sale.opportunity,0,Cancel,Annullieren,0
+view,sale.opportunity,0,Convert to Opportunity,In Verkaufschance umwandeln,0
+view,sale.opportunity,0,Convert to Sale,In Verkauf umwandeln,0
+view,sale.opportunity,0,Lead/Opportunity,Interessent/Chance,0
+view,sale.opportunity,0,Mark as Lost,Als Verlust markieren,0
+view,sale.opportunity,0,Reset as Lead,Auf Interessent zurücksetzen,0
+view,sale.opportunity,0,Sale Lead/Opportunity,Interessent/Verkaufschance,0
+view,sale.opportunity,0,Sales Leads/Opportunities,Interessenten/Verkaufschancen,0
+view,sale.opportunity,0,Set as Lead,Auf Interessent setzen,0
+view,sale.opportunity_employee,0,Opportunities per Employee,Verkaufschancen pro Mitarbeiter,0
+view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Monat,0
+view,sale.opportunity.history,0,History,Verlauf,0
+view,sale.opportunity.history,0,Lead/Opportunity,Interessent/Chance,0
+view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Interessent/Verkaufschance,0
+view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Interessenten/Verkaufschancen,0
+view,sale.opportunity_monthly,0,Sale Opportunities per Month,Verkaufschancen pro Mitarbeiter,0
+wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Annullieren,0
+wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Öffnen,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..813fab4
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,162 @@
+type,name,res_id,src,value,fuzzy
+error,sale.opportunity,0,Probability must be between 0 and 100!,La probabilité doit être entre 0 et 100 !,0
+field,"sale.open_opportunity_employee.init,end_date",0,End Date,Date de fin,0
+field,"sale.open_opportunity_employee.init,start_date",0,Start Date,Date de début,0
+field,"sale.opportunity,address",0,Address,Adresse,0
+field,"sale.opportunity,amount",0,Amount,Montant,0
+field,"sale.opportunity,comment",0,Comment,Commentaire,0
+field,"sale.opportunity,company",0,Company,Société,0
+field,"sale.opportunity,currency",0,Currency,Devise,0
+field,"sale.opportunity,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"sale.opportunity,description",0,Description,Description,0
+field,"sale.opportunity,employee",0,Employee,Employé,0
+field,"sale.opportunity_employee,amount",0,Amount,Montant,0
+field,"sale.opportunity_employee,company",0,Company,Société,0
+field,"sale.opportunity_employee,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
+field,"sale.opportunity_employee,conversion_rate",0,Conversion Rate,Taux de conversion,0
+field,"sale.opportunity_employee,converted",0,Converted,Convertie,0
+field,"sale.opportunity_employee,converted_amount",0,Converted Amount,Montant convertit,0
+field,"sale.opportunity_employee,currency",0,Currency,Devise,0
+field,"sale.opportunity_employee,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"sale.opportunity_employee,employee",0,Employee,Employé,0
+field,"sale.opportunity_employee,lost",0,Lost,Perdue,0
+field,"sale.opportunity_employee_monthly,amount",0,Amount,Montant,0
+field,"sale.opportunity_employee_monthly,company",0,Company,Société,0
+field,"sale.opportunity_employee_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
+field,"sale.opportunity_employee_monthly,conversion_rate",0,Conversion Rate,Taux de conversion,0
+field,"sale.opportunity_employee_monthly,converted",0,Converted,Convertie,0
+field,"sale.opportunity_employee_monthly,converted_amount",0,Converted Amount,Montant converti,0
+field,"sale.opportunity_employee_monthly,currency",0,Currency,Devise,0
+field,"sale.opportunity_employee_monthly,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"sale.opportunity_employee_monthly,employee",0,Employee,Employé,0
+field,"sale.opportunity_employee_monthly,lost",0,Lost,Perdue,0
+field,"sale.opportunity_employee_monthly,month",0,Month,Mois,0
+field,"sale.opportunity_employee_monthly,number",0,Number,Nombre,0
+field,"sale.opportunity_employee_monthly,rec_name",0,Name,Nom,0
+field,"sale.opportunity_employee_monthly,year",0,Year,Année,0
+field,"sale.opportunity_employee,number",0,Number,Nombre,0
+field,"sale.opportunity_employee,rec_name",0,Name,Nom,0
+field,"sale.opportunity,end_date",0,End Date,Date de fin,0
+field,"sale.opportunity,history",0,History,Historique,0
+field,"sale.opportunity.history,address",0,Address,Adresse,0
+field,"sale.opportunity.history,comment",0,Comment,Commentaire,0
+field,"sale.opportunity.history,company",0,Company,Société,0
+field,"sale.opportunity.history,date",0,Change Date,Date de modification,0
+field,"sale.opportunity.history,description",0,Description,Description,0
+field,"sale.opportunity.history,employee",0,Employee,Employé,0
+field,"sale.opportunity.history,end_date",0,End Date,Date de fin,0
+field,"sale.opportunity.history,lines",0,Lines,Lignes,0
+field,"sale.opportunity.history,lost_reason",0,Reason for loss,Raison de la perte,0
+field,"sale.opportunity.history,opportunity",0,Sale Opportunity,Opportunité de vente,0
+field,"sale.opportunity.history,party",0,Party,Tiers,0
+field,"sale.opportunity.history,probability",0,Conversion Probability,Probabilité de conversion,0
+field,"sale.opportunity.history,rec_name",0,Name,Nom,0
+field,"sale.opportunity.history,start_date",0,Start Date,Date de début,0
+field,"sale.opportunity.history,state",0,State,État,0
+field,"sale.opportunity.history,user",0,User,Utilisateur,0
+field,"sale.opportunity.line,opportunity",0,Opportunity,Opportunité,0
+field,"sale.opportunity.line,product",0,Product,Produit,0
+field,"sale.opportunity.line,quantity",0,Quantity,Quantité,0
+field,"sale.opportunity.line,rec_name",0,Name,Nom,0
+field,"sale.opportunity,lines",0,Lines,Lignes,0
+field,"sale.opportunity.line,sale_line",0,Sale Line,Ligne de vente,0
+field,"sale.opportunity.line,sequence",0,Sequence,Séquence,0
+field,"sale.opportunity.line,unit",0,Unit,Unité,0
+field,"sale.opportunity.line,unit_digits",0,Unit Digits,Décimales de l'unité,0
+field,"sale.opportunity,lost_reason",0,Reason for loss,Raison de la perte,0
+field,"sale.opportunity_monthly,amount",0,Amount,Montant,0
+field,"sale.opportunity_monthly,company",0,Company,Société,0
+field,"sale.opportunity_monthly,conversion_amount_rate",0,Conversion Amount Rate,Taux de conversion des montants,0
+field,"sale.opportunity_monthly,conversion_rate",0,Conversion Rate,Taux de conversion,0
+field,"sale.opportunity_monthly,converted",0,Converted,Convertie,0
+field,"sale.opportunity_monthly,converted_amount",0,Converted Amount,Montant converti,0
+field,"sale.opportunity_monthly,currency",0,Currency,Devise,0
+field,"sale.opportunity_monthly,currency_digits",0,Currency Digits,Décimales de la devise,0
+field,"sale.opportunity_monthly,lost",0,Lost,Perdue,0
+field,"sale.opportunity_monthly,month",0,Month,Mois,0
+field,"sale.opportunity_monthly,number",0,Number,Nombre,0
+field,"sale.opportunity_monthly,rec_name",0,Name,Nom,0
+field,"sale.opportunity_monthly,year",0,Year,Année,0
+field,"sale.opportunity_monthly,year_month",0,Year-Month,Année-Mois,0
+field,"sale.opportunity,party",0,Party,Tiers,0
+field,"sale.opportunity,payment_term",0,Payment Term,Conditions de paiement,0
+field,"sale.opportunity,probability",0,Conversion Probability,Probabilité de conversion,0
+field,"sale.opportunity,rec_name",0,Name,Nom,0
+field,"sale.opportunity,sale",0,Sale,Vente,0
+field,"sale.opportunity,start_date",0,Start Date,Date de début,0
+field,"sale.opportunity,state",0,State,État,0
+field,"sale.opportunity,warehouse",0,Warehouse,Entrepôt,0
+help,"sale.opportunity,amount",0,Estimated revenue amount,Revenu estimé,0
+help,"sale.opportunity_employee,conversion_amount_rate",0,In %,En %,0
+help,"sale.opportunity_employee,conversion_rate",0,In %,En %,0
+help,"sale.opportunity_employee_monthly,conversion_amount_rate",0,In %,En %,0
+help,"sale.opportunity_employee_monthly,conversion_rate",0,In %,En %,0
+help,"sale.opportunity_monthly,conversion_amount_rate",0,In %,En %,0
+help,"sale.opportunity_monthly,conversion_rate",0,In %,En %,0
+help,"sale.opportunity,probability",0,Percentage between 0 and 100,Pourcentage entre 0 et 100,0
+model,"ir.action,name",act_opportunity_form_cancelled,Cancelled Leads and Opportunities,Opportunités annulées,0
+model,"ir.action,name",act_opportunity_form_converted,Converted Opportunities,Opportunités converties,0
+model,"ir.action,name",act_opportunity_form,Leads and Opportunities,Opportunités,0
+model,"ir.action,name",act_opportunity_form_lost,Lost Leads and Opportunities,Opportunités perdues,0
+model,"ir.action,name",act_opportunity_form_new,New Lead,Nouveau contact commercial,0
+model,"ir.action,name",act_opportunity_form_lead,Opened Leads,Contacts commerciaux ouverts,0
+model,"ir.action,name",act_opportunity_form_opportunity,Opportunities,Opportunités,0
+model,"ir.action,name",act_opportunity_employee_form,Opportunities per Employee,Opportunités par employé,0
+model,"ir.action,name",act_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
+model,"ir.action,name",act_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
+model,"ir.action,name",act_opportunity_monthly_form,Opportunities per Month,Opportunités par mois,0
+model,"ir.action,name",act_opportunity_form2,Sales Leads/Opportunities,Contacts commerciaux / Opportunités de vente,0
+model,"ir.ui.menu,name",menu_opportunity_form_cancelled,Cancelled Leads and Opportunities,Opportunités annulées,0
+model,"ir.ui.menu,name",menu_opportunity_form_converted,Converted Opportunities,Opportunités converties,0
+model,"ir.ui.menu,name",menu_opportunity_form,Leads and Opportunities,Contacts et opportunités de vente,0
+model,"ir.ui.menu,name",menu_opportunity_form_lost,Lost Leads and Opportunities,Opportunités perdues,0
+model,"ir.ui.menu,name",menu_opportunity_form_new,New Lead,Nouveau contact commercial,0
+model,"ir.ui.menu,name",menu_opportunity_form_lead,Opened Leads,Contatcs commerciaux ouverts,0
+model,"ir.ui.menu,name",menu_opportunity_form_opportunity,Opportunities,Opportunités,0
+model,"ir.ui.menu,name",menu_open_sale_opportunity_employee,Opportunities per Employee,Opportunités par employé,0
+model,"ir.ui.menu,name",menu_opportunity_employee_monthly_form,Opportunities per Employee per Month,Opportunités par employé par mois,0
+model,"ir.ui.menu,name",menu_opportunity_monthly_form,Opportunities per Month,Opportunités par mois,0
+model,"ir.ui.menu,name",menu_reporting,Reporting,Rapports,0
+model,"res.group,name",group_opportunity,Sale Opportunity,Opportunités de vente,0
+model,"sale.open_opportunity_employee.init,name",0,Open Sale Opportunity per Employee Init,Opportunités de vente par employé - Init,0
+model,"sale.opportunity_employee_monthly,name",0,Sale Opportunity per Employee per Month,Opportunités de vente par employé par mois,0
+model,"sale.opportunity_employee,name",0,Sale Opportunity per Employee,Opportunités de vente par employé,0
+model,"sale.opportunity.history,name",0,Sale Opportunity History,Historique des opportunités de vente,0
+model,"sale.opportunity.line,name",0,Sale Opportunity Line,Ligne d'opportunité de vente,0
+model,"sale.opportunity_monthly,name",0,Sale Opportunity per Month,Opportunités de vente par mois,0
+model,"sale.opportunity,name",0,Sale Opportunity,Opportunités de vente,0
+model,"workflow.activity,name",opportunity_activity_cancelled,Cancelled,Annulée,0
+model,"workflow.activity,name",opportunity_activity_converted,Converted,Convertie,0
+model,"workflow.activity,name",opportunity_activity_lead,Lead,Contact,0
+model,"workflow.activity,name",opportunity_activity_lost,Lost,Perdue,0
+model,"workflow.activity,name",opportunity_activity_opportunity,Opportunity,Opportunité,0
+model,"workflow,name",opportunity_workflow,Sales Opportunity Workflow,Workflow opportunité de vente,0
+selection,"sale.opportunity.history,state",0,Cancelled,Annulée,0
+selection,"sale.opportunity.history,state",0,Converted,Convertie,0
+selection,"sale.opportunity.history,state",0,Lead,Contact,0
+selection,"sale.opportunity.history,state",0,Lost,Perdue,0
+selection,"sale.opportunity.history,state",0,Opportunity,Opportunité,0
+selection,"sale.opportunity,state",0,Cancelled,Annulée,0
+selection,"sale.opportunity,state",0,Converted,Convertie,0
+selection,"sale.opportunity,state",0,Lead,Contact,0
+selection,"sale.opportunity,state",0,Lost,Perdue,0
+selection,"sale.opportunity,state",0,Opportunity,Opportunité,0
+view,sale.open_opportunity_employee.init,0,Sale Opportunities per Employee,Opportunités de vente par employé,0
+view,sale.opportunity,0,Cancel,Annuler,0
+view,sale.opportunity,0,Convert to Opportunity,Convertir en opportunité,0
+view,sale.opportunity,0,Convert to Sale,Convertir en vente,0
+view,sale.opportunity,0,Lead/Opportunity,Contact / Opportunité,0
+view,sale.opportunity,0,Mark as Lost,Marquer comme perdue,0
+view,sale.opportunity,0,Reset as Lead,Reconvertir en contact,0
+view,sale.opportunity,0,Sale Lead/Opportunity,Contact commercial / Opportunité de vente,0
+view,sale.opportunity,0,Sales Leads/Opportunities,Contacts commerciaux / Opportunités,0
+view,sale.opportunity,0,Set as Lead,Reconvertir en contact,0
+view,sale.opportunity_employee,0,Opportunities per Employee,Opportunités par employé,0
+view,sale.opportunity_employee_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
+view,sale.opportunity.history,0,History,Historique,0
+view,sale.opportunity.history,0,Lead/Opportunity,Contact / Opportunité,0
+view,sale.opportunity.line,0,Sale Lead/Opportunity Line,Ligne de contact / Opportunité de vente,0
+view,sale.opportunity.line,0,Sales Leads/Opportunities Lines,Lignes de contacts / Opportunités de vente,0
+view,sale.opportunity_monthly,0,Sale Opportunities per Month,Opportunités de vente par mois,0
+wizard_button,"sale.open_opportunity_employee,init,end",0,Cancel,Annuler,0
+wizard_button,"sale.open_opportunity_employee,init,open",0,Open,Ouvrir,0
diff --git a/opportunity.py b/opportunity.py
new file mode 100644
index 0000000..17bc701
--- /dev/null
+++ b/opportunity.py
@@ -0,0 +1,852 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Sales extension for managing leads and opportunities"
+import datetime
+from trytond.model import ModelView, ModelSQL, ModelWorkflow, fields
+from trytond.wizard import Wizard
+from trytond.backend import FIELDS
+from trytond.pyson import Equal, Eval, Not, In, If, Get, PYSONEncoder
+
+STATES = [
+    ('lead', 'Lead'),
+    ('opportunity', 'Opportunity'),
+    ('converted', 'Converted'),
+    ('cancelled', 'Cancelled'),
+    ('lost', 'Lost'),
+]
+_STATES_START = {
+    'readonly': Not(Equal(Eval('state'), 'lead')),
+}
+_STATES_STOP = {
+    'readonly': In(Eval('state'), ['converted', 'lost', 'cancelled']),
+}
+
+class SaleOpportunity(ModelWorkflow, ModelSQL, ModelView):
+    'Sale Opportunity'
+    _name = "sale.opportunity"
+    _description = __doc__
+    _history = True
+    _rec_name = 'description'
+
+    party = fields.Many2One('party.party', 'Party', required=True, select=1,
+            states=_STATES_STOP, depends=['state'])
+    address = fields.Many2One('party.address', 'Address',
+            domain=[('party', '=', Eval('party'))],
+            select=2, depends=['party', 'state'],
+            states=_STATES_STOP)
+    company = fields.Many2One('company.company', 'Company', required=True,
+            select=1, states=_STATES_STOP, domain=[
+                ('id', If(In('company', Eval('context', {})), '=', '!='),
+                    Get(Eval('context', {}), 'company', 0)),
+            ], on_change=['company'], depends=['state'])
+    currency = fields.Function(fields.Many2One('currency.currency',
+        'Currency'), 'get_currency')
+    currency_digits = fields.Function(fields.Integer('Currency Digits'),
+            'get_currency_digits')
+    amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'], help='Estimated revenue amount')
+    warehouse = fields.Many2One('stock.location', 'Warehouse',
+            domain=[('type', '=', 'warehouse')], states={
+                'required': Equal(Eval('state'), 'converted'),
+                'readonly': In(Eval('state'),
+                    ['converted', 'lost', 'cancelled']),
+            })
+    payment_term = fields.Many2One('account.invoice.payment_term',
+            'Payment Term', states={
+                'required': Equal(Eval('state'), 'converted'),
+                'readonly': In(Eval('state'),
+                    ['converted', 'lost', 'cancelled']),
+            })
+    employee = fields.Many2One('company.employee', 'Employee', required=True,
+            states=_STATES_STOP, depends=['state', 'company'],
+            domain=[('company', '=', Eval('company'))])
+    start_date = fields.Date('Start Date', required=True, select=1,
+            states=_STATES_START, depends=['state'])
+    end_date = fields.Date('End Date', select=2, readonly=True, states={
+        'invisible': Not(In(Eval('state'),
+            ['converted', 'cancelled', 'lost'])),
+    }, depends=['state'])
+    description = fields.Char('Description', required=True,
+            states=_STATES_STOP, depends=['state'])
+    comment = fields.Text('Comment', states=_STATES_STOP)
+    lines = fields.One2Many('sale.opportunity.line', 'opportunity', 'Lines',
+            states=_STATES_STOP, depends=['state'])
+    state = fields.Selection(STATES, 'State', required=True, select=1,
+            sort=False, readonly=True)
+    probability = fields.Integer('Conversion Probability',
+            states={
+                'readonly': Not(In(Eval('state'), ['opportunity', 'lead'])),
+            }, depends=['state'], help="Percentage between 0 and 100")
+    history = fields.One2Many('sale.opportunity.history', 'opportunity',
+            'History', readonly=True)
+    lost_reason = fields.Text('Reason for loss', states={
+        'invisible': Not(Equal(Eval('state'), 'lost')),
+    }, depends=['state'])
+    sale = fields.Many2One('sale.sale', 'Sale', readonly=True, states={
+        'invisible': Not(Equal(Eval('state'), 'converted')),
+        }, depends=['state'])
+
+    def __init__(self):
+        super(SaleOpportunity, self).__init__()
+        self._order.insert(0, ('start_date', 'DESC'))
+        self._sql_constraints += [
+            ('check_percentage',
+                'CHECK(probability >= 0 AND probability <= 100)',
+                'Probability must be between 0 and 100!')
+        ]
+        self._rpc.update({
+            'button_lead': True,
+        })
+
+    def default_state(self, cursor, user, context=None):
+        return 'lead'
+
+    def default_start_date(self, cursor, user, context=None):
+        date_obj = self.pool.get('ir.date')
+        return date_obj.today(cursor, user, context=context)
+
+    def default_probability(self, cursor, user, context=None):
+        return 50
+
+    def default_company(self, cursor, user, context=None):
+        if context is None:
+            context = {}
+        return context.get('company', False)
+
+    def default_employee(self, cursor, user_id, context=None):
+        user_obj = self.pool.get('res.user')
+        employee_obj = self.pool.get('company.employee')
+
+        if context is None:
+            context = {}
+        employee_id = None
+        if context.get('employee'):
+            employee_id = context['employee']
+        else:
+            user = user_obj.browse(cursor, user_id, user_id, context=context)
+            if user.employee:
+                employee_id = user.employee.id
+        if employee_id:
+            return employee_id
+        return False
+
+    def default_payment_term(self, cursor, user, context=None):
+        payment_term_obj = self.pool.get('account.invoice.payment_term')
+        payment_term_ids = payment_term_obj.search(cursor, user,
+                self.payment_term.domain, context=context)
+        if len(payment_term_ids) == 1:
+            return payment_term_ids[0]
+        return False
+
+    def default_warehouse(self, cursor, user, context=None):
+        location_obj = self.pool.get('stock.location')
+        location_ids = location_obj.search(cursor, user,
+                self.warehouse.domain, context=context)
+        if len(location_ids) == 1:
+            return location_ids[0]
+        return False
+
+    def get_currency(self, cursor, user, ids, name, context=None):
+        res = {}
+        for opportunity in self.browse(cursor, user, ids, context=context):
+            res[opportunity.id] = opportunity.company.currency.id
+        return res
+
+    def get_currency_digits(self, cursor, user, ids, name, context=None):
+        res = {}
+        for opportunity in self.browse(cursor, user, ids, context=context):
+            res[opportunity.id] = opportunity.company.currency.digits
+        return res
+
+    def on_change_company(self, cursor, user, values, context=None):
+        company_obj = self.pool.get('company.company')
+
+        res = {}
+        if values.get('company'):
+            company = company_obj.browse(cursor, user, values['company'],
+                    context=context)
+            res['currency'] = company.currency.id
+            res['currency.rec_name'] = company.currency.rec_name
+            res['currency_digits'] = company.currency.digits
+        return res
+
+    def on_change_party(self, cursor, user, values, context=None):
+        party_obj = self.pool.get('party.party')
+        payment_term_obj = self.pool.get('account.invoice.payment_term')
+
+        res = {
+            'payment_term': False,
+        }
+        if vals.get('party'):
+            party = party_obj.browse(cursor, user, vals['party'],
+                    context=context)
+            if party.payment_term:
+                res['payment_term'] = party.payment_term.id
+        if not res['payment_term']:
+            res['payment_term'] = self.default_payment_term(cursor, user,
+                    context=context)
+        if res['payment_term']:
+            res['payment_term.rec_name'] = payment_term_obj.browse(cursor, user,
+                    res['payment_term'], context=context).rec_name
+        return res
+
+    def set_end_date(self, cursor, user, opportunity_id, state, context=None):
+        """
+        This will fill the end_date for a lead/opportunity and change the state
+
+        :param cursor: the database cursor
+        :param user: the user id
+        :param opportunity_id: the id of the opportunity
+        :param state: the target state
+        :param context: the context
+        """
+        date_obj = self.pool.get('ir.date')
+        self.write(cursor, user, opportunity_id, {
+            'end_date': date_obj.today(cursor, user, context=context),
+            'state': state,
+            }, context=context)
+
+    def button_lead(self, cursor, user, ids, context=None):
+        self.workflow_trigger_create(cursor, user, ids, context=context)
+        return True
+
+    def _get_sale_line_opportunity_line(self, cursor, user, opportunity,
+            context=None):
+        '''
+        Return sale line values for each opportunity line
+
+        :param cursor: the database cursor
+        :param user: the user id
+        :param opportunity: the BrowseRecord of opportunity
+        :param context: the context
+
+        :return: a dictionary with opportunity line id as key
+            and a dictionary of sale line values as value
+        '''
+        line_obj = self.pool.get('sale.opportunity.line')
+        res = {}
+        for line in opportunity.lines:
+            val = line_obj.get_sale_line(cursor, user, line, context=context)
+            if val:
+                res[line.id] = val
+        return res
+
+    def _get_sale_opportunity(self, cursor, user, opportunity, context=None):
+        '''
+        Return sale values for an opportunity
+
+        :param cursor: the database cursor
+        :param user: the user id
+        :param opportunity: the BrowseRecord of the opportunity
+        :param context: the context
+
+        :return: a dictionary with sale fields as key and sale values as value
+        '''
+        res = {
+            'description': opportunity.description,
+            'party': opportunity.party.id,
+            'payment_term': opportunity.payment_term.id,
+            'company': opportunity.company.id,
+            'warehouse': opportunity.warehouse.id,
+            'invoice_address': opportunity.address and opportunity.address.id,
+            'shipment_address': opportunity.address and opportunity.address.id,
+            'currency': opportunity.company.currency.id,
+            'comment': opportunity.comment,
+        }
+        return res
+
+    def create_sale(self, cursor, user, opportunity_id, context=None):
+        '''
+        Create a sale for the opportunity
+
+        :param cursor: the database cursor
+        :param user: the user id
+        :param opportunity_id: the id of the opportunity
+        :param context: the context
+        '''
+        sale_obj = self.pool.get('sale.sale')
+        sale_line_obj = self.pool.get('sale.line')
+        line_obj = self.pool.get('sale.opportunity.line')
+
+        if context is None:
+            context = {}
+
+        opportunity = self.browse(cursor, user, opportunity_id,
+                context=context)
+
+        values = self._get_sale_opportunity(cursor, user, opportunity,
+                context=context)
+        sale_line_values = self._get_sale_line_opportunity_line(cursor, user,
+                opportunity, context=context)
+
+        ctx = context.copy()
+        ctx['user'] = user
+        sale_id = sale_obj.create(cursor, 0, values, context=ctx)
+
+        for line_id, values in sale_line_values.iteritems():
+            values['sale'] = sale_id
+            sale_line_id = sale_line_obj.create(cursor, 0, values,
+                    context=ctx)
+            line_obj.write(cursor, user, line_id, {
+                'sale_line': sale_line_id,
+                }, context=context)
+
+        self.write(cursor, user, opportunity_id, {
+            'sale': sale_id,
+            }, context=context)
+        return sale_id
+
+SaleOpportunity()
+
+
+class SaleOpportunityLine(ModelSQL, ModelView):
+    'Sale Opportunity Line'
+    _name = "sale.opportunity.line"
+    _description = __doc__
+    _rec_name = "product"
+    _history = True
+
+    opportunity = fields.Many2One('sale.opportunity', 'Opportunity')
+    sequence = fields.Integer('Sequence')
+    product = fields.Many2One('product.product', 'Product', required=True,
+            domain=[('salable', '=', True)], on_change=['product', 'unit'])
+    quantity = fields.Float('Quantity', required=True,
+            digits=(16, Eval('unit_digits', 2)), depends=['unit_digits'])
+    unit = fields.Many2One('product.uom', 'Unit', required=True)
+    unit_digits = fields.Function(fields.Integer('Unit Digits',
+        on_change_with=['unit']), 'get_unit_digits')
+    sale_line = fields.Many2One('sale.line', 'Sale Line', readonly=True,
+            states={
+                'invisible': Not(Equal(Eval('_parent_opportunity.state'),
+                    'converted')),
+            })
+
+    def __init__(self):
+        super(SaleOpportunityLine, self).__init__()
+        self._order.insert(0, ('sequence', 'ASC'))
+
+    def on_change_with_unit_digits(self, cursor, user, vals, context=None):
+        uom_obj = self.pool.get('product.uom')
+        if vals.get('unit'):
+            uom = uom_obj.browse(cursor, user, vals['unit'],
+                    context=context)
+            return uom.digits
+        return 2
+
+    def get_unit_digits(self, cursor, user, ids, name, context=None):
+        res = {}
+        for line in self.browse(cursor, user, ids, context=context):
+            if line.unit:
+                res[line.id] = line.unit.digits
+            else:
+                res[line.id] = 2
+        return res
+
+    def on_change_product(self, cursor, user, vals, context=None):
+        product_obj = self.pool.get('product.product')
+
+        if context is None:
+            context = {}
+        if not vals.get('product'):
+            return {}
+        res = {}
+
+        product = product_obj.browse(cursor, user, vals['product'],
+                context=context)
+        category = product.sale_uom.category
+        if not vals.get('unit') \
+                or vals.get('unit') not in [x.id for x in category.uoms]:
+            res['unit'] = product.sale_uom.id
+            res['unit.rec_name'] = product.sale_uom.rec_name
+            res['unit_digits'] = product.sale_uom.digits
+        return res
+
+    def get_sale_line(self, cursor, user, line, context=None):
+        '''
+        Return sale line values for opportunity line
+
+        :param cursor: the database cursor
+        :param user: the user id
+        :param line: the BrowseRecord of the line
+        :param context: the context
+
+        :return: a dictionary with sale line fields as key
+            and sale line values as value
+        '''
+        sale_line_obj = self.pool.get('sale.line')
+        res = {
+            'type': 'line',
+            'quantity': line.quantity,
+            'unit': line.unit.id,
+            'product': line.product.id,
+        }
+        res.update(sale_line_obj.on_change_product(cursor, user, {
+            'product': line.product.id,
+            'unit': line.unit.id,
+            'quantity': line.quantity,
+            '_parent_sale.party': line.opportunity.party.id,
+            '_parent_sale.currency': line.opportunity.company.currency.id,
+            }, context=context))
+        return res
+
+SaleOpportunityLine()
+
+
+class One2ManyHistory(fields.One2Many):
+
+    def get(self, cursor, user, ids, model, name, values=None,
+            context=None):
+        opportunity2id = {}
+        histories = model.browse(cursor, user, ids, context=context)
+        opportunity2id = dict((history.opportunity.id, history.id) for
+                history in histories)
+        res = super(One2ManyHistory, self).get(cursor, user,
+                opportunity2id.keys(), model, name, values=values,
+                context=context)
+        return dict((opportunity2id[i], j) for i, j in res.iteritems())
+
+
+class SaleOpportunityHistory(ModelSQL, ModelView):
+    'Sale Opportunity History'
+    _name = 'sale.opportunity.history'
+    _description = __doc__
+
+    date = fields.DateTime('Change Date')
+    opportunity = fields.Many2One('sale.opportunity', 'Sale Opportunity')
+    user = fields.Many2One('res.user', 'User')
+    party = fields.Many2One('party.party', 'Party', datetime_field='date')
+    address = fields.Many2One('party.address', 'Address',
+            datetime_field='date')
+    company = fields.Many2One('company.company', 'Company',
+            datetime_field='date')
+    employee = fields.Many2One('company.employee', 'Employee',
+            datetime_field='date')
+    start_date = fields.Date('Start Date')
+    end_date = fields.Date('End Date', states={
+        'invisible': Not(In(Eval('state'),
+            ['converted', 'cancelled', 'lost'])),
+    }, depends=['state'])
+    description = fields.Char('Description')
+    comment = fields.Text('Comment')
+    lines = One2ManyHistory('sale.opportunity.line', 'opportunity', 'Lines',
+            datetime_field='date')
+    state = fields.Selection(STATES, 'State')
+    probability = fields.Integer('Conversion Probability')
+    lost_reason = fields.Text('Reason for loss', states={
+        'invisible': Not(Equal(Eval('state'), 'lost')),
+    }, depends=['state'])
+
+
+    def __init__(self):
+        super(SaleOpportunityHistory, self).__init__()
+        self._order.insert(0, ('date', 'DESC'))
+
+    def _table_query_fields(self, context=None):
+        opportunity_obj = self.pool.get('sale.opportunity')
+        table = '%s__history' % opportunity_obj._table
+        return [
+            'MIN("%s".__id) AS id' % table,
+            '"%s".id AS opportunity' % table,
+            'MIN(COALESCE("%s".write_date, "%s".create_date)) AS date' % (table, table),
+            'COALESCE("%s".write_uid, "%s".create_uid) AS user' % (table, table),
+        ] + ['"%s"."%s"' % (table, name) for name, field in self._columns.iteritems()
+                if name not in ('id', 'opportunity', 'date', 'user')
+                and not hasattr(field, 'set')]
+
+    def _table_query_group(self, context=None):
+        opportunity_obj = self.pool.get('sale.opportunity')
+        table = '%s__history' % opportunity_obj._table
+        return [
+            '"%s".id' % table,
+            'COALESCE("%s".write_uid, "%s".create_uid)' % (table, table),
+        ] + ['"%s"."%s"' % (table, name)
+                for name, field in self._columns.iteritems()
+                if name not in ('id', 'opportunity', 'date', 'user')
+                and not hasattr(field, 'set')]
+
+    def table_query(self, context=None):
+        opportunity_obj = self.pool.get('sale.opportunity')
+        return (('SELECT ' + \
+                (', '.join(self._table_query_fields(context=context))) + \
+                ' FROM "%s__history" '
+                'GROUP BY ' + \
+                (', '.join(self._table_query_group(context=context)))) % \
+                opportunity_obj._table, [])
+
+    def read(self, cursor, user, ids, fields_names=None, context=None):
+        res = super(SaleOpportunityHistory, self).read(cursor, user, ids,
+                fields_names=fields_names, context=context)
+
+        # Remove microsecond from timestamp
+        for values in res:
+            if 'date' in values:
+                values['date'] = values['date'].replace(microsecond=0)
+        return res
+
+SaleOpportunityHistory()
+
+
+class SaleOpportunityEmployee(ModelSQL, ModelView):
+    'Sale Opportunity per Employee'
+    _name = 'sale.opportunity_employee'
+    _description = __doc__
+
+    employee = fields.Many2One('company.employee', 'Employee')
+    number = fields.Integer('Number')
+    converted = fields.Integer('Converted')
+    conversion_rate = fields.Function(fields.Float('Conversion Rate',
+        help='In %'), 'get_conversion_rate')
+    lost = fields.Integer('Lost')
+    company = fields.Many2One('company.company', 'Company')
+    currency = fields.Function(fields.Many2One('currency.currency',
+        'Currency'), 'get_currency')
+    currency_digits = fields.Function(fields.Integer('Currency Digits'),
+            'get_currency_digits')
+    amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'])
+    converted_amount = fields.Numeric('Converted Amount',
+            digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'])
+    conversion_amount_rate = fields.Function(fields.Float(
+        'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
+
+    def _converted_state(self, context=None):
+        return ['converted']
+
+    def _lost_state(self, context=None):
+        return ['lost']
+
+    def table_query(self, context=None):
+        opportunity_obj = self.pool.get('sale.opportunity')
+        if context is None:
+            context = {}
+        clause = ' '
+        args = [True]
+        if context.get('start_date'):
+            clause += 'AND start_date >= %s '
+            args.append(context['start_date'])
+        if context.get('end_date'):
+            clause += 'AND start_date <= %s '
+            args.append(context['end_date'])
+        return ('SELECT DISTINCT(employee) AS id, '
+                    'MAX(create_uid) AS create_uid, '
+                    'MAX(create_date) AS create_date, '
+                    'MAX(write_uid) AS write_uid, '
+                    'MAX(write_date) AS write_date, '
+                    'employee, '
+                    'company, '
+                    'COUNT(1) AS number, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._converted_state(context=context)) + ') '
+                        'THEN 1 ELSE 0 END) AS converted, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._lost_state(context=context)) + ') '
+                        'THEN 1 ELSE 0 END) AS lost, '
+                    'SUM(amount) AS amount, '
+                    'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._converted_state(context=context)) + ') '
+                        'THEN amount ELSE 0 END) AS converted_amount '
+                'FROM "' + opportunity_obj._table + '" '
+                'WHERE %s ' \
+                + clause + \
+                'GROUP BY employee, company', args)
+
+    def get_conversion_rate(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            if record.number:
+                res[record.id] = float(record.converted) / record.number * 100.0
+            else:
+                res[record.id] = 0.0
+        return res
+
+    def get_currency(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = record.company.currency.id
+        return res
+
+    def get_currency_digits(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = record.company.currency.digits
+        return res
+
+    def get_conversion_amount_rate(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            if record.amount:
+                res[record.id] = (float(record.converted_amount) /
+                        float(record.amount) * 100.0)
+            else:
+                res[record.id] = 0.0
+        return res
+
+SaleOpportunityEmployee()
+
+
+class OpenSaleOpportunityEmployeeInit(ModelView):
+    'Open Sale Opportunity per Employee Init'
+    _name = 'sale.open_opportunity_employee.init'
+    _description = __doc__
+    start_date = fields.Date('Start Date')
+    end_date = fields.Date('End Date')
+
+OpenSaleOpportunityEmployeeInit()
+
+
+class OpenSaleOpportunityEmployee(Wizard):
+    'Open Sale Opportunity per Employee'
+    _name = 'sale.open_opportunity_employee'
+    states = {
+        'init': {
+            'result': {
+                'type': 'form',
+                'object': 'sale.open_opportunity_employee.init',
+                'state': [
+                    ('end', 'Cancel', 'tryton-cancel'),
+                    ('open', 'Open', 'tryton-ok', True),
+                ],
+            },
+        },
+        'open': {
+            'result': {
+                'type': 'action',
+                'action': '_action_open',
+                'state': 'end',
+            },
+        },
+    }
+
+    def _action_open(self, cursor, user, data, context=None):
+        model_data_obj = self.pool.get('ir.model.data')
+        act_window_obj = self.pool.get('ir.action.act_window')
+        act_window_id = model_data_obj.get_id(cursor, user, 'sale_opportunity',
+                'act_opportunity_employee_form', context=context)
+        res = act_window_obj.read(cursor, user, act_window_id, context=context)
+        res['pyson_context'] = PYSONEncoder().encode({
+            'start_date': data['form']['start_date'],
+            'end_date': data['form']['end_date'],
+            })
+        return res
+
+OpenSaleOpportunityEmployee()
+
+
+class SaleOpportunityMonthly(ModelSQL, ModelView):
+    'Sale Opportunity per Month'
+    _name = 'sale.opportunity_monthly'
+    _description = __doc__
+
+    year = fields.Char('Year')
+    month = fields.Integer('Month')
+    year_month = fields.Function(fields.Char('Year-Month'),
+            'get_year_month')
+    number = fields.Integer('Number')
+    converted = fields.Integer('Converted')
+    conversion_rate = fields.Function(fields.Float('Conversion Rate',
+        help='In %'), 'get_conversion_rate')
+    lost = fields.Integer('Lost')
+    company = fields.Many2One('company.company', 'Company')
+    currency = fields.Function(fields.Many2One('currency.currency',
+        'Currency'), 'get_currency')
+    currency_digits = fields.Function(fields.Integer('Currency Digits'),
+            'get_currency_digits')
+    amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'])
+    converted_amount = fields.Numeric('Converted Amount',
+            digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'])
+    conversion_amount_rate = fields.Function(fields.Float(
+        'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
+
+    def __init__(self):
+        super(SaleOpportunityMonthly, self).__init__()
+        self._order.insert(0, ('year', 'DESC'))
+        self._order.insert(1, ('month', 'DESC'))
+
+    def _converted_state(self, context=None):
+        return ['converted']
+
+    def _lost_state(self, context=None):
+        return ['lost']
+
+    def table_query(self, context=None):
+        opportunity_obj = self.pool.get('sale.opportunity')
+        type_id = FIELDS[self.id._type].sql_type(self.id)[0]
+        type_year = FIELDS[self.year._type].sql_type(self.year)[0]
+        return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
+                    'create_date, write_uid, write_date, '
+                    'CAST(year AS ' + type_year + ') AS year, month, company, '
+                    'number, converted, lost, amount, converted_amount '
+                'FROM ('
+                    'SELECT EXTRACT(MONTH FROM start_date) + '
+                            'EXTRACT(YEAR FROM start_date) * 100 AS id, '
+                        'MAX(create_uid) AS create_uid, '
+                        'MAX(create_date) AS create_date, '
+                        'MAX(write_uid) AS write_uid, '
+                        'MAX(write_date) AS write_date, '
+                        'EXTRACT(YEAR FROM start_date) AS year, '
+                        'EXTRACT(MONTH FROM start_date) AS month, '
+                        'company, '
+                        'COUNT(1) AS number, '
+                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._converted_state(context=context)) + ') '
+                        'THEN 1 ELSE 0 END) AS converted, '
+                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._lost_state(context=context)) + ') '
+                        'THEN 1 ELSE 0 END) AS lost, '
+                        'SUM(amount) AS amount, '
+                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._converted_state(context=context)) + ') '
+                        'THEN amount ELSE 0 END) AS converted_amount '
+                    'FROM "' + opportunity_obj._table + '" '
+                    'GROUP BY year, month, company) AS "' + self._table + '"',
+                [])
+
+    def get_conversion_rate(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            if record.number:
+                res[record.id] = float(record.converted) / record.number * 100.0
+            else:
+                res[record.id] = 0.0
+        return res
+
+    def get_year_month(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = '%s-%s' % (record.year, int(record.month))
+        return res
+
+    def get_currency(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = record.company.currency.id
+        return res
+
+    def get_currency_digits(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = record.company.currency.digits
+        return res
+
+    def get_conversion_amount_rate(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            if record.amount:
+                res[record.id] = (float(record.converted_amount) /
+                        float(record.amount) * 100.0)
+            else:
+                res[record.id] = 0.0
+        return res
+
+SaleOpportunityMonthly()
+
+
+class SaleOpportunityEmployeeMonthly(ModelSQL, ModelView):
+    'Sale Opportunity per Employee per Month'
+    _name = 'sale.opportunity_employee_monthly'
+    _description = __doc__
+
+    year = fields.Char('Year')
+    month = fields.Integer('Month')
+    employee = fields.Many2One('company.employee', 'Employee')
+    number = fields.Integer('Number')
+    converted = fields.Integer('Converted')
+    conversion_rate = fields.Function(fields.Float('Conversion Rate',
+        help='In %'), 'get_conversion_rate')
+    lost = fields.Integer('Lost')
+    company = fields.Many2One('company.company', 'Company')
+    currency = fields.Function(fields.Many2One('currency.currency',
+        'Currency'), 'get_currency')
+    currency_digits = fields.Function(fields.Integer('Currency Digits'),
+            'get_currency_digits')
+    amount = fields.Numeric('Amount', digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'])
+    converted_amount = fields.Numeric('Converted Amount',
+            digits=(16, Eval('currency_digits', 2)),
+            depends=['currency_digits'])
+    conversion_amount_rate = fields.Function(fields.Float(
+        'Conversion Amount Rate', help='In %'), 'get_conversion_amount_rate')
+
+    def __init__(self):
+        super(SaleOpportunityEmployeeMonthly, self).__init__()
+        self._order.insert(0, ('year', 'DESC'))
+        self._order.insert(1, ('month', 'DESC'))
+        self._order.insert(2, ('employee', 'ASC'))
+
+    def _converted_state(self, context=None):
+        return ['converted']
+
+    def _lost_state(self, context=None):
+        return ['lost']
+
+    def table_query(self, context=None):
+        opportunity_obj = self.pool.get('sale.opportunity')
+        type_id = FIELDS[self.id._type].sql_type(self.id)[0]
+        type_year = FIELDS[self.year._type].sql_type(self.year)[0]
+        return ('SELECT CAST(id AS ' + type_id + ') AS id, create_uid, '
+                    'create_date, write_uid, write_date, '
+                    'CAST(year AS ' + type_year + ') AS year, month, '
+                    'employee, company, number, converted, lost, amount, '
+                    'converted_amount '
+                'FROM ('
+                    'SELECT EXTRACT(MONTH FROM start_date) + '
+                            'EXTRACT(YEAR FROM start_date) * 100 + '
+                            'employee * 1000000 AS id, '
+                        'MAX(create_uid) AS create_uid, '
+                        'MAX(create_date) AS create_date, '
+                        'MAX(write_uid) AS write_uid, '
+                        'MAX(write_date) AS write_date, '
+                        'EXTRACT(YEAR FROM start_date) AS year, '
+                        'EXTRACT(MONTH FROM start_date) AS month, '
+                        'employee, '
+                        'company, '
+                        'COUNT(1) AS number, '
+                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._converted_state(context=context)) + ') '
+                        'THEN 1 ELSE 0 END) AS converted, '
+                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._lost_state(context=context)) + ') '
+                        'THEN 1 ELSE 0 END) AS lost, '
+                        'SUM(amount) AS amount, '
+                        'SUM(CASE WHEN state IN (' + ','.join("'%s'" % x
+                        for x in self._converted_state(context=context)) + ') '
+                        'THEN amount ELSE 0 END) AS converted_amount '
+                    'FROM "' + opportunity_obj._table + '" '
+                    'GROUP BY year, month, employee, company) '
+                'AS "' + self._table + '"', [])
+
+    def get_conversion_rate(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            if record.number:
+                res[record.id] = float(record.converted) / record.number * 100.0
+            else:
+                res[record.id] = 0.0
+        return res
+
+    def get_currency(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = record.company.currency.id
+        return res
+
+    def get_currency_digits(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            res[record.id] = record.company.currency.digits
+        return res
+
+    def get_conversion_amount_rate(self, cursor, user, ids, name, context=None):
+        res = {}
+        for record in self.browse(cursor, user, ids, context=context):
+            if record.amount:
+                res[record.id] = (float(record.converted_amount) /
+                        float(record.amount) * 100.0)
+            else:
+                res[record.id] = 0.0
+        return res
+
+SaleOpportunityEmployeeMonthly()
diff --git a/opportunity.xml b/opportunity.xml
new file mode 100644
index 0000000..d3df37d
--- /dev/null
+++ b/opportunity.xml
@@ -0,0 +1,766 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tryton>
+    <data>
+        <menuitem name="Reporting" parent="sale.menu_sale"
+            id="menu_reporting" sequence="100"/>
+
+        <record model="res.group" id="group_opportunity">
+            <field name="name">Sale Opportunity</field>
+        </record>
+        <record model="res.user" id="res.user_admin">
+            <field name="groups" eval="[('add', ref('group_opportunity'))]"/>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_view_form">
+            <field name="model">sale.opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="Sale Lead/Opportunity">
+                    <label name="party"/>
+                    <field name="party"/>
+                    <label name="address"/>
+                    <field name="address"/>
+                    <label name="amount"/>
+                    <group col="2" id="amount_currency">
+                        <field name="amount"/>
+                        <field name="currency"/>
+                    </group>
+                    <label name="probability"/>
+                    <field name="probability"/>
+                    <label name="description"/>
+                    <field name="description" colspan="3"/>
+                    <notebook colspan="4">
+                        <page string="Lead/Opportunity" id="opportunity">
+                            <label name="company"/>
+                            <field name="company"/>
+                            <label name="employee"/>
+                            <field name="employee"/>
+                            <label name="start_date"/>
+                            <field name="start_date"/>
+                            <label name="end_date"/>
+                            <field name="end_date"/>
+                            <label name="warehouse"/>
+                            <field name="warehouse"/>
+                            <label name="payment_term"/>
+                            <field name="payment_term"/>
+                            <label name="sale"/>
+                            <field name="sale"/>
+                            <separator name="comment" colspan="4"/>
+                            <field name="comment" colspan="4"/>
+                            <separator name="lost_reason" colspan="4"/>
+                            <field name="lost_reason" colspan="4"/>
+                            <group col="2" colspan="2" id="state">
+                                <label name="state"/>
+                                <field name="state"/>
+                            </group>
+                            <group col="6" colspan="2" id="buttons">
+                                <button name="cancelled" string="Cancel"
+                                    states="{'invisible': Not(In(Eval('state'), ['lead', 'opportunity']))}"
+                                    icon="tryton-cancel"/>
+                                <button name="lost_lead" string="Mark as Lost"
+                                    states="{'invisible':Not(In(Eval('state'), ['lead','opportunity']))}"
+                                    icon="tryton-cancel"/>
+                                <button name="set_as_lead" string="Set as Lead"
+                                    states="{'invisible':Not(In(Eval('state'), ['opportunity']))}"
+                                    icon="tryton-go-previous"/>
+                                <button name="convert_to_opportunity" string="Convert to Opportunity"
+                                    states="{'invisible': Not(In(Eval('state'), ['lead']))}"
+                                    icon="tryton-go-next"/>
+                                <button name="convert_to_sale" string="Convert to Sale"
+                                    states="{'invisible': Not(In(Eval('state'), ['opportunity']))}"
+                                    icon="tryton-go-next"/>
+                                <button name="button_lead" string="Reset as Lead"
+                                    type="object"
+                                    states="{'invisible': Not(In(Eval('state'), ['lost', 'cancelled']))}"
+                                    icon="tryton-clear"/>
+                            </group>
+                        </page>
+                        <page name="lines">
+                            <field name="lines"/>
+                        </page>
+                        <page name="history">
+                            <field name="history"/>
+                        </page>
+                    </notebook>
+                </form>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_view_tree">
+            <field name="model">sale.opportunity</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Sales Leads/Opportunities">
+                    <field name="start_date" select="2"/>
+                    <field name="end_date" select="2"/>
+                    <field name="description" select="2"/>
+                    <field name="party" select="1"/>
+                    <field name="amount" select="1"/>
+                    <field name="currency"/>
+                    <field name="state" select="1"/>
+                    <field name="probability" select="2"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.action.act_window" id="act_opportunity_form">
+            <field name="name">Leads and Opportunities</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form"/>
+        </record>
+        <menuitem parent="sale.menu_sale" action="act_opportunity_form"
+            id="menu_opportunity_form" sequence="5"/>
+
+        <record model="ir.action.act_window" id="act_opportunity_form_new">
+            <field name="name">New Lead</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_new_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form_new"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_new_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form_new"/>
+        </record>
+        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_new"
+            id="menu_opportunity_form_new" sequence="10"/>
+
+        <record model="ir.action.act_window" id="act_opportunity_form_lead">
+            <field name="name">Opened Leads</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="domain">[("state", "=", "lead")]</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_lead_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form_lead"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_lead_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form_lead"/>
+        </record>
+        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_lead"
+            id="menu_opportunity_form_lead" sequence="20"/>
+
+        <record model="ir.action.act_window" id="act_opportunity_form_opportunity">
+            <field name="name">Opportunities</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="domain">[("state", "=", "opportunity")]</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_opportunity_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form_opportunity"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_opportunity_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form_opportunity"/>
+        </record>
+        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_opportunity"
+            id="menu_opportunity_form_opportunity" sequence="30"/>
+
+        <record model="ir.action.act_window" id="act_opportunity_form_converted">
+            <field name="name">Converted Opportunities</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="domain">[("state", "=", "converted")]</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_converted_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form_converted"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_converted_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form_converted"/>
+        </record>
+        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_converted"
+            id="menu_opportunity_form_converted" sequence="40"/>
+
+        <record model="ir.action.act_window" id="act_opportunity_form_cancelled">
+            <field name="name">Cancelled Leads and Opportunities</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="domain">[("state", "=", "cancelled")]</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_cancelled_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form_cancelled"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_cancelled_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form_cancelled"/>
+        </record>
+        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_cancelled"
+            id="menu_opportunity_form_cancelled" sequence="50"/>
+
+        <record model="ir.action.act_window" id="act_opportunity_form_lost">
+            <field name="name">Lost Leads and Opportunities</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="domain">[("state", "=", "lost")]</field>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_lost_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_view_tree"/>
+            <field name="act_window" ref="act_opportunity_form_lost"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_opportunity_form_lost_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_view_form"/>
+            <field name="act_window" ref="act_opportunity_form_lost"/>
+        </record>
+        <menuitem parent="menu_opportunity_form" action="act_opportunity_form_lost"
+            id="menu_opportunity_form_lost" sequence="60"/>
+
+        <record model="ir.model.access" id="access_opportunity">
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_delete" eval="False"/>
+        </record>
+        <record model="ir.model.access" id="access_opportunity_oppotunity">
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="group" ref="group_opportunity"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+
+        <record model="ir.rule.group" id="rule_group_opportunity">
+            <field name="model" search="[('model', '=', 'sale.opportunity')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_group_opportunity1">
+            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity')]"/>
+            <field name="operator">=</field>
+            <field name="operand">User/Current Company</field>
+            <field name="rule_group" ref="rule_group_opportunity"/>
+        </record>
+
+        <record model="workflow" id="opportunity_workflow">
+            <field name="name">Sales Opportunity Workflow</field>
+            <field name="model">sale.opportunity</field>
+            <field name="on_create" eval="True" />
+        </record>
+
+        <record model="workflow.activity" id="opportunity_activity_lead">
+            <field name="name">Lead</field>
+            <field name="workflow" ref="opportunity_workflow"/>
+            <field name="kind">function</field>
+            <field name="action">write({'state': 'lead'})</field>
+            <field name="flow_start" eval="True"/>
+        </record>
+        <record model="workflow.activity" id="opportunity_activity_opportunity">
+            <field name="name">Opportunity</field>
+            <field name="workflow" ref="opportunity_workflow"/>
+            <field name="kind">function</field>
+            <field name="action">write({'state': 'opportunity'})</field>
+        </record>
+        <record model="workflow.activity" id="opportunity_activity_converted">
+            <field name="name">Converted</field>
+            <field name="workflow" ref="opportunity_workflow"/>
+            <field name="kind">function</field>
+            <field name="action">set_end_date('converted')
+create_sale()</field>
+            <field name="flow_stop" eval="True"/>
+        </record>
+        <record model="workflow.activity" id="opportunity_activity_cancelled">
+            <field name="name">Cancelled</field>
+            <field name="workflow" ref="opportunity_workflow"/>
+            <field name="kind">function</field>
+            <field name="action">set_end_date('cancelled')</field>
+            <field name="flow_stop" eval="True"/>
+        </record>
+        <record model="workflow.activity" id="opportunity_activity_lost">
+            <field name="name">Lost</field>
+            <field name="workflow" ref="opportunity_workflow"/>
+            <field name="kind">function</field>
+            <field name="action">set_end_date('lost')</field>
+            <field name="flow_stop" eval="True"/>
+        </record>
+
+        <record model="workflow.transition" id="opportunity_transition_lead_opportunity">
+            <field name="act_from" ref="opportunity_activity_lead"/>
+            <field name="act_to" ref="opportunity_activity_opportunity"/>
+            <field name="signal">convert_to_opportunity</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_opportunity_converted">
+            <field name="act_from" ref="opportunity_activity_opportunity"/>
+            <field name="act_to" ref="opportunity_activity_converted"/>
+            <field name="signal">convert_to_sale</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_opportunity_lead">
+            <field name="act_from" ref="opportunity_activity_opportunity"/>
+            <field name="act_to" ref="opportunity_activity_lead"/>
+            <field name="signal">set_as_lead</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_cancelled_lead">
+            <field name="act_from" ref="opportunity_activity_cancelled"/>
+            <field name="act_to" ref="opportunity_activity_lead"/>
+            <field name="signal">set_as_lead</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_lead_lost">
+            <field name="act_from" ref="opportunity_activity_lead"/>
+            <field name="act_to" ref="opportunity_activity_lost"/>
+            <field name="signal">lost_lead</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_opportunity_lost">
+            <field name="act_from" ref="opportunity_activity_opportunity"/>
+            <field name="act_to" ref="opportunity_activity_lost"/>
+            <field name="signal">lost_lead</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_lead_cancelled">
+            <field name="act_from" ref="opportunity_activity_lead"/>
+            <field name="act_to" ref="opportunity_activity_cancelled"/>
+            <field name="signal">cancelled</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+        <record model="workflow.transition" id="opportunity_transition_opp_cancelled">
+            <field name="act_from" ref="opportunity_activity_opportunity"/>
+            <field name="act_to" ref="opportunity_activity_cancelled"/>
+            <field name="signal">cancelled</field>
+            <field name="group" ref="sale.group_sale"/>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_line_view_form">
+            <field name="model">sale.opportunity.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="Sale Lead/Opportunity Line">
+                    <label name="opportunity"/>
+                    <field name="opportunity" colspan="3"/>
+                    <label name="product"/>
+                    <field name="product"/>
+                    <label name="sequence"/>
+                    <field name="sequence"/>
+                    <label name="quantity"/>
+                    <field name="quantity"/>
+                    <label name="unit"/>
+                    <field name="unit"/>
+                    <label name="sale_line"/>
+                    <field name="sale_line"/>
+                </form>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="opportunity_line_view_tree">
+            <field name="model">sale.opportunity.line</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Sales Leads/Opportunities Lines" fill="1" sequence="sequence">
+                    <field name="opportunity" select="1"/>
+                    <field name="product" select="1"/>
+                    <field name="quantity" select="2"/>
+                    <field name="unit" select="2"/>
+                    <field name="sequence" tree_invisible="1"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.model.access" id="access_opportunity_line">
+            <field name="model" search="[('model', '=', 'sale.opportunity.line')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+        <record model="ir.model.access" id="access_opportunity_line_opportunity">
+            <field name="model" search="[('model', '=', 'sale.opportunity.line')]"/>
+            <field name="group" ref="group_opportunity"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_history_view_form">
+            <field name="model">sale.opportunity.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="History">
+                    <label name="opportunity"/>
+                    <field name="opportunity" colspan="4"/>
+                    <label name="user"/>
+                    <field name="user"/>
+                    <label name="date"/>
+                    <field name="date"/>
+                    <label name="party"/>
+                    <field name="party"/>
+                    <label name="address"/>
+                    <field name="address"/>
+                    <label name="description"/>
+                    <field name="description"/>
+                    <label name="probability"/>
+                    <field name="probability"/>
+                    <notebook colspan="4">
+                        <page string="Lead/Opportunity" id="opportunity">
+                            <label name="company"/>
+                            <field name="company"/>
+                            <label name="employee"/>
+                            <field name="employee"/>
+                            <label name="start_date"/>
+                            <field name="start_date"/>
+                            <label name="end_date"/>
+                            <field name="end_date"/>
+                            <separator name="comment" colspan="4"/>
+                            <field name="comment" colspan="4"/>
+                            <separator name="lost_reason" colspan="4"/>
+                            <field name="lost_reason" colspan="4"/>
+                            <group col="2" colspan="2" id="state">
+                                <label name="state"/>
+                                <field name="state"/>
+                            </group>
+                        </page>
+                        <page name="lines">
+                            <field name="lines"/>
+                        </page>
+                    </notebook>
+                </form>
+                ]]>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="opportunity_history_view_tree">
+            <field name="model">sale.opportunity.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="History">
+                    <field name="date" select="1"/>
+                    <field name="user" select="1"/>
+                    <field name="start_date" select="2"/>
+                    <field name="end_date" select="2"/>
+                    <field name="description" select="2"/>
+                    <field name="party" select="2"/>
+                    <field name="state" select="1"/>
+                    <field name="probability" select="2"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.model.access" id="access_opportunity_history">
+            <field name="model" search="[('model', '=', 'sale.opportunity.history')]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+        <record model="ir.model.access" id="access_opportunity_history_opportunity">
+            <field name="model" search="[('model', '=', 'sale.opportunity.history')]"/>
+            <field name="group" ref="group_opportunity"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_delete" eval="True"/>
+        </record>
+
+        <record model="ir.rule.group" id="rule_group_opportunity_history">
+            <field name="model" search="[('model', '=', 'sale.opportunity.history')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_group_opportunity_history1">
+            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity.history')]"/>
+            <field name="operator">=</field>
+            <field name="operand">User/Current Company</field>
+            <field name="rule_group" ref="rule_group_opportunity_history"/>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_employee_view_tree">
+            <field name="model">sale.opportunity_employee</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Opportunities per Employee">
+                    <field name="employee" select="1"/>
+                    <field name="number" select="1"/>
+                    <field name="converted" select="2"/>
+                    <field name="lost" select="2"/>
+                    <field name="conversion_rate"/>
+                    <field name="amount" select="1"/>
+                    <field name="converted_amount" select="2"/>
+                    <field name="currency" select="2"/>
+                    <field name="conversion_amount_rate"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_employee_view_graph1">
+            <field name="model">sale.opportunity_employee</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <graph string="Opportunities per Employee">
+                    <x>
+                        <field name="employee"/>
+                    </x>
+                    <y>
+                        <field name="number"/>
+                        <field name="converted"/>
+                        <field name="lost"/>
+                    </y>
+                </graph>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_employee_view_graph2">
+            <field name="model">sale.opportunity_employee</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <graph string="Opportunities per Employee">
+                    <x>
+                        <field name="employee"/>
+                    </x>
+                    <y>
+                        <field name="amount"/>
+                        <field name="converted_amount"/>
+                    </y>
+                </graph>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.action.act_window" id="act_opportunity_employee_form">
+            <field name="name">Opportunities per Employee</field>
+            <field name="res_model">sale.opportunity_employee</field>
+            <field name="view_type">form</field>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_employee_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_employee_view_tree"/>
+            <field name="act_window" ref="act_opportunity_employee_form"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_employee_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_employee_view_graph1"/>
+            <field name="act_window" ref="act_opportunity_employee_form"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_employee_form_view3">
+            <field name="sequence" eval="30"/>
+            <field name="view" ref="opportunity_employee_view_graph2"/>
+            <field name="act_window" ref="act_opportunity_employee_form"/>
+        </record>
+
+        <record model="ir.rule.group" id="rule_group_opportunity_employee">
+            <field name="model" search="[('model', '=', 'sale.opportunity_employee')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_group_opportunity_employee1">
+            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity_employee')]"/>
+            <field name="operator">=</field>
+            <field name="operand">User/Current Company</field>
+            <field name="rule_group" ref="rule_group_opportunity_employee"/>
+        </record>
+
+        <record model="ir.ui.view" id="open_sale_opportunity_employee_init_view_form">
+            <field name="model">sale.open_opportunity_employee.init</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="Sale Opportunities per Employee">
+                    <label name="start_date"/>
+                    <field name="start_date"/>
+                    <label name="end_date"/>
+                    <field name="end_date"/>
+                </form>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.action.wizard" id="act_open_sale_opportunity_employee">
+            <field name="name">Opportunities per Employee</field>
+            <field name="wiz_name">sale.open_opportunity_employee</field>
+        </record>
+        <menuitem parent="menu_reporting" action="act_open_sale_opportunity_employee"
+            icon="tryton-list" id="menu_open_sale_opportunity_employee"/>
+
+        <record model="ir.ui.view" id="opportunity_monthly_view_tree">
+            <field name="model">sale.opportunity_monthly</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Sale Opportunities per Month">
+                    <field name="year" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="number" select="2"/>
+                    <field name="converted" select="2"/>
+                    <field name="lost" select="2"/>
+                    <field name="conversion_rate"/>
+                    <field name="amount" select="2"/>
+                    <field name="converted_amount" select="2"/>
+                    <field name="currency"/>
+                    <field name="conversion_amount_rate"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_monthly_view_graph1">
+            <field name="model">sale.opportunity_monthly</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <graph string="Sale Opportunities per Month">
+                    <x>
+                        <field name="year_month"/>
+                    </x>
+                    <y>
+                        <field name="number"/>
+                        <field name="converted"/>
+                        <field name="lost"/>
+                    </y>
+                </graph>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_monthly_view_graph2">
+            <field name="model">sale.opportunity_monthly</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <graph string="Sale Opportunities per Month">
+                    <x>
+                        <field name="year_month"/>
+                    </x>
+                    <y>
+                        <field name="amount"/>
+                        <field name="converted_amount"/>
+                    </y>
+                </graph>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.action.act_window" id="act_opportunity_monthly_form">
+            <field name="name">Opportunities per Month</field>
+            <field name="res_model">sale.opportunity_monthly</field>
+            <field name="view_type">form</field>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_monthly_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_monthly_view_tree"/>
+            <field name="act_window" ref="act_opportunity_monthly_form"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_monthly_form_view2">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="opportunity_monthly_view_graph1"/>
+            <field name="act_window" ref="act_opportunity_monthly_form"/>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_monthly_form_view3">
+            <field name="sequence" eval="30"/>
+            <field name="view" ref="opportunity_monthly_view_graph2"/>
+            <field name="act_window" ref="act_opportunity_monthly_form"/>
+        </record>
+
+        <menuitem parent="menu_reporting" action="act_opportunity_monthly_form"
+            id="menu_opportunity_monthly_form"/>
+
+        <record model="ir.rule.group" id="rule_group_opportunity_monthly">
+            <field name="model" search="[('model', '=', 'sale.opportunity_monthly')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_group_opportunity_monthly1">
+            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity_monthly')]"/>
+            <field name="operator">=</field>
+            <field name="operand">User/Current Company</field>
+            <field name="rule_group" ref="rule_group_opportunity_monthly"/>
+        </record>
+
+        <record model="ir.ui.view" id="opportunity_employee_monthly_view_tree">
+            <field name="model">sale.opportunity_employee_monthly</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <tree string="Sale Opportunities per Month">
+                    <field name="year" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="employee" select="1"/>
+                    <field name="number" select="2"/>
+                    <field name="converted" select="2"/>
+                    <field name="lost" select="2"/>
+                    <field name="conversion_rate"/>
+                    <field name="amount" select="2"/>
+                    <field name="converted_amount" select="2"/>
+                    <field name="currency"/>
+                    <field name="conversion_amount_rate"/>
+                </tree>
+                ]]>
+            </field>
+        </record>
+
+        <record model="ir.action.act_window" id="act_opportunity_employee_monthly_form">
+            <field name="name">Opportunities per Employee per Month</field>
+            <field name="res_model">sale.opportunity_employee_monthly</field>
+            <field name="view_type">form</field>
+        </record>
+        <record model="ir.action.act_window.view"
+            id="act_opportunity_employee_monthly_form_view1">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="opportunity_employee_monthly_view_tree"/>
+            <field name="act_window" ref="act_opportunity_employee_monthly_form"/>
+        </record>
+
+        <menuitem parent="menu_reporting"
+            action="act_opportunity_employee_monthly_form"
+            id="menu_opportunity_employee_monthly_form"/>
+
+        <record model="ir.rule.group" id="rule_group_opportunity_employee_monthly">
+            <field name="model" search="[('model', '=', 'sale.opportunity_employee_monthly')]"/>
+            <field name="global_p" eval="True"/>
+        </record>
+        <record model="ir.rule" id="rule_group_opportunity_employee_monthly1">
+            <field name="field" search="[('name', '=', 'company'), ('model.model', '=', 'sale.opportunity_employee_monthly')]"/>
+            <field name="operator">=</field>
+            <field name="operand">User/Current Company</field>
+            <field name="rule_group" ref="rule_group_opportunity_employee_monthly"/>
+        </record>
+
+    </data>
+</tryton>
diff --git a/party.xml b/party.xml
new file mode 100644
index 0000000..d3bf018
--- /dev/null
+++ b/party.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+        <record model="ir.action.act_window" id="act_opportunity_form2">
+            <field name="name">Sales Leads/Opportunities</field>
+            <field name="res_model">sale.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="domain">[("party", "=", Eval('active_id'))]</field>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_sale_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">party.party,0</field>
+            <field name="action" ref="act_opportunity_form2"/>
+        </record>
+
+    </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..3e49ab7
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup
+import re
+
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
+
+requires = []
+for dep in info.get('depends', []):
+    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+        requires.append('trytond_%s >= %s.%s, < %s.%s' %
+                (dep, major_version, minor_version, major_version,
+                    minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+        (major_version, minor_version, major_version, minor_version + 1))
+
+setup(name='trytond_sale_opportunity',
+    version=info.get('version', '0.0.1'),
+    description=info.get('description', ''),
+    author=info.get('author', ''),
+    author_email=info.get('email', ''),
+    url=info.get('website', ''),
+    download_url="http://downloads.tryton.org/" + \
+            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+    package_dir={'trytond.modules.sale_opportunity': '.'},
+    packages=[
+        'trytond.modules.sale_opportunity',
+        'trytond.modules.sale_opportunity.tests',
+    ],
+    package_data={
+        'trytond.modules.sale_opportunity': info.get('xml', []) \
+                + info.get('translation', []),
+    },
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Financial and Insurance Industry',
+        'Intended Audience :: Legal Industry',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: English',
+        'Natural Language :: French',
+        'Natural Language :: German',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Office/Business',
+    ],
+    license='GPL-3',
+    install_requires=requires,
+    zip_safe=False,
+    entry_points="""
+    [trytond.modules]
+    sale_opportunity = trytond.modules.sale_opportunity
+    """,
+    test_suite='tests',
+    test_loader='trytond.test_loader:Loader',
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..0a37d9e
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_sale_opportunity import suite
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
new file mode 100644
index 0000000..e4ecd90
Binary files /dev/null and b/tests/__init__.pyc differ
diff --git a/tests/test_sale_opportunity.py b/tests/test_sale_opportunity.py
new file mode 100644
index 0000000..b92dc76
--- /dev/null
+++ b/tests/test_sale_opportunity.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+    '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+    sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import test_view
+
+
+class SaleOpportunityTestCase(unittest.TestCase):
+    '''
+    Test SaleOpportunity module.
+    '''
+
+    def setUp(self):
+        trytond.tests.test_tryton.install_module('sale_opportunity')
+
+    def test0005views(self):
+        '''
+        Test views.
+        '''
+        test_view('sale_opportunity')
+
+def suite():
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+        SaleOpportunityTestCase))
+    return suite
+
+if __name__ == '__main__':
+    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tests/test_sale_opportunity.pyc b/tests/test_sale_opportunity.pyc
new file mode 100644
index 0000000..428332a
Binary files /dev/null and b/tests/test_sale_opportunity.pyc differ
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
new file mode 100644
index 0000000..b1f7022
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -0,0 +1,29 @@
+Metadata-Version: 1.0
+Name: trytond-sale-opportunity
+Version: 1.6.0
+Summary: Provides:
+    - Leads
+    - Leads to Opportunities conversion
+    - Conversion Management
+    - Record of lost leads
+    - Opportunities to sale orders
+
+Home-page: http://www.openlabs.co.in/
+Author: Sharoon Thomas, Openlabs
+Author-email: info at openlabs.co.in
+License: GPL-3
+Download-URL: http://downloads.tryton.org/1.6/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
diff --git a/trytond_sale_opportunity.egg-info/SOURCES.txt b/trytond_sale_opportunity.egg-info/SOURCES.txt
new file mode 100644
index 0000000..24ed023
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/SOURCES.txt
@@ -0,0 +1,27 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+fr_FR.csv
+opportunity.xml
+party.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./opportunity.py
+./tests/__init__.py
+./tests/test_sale_opportunity.py
+tests/__init__.py
+tests/__init__.pyc
+tests/test_sale_opportunity.py
+tests/test_sale_opportunity.pyc
+trytond_sale_opportunity.egg-info/PKG-INFO
+trytond_sale_opportunity.egg-info/SOURCES.txt
+trytond_sale_opportunity.egg-info/dependency_links.txt
+trytond_sale_opportunity.egg-info/entry_points.txt
+trytond_sale_opportunity.egg-info/not-zip-safe
+trytond_sale_opportunity.egg-info/requires.txt
+trytond_sale_opportunity.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_sale_opportunity.egg-info/dependency_links.txt b/trytond_sale_opportunity.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_sale_opportunity.egg-info/entry_points.txt b/trytond_sale_opportunity.egg-info/entry_points.txt
new file mode 100644
index 0000000..b1c91b5
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+    [trytond.modules]
+    sale_opportunity = trytond.modules.sale_opportunity
+    
\ No newline at end of file
diff --git a/trytond_sale_opportunity.egg-info/not-zip-safe b/trytond_sale_opportunity.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_sale_opportunity.egg-info/requires.txt b/trytond_sale_opportunity.egg-info/requires.txt
new file mode 100644
index 0000000..96fc22a
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/requires.txt
@@ -0,0 +1,8 @@
+trytond_party >= 1.6, < 1.7
+trytond_company >= 1.6, < 1.7
+trytond_product >= 1.6, < 1.7
+trytond_sale >= 1.6, < 1.7
+trytond_account >= 1.6, < 1.7
+trytond_stock >= 1.6, < 1.7
+trytond_currency >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
diff --git a/trytond_sale_opportunity.egg-info/top_level.txt b/trytond_sale_opportunity.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_sale_opportunity.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
-- 
tryton-modules-sale-opportunity



More information about the tryton-debian-vcs mailing list