Merge lp:~cv.clearcorp/partner-contact-management/7.0-review_partner_merge into lp:~partner-contact-core-editors/partner-contact-management/7.0
- 7.0-review_partner_merge
- Merge into 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 |
Related bugs: |
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 |
Commit message
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 : | # |
review:
Approve
(code review)
Revision history for this message
Lorenzo Battistini (elbati) wrote : | # |
This project is now hosted on https:/
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
1 | === modified file 'base_partner_merge/base_partner_merge.py' |
2 | --- base_partner_merge/base_partner_merge.py 2014-02-06 13:36:20 +0000 |
3 | +++ base_partner_merge/base_partner_merge.py 2014-06-13 23:01:42 +0000 |
4 | @@ -90,6 +90,7 @@ |
5 | # Group by |
6 | 'group_by_email': fields.boolean('Email'), |
7 | 'group_by_name': fields.boolean('Name'), |
8 | + 'group_by_ref': fields.boolean('Reference'), |
9 | 'group_by_is_company': fields.boolean('Is Company'), |
10 | 'group_by_vat': fields.boolean('VAT'), |
11 | 'group_by_parent_id': fields.boolean('Parent Company'), |
12 | @@ -469,7 +470,7 @@ |
13 | |
14 | filters = [] |
15 | for field in fields: |
16 | - if field in ['email', 'name']: |
17 | + if field in ['email', 'name', 'ref']: |
18 | filters.append((field, 'IS NOT', 'NULL')) |
19 | |
20 | criteria = ' AND '.join('%s %s %s' % (field, operator, value) |
21 | |
22 | === modified file 'base_partner_merge/base_partner_merge_view.xml' |
23 | --- base_partner_merge/base_partner_merge_view.xml 2014-02-25 14:53:41 +0000 |
24 | +++ base_partner_merge/base_partner_merge_view.xml 2014-06-13 23:01:42 +0000 |
25 | @@ -76,6 +76,7 @@ |
26 | attrs="{'invisible': [('state', 'not in', ('option',))]}"> |
27 | <field name='group_by_email' /> |
28 | <field name='group_by_name' /> |
29 | + <field name='group_by_ref' /> |
30 | <field name='group_by_is_company' /> |
31 | <field name='group_by_vat' /> |
32 | <field name='group_by_parent_id' /> |
33 | |
34 | === added directory 'base_partner_merge/i18n' |
35 | === added file 'base_partner_merge/i18n/base_partner_merge.pot' |
36 | --- base_partner_merge/i18n/base_partner_merge.pot 1970-01-01 00:00:00 +0000 |
37 | +++ base_partner_merge/i18n/base_partner_merge.pot 2014-06-13 23:01:42 +0000 |
38 | @@ -0,0 +1,308 @@ |
39 | +# Translation of OpenERP Server. |
40 | +# This file contains the translation of the following modules: |
41 | +# * base_partner_merge |
42 | +# |
43 | +msgid "" |
44 | +msgstr "" |
45 | +"Project-Id-Version: OpenERP Server 7.0\n" |
46 | +"Report-Msgid-Bugs-To: \n" |
47 | +"POT-Creation-Date: 2014-06-13 22:04+0000\n" |
48 | +"PO-Revision-Date: 2014-06-13 22:04+0000\n" |
49 | +"Last-Translator: <>\n" |
50 | +"Language-Team: \n" |
51 | +"MIME-Version: 1.0\n" |
52 | +"Content-Type: text/plain; charset=UTF-8\n" |
53 | +"Content-Transfer-Encoding: \n" |
54 | +"Plural-Forms: \n" |
55 | + |
56 | +#. module: base_partner_merge |
57 | +#: code:addons/base_partner_merge/base_partner_merge.py:384 |
58 | +#, python-format |
59 | +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." |
60 | +msgstr "" |
61 | + |
62 | +#. module: base_partner_merge |
63 | +#: view:base.partner.merge.automatic.wizard:0 |
64 | +msgid "Partners" |
65 | +msgstr "" |
66 | + |
67 | +#. module: base_partner_merge |
68 | +#: view:base.partner.merge.automatic.wizard:0 |
69 | +msgid "Exclude contacts having" |
70 | +msgstr "" |
71 | + |
72 | +#. module: base_partner_merge |
73 | +#: view:base.partner.merge.automatic.wizard:0 |
74 | +msgid "Deduplicate the other Contacts" |
75 | +msgstr "" |
76 | + |
77 | +#. module: base_partner_merge |
78 | +#: field:base.partner.merge.automatic.wizard,partner_ids:0 |
79 | +msgid "Contacts" |
80 | +msgstr "" |
81 | + |
82 | +#. module: base_partner_merge |
83 | +#: field:base.partner.merge.automatic.wizard,number_group:0 |
84 | +msgid "Group of Contacts" |
85 | +msgstr "" |
86 | + |
87 | +#. module: base_partner_merge |
88 | +#: field:base.partner.merge.line,wizard_id:0 |
89 | +msgid "Wizard" |
90 | +msgstr "" |
91 | + |
92 | +#. module: base_partner_merge |
93 | +#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard |
94 | +msgid "base.partner.merge.automatic.wizard" |
95 | +msgstr "" |
96 | + |
97 | +#. module: base_partner_merge |
98 | +#: code:addons/base_partner_merge/base_partner_merge.py:347 |
99 | +#, python-format |
100 | +msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed." |
101 | +msgstr "" |
102 | + |
103 | +#. module: base_partner_merge |
104 | +#: field:base.partner.merge.automatic.wizard,state:0 |
105 | +msgid "State" |
106 | +msgstr "" |
107 | + |
108 | +#. module: base_partner_merge |
109 | +#: view:base.partner.merge.automatic.wizard:0 |
110 | +msgid "Skip these contacts" |
111 | +msgstr "" |
112 | + |
113 | +#. module: base_partner_merge |
114 | +#: code:addons/base_partner_merge/base_partner_merge.py:357 |
115 | +#, python-format |
116 | +msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails." |
117 | +msgstr "" |
118 | + |
119 | +#. module: base_partner_merge |
120 | +#: view:base.partner.merge.automatic.wizard:0 |
121 | +msgid "Merge the following contacts" |
122 | +msgstr "" |
123 | + |
124 | +#. module: base_partner_merge |
125 | +#: field:base.partner.merge.automatic.wizard,group_by_email:0 |
126 | +msgid "Email" |
127 | +msgstr "" |
128 | + |
129 | +#. module: base_partner_merge |
130 | +#: field:base.partner.merge.automatic.wizard,current_line_id:0 |
131 | +msgid "Current Line" |
132 | +msgstr "" |
133 | + |
134 | +#. module: base_partner_merge |
135 | +#: selection:base.partner.merge.automatic.wizard,state:0 |
136 | +msgid "Option" |
137 | +msgstr "" |
138 | + |
139 | +#. module: base_partner_merge |
140 | +#: field:base.partner.merge.automatic.wizard,dst_partner_id:0 |
141 | +msgid "Destination Contact" |
142 | +msgstr "" |
143 | + |
144 | +#. module: base_partner_merge |
145 | +#: view:base.partner.merge.automatic.wizard:0 |
146 | +msgid "Are you sure to execute the automatic merge of your contacts ?" |
147 | +msgstr "" |
148 | + |
149 | +#. module: base_partner_merge |
150 | +#: view:base.partner.merge.automatic.wizard:0 |
151 | +msgid "Are you sure to execute the list of automatic merges of your contacts ?" |
152 | +msgstr "" |
153 | + |
154 | +#. module: base_partner_merge |
155 | +#: selection:base.partner.merge.automatic.wizard,state:0 |
156 | +msgid "Finished" |
157 | +msgstr "" |
158 | + |
159 | +#. module: base_partner_merge |
160 | +#: field:base.partner.merge.automatic.wizard,group_by_vat:0 |
161 | +msgid "VAT" |
162 | +msgstr "" |
163 | + |
164 | +#. module: base_partner_merge |
165 | +#: view:base.partner.merge.automatic.wizard:0 |
166 | +msgid "Merge Automatically all process" |
167 | +msgstr "" |
168 | + |
169 | +#. module: base_partner_merge |
170 | +#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line |
171 | +msgid "base.partner.merge.line" |
172 | +msgstr "" |
173 | + |
174 | +#. module: base_partner_merge |
175 | +#: view:base.partner.merge.automatic.wizard:0 |
176 | +msgid "Select the list of fields used to search for\n" |
177 | +" duplicated records. If you select several fields,\n" |
178 | +" OpenERP will propose you to merge only those having\n" |
179 | +" all these fields in common. (not one of the fields)." |
180 | +msgstr "" |
181 | + |
182 | +#. module: base_partner_merge |
183 | +#: field:base.partner.merge.automatic.wizard,group_by_is_company:0 |
184 | +msgid "Is Company" |
185 | +msgstr "" |
186 | + |
187 | +#. module: base_partner_merge |
188 | +#: field:base.partner.merge.automatic.wizard,maximum_group:0 |
189 | +msgid "Maximum of Group of Contacts" |
190 | +msgstr "" |
191 | + |
192 | +#. module: base_partner_merge |
193 | +#: view:base.partner.merge.automatic.wizard:0 |
194 | +msgid "Search duplicates based on duplicated data in" |
195 | +msgstr "" |
196 | + |
197 | +#. module: base_partner_merge |
198 | +#: field:base.partner.merge.automatic.wizard,group_by_name:0 |
199 | +msgid "Name" |
200 | +msgstr "" |
201 | + |
202 | +#. module: base_partner_merge |
203 | +#: view:base.partner.merge.automatic.wizard:0 |
204 | +msgid "Merge Selection" |
205 | +msgstr "" |
206 | + |
207 | +#. module: base_partner_merge |
208 | +#: view:base.partner.merge.automatic.wizard:0 |
209 | +msgid "Merge Automatically" |
210 | +msgstr "" |
211 | + |
212 | +#. module: base_partner_merge |
213 | +#: field:base.partner.merge.automatic.wizard,line_ids:0 |
214 | +msgid "Lines" |
215 | +msgstr "" |
216 | + |
217 | +#. module: base_partner_merge |
218 | +#: field:base.partner.merge.line,aggr_ids:0 |
219 | +msgid "Ids" |
220 | +msgstr "" |
221 | + |
222 | +#. module: base_partner_merge |
223 | +#: field:base.partner.merge.line,min_id:0 |
224 | +msgid "MinID" |
225 | +msgstr "" |
226 | + |
227 | +#. module: base_partner_merge |
228 | +#: selection:base.partner.merge.automatic.wizard,state:0 |
229 | +msgid "Selection" |
230 | +msgstr "" |
231 | + |
232 | +#. module: base_partner_merge |
233 | +#: code:addons/base_partner_merge/base_partner_merge.py:346 |
234 | +#: code:addons/base_partner_merge/base_partner_merge.py:356 |
235 | +#: code:addons/base_partner_merge/base_partner_merge.py:383 |
236 | +#: code:addons/base_partner_merge/base_partner_merge.py:517 |
237 | +#, python-format |
238 | +msgid "Error" |
239 | +msgstr "" |
240 | + |
241 | +#. module: base_partner_merge |
242 | +#: view:base.partner.merge.automatic.wizard:0 |
243 | +msgid "There is no more contacts to merge for this request..." |
244 | +msgstr "" |
245 | + |
246 | +#. module: base_partner_merge |
247 | +#: field:base.partner.merge.automatic.wizard,exclude_journal_item:0 |
248 | +msgid "Journal Items associated to the contact" |
249 | +msgstr "" |
250 | + |
251 | +#. module: base_partner_merge |
252 | +#: view:base.partner.merge.automatic.wizard:0 |
253 | +msgid "Options" |
254 | +msgstr "" |
255 | + |
256 | +#. module: base_partner_merge |
257 | +#: view:base.partner.merge.automatic.wizard:0 |
258 | +msgid "The selected contacts will be merged together. All\n" |
259 | +" documents linking to one of these contacts will be\n" |
260 | +" redirected to the aggregated contact. You can remove\n" |
261 | +" contacts from this list to avoid merging them." |
262 | +msgstr "" |
263 | + |
264 | +#. module: base_partner_merge |
265 | +#: view:base.partner.merge.automatic.wizard:0 |
266 | +msgid "Automatic Merge Wizard" |
267 | +msgstr "" |
268 | + |
269 | +#. module: base_partner_merge |
270 | +#: field:base.partner.merge.automatic.wizard,group_by_parent_id:0 |
271 | +msgid "Parent Company" |
272 | +msgstr "" |
273 | + |
274 | +#. module: base_partner_merge |
275 | +#: field:base.partner.merge.automatic.wizard,group_by_ref:0 |
276 | +msgid "Reference" |
277 | +msgstr "" |
278 | + |
279 | +#. module: base_partner_merge |
280 | +#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge |
281 | +msgid "Automatic Merge" |
282 | +msgstr "" |
283 | + |
284 | +#. module: base_partner_merge |
285 | +#: code:addons/base_partner_merge/base_partner_merge.py:518 |
286 | +#, python-format |
287 | +msgid "You have to specify a filter for your selection" |
288 | +msgstr "" |
289 | + |
290 | +#. module: base_partner_merge |
291 | +#: code:addons/base_partner_merge/base_partner_merge.py:402 |
292 | +#, python-format |
293 | +msgid "Merged with the following partners:" |
294 | +msgstr "" |
295 | + |
296 | +#. module: base_partner_merge |
297 | +#: view:base.partner.merge.automatic.wizard:0 |
298 | +msgid "or" |
299 | +msgstr "" |
300 | + |
301 | +#. module: base_partner_merge |
302 | +#: field:res.partner,create_date:0 |
303 | +msgid "Create Date" |
304 | +msgstr "" |
305 | + |
306 | +#. module: base_partner_merge |
307 | +#: view:base.partner.merge.automatic.wizard:0 |
308 | +msgid "Merge with Manual Check" |
309 | +msgstr "" |
310 | + |
311 | +#. module: base_partner_merge |
312 | +#: model:ir.model,name:base_partner_merge.model_res_partner |
313 | +msgid "Partner" |
314 | +msgstr "" |
315 | + |
316 | +#. module: base_partner_merge |
317 | +#: view:base.partner.merge.automatic.wizard:0 |
318 | +msgid "Cancel" |
319 | +msgstr "" |
320 | + |
321 | +#. module: base_partner_merge |
322 | +#: view:base.partner.merge.automatic.wizard:0 |
323 | +msgid "Close" |
324 | +msgstr "" |
325 | + |
326 | +#. module: base_partner_merge |
327 | +#: field:base.partner.merge.automatic.wizard,exclude_contact:0 |
328 | +msgid "A user associated to the contact" |
329 | +msgstr "" |
330 | + |
331 | +#. module: base_partner_merge |
332 | +#: model:ir.ui.menu,name:base_partner_merge.root_menu |
333 | +msgid "Tools" |
334 | +msgstr "" |
335 | + |
336 | +#. module: base_partner_merge |
337 | +#: field:res.partner,id:0 |
338 | +msgid "Id" |
339 | +msgstr "" |
340 | + |
341 | +#. module: base_partner_merge |
342 | +#: model:ir.actions.act_window,name:base_partner_merge.base_partner_merge_automatic_act |
343 | +#: model:ir.ui.menu,name:base_partner_merge.partner_merge_automatic_menu |
344 | +msgid "Deduplicate Contacts" |
345 | +msgstr "" |
346 | + |
347 | |
348 | === added file 'base_partner_merge/i18n/es.po' |
349 | --- base_partner_merge/i18n/es.po 1970-01-01 00:00:00 +0000 |
350 | +++ base_partner_merge/i18n/es.po 2014-06-13 23:01:42 +0000 |
351 | @@ -0,0 +1,314 @@ |
352 | +# Translation of OpenERP Server. |
353 | +# This file contains the translation of the following modules: |
354 | +# * base_partner_merge |
355 | +# |
356 | +msgid "" |
357 | +msgstr "" |
358 | +"Project-Id-Version: OpenERP Server 7.0\n" |
359 | +"Report-Msgid-Bugs-To: \n" |
360 | +"POT-Creation-Date: 2014-06-13 22:04+0000\n" |
361 | +"PO-Revision-Date: 2014-06-13 22:04+0000\n" |
362 | +"Last-Translator: <>\n" |
363 | +"Language-Team: \n" |
364 | +"MIME-Version: 1.0\n" |
365 | +"Content-Type: text/plain; charset=UTF-8\n" |
366 | +"Content-Transfer-Encoding: \n" |
367 | +"Plural-Forms: \n" |
368 | + |
369 | +#. module: base_partner_merge |
370 | +#: code:addons/base_partner_merge/base_partner_merge.py:384 |
371 | +#, python-format |
372 | +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." |
373 | +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." |
374 | + |
375 | +#. module: base_partner_merge |
376 | +#: view:base.partner.merge.automatic.wizard:0 |
377 | +msgid "Partners" |
378 | +msgstr "Empresas" |
379 | + |
380 | +#. module: base_partner_merge |
381 | +#: view:base.partner.merge.automatic.wizard:0 |
382 | +msgid "Exclude contacts having" |
383 | +msgstr "Excluir contactos que tengan" |
384 | + |
385 | +#. module: base_partner_merge |
386 | +#: view:base.partner.merge.automatic.wizard:0 |
387 | +msgid "Deduplicate the other Contacts" |
388 | +msgstr "Duplicar los otros contactos" |
389 | + |
390 | +#. module: base_partner_merge |
391 | +#: field:base.partner.merge.automatic.wizard,partner_ids:0 |
392 | +msgid "Contacts" |
393 | +msgstr "Contactos" |
394 | + |
395 | +#. module: base_partner_merge |
396 | +#: field:base.partner.merge.automatic.wizard,number_group:0 |
397 | +msgid "Group of Contacts" |
398 | +msgstr "Grupo de Contactos" |
399 | + |
400 | +#. module: base_partner_merge |
401 | +#: field:base.partner.merge.line,wizard_id:0 |
402 | +msgid "Wizard" |
403 | +msgstr "Asistente" |
404 | + |
405 | +#. module: base_partner_merge |
406 | +#: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard |
407 | +msgid "base.partner.merge.automatic.wizard" |
408 | +msgstr "base.partner.merge.automatic.wizard" |
409 | + |
410 | +#. module: base_partner_merge |
411 | +#: code:addons/base_partner_merge/base_partner_merge.py:347 |
412 | +#, python-format |
413 | +msgid "For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed." |
414 | +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." |
415 | + |
416 | +#. module: base_partner_merge |
417 | +#: field:base.partner.merge.automatic.wizard,state:0 |
418 | +msgid "State" |
419 | +msgstr "Estado" |
420 | + |
421 | +#. module: base_partner_merge |
422 | +#: view:base.partner.merge.automatic.wizard:0 |
423 | +msgid "Skip these contacts" |
424 | +msgstr "Saltar estos contactos" |
425 | + |
426 | +#. module: base_partner_merge |
427 | +#: code:addons/base_partner_merge/base_partner_merge.py:357 |
428 | +#, python-format |
429 | +msgid "All contacts must have the same email. Only the Administrator can merge contacts with different emails." |
430 | +msgstr "Todos los contactos deben tener el mismo correo electrónico. Sólo el administrador puede combinar contactos con diferentes correos." |
431 | + |
432 | +#. module: base_partner_merge |
433 | +#: view:base.partner.merge.automatic.wizard:0 |
434 | +msgid "Merge the following contacts" |
435 | +msgstr "Combinar los siguientes contactos" |
436 | + |
437 | +#. module: base_partner_merge |
438 | +#: field:base.partner.merge.automatic.wizard,group_by_email:0 |
439 | +msgid "Email" |
440 | +msgstr "Correo electrónico" |
441 | + |
442 | +#. module: base_partner_merge |
443 | +#: field:base.partner.merge.automatic.wizard,current_line_id:0 |
444 | +msgid "Current Line" |
445 | +msgstr "Línea Actual" |
446 | + |
447 | +#. module: base_partner_merge |
448 | +#: selection:base.partner.merge.automatic.wizard,state:0 |
449 | +msgid "Option" |
450 | +msgstr "Opción" |
451 | + |
452 | +#. module: base_partner_merge |
453 | +#: field:base.partner.merge.automatic.wizard,dst_partner_id:0 |
454 | +msgid "Destination Contact" |
455 | +msgstr "Contacto de Destino" |
456 | + |
457 | +#. module: base_partner_merge |
458 | +#: view:base.partner.merge.automatic.wizard:0 |
459 | +msgid "Are you sure to execute the automatic merge of your contacts ?" |
460 | +msgstr "Está seguro de ejecutar la combinación automática de sus contactos ?" |
461 | + |
462 | +#. module: base_partner_merge |
463 | +#: view:base.partner.merge.automatic.wizard:0 |
464 | +msgid "Are you sure to execute the list of automatic merges of your contacts ?" |
465 | +msgstr "Está seguro de ejecutar la lista de combinación automática de sus contactos ?" |
466 | + |
467 | +#. module: base_partner_merge |
468 | +#: selection:base.partner.merge.automatic.wizard,state:0 |
469 | +msgid "Finished" |
470 | +msgstr "Finalizado" |
471 | + |
472 | +#. module: base_partner_merge |
473 | +#: field:base.partner.merge.automatic.wizard,group_by_vat:0 |
474 | +msgid "VAT" |
475 | +msgstr "VAT" |
476 | + |
477 | +#. module: base_partner_merge |
478 | +#: view:base.partner.merge.automatic.wizard:0 |
479 | +msgid "Merge Automatically all process" |
480 | +msgstr "Combinar automáticamente todo el proceso" |
481 | + |
482 | +#. module: base_partner_merge |
483 | +#: model:ir.model,name:base_partner_merge.model_base_partner_merge_line |
484 | +msgid "base.partner.merge.line" |
485 | +msgstr "base.partner.merge.line" |
486 | + |
487 | +#. module: base_partner_merge |
488 | +#: view:base.partner.merge.automatic.wizard:0 |
489 | +msgid "Select the list of fields used to search for\n" |
490 | +" duplicated records. If you select several fields,\n" |
491 | +" OpenERP will propose you to merge only those having\n" |
492 | +" all these fields in common. (not one of the fields)." |
493 | +msgstr "Seleccione la lista de campos utilizados para buscar \n " |
494 | +" registros duplicados. Si selecciona varios campos, \n" |
495 | +" OpenERP propondrá combinar sólo los que tienen \n" |
496 | +" todos estos campos en común. (No uno de los campos)." |
497 | + |
498 | +#. module: base_partner_merge |
499 | +#: field:base.partner.merge.automatic.wizard,group_by_is_company:0 |
500 | +msgid "Is Company" |
501 | +msgstr "Es Compañía" |
502 | + |
503 | +#. module: base_partner_merge |
504 | +#: field:base.partner.merge.automatic.wizard,maximum_group:0 |
505 | +msgid "Maximum of Group of Contacts" |
506 | +msgstr "Máximo Grupo de Contactos" |
507 | + |
508 | +#. module: base_partner_merge |
509 | +#: view:base.partner.merge.automatic.wizard:0 |
510 | +msgid "Search duplicates based on duplicated data in" |
511 | +msgstr "Buscar duplicados basado en datos duplicados" |
512 | + |
513 | +#. module: base_partner_merge |
514 | +#: field:base.partner.merge.automatic.wizard,group_by_name:0 |
515 | +msgid "Name" |
516 | +msgstr "Nombre" |
517 | + |
518 | +#. module: base_partner_merge |
519 | +#: view:base.partner.merge.automatic.wizard:0 |
520 | +msgid "Merge Selection" |
521 | +msgstr "Seleción para combinar" |
522 | + |
523 | +#. module: base_partner_merge |
524 | +#: view:base.partner.merge.automatic.wizard:0 |
525 | +msgid "Merge Automatically" |
526 | +msgstr "Combinar automáticamente" |
527 | + |
528 | +#. module: base_partner_merge |
529 | +#: field:base.partner.merge.automatic.wizard,line_ids:0 |
530 | +msgid "Lines" |
531 | +msgstr "Líneas" |
532 | + |
533 | +#. module: base_partner_merge |
534 | +#: field:base.partner.merge.line,aggr_ids:0 |
535 | +msgid "Ids" |
536 | +msgstr "Ids" |
537 | + |
538 | +#. module: base_partner_merge |
539 | +#: field:base.partner.merge.line,min_id:0 |
540 | +msgid "MinID" |
541 | +msgstr "MinID" |
542 | + |
543 | +#. module: base_partner_merge |
544 | +#: selection:base.partner.merge.automatic.wizard,state:0 |
545 | +msgid "Selection" |
546 | +msgstr "Selección" |
547 | + |
548 | +#. module: base_partner_merge |
549 | +#: code:addons/base_partner_merge/base_partner_merge.py:346 |
550 | +#: code:addons/base_partner_merge/base_partner_merge.py:356 |
551 | +#: code:addons/base_partner_merge/base_partner_merge.py:383 |
552 | +#: code:addons/base_partner_merge/base_partner_merge.py:517 |
553 | +#, python-format |
554 | +msgid "Error" |
555 | +msgstr "Error" |
556 | + |
557 | +#. module: base_partner_merge |
558 | +#: view:base.partner.merge.automatic.wizard:0 |
559 | +msgid "There is no more contacts to merge for this request..." |
560 | +msgstr "No existen más contactos para combinar para esta solicitud..." |
561 | + |
562 | +#. module: base_partner_merge |
563 | +#: field:base.partner.merge.automatic.wizard,exclude_journal_item:0 |
564 | +msgid "Journal Items associated to the contact" |
565 | +msgstr "Líneas de asiento asociadas a este contacto" |
566 | + |
567 | +#. module: base_partner_merge |
568 | +#: view:base.partner.merge.automatic.wizard:0 |
569 | +msgid "Options" |
570 | +msgstr "Opciones" |
571 | + |
572 | +#. module: base_partner_merge |
573 | +#: view:base.partner.merge.automatic.wizard:0 |
574 | +msgid "The selected contacts will be merged together. All\n" |
575 | +" documents linking to one of these contacts will be\n" |
576 | +" redirected to the aggregated contact. You can remove\n" |
577 | +" contacts from this list to avoid merging them." |
578 | +msgstr " Los contactos seleccionados se combinan entre sí. Todos \n" |
579 | +" los documentos que vinculan a uno de estos contactos se \n" |
580 | +" redireccionan al contacto agregado. Puede eliminar \n" |
581 | +" los contactos de esta lista para evitar combinarlos." |
582 | + |
583 | +#. module: base_partner_merge |
584 | +#: view:base.partner.merge.automatic.wizard:0 |
585 | +msgid "Automatic Merge Wizard" |
586 | +msgstr "Asistente para combinación automática" |
587 | + |
588 | +#. module: base_partner_merge |
589 | +#: field:base.partner.merge.automatic.wizard,group_by_parent_id:0 |
590 | +msgid "Parent Company" |
591 | +msgstr "Compañía Padre" |
592 | + |
593 | +#. module: base_partner_merge |
594 | +#: field:base.partner.merge.automatic.wizard,group_by_ref:0 |
595 | +msgid "Reference" |
596 | +msgstr "Referencia" |
597 | + |
598 | +#. module: base_partner_merge |
599 | +#: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge |
600 | +msgid "Automatic Merge" |
601 | +msgstr "Combinar automático" |
602 | + |
603 | +#. module: base_partner_merge |
604 | +#: code:addons/base_partner_merge/base_partner_merge.py:518 |
605 | +#, python-format |
606 | +msgid "You have to specify a filter for your selection" |
607 | +msgstr "Necesita tener un filtro para su selección" |
608 | + |
609 | +#. module: base_partner_merge |
610 | +#: code:addons/base_partner_merge/base_partner_merge.py:402 |
611 | +#, python-format |
612 | +msgid "Merged with the following partners:" |
613 | +msgstr "Combinar con las siguientes empresas:" |
614 | + |
615 | +#. module: base_partner_merge |
616 | +#: view:base.partner.merge.automatic.wizard:0 |
617 | +msgid "or" |
618 | +msgstr "o" |
619 | + |
620 | +#. module: base_partner_merge |
621 | +#: field:res.partner,create_date:0 |
622 | +msgid "Create Date" |
623 | +msgstr "Fecha de creación" |
624 | + |
625 | +#. module: base_partner_merge |
626 | +#: view:base.partner.merge.automatic.wizard:0 |
627 | +msgid "Merge with Manual Check" |
628 | +msgstr "Combinar con revisión manual" |
629 | + |
630 | +#. module: base_partner_merge |
631 | +#: model:ir.model,name:base_partner_merge.model_res_partner |
632 | +msgid "Partner" |
633 | +msgstr "Empresa" |
634 | + |
635 | +#. module: base_partner_merge |
636 | +#: view:base.partner.merge.automatic.wizard:0 |
637 | +msgid "Cancel" |
638 | +msgstr "Cancelar" |
639 | + |
640 | +#. module: base_partner_merge |
641 | +#: view:base.partner.merge.automatic.wizard:0 |
642 | +msgid "Close" |
643 | +msgstr "Cerrar" |
644 | + |
645 | +#. module: base_partner_merge |
646 | +#: field:base.partner.merge.automatic.wizard,exclude_contact:0 |
647 | +msgid "A user associated to the contact" |
648 | +msgstr "Usuario asociado con el contacto" |
649 | + |
650 | +#. module: base_partner_merge |
651 | +#: model:ir.ui.menu,name:base_partner_merge.root_menu |
652 | +msgid "Tools" |
653 | +msgstr "Herramientas" |
654 | + |
655 | +#. module: base_partner_merge |
656 | +#: field:res.partner,id:0 |
657 | +msgid "Id" |
658 | +msgstr "Id" |
659 | + |
660 | +#. module: base_partner_merge |
661 | +#: model:ir.actions.act_window,name:base_partner_merge.base_partner_merge_automatic_act |
662 | +#: model:ir.ui.menu,name:base_partner_merge.partner_merge_automatic_menu |
663 | +msgid "Deduplicate Contacts" |
664 | +msgstr "Contactos Duplicados" |
665 | + |
LGTM.
Regards.