Merge lp:~cv.clearcorp/partner-contact-management/7.0-review_partner_merge into lp:~clearcorp-drivers/partner-contact-management/7.0-ccorp

[Carlos Vásquez (ClearCorp)]

[FIX] Fix base_partner_merge report. Add reference as a criteria for merge contacts

=== modified file 'base_partner_merge/base_partner_merge.py'
--- base_partner_merge/base_partner_merge.py	2014-02-06 13:36:20 +0000
+++ base_partner_merge/base_partner_merge.py	2014-06-13 23:01:23 +0000
@@ -90,6 +90,7 @@
         # Group by
         'group_by_email': fields.boolean('Email'),
         'group_by_name': fields.boolean('Name'),
+        'group_by_ref': fields.boolean('Reference'),
         'group_by_is_company': fields.boolean('Is Company'),
         'group_by_vat': fields.boolean('VAT'),
         'group_by_parent_id': fields.boolean('Parent Company'),
@@ -469,7 +470,7 @@
 
         filters = []
         for field in fields:
-            if field in ['email', 'name']:
+            if field in ['email', 'name', 'ref']:
                 filters.append((field, 'IS NOT', 'NULL'))
 
         criteria = ' AND '.join('%s %s %s' % (field, operator, value)

=== modified file 'base_partner_merge/base_partner_merge_view.xml'
--- base_partner_merge/base_partner_merge_view.xml	2014-02-25 14:53:41 +0000
+++ base_partner_merge/base_partner_merge_view.xml	2014-06-13 23:01:23 +0000
@@ -76,6 +76,7 @@
                             attrs="{'invisible': [('state', 'not in', ('option',))]}">
                             <field name='group_by_email' />
                             <field name='group_by_name' />
+                            <field name='group_by_ref' />
                             <field name='group_by_is_company' />
                             <field name='group_by_vat' />
                             <field name='group_by_parent_id' />

=== added directory 'base_partner_merge/i18n'
=== added file 'base_partner_merge/i18n/base_partner_merge.pot'
--- base_partner_merge/i18n/base_partner_merge.pot	1970-01-01 00:00:00 +0000
+++ base_partner_merge/i18n/base_partner_merge.pot	2014-06-13 23:01:23 +0000
@@ -0,0 +1,308 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_partner_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-13 22:04+0000\n"
+"PO-Revision-Date: 2014-06-13 22:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:384
+#, python-format
+msgid "Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Partners"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Exclude contacts having"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Deduplicate the other Contacts"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,partner_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,number_group:0
+msgid "Group of Contacts"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.line,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: base_partner_merge
+#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr ""
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:347
+#, python-format
+msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Skip these contacts"
+msgstr ""
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:357
+#, python-format
+msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge the following contacts"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,current_line_id:0
+msgid "Current Line"
+msgstr ""
+
+#. module: base_partner_merge
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Option"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,dst_partner_id:0
+msgid "Destination Contact"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Are you sure to execute the automatic merge of your contacts ?"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Are you sure to execute the list of automatic merges of your contacts ?"
+msgstr ""
+
+#. module: base_partner_merge
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Finished"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_vat:0
+msgid "VAT"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge Automatically all process"
+msgstr ""
+
+#. module: base_partner_merge
+#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line
+msgid "base.partner.merge.line"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Select the list of fields used to search for\n"
+"                            duplicated records. If you select several fields,\n"
+"                            OpenERP will propose you to merge only those having\n"
+"                            all these fields in common. (not one of the fields)."
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_is_company:0
+msgid "Is Company"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,maximum_group:0
+msgid "Maximum of Group of Contacts"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Search duplicates based on duplicated data in"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge Selection"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge Automatically"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.line,aggr_ids:0
+msgid "Ids"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.line,min_id:0
+msgid "MinID"
+msgstr ""
+
+#. module: base_partner_merge
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Selection"
+msgstr ""
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:346
+#: code:addons/base_partner_merge/base_partner_merge.py:356
+#: code:addons/base_partner_merge/base_partner_merge.py:383
+#: code:addons/base_partner_merge/base_partner_merge.py:517
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "There is no more contacts to merge for this request..."
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,exclude_journal_item:0
+msgid "Journal Items associated to the contact"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Options"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "The selected contacts will be merged together. All\n"
+"                                documents linking to one of these contacts will be\n"
+"                                redirected to the aggregated contact. You can remove\n"
+"                                contacts from this list to avoid merging them."
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Automatic Merge Wizard"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_parent_id:0
+msgid "Parent Company"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: base_partner_merge
+#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge
+msgid "Automatic Merge"
+msgstr ""
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:518
+#, python-format
+msgid "You have to specify a filter for your selection"
+msgstr ""
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:402
+#, python-format
+msgid "Merged with the following partners:"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:res.partner,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge with Manual Check"
+msgstr ""
+
+#. module: base_partner_merge
+#: model:ir.model,name:base_partner_merge.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Close"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,exclude_contact:0
+msgid "A user associated to the contact"
+msgstr ""
+
+#. module: base_partner_merge
+#: model:ir.ui.menu,name:base_partner_merge.root_menu
+msgid "Tools"
+msgstr ""
+
+#. module: base_partner_merge
+#: field:res.partner,id:0
+msgid "Id"
+msgstr ""
+
+#. module: base_partner_merge
+#: model:ir.actions.act_window,name:base_partner_merge.base_partner_merge_automatic_act
+#: model:ir.ui.menu,name:base_partner_merge.partner_merge_automatic_menu
+msgid "Deduplicate Contacts"
+msgstr ""
+

=== added file 'base_partner_merge/i18n/es.po'
--- base_partner_merge/i18n/es.po	1970-01-01 00:00:00 +0000
+++ base_partner_merge/i18n/es.po	2014-06-13 23:01:23 +0000
@@ -0,0 +1,314 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_partner_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-13 22:04+0000\n"
+"PO-Revision-Date: 2014-06-13 22:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:384
+#, python-format
+msgid "Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."
+msgstr "Sólo el contacto de destino puede estar relacionado con Líneas de Asiento existentes. Contacte con el Administrador si necesita combinar varios contactos vinculados a Líneas de Asiento existentes."
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Exclude contacts having"
+msgstr "Excluir contactos que tengan"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Deduplicate the other Contacts"
+msgstr "Duplicar los otros contactos"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,partner_ids:0
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,number_group:0
+msgid "Group of Contacts"
+msgstr "Grupo de Contactos"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.line,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. module: base_partner_merge
+#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard
+msgid "base.partner.merge.automatic.wizard"
+msgstr "base.partner.merge.automatic.wizard"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:347
+#, python-format
+msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
+msgstr "Por razones de seguridad, no se puede combinar más de 3 contactos juntos. Se puede volver a abrir el asistente varias veces si es necesario."
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Skip these contacts"
+msgstr "Saltar estos contactos"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:357
+#, python-format
+msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
+msgstr "Todos los contactos deben tener el mismo correo electrónico. Sólo el administrador puede combinar contactos con diferentes correos."
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge the following contacts"
+msgstr "Combinar los siguientes contactos"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_email:0
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,current_line_id:0
+msgid "Current Line"
+msgstr "Línea Actual"
+
+#. module: base_partner_merge
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Option"
+msgstr "Opción"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,dst_partner_id:0
+msgid "Destination Contact"
+msgstr "Contacto de Destino"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Are you sure to execute the automatic merge of your contacts ?"
+msgstr "Está seguro de ejecutar la combinación automática de sus contactos ?"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Are you sure to execute the list of automatic merges of your contacts ?"
+msgstr "Está seguro de ejecutar la lista de combinación automática de sus contactos ?"
+
+#. module: base_partner_merge
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Finished"
+msgstr "Finalizado"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_vat:0
+msgid "VAT"
+msgstr "VAT"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge Automatically all process"
+msgstr "Combinar automáticamente todo el proceso"
+
+#. module: base_partner_merge
+#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line
+msgid "base.partner.merge.line"
+msgstr "base.partner.merge.line"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Select the list of fields used to search for\n"
+"                            duplicated records. If you select several fields,\n"
+"                            OpenERP will propose you to merge only those having\n"
+"                            all these fields in common. (not one of the fields)."
+msgstr "Seleccione la lista de campos utilizados para buscar \n "
+"							 registros duplicados. Si selecciona varios campos, \n"
+"							 OpenERP propondrá combinar sólo los que tienen \n"
+"							 todos estos campos en común. (No uno de los campos)."
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_is_company:0
+msgid "Is Company"
+msgstr "Es Compañía"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,maximum_group:0
+msgid "Maximum of Group of Contacts"
+msgstr "Máximo Grupo de Contactos"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Search duplicates based on duplicated data in"
+msgstr "Buscar duplicados basado en datos duplicados"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge Selection"
+msgstr "Seleción para combinar"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge Automatically"
+msgstr "Combinar automáticamente"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,line_ids:0
+msgid "Lines"
+msgstr "Líneas"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.line,aggr_ids:0
+msgid "Ids"
+msgstr "Ids"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.line,min_id:0
+msgid "MinID"
+msgstr "MinID"
+
+#. module: base_partner_merge
+#: selection:base.partner.merge.automatic.wizard,state:0
+msgid "Selection"
+msgstr "Selección"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:346
+#: code:addons/base_partner_merge/base_partner_merge.py:356
+#: code:addons/base_partner_merge/base_partner_merge.py:383
+#: code:addons/base_partner_merge/base_partner_merge.py:517
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "There is no more contacts to merge for this request..."
+msgstr "No existen más contactos para combinar para esta solicitud..."
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,exclude_journal_item:0
+msgid "Journal Items associated to the contact"
+msgstr "Líneas de asiento asociadas a este contacto"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "The selected contacts will be merged together. All\n"
+"                                documents linking to one of these contacts will be\n"
+"                                redirected to the aggregated contact. You can remove\n"
+"                                contacts from this list to avoid merging them."
+msgstr " Los contactos seleccionados se combinan entre sí. Todos \n"
+"								 los documentos que vinculan a uno de estos contactos se \n"
+"								 redireccionan al contacto agregado. Puede eliminar \n"
+"								 los contactos de esta lista para evitar combinarlos."
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Automatic Merge Wizard"
+msgstr "Asistente para combinación automática"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_parent_id:0
+msgid "Parent Company"
+msgstr "Compañía Padre"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,group_by_ref:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: base_partner_merge
+#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge
+msgid "Automatic Merge"
+msgstr "Combinar automático"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:518
+#, python-format
+msgid "You have to specify a filter for your selection"
+msgstr "Necesita tener un filtro para su selección"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/base_partner_merge.py:402
+#, python-format
+msgid "Merged with the following partners:"
+msgstr "Combinar con las siguientes empresas:"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "or"
+msgstr "o"
+
+#. module: base_partner_merge
+#: field:res.partner,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Merge with Manual Check"
+msgstr "Combinar con revisión manual"
+
+#. module: base_partner_merge
+#: model:ir.model,name:base_partner_merge.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_partner_merge
+#: view:base.partner.merge.automatic.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: base_partner_merge
+#: field:base.partner.merge.automatic.wizard,exclude_contact:0
+msgid "A user associated to the contact"
+msgstr "Usuario asociado con el contacto"
+
+#. module: base_partner_merge
+#: model:ir.ui.menu,name:base_partner_merge.root_menu
+msgid "Tools"
+msgstr "Herramientas"
+
+#. module: base_partner_merge
+#: field:res.partner,id:0
+msgid "Id"
+msgstr "Id"
+
+#. module: base_partner_merge
+#: model:ir.actions.act_window,name:base_partner_merge.base_partner_merge_automatic_act
+#: model:ir.ui.menu,name:base_partner_merge.partner_merge_automatic_menu
+msgid "Deduplicate Contacts"
+msgstr "Contactos Duplicados"
+