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