Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/7.0-opw-590950-ksa into lp:openobject-server

  1. 7.0-opw-590950-ksa
  2. Merge into trunk
Proposed by Kirti Savalia(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/7.0-opw-590950-ksa
Merge into: lp:openobject-server
Diff against target: 1142 lines (+510/-26) (has conflicts)
10 files modified
openerp/addons/base/i18n/fr.po (+35/-1)
openerp/addons/base/i18n/hu.po (+189/-0)
openerp/addons/base/i18n/mn.po (+30/-0)
openerp/addons/base/i18n/ro.po (+48/-2)
openerp/addons/base/i18n/ru.po (+14/-0)
openerp/addons/base/i18n/tr.po (+150/-8)
openerp/addons/base/res/res_company.py (+29/-9)
openerp/addons/base/res/res_partner_view.xml (+1/-1)
openerp/report/render/rml2pdf/trml2pdf.py (+8/-4)
openerp/service/workers.py (+6/-1)
Text conflict in openerp/addons/base/i18n/fr.po
Text conflict in openerp/addons/base/i18n/hu.po
Text conflict in openerp/addons/base/i18n/mn.po
Text conflict in openerp/addons/base/i18n/ro.po
Text conflict in openerp/addons/base/i18n/ru.po
Text conflict in openerp/addons/base/i18n/tr.po
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/7.0-opw-590950-ksa
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+158607@code.launchpad.net

Description of the change

Hello,

Fixed the issue when duplicate the company.

Thanks
KSA

To post a comment you must log in.

Unmerged revisions

4931. By Kirti Savalia(OpenERP)

[FIX]:The problem when you duplicate the company

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/i18n/fr.po'
2--- openerp/addons/base/i18n/fr.po 2013-04-10 05:21:38 +0000
3+++ openerp/addons/base/i18n/fr.po 2013-04-12 13:19:33 +0000
4@@ -4,17 +4,32 @@
5 #
6 msgid ""
7 msgstr ""
8+<<<<<<< TREE
9 "Project-Id-Version: OpenERP Server 5.0.4\n"
10 "Report-Msgid-Bugs-To: support@openerp.com\n"
11 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
12 "PO-Revision-Date: 2012-12-06 10:07+0000\n"
13 "Last-Translator: Quentin THEURET <Unknown>\n"
14 "Language-Team: \n"
15+=======
16+"Project-Id-Version: openobject-server\n"
17+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
18+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
19+"PO-Revision-Date: 2013-04-10 02:40+0000\n"
20+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
21+"<maxime.chambreuil@savoirfairelinux.com>\n"
22+"Language-Team: French <fr@li.org>\n"
23+>>>>>>> MERGE-SOURCE
24 "MIME-Version: 1.0\n"
25 "Content-Type: text/plain; charset=UTF-8\n"
26 "Content-Transfer-Encoding: 8bit\n"
27+<<<<<<< TREE
28 "X-Launchpad-Export-Date: 2013-04-10 05:14+0000\n"
29 "X-Generator: Launchpad (build 16550)\n"
30+=======
31+"X-Launchpad-Export-Date: 2013-04-11 14:43+0000\n"
32+"X-Generator: Launchpad (build 16550)\n"
33+>>>>>>> MERGE-SOURCE
34
35 #. module: base
36 #: model:ir.module.module,description:base.module_account_check_writing
37@@ -7490,6 +7505,14 @@
38 msgstr "Îles mineures éloignées des États-Unis"
39
40 #. module: base
41+<<<<<<< TREE
42+=======
43+#: view:base.language.import:0
44+msgid "e.g. English"
45+msgstr "par exemple Français"
46+
47+#. module: base
48+>>>>>>> MERGE-SOURCE
49 #: help:ir.cron,numbercall:0
50 msgid ""
51 "How many times the method is called,\n"
52@@ -7574,7 +7597,18 @@
53 #. module: base
54 #: field:res.partner,is_company:0
55 msgid "Is a Company"
56-msgstr "Est une compagnie"
57+<<<<<<< TREE
58+msgstr "Est une compagnie"
59+=======
60+msgstr "Est une compagnie"
61+
62+#. module: base
63+#: view:res.company:0
64+#: view:res.partner:0
65+#: view:res.users:0
66+msgid "e.g. www.openerp.com"
67+msgstr "ex : www.openerp.com"
68+>>>>>>> MERGE-SOURCE
69
70 #. module: base
71 #: selection:ir.cron,interval_type:0
72
73=== modified file 'openerp/addons/base/i18n/hu.po'
74--- openerp/addons/base/i18n/hu.po 2013-04-10 05:21:38 +0000
75+++ openerp/addons/base/i18n/hu.po 2013-04-12 13:19:33 +0000
76@@ -4,17 +4,29 @@
77 # Tamás Dénes <tamas.denes@gmail.com>, 2010.
78 msgid ""
79 msgstr ""
80+<<<<<<< TREE
81 "Project-Id-Version: OpenERP Server 6.0\n"
82 "Report-Msgid-Bugs-To: support@openerp.com\n"
83 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
84 "PO-Revision-Date: 2013-03-14 10:08+0000\n"
85+=======
86+"Project-Id-Version: openobject-server\n"
87+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
88+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
89+"PO-Revision-Date: 2013-04-07 14:30+0000\n"
90+>>>>>>> MERGE-SOURCE
91 "Last-Translator: krnkris <Unknown>\n"
92 "Language-Team: Hungarian <openerp-hungarian-team@lists.launchpad.net>\n"
93 "MIME-Version: 1.0\n"
94 "Content-Type: text/plain; charset=UTF-8\n"
95 "Content-Transfer-Encoding: 8bit\n"
96+<<<<<<< TREE
97 "X-Launchpad-Export-Date: 2013-04-10 05:15+0000\n"
98 "X-Generator: Launchpad (build 16550)\n"
99+=======
100+"X-Launchpad-Export-Date: 2013-04-08 06:19+0000\n"
101+"X-Generator: Launchpad (build 16550)\n"
102+>>>>>>> MERGE-SOURCE
103
104 #. module: base
105 #: model:ir.module.module,description:base.module_account_check_writing
106@@ -30,6 +42,14 @@
107 " "
108
109 #. module: base
110+<<<<<<< TREE
111+=======
112+#: view:res.partner.bank:0
113+msgid "e.g. GEBABEBB"
114+msgstr "pl. GEBABEBB"
115+
116+#. module: base
117+>>>>>>> MERGE-SOURCE
118 #: model:res.country,name:base.sh
119 msgid "Saint Helena"
120 msgstr "Szent Ilona"
121@@ -765,6 +785,14 @@
122 msgstr "Értékesítések & Beszerzések"
123
124 #. module: base
125+<<<<<<< TREE
126+=======
127+#: view:res.partner:0
128+msgid "Put an internal note..."
129+msgstr "Tegyen egy belső megjegyyzést ide"
130+
131+#. module: base
132+>>>>>>> MERGE-SOURCE
133 #: view:ir.translation:0
134 msgid "Untranslated"
135 msgstr "Lefordítatlan"
136@@ -1167,6 +1195,18 @@
137 msgstr "Modul frissítés"
138
139 #. module: base
140+<<<<<<< TREE
141+=======
142+#: view:res.bank:0
143+#: view:res.company:0
144+#: view:res.partner:0
145+#: view:res.partner.bank:0
146+#: view:res.users:0
147+msgid "ZIP"
148+msgstr "Irányítószám"
149+
150+#. module: base
151+>>>>>>> MERGE-SOURCE
152 #: selection:base.language.install,lang:0
153 msgid "Spanish (UY) / Español (UY)"
154 msgstr "Spanyol (UY)"
155@@ -3889,6 +3929,14 @@
156 " "
157
158 #. module: base
159+<<<<<<< TREE
160+=======
161+#: view:res.company:0
162+msgid "e.g. Global Business Solutions"
163+msgstr "pl. Global Business Solutions"
164+
165+#. module: base
166+>>>>>>> MERGE-SOURCE
167 #: field:res.company,rml_header1:0
168 msgid "Company Tagline"
169 msgstr "Vállalat mottója"
170@@ -7474,6 +7522,14 @@
171 msgstr "USA kisebb félreeső szigetei"
172
173 #. module: base
174+<<<<<<< TREE
175+=======
176+#: view:base.language.import:0
177+msgid "e.g. English"
178+msgstr "pl. angol"
179+
180+#. module: base
181+>>>>>>> MERGE-SOURCE
182 #: help:ir.cron,numbercall:0
183 msgid ""
184 "How many times the method is called,\n"
185@@ -7561,6 +7617,16 @@
186 msgstr "Ez egy vállalat"
187
188 #. module: base
189+<<<<<<< TREE
190+=======
191+#: view:res.company:0
192+#: view:res.partner:0
193+#: view:res.users:0
194+msgid "e.g. www.openerp.com"
195+msgstr "pl. www.openerp.com"
196+
197+#. module: base
198+>>>>>>> MERGE-SOURCE
199 #: selection:ir.cron,interval_type:0
200 msgid "Hours"
201 msgstr "Órák"
202@@ -8166,6 +8232,14 @@
203 msgstr "ir.cron"
204
205 #. module: base
206+<<<<<<< TREE
207+=======
208+#: model:ir.ui.menu,name:base.menu_sales_followup
209+msgid "Payment Follow-up"
210+msgstr "Fizetési-emlékeztető kifizetés"
211+
212+#. module: base
213+>>>>>>> MERGE-SOURCE
214 #: model:res.country,name:base.cw
215 msgid "Curaçao"
216 msgstr "Curaçao"
217@@ -9099,6 +9173,14 @@
218 msgstr "Felhasználói belépés"
219
220 #. module: base
221+<<<<<<< TREE
222+=======
223+#: view:ir.filters:0
224+msgid "Filters created by myself"
225+msgstr "Általam létrehozott szűrők"
226+
227+#. module: base
228+>>>>>>> MERGE-SOURCE
229 #: model:ir.module.module,shortdesc:base.module_l10n_hn
230 msgid "Honduras - Accounting"
231 msgstr "Honduras - Könyvelés"
232@@ -9352,6 +9434,15 @@
233
234 #. module: base
235 #: view:res.partner:0
236+<<<<<<< TREE
237+=======
238+#: view:res.users:0
239+msgid "Tags..."
240+msgstr "Cimkék..."
241+
242+#. module: base
243+#: view:res.partner:0
244+>>>>>>> MERGE-SOURCE
245 msgid "at"
246 msgstr "ekkor"
247
248@@ -9376,6 +9467,14 @@
249 msgstr "Fájlformátum"
250
251 #. module: base
252+<<<<<<< TREE
253+=======
254+#: view:ir.filters:0
255+msgid "My filters"
256+msgstr "Szűrőim"
257+
258+#. module: base
259+>>>>>>> MERGE-SOURCE
260 #: field:res.lang,iso_code:0
261 msgid "ISO code"
262 msgstr "ISO kód"
263@@ -10242,6 +10341,15 @@
264 msgstr "Kifizetés követés szervezése"
265
266 #. module: base
267+<<<<<<< TREE
268+=======
269+#: code:addons/orm.py:5334
270+#, python-format
271+msgid "The value for the field '%s' already exists."
272+msgstr "Ennek a mezőnek '%s' az értéke mér be lett írva."
273+
274+#. module: base
275+>>>>>>> MERGE-SOURCE
276 #: field:workflow.workitem,inst_id:0
277 msgid "Instance"
278 msgstr "Példány"
279@@ -11566,9 +11674,17 @@
280 msgstr "Partner hiv."
281
282 #. module: base
283+<<<<<<< TREE
284 #: model:ir.module.module,shortdesc:base.module_hr_expense
285 msgid "Expense Management"
286 msgstr "Kiadás szervezése"
287+=======
288+#. openerp-web
289+#: code:addons/base/static/src/js/apps.js:103
290+#, python-format
291+msgid "OpenERP Apps Unreachable"
292+msgstr "OpenERP Kiegészítők nem elérhetőek"
293+>>>>>>> MERGE-SOURCE
294
295 #. module: base
296 #: field:ir.attachment,create_date:0
297@@ -12189,6 +12305,18 @@
298 msgstr "Szerződések szervezése: hr_expense link"
299
300 #. module: base
301+<<<<<<< TREE
302+=======
303+#: code:addons/base/module/module.py:670
304+#, python-format
305+msgid ""
306+"The `%s` module appears to be unavailable at the moment, please try again "
307+"later."
308+msgstr ""
309+"A `%s` modul úgy néz ki most nem elérhető, kérem próbálja meg később."
310+
311+#. module: base
312+>>>>>>> MERGE-SOURCE
313 #: view:ir.attachment:0
314 #: view:ir.cron:0
315 #: view:ir.filters:0
316@@ -12602,6 +12730,17 @@
317 "ezt az átmenetet."
318
319 #. module: base
320+<<<<<<< TREE
321+=======
322+#: view:res.bank:0
323+#: view:res.company:0
324+#: view:res.partner:0
325+#: view:res.users:0
326+msgid "Street..."
327+msgstr "Utca..."
328+
329+#. module: base
330+>>>>>>> MERGE-SOURCE
331 #: constraint:res.users:0
332 msgid "The chosen company is not in the allowed companies for this user"
333 msgstr ""
334@@ -14151,6 +14290,15 @@
335 msgstr "Vevő"
336
337 #. module: base
338+<<<<<<< TREE
339+=======
340+#: view:res.partner:0
341+#: view:res.users:0
342+msgid "e.g. +32.81.81.37.00"
343+msgstr "pl. +32.81.81.37.00"
344+
345+#. module: base
346+>>>>>>> MERGE-SOURCE
347 #: selection:base.language.install,lang:0
348 msgid "Spanish (NI) / Español (NI)"
349 msgstr "Spanyol (NI) / Español (NI)"
350@@ -15269,6 +15417,16 @@
351 msgstr "Külső azonosítók"
352
353 #. module: base
354+<<<<<<< TREE
355+=======
356+#. openerp-web
357+#: code:addons/base/static/src/js/apps.js:103
358+#, python-format
359+msgid "Showing locally available modules"
360+msgstr "Megmutatja a helyileg elérhető modulokat"
361+
362+#. module: base
363+>>>>>>> MERGE-SOURCE
364 #: selection:base.language.install,lang:0
365 msgid "Malayalam / മലയാളം"
366 msgstr "Malayalam / മലയാളം"
367@@ -17520,6 +17678,14 @@
368 msgstr "Automatikus betöltés bézet"
369
370 #. module: base
371+<<<<<<< TREE
372+=======
373+#: view:res.country:0
374+msgid "Address format..."
375+msgstr "Címzés formátuma..."
376+
377+#. module: base
378+>>>>>>> MERGE-SOURCE
379 #: model:ir.module.module,description:base.module_l10n_et
380 msgid ""
381 "\n"
382@@ -18090,6 +18256,14 @@
383 msgstr "Paraméterek"
384
385 #. module: base
386+<<<<<<< TREE
387+=======
388+#: view:res.partner:0
389+msgid "e.g. Sales Director"
390+msgstr "pl. Értékesítési vezető"
391+
392+#. module: base
393+>>>>>>> MERGE-SOURCE
394 #: selection:base.language.install,lang:0
395 msgid "Czech / Čeština"
396 msgstr "Cseh / Čeština"
397@@ -18279,6 +18453,14 @@
398 msgstr "Automata telepítés"
399
400 #. module: base
401+<<<<<<< TREE
402+=======
403+#: view:base.language.import:0
404+msgid "e.g. en_US"
405+msgstr "pl. en_US, hu_HU"
406+
407+#. module: base
408+>>>>>>> MERGE-SOURCE
409 #: model:ir.module.module,description:base.module_l10n_hn
410 msgid ""
411 "\n"
412@@ -18512,10 +18694,17 @@
413 msgstr "Feltétel"
414
415 #. module: base
416+<<<<<<< TREE
417 #: model:ir.actions.client,name:base.modules_updates_act_cl
418 #: model:ir.ui.menu,name:base.menu_module_updates
419 msgid "Updates"
420 msgstr "Frissítések"
421+=======
422+#: code:addons/base/module/module.py:669
423+#, python-format
424+msgid "Module not found"
425+msgstr "Modul nem található"
426+>>>>>>> MERGE-SOURCE
427
428 #. module: base
429 #: help:res.currency,rate:0
430
431=== modified file 'openerp/addons/base/i18n/mn.po'
432--- openerp/addons/base/i18n/mn.po 2013-04-10 05:21:38 +0000
433+++ openerp/addons/base/i18n/mn.po 2013-04-12 13:19:33 +0000
434@@ -4,17 +4,31 @@
435 #
436 msgid ""
437 msgstr ""
438+<<<<<<< TREE
439 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
440 "Report-Msgid-Bugs-To: support@openerp.com\n"
441 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
442 "PO-Revision-Date: 2013-02-07 04:04+0000\n"
443 "Last-Translator: Tenuun Khangaitan <tenuun.khangaitan@gmail.com>\n"
444 "Language-Team: \n"
445+=======
446+"Project-Id-Version: openobject-server\n"
447+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
448+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
449+"PO-Revision-Date: 2013-04-07 15:08+0000\n"
450+"Last-Translator: gobi <Unknown>\n"
451+"Language-Team: Mongolian <mn@li.org>\n"
452+>>>>>>> MERGE-SOURCE
453 "MIME-Version: 1.0\n"
454 "Content-Type: text/plain; charset=UTF-8\n"
455 "Content-Transfer-Encoding: 8bit\n"
456+<<<<<<< TREE
457 "X-Launchpad-Export-Date: 2013-04-10 05:16+0000\n"
458 "X-Generator: Launchpad (build 16550)\n"
459+=======
460+"X-Launchpad-Export-Date: 2013-04-08 06:19+0000\n"
461+"X-Generator: Launchpad (build 16550)\n"
462+>>>>>>> MERGE-SOURCE
463
464 #. module: base
465 #: model:ir.module.module,description:base.module_account_check_writing
466@@ -30,6 +44,14 @@
467 " "
468
469 #. module: base
470+<<<<<<< TREE
471+=======
472+#: view:res.partner.bank:0
473+msgid "e.g. GEBABEBB"
474+msgstr "e.g. GEBABEBB"
475+
476+#. module: base
477+>>>>>>> MERGE-SOURCE
478 #: model:res.country,name:base.sh
479 msgid "Saint Helena"
480 msgstr "Сэйнт Хелена"
481@@ -756,6 +778,14 @@
482 msgstr "Борлуулалт & Худалдан авалт"
483
484 #. module: base
485+<<<<<<< TREE
486+=======
487+#: view:res.partner:0
488+msgid "Put an internal note..."
489+msgstr "Дотоод тэмдэглэл бичих..."
490+
491+#. module: base
492+>>>>>>> MERGE-SOURCE
493 #: view:ir.translation:0
494 msgid "Untranslated"
495 msgstr "Орчуулагдаагүй"
496
497=== modified file 'openerp/addons/base/i18n/ro.po'
498--- openerp/addons/base/i18n/ro.po 2013-04-10 05:21:38 +0000
499+++ openerp/addons/base/i18n/ro.po 2013-04-12 13:19:33 +0000
500@@ -4,17 +4,31 @@
501 #
502 msgid ""
503 msgstr ""
504+<<<<<<< TREE
505 "Project-Id-Version: OpenERP Server 5.0.4\n"
506 "Report-Msgid-Bugs-To: support@openerp.com\n"
507 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
508 "PO-Revision-Date: 2013-01-05 18:18+0000\n"
509 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
510 "Language-Team: \n"
511+=======
512+"Project-Id-Version: openobject-server\n"
513+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
514+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
515+"PO-Revision-Date: 2013-04-07 18:50+0000\n"
516+"Last-Translator: Dorin <dhongu@gmail.com>\n"
517+"Language-Team: Romanian <ro@li.org>\n"
518+>>>>>>> MERGE-SOURCE
519 "MIME-Version: 1.0\n"
520 "Content-Type: text/plain; charset=UTF-8\n"
521 "Content-Transfer-Encoding: 8bit\n"
522+<<<<<<< TREE
523 "X-Launchpad-Export-Date: 2013-04-10 05:17+0000\n"
524 "X-Generator: Launchpad (build 16550)\n"
525+=======
526+"X-Launchpad-Export-Date: 2013-04-08 06:19+0000\n"
527+"X-Generator: Launchpad (build 16550)\n"
528+>>>>>>> MERGE-SOURCE
529
530 #. module: base
531 #: model:ir.module.module,description:base.module_account_check_writing
532@@ -767,7 +781,16 @@
533 #. module: base
534 #: view:res.partner:0
535 msgid "Sales & Purchases"
536-msgstr "Vânzări & Achiziții"
537+<<<<<<< TREE
538+msgstr "Vânzări & Achiziții"
539+=======
540+msgstr "Vânzări & Achiziții"
541+
542+#. module: base
543+#: view:res.partner:0
544+msgid "Put an internal note..."
545+msgstr "Adăugați o notă internă"
546+>>>>>>> MERGE-SOURCE
547
548 #. module: base
549 #: view:ir.translation:0
550@@ -3393,12 +3416,16 @@
551 #: field:ir.translation,res_id:0
552 #: field:ir.values,res_id:0
553 msgid "Record ID"
554+<<<<<<< TREE
555 msgstr "ID Înregistrare"
556
557 #. module: base
558 #: view:ir.filters:0
559 msgid "My Filters"
560 msgstr "Filtrele mele"
561+=======
562+msgstr "ID Înregistrare"
563+>>>>>>> MERGE-SOURCE
564
565 #. module: base
566 #: field:ir.actions.server,email:0
567@@ -7499,6 +7526,14 @@
568 "Minor Outlying Islands SUA (Insulele Minore de Coasta ale Statelor Unite)"
569
570 #. module: base
571+<<<<<<< TREE
572+=======
573+#: view:base.language.import:0
574+msgid "e.g. English"
575+msgstr "e.g. English"
576+
577+#. module: base
578+>>>>>>> MERGE-SOURCE
579 #: help:ir.cron,numbercall:0
580 msgid ""
581 "How many times the method is called,\n"
582@@ -7583,7 +7618,18 @@
583 #. module: base
584 #: field:res.partner,is_company:0
585 msgid "Is a Company"
586-msgstr "Este o companie"
587+<<<<<<< TREE
588+msgstr "Este o companie"
589+=======
590+msgstr "Este o companie"
591+
592+#. module: base
593+#: view:res.company:0
594+#: view:res.partner:0
595+#: view:res.users:0
596+msgid "e.g. www.openerp.com"
597+msgstr "e.g. www.openerp.com"
598+>>>>>>> MERGE-SOURCE
599
600 #. module: base
601 #: selection:ir.cron,interval_type:0
602
603=== modified file 'openerp/addons/base/i18n/ru.po'
604--- openerp/addons/base/i18n/ru.po 2013-04-10 05:21:38 +0000
605+++ openerp/addons/base/i18n/ru.po 2013-04-12 13:19:33 +0000
606@@ -4,17 +4,31 @@
607 #
608 msgid ""
609 msgstr ""
610+<<<<<<< TREE
611 "Project-Id-Version: OpenERP Server 5.0.4\n"
612 "Report-Msgid-Bugs-To: support@openerp.com\n"
613 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
614 "PO-Revision-Date: 2013-01-24 13:14+0000\n"
615 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
616 "Language-Team: \n"
617+=======
618+"Project-Id-Version: openobject-server\n"
619+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
620+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
621+"PO-Revision-Date: 2013-04-09 08:38+0000\n"
622+"Last-Translator: Paul Korotkov <korotkov.paul@gmail.com>\n"
623+"Language-Team: Russian <ru@li.org>\n"
624+>>>>>>> MERGE-SOURCE
625 "MIME-Version: 1.0\n"
626 "Content-Type: text/plain; charset=UTF-8\n"
627 "Content-Transfer-Encoding: 8bit\n"
628+<<<<<<< TREE
629 "X-Launchpad-Export-Date: 2013-04-10 05:17+0000\n"
630 "X-Generator: Launchpad (build 16550)\n"
631+=======
632+"X-Launchpad-Export-Date: 2013-04-10 05:54+0000\n"
633+"X-Generator: Launchpad (build 16550)\n"
634+>>>>>>> MERGE-SOURCE
635
636 #. module: base
637 #: model:ir.module.module,description:base.module_account_check_writing
638
639=== modified file 'openerp/addons/base/i18n/tr.po'
640--- openerp/addons/base/i18n/tr.po 2013-04-10 05:21:38 +0000
641+++ openerp/addons/base/i18n/tr.po 2013-04-12 13:19:33 +0000
642@@ -4,17 +4,31 @@
643 #
644 msgid ""
645 msgstr ""
646+<<<<<<< TREE
647 "Project-Id-Version: OpenERP Server 5.0.4\n"
648 "Report-Msgid-Bugs-To: support@openerp.com\n"
649 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
650 "PO-Revision-Date: 2012-11-28 08:41+0000\n"
651 "Last-Translator: Ahmet Altınışık <Unknown>\n"
652 "Language-Team: \n"
653+=======
654+"Project-Id-Version: openobject-server\n"
655+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
656+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
657+"PO-Revision-Date: 2013-04-11 21:43+0000\n"
658+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
659+"Language-Team: Turkish <tr@li.org>\n"
660+>>>>>>> MERGE-SOURCE
661 "MIME-Version: 1.0\n"
662 "Content-Type: text/plain; charset=UTF-8\n"
663 "Content-Transfer-Encoding: 8bit\n"
664+<<<<<<< TREE
665 "X-Launchpad-Export-Date: 2013-04-10 05:19+0000\n"
666 "X-Generator: Launchpad (build 16550)\n"
667+=======
668+"X-Launchpad-Export-Date: 2013-04-12 06:05+0000\n"
669+"X-Generator: Launchpad (build 16564)\n"
670+>>>>>>> MERGE-SOURCE
671
672 #. module: base
673 #: model:ir.module.module,description:base.module_account_check_writing
674@@ -30,6 +44,14 @@
675 " "
676
677 #. module: base
678+<<<<<<< TREE
679+=======
680+#: view:res.partner.bank:0
681+msgid "e.g. GEBABEBB"
682+msgstr "örn. GEBABEBB"
683+
684+#. module: base
685+>>>>>>> MERGE-SOURCE
686 #: model:res.country,name:base.sh
687 msgid "Saint Helena"
688 msgstr "Azize Helen"
689@@ -2339,7 +2361,7 @@
690 #. module: base
691 #: model:ir.module.module,shortdesc:base.module_auth_crypt
692 msgid "Password Encryption"
693-msgstr ""
694+msgstr "Parola Şifreleme"
695
696 #. module: base
697 #: view:workflow.activity:0
698@@ -6118,6 +6140,14 @@
699 msgstr "ABD Çevresi Adaları"
700
701 #. module: base
702+<<<<<<< TREE
703+=======
704+#: view:base.language.import:0
705+msgid "e.g. English"
706+msgstr "örn. Türkçe"
707+
708+#. module: base
709+>>>>>>> MERGE-SOURCE
710 #: help:ir.cron,numbercall:0
711 msgid ""
712 "How many times the method is called,\n"
713@@ -6201,6 +6231,16 @@
714 msgstr "Bu Bir Firmamı"
715
716 #. module: base
717+<<<<<<< TREE
718+=======
719+#: view:res.company:0
720+#: view:res.partner:0
721+#: view:res.users:0
722+msgid "e.g. www.openerp.com"
723+msgstr "örn. www.openerp.com"
724+
725+#. module: base
726+>>>>>>> MERGE-SOURCE
727 #: selection:ir.cron,interval_type:0
728 msgid "Hours"
729 msgstr "Saat"
730@@ -6628,6 +6668,14 @@
731 msgstr "ir.cron"
732
733 #. module: base
734+<<<<<<< TREE
735+=======
736+#: model:ir.ui.menu,name:base.menu_sales_followup
737+msgid "Payment Follow-up"
738+msgstr "Ödeme Takip"
739+
740+#. module: base
741+>>>>>>> MERGE-SOURCE
742 #: model:res.country,name:base.cw
743 msgid "Curaçao"
744 msgstr ""
745@@ -7422,6 +7470,14 @@
746 msgstr "Kullanıcı Girişi"
747
748 #. module: base
749+<<<<<<< TREE
750+=======
751+#: view:ir.filters:0
752+msgid "Filters created by myself"
753+msgstr "Benim oluşturuduğum Filtreler"
754+
755+#. module: base
756+>>>>>>> MERGE-SOURCE
757 #: model:ir.module.module,shortdesc:base.module_l10n_hn
758 msgid "Honduras - Accounting"
759 msgstr "Honduras - Muhasebe"
760@@ -7642,6 +7698,15 @@
761
762 #. module: base
763 #: view:res.partner:0
764+<<<<<<< TREE
765+=======
766+#: view:res.users:0
767+msgid "Tags..."
768+msgstr "Etiketler..."
769+
770+#. module: base
771+#: view:res.partner:0
772+>>>>>>> MERGE-SOURCE
773 msgid "at"
774 msgstr "de"
775
776@@ -7666,6 +7731,14 @@
777 msgstr "Dosya Biçimi"
778
779 #. module: base
780+<<<<<<< TREE
781+=======
782+#: view:ir.filters:0
783+msgid "My filters"
784+msgstr "Benim filtrelerim"
785+
786+#. module: base
787+>>>>>>> MERGE-SOURCE
788 #: field:res.lang,iso_code:0
789 msgid "ISO code"
790 msgstr "ISO kodu"
791@@ -8027,12 +8100,12 @@
792 #: code:addons/base/res/res_users.py:473
793 #, python-format
794 msgid "Setting empty passwords is not allowed for security reasons!"
795-msgstr "Güvenlik sebebiyle boş şifrelere izin verilmemektedir!"
796+msgstr "Güvenlik nedeniyle boş parolalara izin verilmemektedir!"
797
798 #. module: base
799 #: help:ir.mail_server,smtp_pass:0
800 msgid "Optional password for SMTP authentication"
801-msgstr "SMTP kimlik doğrulaması için şifre (opsiyonel)"
802+msgstr "SMTP kimlik doğrulaması için seçmeli parola"
803
804 #. module: base
805 #: code:addons/base/ir/ir_model.py:728
806@@ -9412,9 +9485,17 @@
807 msgstr "Partner Ref."
808
809 #. module: base
810+<<<<<<< TREE
811 #: model:ir.module.module,shortdesc:base.module_hr_expense
812 msgid "Expense Management"
813 msgstr "Harcama Yönetimi"
814+=======
815+#. openerp-web
816+#: code:addons/base/static/src/js/apps.js:103
817+#, python-format
818+msgid "OpenERP Apps Unreachable"
819+msgstr "OpenERP Ugulamaları Erişilebilir Değil"
820+>>>>>>> MERGE-SOURCE
821
822 #. module: base
823 #: field:ir.attachment,create_date:0
824@@ -10289,6 +10370,17 @@
825 msgstr "Bu çeviriyi onaylaması için kullanıcının içinde olması gereken grup"
826
827 #. module: base
828+<<<<<<< TREE
829+=======
830+#: view:res.bank:0
831+#: view:res.company:0
832+#: view:res.partner:0
833+#: view:res.users:0
834+msgid "Street..."
835+msgstr "Adres..."
836+
837+#. module: base
838+>>>>>>> MERGE-SOURCE
839 #: constraint:res.users:0
840 msgid "The chosen company is not in the allowed companies for this user"
841 msgstr "Bu kullanıcının seçilen şirkete erişim hakkı yok"
842@@ -11604,6 +11696,15 @@
843 msgstr "Müşteri"
844
845 #. module: base
846+<<<<<<< TREE
847+=======
848+#: view:res.partner:0
849+#: view:res.users:0
850+msgid "e.g. +32.81.81.37.00"
851+msgstr "örn. +90.212.345.37.00"
852+
853+#. module: base
854+>>>>>>> MERGE-SOURCE
855 #: selection:base.language.install,lang:0
856 msgid "Spanish (NI) / Español (NI)"
857 msgstr "İspanyolca (NI) / Español (NI)"
858@@ -12416,7 +12517,7 @@
859 #. module: base
860 #: view:res.users:0
861 msgid "Change password"
862-msgstr "Şifreyi değiştir"
863+msgstr "Parolayı değiştir"
864
865 #. module: base
866 #: model:res.country,name:base.sr
867@@ -12471,7 +12572,7 @@
868 #. module: base
869 #: model:ir.model,name:base.model_change_password_user
870 msgid "Change Password Wizard User"
871-msgstr ""
872+msgstr "Parola Değiştirme Sihirbazı Kullanıcısı"
873
874 #. module: base
875 #: model:res.groups,name:base.group_no_one
876@@ -12534,6 +12635,16 @@
877 msgstr "Dış Tanımlayıcılar"
878
879 #. module: base
880+<<<<<<< TREE
881+=======
882+#. openerp-web
883+#: code:addons/base/static/src/js/apps.js:103
884+#, python-format
885+msgid "Showing locally available modules"
886+msgstr "Yerel olarak kullanılabilir modülleri bakın"
887+
888+#. module: base
889+>>>>>>> MERGE-SOURCE
890 #: selection:base.language.install,lang:0
891 msgid "Malayalam / മലയാളം"
892 msgstr "Malayalam dili / മലയാളം"
893@@ -12769,7 +12880,7 @@
894 #. module: base
895 #: selection:base.language.export,state:0
896 msgid "choose"
897-msgstr "seçme"
898+msgstr "seç"
899
900 #. module: base
901 #: code:addons/base/ir/ir_mail_server.py:445
902@@ -12898,7 +13009,7 @@
903 #. module: base
904 #: field:res.users,new_password:0
905 msgid "Set Password"
906-msgstr "Parola Ayarlama"
907+msgstr "Parola Ayarla"
908
909 #. module: base
910 #: field:ir.actions.server,subject:0
911@@ -14107,7 +14218,7 @@
912 #. module: base
913 #: model:ir.model,name:base.model_change_password_wizard
914 msgid "Change Password Wizard"
915-msgstr ""
916+msgstr "Parola Değiştirme Sihirbazı"
917
918 #. module: base
919 #: model:ir.module.module,summary:base.module_account_voucher
920@@ -14346,6 +14457,14 @@
921 msgstr "Görünüm Kendiliğinden Yüklenmesi"
922
923 #. module: base
924+<<<<<<< TREE
925+=======
926+#: view:res.country:0
927+msgid "Address format..."
928+msgstr "Adres formatı..."
929+
930+#. module: base
931+>>>>>>> MERGE-SOURCE
932 #: model:ir.module.module,description:base.module_l10n_et
933 msgid ""
934 "\n"
935@@ -14791,6 +14910,14 @@
936 msgstr "Parametreler"
937
938 #. module: base
939+<<<<<<< TREE
940+=======
941+#: view:res.partner:0
942+msgid "e.g. Sales Director"
943+msgstr "örn. Satış Yöneticisi"
944+
945+#. module: base
946+>>>>>>> MERGE-SOURCE
947 #: selection:base.language.install,lang:0
948 msgid "Czech / Čeština"
949 msgstr "Çekce / Čeština"
950@@ -14969,6 +15096,14 @@
951 msgstr "Otomatik Yükleme"
952
953 #. module: base
954+<<<<<<< TREE
955+=======
956+#: view:base.language.import:0
957+msgid "e.g. en_US"
958+msgstr "örn. tr_TR"
959+
960+#. module: base
961+>>>>>>> MERGE-SOURCE
962 #: model:ir.module.module,description:base.module_l10n_hn
963 msgid ""
964 "\n"
965@@ -15144,10 +15279,17 @@
966 msgstr "Koşul"
967
968 #. module: base
969+<<<<<<< TREE
970 #: model:ir.actions.client,name:base.modules_updates_act_cl
971 #: model:ir.ui.menu,name:base.menu_module_updates
972 msgid "Updates"
973 msgstr "Güncellemeler"
974+=======
975+#: code:addons/base/module/module.py:669
976+#, python-format
977+msgid "Module not found"
978+msgstr "Modül bulunamadı"
979+>>>>>>> MERGE-SOURCE
980
981 #. module: base
982 #: help:res.currency,rate:0
983
984=== modified file 'openerp/addons/base/res/res_company.py'
985--- openerp/addons/base/res/res_company.py 2013-02-15 16:32:14 +0000
986+++ openerp/addons/base/res/res_company.py 2013-04-12 13:19:33 +0000
987@@ -75,6 +75,28 @@
988 _description = 'Companies'
989 _order = 'name'
990
991+ def copy(self, cr, uid, id, default=None, context=None):
992+ """
993+ Add (copy) in the name when duplicate record
994+ """
995+ if not context:
996+ context = {}
997+ if not default:
998+ default = {}
999+ company = self.browse(cr, uid, id, context=context)
1000+ default = default.copy()
1001+ default.update({'name': company.name + _(' (Copy)'),
1002+ 'street':company.street,
1003+ 'street2':company.street2,
1004+ 'city':company.city,
1005+ 'state_id':company.state_id.id,
1006+ 'phone':company.phone,
1007+ 'fax':company.fax,
1008+ 'zip':company.zip,
1009+ 'country_id':company.country_id.id,
1010+ 'email':company.email})
1011+ return super(res_company, self).copy(cr, uid, id, default, context=context)
1012+
1013 def _get_address_data(self, cr, uid, ids, field_names, arg, context=None):
1014 """ Read the 'address' functional fields. """
1015 result = {}
1016@@ -245,16 +267,14 @@
1017 self._get_company_children.clear_cache(self)
1018
1019 def create(self, cr, uid, vals, context=None):
1020- if not vals.get('name', False) or vals.get('partner_id', False):
1021+ if vals.get('name'):
1022+ obj_partner = self.pool.get('res.partner')
1023+ partner_id = obj_partner.create(cr, uid, {'name': vals['name'], 'is_company':True, 'image': vals.get('logo', False)}, context=context)
1024+ vals.update({'partner_id': partner_id})
1025 self.cache_restart(cr)
1026- return super(res_company, self).create(cr, uid, vals, context=context)
1027- obj_partner = self.pool.get('res.partner')
1028- partner_id = obj_partner.create(cr, uid, {'name': vals['name'], 'is_company':True, 'image': vals.get('logo', False)}, context=context)
1029- vals.update({'partner_id': partner_id})
1030- self.cache_restart(cr)
1031- company_id = super(res_company, self).create(cr, uid, vals, context=context)
1032- obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
1033- return company_id
1034+ company_id = super(res_company, self).create(cr, uid, vals, context=context)
1035+ obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
1036+ return company_id
1037
1038 def write(self, cr, uid, ids, values, context=None):
1039 self.cache_restart(cr)
1040
1041=== modified file 'openerp/addons/base/res/res_partner_view.xml'
1042--- openerp/addons/base/res/res_partner_view.xml 2013-04-05 11:07:50 +0000
1043+++ openerp/addons/base/res/res_partner_view.xml 2013-04-12 13:19:33 +0000
1044@@ -182,7 +182,7 @@
1045 </group>
1046
1047 <notebook colspan="4">
1048- <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}">
1049+ <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}" autofocus="autofocus">
1050 <field name="child_ids" context="{'default_parent_id': active_id}" mode="kanban">
1051 <kanban>
1052 <field name="color"/>
1053
1054=== modified file 'openerp/report/render/rml2pdf/trml2pdf.py'
1055--- openerp/report/render/rml2pdf/trml2pdf.py 2013-03-11 15:51:47 +0000
1056+++ openerp/report/render/rml2pdf/trml2pdf.py 2013-04-12 13:19:33 +0000
1057@@ -435,7 +435,7 @@
1058 self.canvas.circle(x_cen=utils.unit_get(node.get('x')), y_cen=utils.unit_get(node.get('y')), r=utils.unit_get(node.get('radius')), **utils.attr_get(node, [], {'fill':'bool','stroke':'bool'}))
1059
1060 def _place(self, node):
1061- flows = _rml_flowable(self.doc, self.localcontext, images=self.images, path=self.path, title=self.title).render(node)
1062+ flows = _rml_flowable(self.doc, self.localcontext, images=self.images, path=self.path, title=self.title, canvas=self.canvas).render(node)
1063 infos = utils.attr_get(node, ['x','y','width','height'])
1064
1065 infos['y']+=infos['height']
1066@@ -616,7 +616,7 @@
1067 drw.render(self.canv, None)
1068
1069 class _rml_flowable(object):
1070- def __init__(self, doc, localcontext, images=None, path='.', title=None):
1071+ def __init__(self, doc, localcontext, images=None, path='.', title=None, canvas=None):
1072 if images is None:
1073 images = {}
1074 self.localcontext = localcontext
1075@@ -625,6 +625,7 @@
1076 self.images = images
1077 self.path = path
1078 self.title = title
1079+ self.canvas = canvas
1080
1081 def _textual(self, node):
1082 rc1 = utils._process_text(self, node.text or '')
1083@@ -634,7 +635,10 @@
1084 if key in ('rml_except', 'rml_loop', 'rml_tag'):
1085 del txt_n.attrib[key]
1086 if not n.tag == 'bullet':
1087- txt_n.text = utils.xml2str(self._textual(n))
1088+ if n.tag == 'pageNumber':
1089+ txt_n.text = self.canvas and str(self.canvas.getPageNumber()) or ''
1090+ else:
1091+ txt_n.text = utils.xml2str(self._textual(n))
1092 txt_n.tail = n.tail and utils.xml2str(utils._process_text(self, n.tail.replace('\n',''))) or ''
1093 rc1 += etree.tostring(txt_n)
1094 return rc1
1095@@ -983,7 +987,7 @@
1096 if self.localcontext and not self.localcontext.get('internal_header',False):
1097 del self.localcontext['internal_header']
1098 fis = []
1099- r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title)
1100+ r = _rml_flowable(self.doc,self.localcontext, images=self.images, path=self.path, title=self.title, canvas=None)
1101 story_cnt = 0
1102 for node_story in node_stories:
1103 if story_cnt > 0:
1104
1105=== modified file 'openerp/service/workers.py'
1106--- openerp/service/workers.py 2013-04-04 13:07:04 +0000
1107+++ openerp/service/workers.py 2013-04-12 13:19:33 +0000
1108@@ -241,6 +241,9 @@
1109 self.request_max = multi.limit_request
1110 self.request_count = 0
1111
1112+ def setproctitle(self, title=""):
1113+ setproctitle('openerp: %s %s %s' % (self.__class__.__name__, self.pid, title))
1114+
1115 def close(self):
1116 os.close(self.watchdog_pipe[0])
1117 os.close(self.watchdog_pipe[1])
1118@@ -290,7 +293,7 @@
1119
1120 def start(self):
1121 self.pid = os.getpid()
1122- setproctitle('openerp: %s %s' % (self.__class__.__name__, self.pid))
1123+ self.setproctitle()
1124 _logger.info("Worker %s (%s) alive", self.__class__.__name__, self.pid)
1125 # Reseed the random number generator
1126 random.seed()
1127@@ -413,6 +416,7 @@
1128 if len(db_names):
1129 self.db_index = (self.db_index + 1) % len(db_names)
1130 db_name = db_names[self.db_index]
1131+ self.setproctitle(db_name)
1132 if rpc_request_flag:
1133 start_time = time.time()
1134 start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
1135@@ -422,6 +426,7 @@
1136 import openerp.addons.base as base
1137 acquired = base.ir.ir_cron.ir_cron._acquire_job(db_name)
1138 if not acquired:
1139+ openerp.modules.registry.RegistryManager.delete(db_name)
1140 break
1141 # dont keep cursors in multi database mode
1142 if len(db_names) > 1: