Merge lp:~cv.clearcorp/partner-contact-management/7.0-review_partner_merge into lp:~partner-contact-core-editors/partner-contact-management/7.0

Proposed by Carlos Vásquez (ClearCorp)
Status: Needs review
Proposed branch: lp:~cv.clearcorp/partner-contact-management/7.0-review_partner_merge
Merge into: lp:~partner-contact-core-editors/partner-contact-management/7.0
Diff against target: 665 lines (+625/-1)
4 files modified
base_partner_merge/base_partner_merge.py (+2/-1)
base_partner_merge/base_partner_merge_view.xml (+1/-0)
base_partner_merge/i18n/base_partner_merge.pot (+308/-0)
base_partner_merge/i18n/es.po (+314/-0)
To merge this branch: bzr merge lp:~cv.clearcorp/partner-contact-management/7.0-review_partner_merge
Reviewer Review Type Date Requested Status
Lorenzo Battistini (community) Needs Resubmitting
Pedro Manuel Baeza code review Approve
Review via email: mp+223137@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM.

Regards.

review: Approve (code review)
Revision history for this message
Lorenzo Battistini (elbati) wrote :

This project is now hosted on https://github.com/OCA/partner-contact. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

41. By Carlos Vásquez (ClearCorp)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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:42 +0000
@@ -90,6 +90,7 @@
90 # Group by90 # Group by
91 'group_by_email': fields.boolean('Email'),91 'group_by_email': fields.boolean('Email'),
92 'group_by_name': fields.boolean('Name'),92 'group_by_name': fields.boolean('Name'),
93 'group_by_ref': fields.boolean('Reference'),
93 'group_by_is_company': fields.boolean('Is Company'),94 'group_by_is_company': fields.boolean('Is Company'),
94 'group_by_vat': fields.boolean('VAT'),95 'group_by_vat': fields.boolean('VAT'),
95 'group_by_parent_id': fields.boolean('Parent Company'),96 'group_by_parent_id': fields.boolean('Parent Company'),
@@ -469,7 +470,7 @@
469470
470 filters = []471 filters = []
471 for field in fields:472 for field in fields:
472 if field in ['email', 'name']:473 if field in ['email', 'name', 'ref']:
473 filters.append((field, 'IS NOT', 'NULL'))474 filters.append((field, 'IS NOT', 'NULL'))
474475
475 criteria = ' AND '.join('%s %s %s' % (field, operator, value)476 criteria = ' AND '.join('%s %s %s' % (field, operator, value)
476477
=== 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:42 +0000
@@ -76,6 +76,7 @@
76 attrs="{'invisible': [('state', 'not in', ('option',))]}">76 attrs="{'invisible': [('state', 'not in', ('option',))]}">
77 <field name='group_by_email' />77 <field name='group_by_email' />
78 <field name='group_by_name' />78 <field name='group_by_name' />
79 <field name='group_by_ref' />
79 <field name='group_by_is_company' />80 <field name='group_by_is_company' />
80 <field name='group_by_vat' />81 <field name='group_by_vat' />
81 <field name='group_by_parent_id' />82 <field name='group_by_parent_id' />
8283
=== 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:42 +0000
@@ -0,0 +1,308 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * base_partner_merge
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2014-06-13 22:04+0000\n"
10"PO-Revision-Date: 2014-06-13 22:04+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: base_partner_merge
19#: code:addons/base_partner_merge/base_partner_merge.py:384
20#, python-format
21msgid "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."
22msgstr ""
23
24#. module: base_partner_merge
25#: view:base.partner.merge.automatic.wizard:0
26msgid "Partners"
27msgstr ""
28
29#. module: base_partner_merge
30#: view:base.partner.merge.automatic.wizard:0
31msgid "Exclude contacts having"
32msgstr ""
33
34#. module: base_partner_merge
35#: view:base.partner.merge.automatic.wizard:0
36msgid "Deduplicate the other Contacts"
37msgstr ""
38
39#. module: base_partner_merge
40#: field:base.partner.merge.automatic.wizard,partner_ids:0
41msgid "Contacts"
42msgstr ""
43
44#. module: base_partner_merge
45#: field:base.partner.merge.automatic.wizard,number_group:0
46msgid "Group of Contacts"
47msgstr ""
48
49#. module: base_partner_merge
50#: field:base.partner.merge.line,wizard_id:0
51msgid "Wizard"
52msgstr ""
53
54#. module: base_partner_merge
55#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard
56msgid "base.partner.merge.automatic.wizard"
57msgstr ""
58
59#. module: base_partner_merge
60#: code:addons/base_partner_merge/base_partner_merge.py:347
61#, python-format
62msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
63msgstr ""
64
65#. module: base_partner_merge
66#: field:base.partner.merge.automatic.wizard,state:0
67msgid "State"
68msgstr ""
69
70#. module: base_partner_merge
71#: view:base.partner.merge.automatic.wizard:0
72msgid "Skip these contacts"
73msgstr ""
74
75#. module: base_partner_merge
76#: code:addons/base_partner_merge/base_partner_merge.py:357
77#, python-format
78msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
79msgstr ""
80
81#. module: base_partner_merge
82#: view:base.partner.merge.automatic.wizard:0
83msgid "Merge the following contacts"
84msgstr ""
85
86#. module: base_partner_merge
87#: field:base.partner.merge.automatic.wizard,group_by_email:0
88msgid "Email"
89msgstr ""
90
91#. module: base_partner_merge
92#: field:base.partner.merge.automatic.wizard,current_line_id:0
93msgid "Current Line"
94msgstr ""
95
96#. module: base_partner_merge
97#: selection:base.partner.merge.automatic.wizard,state:0
98msgid "Option"
99msgstr ""
100
101#. module: base_partner_merge
102#: field:base.partner.merge.automatic.wizard,dst_partner_id:0
103msgid "Destination Contact"
104msgstr ""
105
106#. module: base_partner_merge
107#: view:base.partner.merge.automatic.wizard:0
108msgid "Are you sure to execute the automatic merge of your contacts ?"
109msgstr ""
110
111#. module: base_partner_merge
112#: view:base.partner.merge.automatic.wizard:0
113msgid "Are you sure to execute the list of automatic merges of your contacts ?"
114msgstr ""
115
116#. module: base_partner_merge
117#: selection:base.partner.merge.automatic.wizard,state:0
118msgid "Finished"
119msgstr ""
120
121#. module: base_partner_merge
122#: field:base.partner.merge.automatic.wizard,group_by_vat:0
123msgid "VAT"
124msgstr ""
125
126#. module: base_partner_merge
127#: view:base.partner.merge.automatic.wizard:0
128msgid "Merge Automatically all process"
129msgstr ""
130
131#. module: base_partner_merge
132#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line
133msgid "base.partner.merge.line"
134msgstr ""
135
136#. module: base_partner_merge
137#: view:base.partner.merge.automatic.wizard:0
138msgid "Select the list of fields used to search for\n"
139" duplicated records. If you select several fields,\n"
140" OpenERP will propose you to merge only those having\n"
141" all these fields in common. (not one of the fields)."
142msgstr ""
143
144#. module: base_partner_merge
145#: field:base.partner.merge.automatic.wizard,group_by_is_company:0
146msgid "Is Company"
147msgstr ""
148
149#. module: base_partner_merge
150#: field:base.partner.merge.automatic.wizard,maximum_group:0
151msgid "Maximum of Group of Contacts"
152msgstr ""
153
154#. module: base_partner_merge
155#: view:base.partner.merge.automatic.wizard:0
156msgid "Search duplicates based on duplicated data in"
157msgstr ""
158
159#. module: base_partner_merge
160#: field:base.partner.merge.automatic.wizard,group_by_name:0
161msgid "Name"
162msgstr ""
163
164#. module: base_partner_merge
165#: view:base.partner.merge.automatic.wizard:0
166msgid "Merge Selection"
167msgstr ""
168
169#. module: base_partner_merge
170#: view:base.partner.merge.automatic.wizard:0
171msgid "Merge Automatically"
172msgstr ""
173
174#. module: base_partner_merge
175#: field:base.partner.merge.automatic.wizard,line_ids:0
176msgid "Lines"
177msgstr ""
178
179#. module: base_partner_merge
180#: field:base.partner.merge.line,aggr_ids:0
181msgid "Ids"
182msgstr ""
183
184#. module: base_partner_merge
185#: field:base.partner.merge.line,min_id:0
186msgid "MinID"
187msgstr ""
188
189#. module: base_partner_merge
190#: selection:base.partner.merge.automatic.wizard,state:0
191msgid "Selection"
192msgstr ""
193
194#. module: base_partner_merge
195#: code:addons/base_partner_merge/base_partner_merge.py:346
196#: code:addons/base_partner_merge/base_partner_merge.py:356
197#: code:addons/base_partner_merge/base_partner_merge.py:383
198#: code:addons/base_partner_merge/base_partner_merge.py:517
199#, python-format
200msgid "Error"
201msgstr ""
202
203#. module: base_partner_merge
204#: view:base.partner.merge.automatic.wizard:0
205msgid "There is no more contacts to merge for this request..."
206msgstr ""
207
208#. module: base_partner_merge
209#: field:base.partner.merge.automatic.wizard,exclude_journal_item:0
210msgid "Journal Items associated to the contact"
211msgstr ""
212
213#. module: base_partner_merge
214#: view:base.partner.merge.automatic.wizard:0
215msgid "Options"
216msgstr ""
217
218#. module: base_partner_merge
219#: view:base.partner.merge.automatic.wizard:0
220msgid "The selected contacts will be merged together. All\n"
221" documents linking to one of these contacts will be\n"
222" redirected to the aggregated contact. You can remove\n"
223" contacts from this list to avoid merging them."
224msgstr ""
225
226#. module: base_partner_merge
227#: view:base.partner.merge.automatic.wizard:0
228msgid "Automatic Merge Wizard"
229msgstr ""
230
231#. module: base_partner_merge
232#: field:base.partner.merge.automatic.wizard,group_by_parent_id:0
233msgid "Parent Company"
234msgstr ""
235
236#. module: base_partner_merge
237#: field:base.partner.merge.automatic.wizard,group_by_ref:0
238msgid "Reference"
239msgstr ""
240
241#. module: base_partner_merge
242#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge
243msgid "Automatic Merge"
244msgstr ""
245
246#. module: base_partner_merge
247#: code:addons/base_partner_merge/base_partner_merge.py:518
248#, python-format
249msgid "You have to specify a filter for your selection"
250msgstr ""
251
252#. module: base_partner_merge
253#: code:addons/base_partner_merge/base_partner_merge.py:402
254#, python-format
255msgid "Merged with the following partners:"
256msgstr ""
257
258#. module: base_partner_merge
259#: view:base.partner.merge.automatic.wizard:0
260msgid "or"
261msgstr ""
262
263#. module: base_partner_merge
264#: field:res.partner,create_date:0
265msgid "Create Date"
266msgstr ""
267
268#. module: base_partner_merge
269#: view:base.partner.merge.automatic.wizard:0
270msgid "Merge with Manual Check"
271msgstr ""
272
273#. module: base_partner_merge
274#: model:ir.model,name:base_partner_merge.model_res_partner
275msgid "Partner"
276msgstr ""
277
278#. module: base_partner_merge
279#: view:base.partner.merge.automatic.wizard:0
280msgid "Cancel"
281msgstr ""
282
283#. module: base_partner_merge
284#: view:base.partner.merge.automatic.wizard:0
285msgid "Close"
286msgstr ""
287
288#. module: base_partner_merge
289#: field:base.partner.merge.automatic.wizard,exclude_contact:0
290msgid "A user associated to the contact"
291msgstr ""
292
293#. module: base_partner_merge
294#: model:ir.ui.menu,name:base_partner_merge.root_menu
295msgid "Tools"
296msgstr ""
297
298#. module: base_partner_merge
299#: field:res.partner,id:0
300msgid "Id"
301msgstr ""
302
303#. module: base_partner_merge
304#: model:ir.actions.act_window,name:base_partner_merge.base_partner_merge_automatic_act
305#: model:ir.ui.menu,name:base_partner_merge.partner_merge_automatic_menu
306msgid "Deduplicate Contacts"
307msgstr ""
308
0309
=== 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:42 +0000
@@ -0,0 +1,314 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * base_partner_merge
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2014-06-13 22:04+0000\n"
10"PO-Revision-Date: 2014-06-13 22:04+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: base_partner_merge
19#: code:addons/base_partner_merge/base_partner_merge.py:384
20#, python-format
21msgid "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."
22msgstr "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."
23
24#. module: base_partner_merge
25#: view:base.partner.merge.automatic.wizard:0
26msgid "Partners"
27msgstr "Empresas"
28
29#. module: base_partner_merge
30#: view:base.partner.merge.automatic.wizard:0
31msgid "Exclude contacts having"
32msgstr "Excluir contactos que tengan"
33
34#. module: base_partner_merge
35#: view:base.partner.merge.automatic.wizard:0
36msgid "Deduplicate the other Contacts"
37msgstr "Duplicar los otros contactos"
38
39#. module: base_partner_merge
40#: field:base.partner.merge.automatic.wizard,partner_ids:0
41msgid "Contacts"
42msgstr "Contactos"
43
44#. module: base_partner_merge
45#: field:base.partner.merge.automatic.wizard,number_group:0
46msgid "Group of Contacts"
47msgstr "Grupo de Contactos"
48
49#. module: base_partner_merge
50#: field:base.partner.merge.line,wizard_id:0
51msgid "Wizard"
52msgstr "Asistente"
53
54#. module: base_partner_merge
55#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard
56msgid "base.partner.merge.automatic.wizard"
57msgstr "base.partner.merge.automatic.wizard"
58
59#. module: base_partner_merge
60#: code:addons/base_partner_merge/base_partner_merge.py:347
61#, python-format
62msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."
63msgstr "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."
64
65#. module: base_partner_merge
66#: field:base.partner.merge.automatic.wizard,state:0
67msgid "State"
68msgstr "Estado"
69
70#. module: base_partner_merge
71#: view:base.partner.merge.automatic.wizard:0
72msgid "Skip these contacts"
73msgstr "Saltar estos contactos"
74
75#. module: base_partner_merge
76#: code:addons/base_partner_merge/base_partner_merge.py:357
77#, python-format
78msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails."
79msgstr "Todos los contactos deben tener el mismo correo electrónico. Sólo el administrador puede combinar contactos con diferentes correos."
80
81#. module: base_partner_merge
82#: view:base.partner.merge.automatic.wizard:0
83msgid "Merge the following contacts"
84msgstr "Combinar los siguientes contactos"
85
86#. module: base_partner_merge
87#: field:base.partner.merge.automatic.wizard,group_by_email:0
88msgid "Email"
89msgstr "Correo electrónico"
90
91#. module: base_partner_merge
92#: field:base.partner.merge.automatic.wizard,current_line_id:0
93msgid "Current Line"
94msgstr "Línea Actual"
95
96#. module: base_partner_merge
97#: selection:base.partner.merge.automatic.wizard,state:0
98msgid "Option"
99msgstr "Opción"
100
101#. module: base_partner_merge
102#: field:base.partner.merge.automatic.wizard,dst_partner_id:0
103msgid "Destination Contact"
104msgstr "Contacto de Destino"
105
106#. module: base_partner_merge
107#: view:base.partner.merge.automatic.wizard:0
108msgid "Are you sure to execute the automatic merge of your contacts ?"
109msgstr "Está seguro de ejecutar la combinación automática de sus contactos ?"
110
111#. module: base_partner_merge
112#: view:base.partner.merge.automatic.wizard:0
113msgid "Are you sure to execute the list of automatic merges of your contacts ?"
114msgstr "Está seguro de ejecutar la lista de combinación automática de sus contactos ?"
115
116#. module: base_partner_merge
117#: selection:base.partner.merge.automatic.wizard,state:0
118msgid "Finished"
119msgstr "Finalizado"
120
121#. module: base_partner_merge
122#: field:base.partner.merge.automatic.wizard,group_by_vat:0
123msgid "VAT"
124msgstr "VAT"
125
126#. module: base_partner_merge
127#: view:base.partner.merge.automatic.wizard:0
128msgid "Merge Automatically all process"
129msgstr "Combinar automáticamente todo el proceso"
130
131#. module: base_partner_merge
132#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line
133msgid "base.partner.merge.line"
134msgstr "base.partner.merge.line"
135
136#. module: base_partner_merge
137#: view:base.partner.merge.automatic.wizard:0
138msgid "Select the list of fields used to search for\n"
139" duplicated records. If you select several fields,\n"
140" OpenERP will propose you to merge only those having\n"
141" all these fields in common. (not one of the fields)."
142msgstr "Seleccione la lista de campos utilizados para buscar \n "
143" registros duplicados. Si selecciona varios campos, \n"
144" OpenERP propondrá combinar sólo los que tienen \n"
145" todos estos campos en común. (No uno de los campos)."
146
147#. module: base_partner_merge
148#: field:base.partner.merge.automatic.wizard,group_by_is_company:0
149msgid "Is Company"
150msgstr "Es Compañía"
151
152#. module: base_partner_merge
153#: field:base.partner.merge.automatic.wizard,maximum_group:0
154msgid "Maximum of Group of Contacts"
155msgstr "Máximo Grupo de Contactos"
156
157#. module: base_partner_merge
158#: view:base.partner.merge.automatic.wizard:0
159msgid "Search duplicates based on duplicated data in"
160msgstr "Buscar duplicados basado en datos duplicados"
161
162#. module: base_partner_merge
163#: field:base.partner.merge.automatic.wizard,group_by_name:0
164msgid "Name"
165msgstr "Nombre"
166
167#. module: base_partner_merge
168#: view:base.partner.merge.automatic.wizard:0
169msgid "Merge Selection"
170msgstr "Seleción para combinar"
171
172#. module: base_partner_merge
173#: view:base.partner.merge.automatic.wizard:0
174msgid "Merge Automatically"
175msgstr "Combinar automáticamente"
176
177#. module: base_partner_merge
178#: field:base.partner.merge.automatic.wizard,line_ids:0
179msgid "Lines"
180msgstr "Líneas"
181
182#. module: base_partner_merge
183#: field:base.partner.merge.line,aggr_ids:0
184msgid "Ids"
185msgstr "Ids"
186
187#. module: base_partner_merge
188#: field:base.partner.merge.line,min_id:0
189msgid "MinID"
190msgstr "MinID"
191
192#. module: base_partner_merge
193#: selection:base.partner.merge.automatic.wizard,state:0
194msgid "Selection"
195msgstr "Selección"
196
197#. module: base_partner_merge
198#: code:addons/base_partner_merge/base_partner_merge.py:346
199#: code:addons/base_partner_merge/base_partner_merge.py:356
200#: code:addons/base_partner_merge/base_partner_merge.py:383
201#: code:addons/base_partner_merge/base_partner_merge.py:517
202#, python-format
203msgid "Error"
204msgstr "Error"
205
206#. module: base_partner_merge
207#: view:base.partner.merge.automatic.wizard:0
208msgid "There is no more contacts to merge for this request..."
209msgstr "No existen más contactos para combinar para esta solicitud..."
210
211#. module: base_partner_merge
212#: field:base.partner.merge.automatic.wizard,exclude_journal_item:0
213msgid "Journal Items associated to the contact"
214msgstr "Líneas de asiento asociadas a este contacto"
215
216#. module: base_partner_merge
217#: view:base.partner.merge.automatic.wizard:0
218msgid "Options"
219msgstr "Opciones"
220
221#. module: base_partner_merge
222#: view:base.partner.merge.automatic.wizard:0
223msgid "The selected contacts will be merged together. All\n"
224" documents linking to one of these contacts will be\n"
225" redirected to the aggregated contact. You can remove\n"
226" contacts from this list to avoid merging them."
227msgstr " Los contactos seleccionados se combinan entre sí. Todos \n"
228" los documentos que vinculan a uno de estos contactos se \n"
229" redireccionan al contacto agregado. Puede eliminar \n"
230" los contactos de esta lista para evitar combinarlos."
231
232#. module: base_partner_merge
233#: view:base.partner.merge.automatic.wizard:0
234msgid "Automatic Merge Wizard"
235msgstr "Asistente para combinación automática"
236
237#. module: base_partner_merge
238#: field:base.partner.merge.automatic.wizard,group_by_parent_id:0
239msgid "Parent Company"
240msgstr "Compañía Padre"
241
242#. module: base_partner_merge
243#: field:base.partner.merge.automatic.wizard,group_by_ref:0
244msgid "Reference"
245msgstr "Referencia"
246
247#. module: base_partner_merge
248#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge
249msgid "Automatic Merge"
250msgstr "Combinar automático"
251
252#. module: base_partner_merge
253#: code:addons/base_partner_merge/base_partner_merge.py:518
254#, python-format
255msgid "You have to specify a filter for your selection"
256msgstr "Necesita tener un filtro para su selección"
257
258#. module: base_partner_merge
259#: code:addons/base_partner_merge/base_partner_merge.py:402
260#, python-format
261msgid "Merged with the following partners:"
262msgstr "Combinar con las siguientes empresas:"
263
264#. module: base_partner_merge
265#: view:base.partner.merge.automatic.wizard:0
266msgid "or"
267msgstr "o"
268
269#. module: base_partner_merge
270#: field:res.partner,create_date:0
271msgid "Create Date"
272msgstr "Fecha de creación"
273
274#. module: base_partner_merge
275#: view:base.partner.merge.automatic.wizard:0
276msgid "Merge with Manual Check"
277msgstr "Combinar con revisión manual"
278
279#. module: base_partner_merge
280#: model:ir.model,name:base_partner_merge.model_res_partner
281msgid "Partner"
282msgstr "Empresa"
283
284#. module: base_partner_merge
285#: view:base.partner.merge.automatic.wizard:0
286msgid "Cancel"
287msgstr "Cancelar"
288
289#. module: base_partner_merge
290#: view:base.partner.merge.automatic.wizard:0
291msgid "Close"
292msgstr "Cerrar"
293
294#. module: base_partner_merge
295#: field:base.partner.merge.automatic.wizard,exclude_contact:0
296msgid "A user associated to the contact"
297msgstr "Usuario asociado con el contacto"
298
299#. module: base_partner_merge
300#: model:ir.ui.menu,name:base_partner_merge.root_menu
301msgid "Tools"
302msgstr "Herramientas"
303
304#. module: base_partner_merge
305#: field:res.partner,id:0
306msgid "Id"
307msgstr "Id"
308
309#. module: base_partner_merge
310#: model:ir.actions.act_window,name:base_partner_merge.base_partner_merge_automatic_act
311#: model:ir.ui.menu,name:base_partner_merge.partner_merge_automatic_menu
312msgid "Deduplicate Contacts"
313msgstr "Contactos Duplicados"
314