openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00438
[Merge] lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
jam-openerp has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
Harry (Open ERP) (hmo-tinyerp)
Fixed the Bug 673960 and Cleaning of the outlook-plugin file tiny_xmlrpc.py file
--
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons1/+merge/40709
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons1.
=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po 2010-11-12 04:49:27 +0000
+++ account/i18n/bg.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:29+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:00+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po 2010-11-12 04:49:27 +0000
+++ account/i18n/bs.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:41+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:38+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po 2010-11-12 04:49:27 +0000
+++ account/i18n/ca.po 2010-11-12 11:52:57 +0000
@@ -7,14 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:44+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:40+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/da.po'
--- account/i18n/da.po 2010-11-12 04:49:27 +0000
+++ account/i18n/da.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:29+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:34+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Danish <da@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/de.po'
--- account/i18n/de.po 2010-11-12 04:49:27 +0000
+++ account/i18n/de.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:23+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 13:54+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/el.po'
--- account/i18n/el.po 2010-11-12 04:49:27 +0000
+++ account/i18n/el.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:23+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:24+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Greek <el@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/es.po'
--- account/i18n/es.po 2010-11-12 04:49:27 +0000
+++ account/i18n/es.po 2010-11-12 11:52:57 +0000
@@ -7,14 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:12+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:21+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/et.po'
--- account/i18n/et.po 2010-11-12 04:49:27 +0000
+++ account/i18n/et.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:39+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:03+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/fi.po'
--- account/i18n/fi.po 2010-11-12 04:49:27 +0000
+++ account/i18n/fi.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:56+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:13+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Finnish <fi@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/fr.po'
--- account/i18n/fr.po 2010-11-12 04:49:27 +0000
+++ account/i18n/fr.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:11+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:20+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: TeMPO <openerp@xxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/hr.po'
--- account/i18n/hr.po 2010-11-12 04:49:27 +0000
+++ account/i18n/hr.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:19+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:23+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/it.po'
--- account/i18n/it.po 2010-11-12 04:49:27 +0000
+++ account/i18n/it.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 19:48+0000\n"
"Last-Translator: Lorenzo Battistini <lorenzo.battistini@xxxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:36+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/lt.po'
--- account/i18n/lt.po 2010-11-12 04:49:27 +0000
+++ account/i18n/lt.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:06+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:19+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/mn.po'
--- account/i18n/mn.po 2010-11-12 04:49:27 +0000
+++ account/i18n/mn.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:26+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 13:56+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Mongolian <mn@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/nl.po'
--- account/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ account/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:01+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:16+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/pl.po'
--- account/i18n/pl.po 2010-11-12 04:49:27 +0000
+++ account/i18n/pl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:04+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:18+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/pt.po'
--- account/i18n/pt.po 2010-11-12 04:49:27 +0000
+++ account/i18n/pt.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:17+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:23+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/pt_BR.po'
--- account/i18n/pt_BR.po 2010-11-12 04:49:27 +0000
+++ account/i18n/pt_BR.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:26+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:34+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/ro.po'
--- account/i18n/ro.po 2010-11-12 04:49:27 +0000
+++ account/i18n/ro.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:36+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:36+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/ru.po'
--- account/i18n/ru.po 2010-11-12 04:49:27 +0000
+++ account/i18n/ru.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:32+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:03+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/sr.po'
--- account/i18n/sr.po 2010-11-12 04:49:27 +0000
+++ account/i18n/sr.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:21+0000\n"
"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 13:53+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Serbian <sr@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:45+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/sv.po'
--- account/i18n/sv.po 2010-11-12 04:49:27 +0000
+++ account/i18n/sv.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:13+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:23+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Anders Eriksson (Mobila System) <ae@xxxxxxxxxxxxxxx>\n"
"Language-Team: <> <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/tr.po'
--- account/i18n/tr.po 2010-11-12 04:49:27 +0000
+++ account/i18n/tr.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:21+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:24+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Omer Barlas <omer@xxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account/i18n/zh_CN.po'
--- account/i18n/zh_CN.po 2010-11-12 04:49:27 +0000
+++ account/i18n/zh_CN.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:58+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:15+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: solar.xie@xxxxxxxxx <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
=== modified file 'account_tax_include/i18n/it.po'
--- account_tax_include/i18n/it.po 2010-11-12 04:49:27 +0000
+++ account_tax_include/i18n/it.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:50+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 20:39+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
=== modified file 'base_module_quality/i18n/nl.po'
--- base_module_quality/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ base_module_quality/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:24+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 10:56+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Dutch <nl@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
=== modified file 'base_module_record/i18n/nl.po'
--- base_module_record/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ base_module_record/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:34+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 11:05+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
=== modified file 'base_report_creator/i18n/nl.po'
--- base_report_creator/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ base_report_creator/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:28+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 11:11+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
=== modified file 'base_report_designer/i18n/nl.po'
--- base_report_designer/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ base_report_designer/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:22+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 11:20+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
=== modified file 'base_setup/i18n/el.po'
--- base_setup/i18n/el.po 2010-11-12 04:49:27 +0000
+++ base_setup/i18n/el.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,21 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 14:07+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 08:56+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
"Language-Team: Greek <el@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
=== modified file 'base_setup/i18n/nl.po'
--- base_setup/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ base_setup/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:13+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:38+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
=== modified file 'caldav/caldav_view.xml'
=== modified file 'crm/i18n/el.po'
--- crm/i18n/el.po 2010-11-12 04:49:27 +0000
+++ crm/i18n/el.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,21 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 18:19+0000\n"
+=======
+"PO-Revision-Date: 2010-11-10 16:54+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
"Language-Team: nls@xxxxxxxxx <nls@xxxxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
=== modified file 'crm_caldav/crm_caldav_setup.xml'
--- crm_caldav/crm_caldav_setup.xml 2010-10-12 10:41:21 +0000
+++ crm_caldav/crm_caldav_setup.xml 2010-11-12 11:52:57 +0000
@@ -27,7 +27,7 @@
<record id="basic_calendar_lines_vevent0" model="basic.calendar.lines">
<field name="calendar_id" ref="basic_calendar_meetings0"/>
- <field name="domain">[('user_id','=', dctx_user_id)]</field>
+ <field name="domain">[('user_id','=', uid)]</field>
<field name="name">vevent</field>
<field name="object_id" ref="crm.model_crm_meeting"/>
</record>
=== modified file 'document/document.py'
=== modified file 'document/document_storage.py'
=== modified file 'fetchmail/i18n/fr.po'
--- fetchmail/i18n/fr.po 2010-11-12 04:49:27 +0000
+++ fetchmail/i18n/fr.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:34+0000\n"
"Last-Translator: Open Net SÃ rl <openerp@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-10 07:36+0000\n"
+"Last-Translator: Open Net SÃ rl <openerp@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: fetchmail
=== modified file 'google_map/i18n/it.po'
--- google_map/i18n/it.po 2010-11-12 04:49:27 +0000
+++ google_map/i18n/it.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:15+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 20:14+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:45+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:43+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
=== modified file 'marketing_campaign/i18n/nl.po'
--- marketing_campaign/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ marketing_campaign/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:42+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:36+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Dutch <nl@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing_campaign
=== modified file 'membership/i18n/it.po'
--- membership/i18n/it.po 2010-11-12 04:49:27 +0000
+++ membership/i18n/it.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 16:35+0000\n"
"Last-Translator: Leonardo Pistone <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 08:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:43+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
=== modified file 'membership/i18n/nl.po'
--- membership/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ membership/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:45+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:21+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:43+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
=== modified file 'multi_company/i18n/nl.po'
--- multi_company/i18n/nl.po 2010-11-12 04:49:27 +0000
+++ multi_company/i18n/nl.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 09:43+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 14:01+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Dutch <nl@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: multi_company
=== modified file 'outlook/plugin/openerp-outlook-plugin/addin.py'
=== modified file 'outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py'
--- outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py 2010-11-12 09:55:40 +0000
+++ outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py 2010-11-12 11:52:57 +0000
@@ -29,9 +29,11 @@
import pythoncom
import win32com
import win32ui
+
waittime = 10
wait_count = 0
wait_limit = 12
+
def execute(connector, method, *args):
global wait_count
res = False
@@ -80,59 +82,60 @@
self.protocol=None
def getitem(self, attrib):
- v=self.__getattribute__(attrib)
- return str(v)
+ v=self.__getattribute__(attrib)
+ return str(v)
def setitem(self, attrib, value):
- return self.__setattr__(attrib, value)
+ return self.__setattr__(attrib, value)
def GetDBList(self):
- conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/db')
- try:
- db_list = execute(conn, 'list')
- if db_list == False:
- self._running=False
- return []
- else:
- self._running=True
- except:
- db_list=-1
- self._running=True
- return db_list
+ conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/db')
+ try:
+ db_list = execute(conn, 'list')
+ if db_list == False:
+ self._running=False
+ return []
+ else:
+ self._running=True
+ except:
+ db_list=-1
+ self._running=True
+ return db_list
def login(self,dbname, user, pwd):
- self._dbname = dbname
- self._uname = user
- self._pwd = pwd
- conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
- uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
- return uid
+ self._dbname = dbname
+ self._uname = user
+ self._pwd = pwd
+ conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
+ uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+ return uid
def GetAllObjects(self):
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
- objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
- obj_list = [item['model'] for item in objects]
- return obj_list
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
+ objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
+ obj_list = [item['model'] for item in objects]
+ return obj_list
def GetObjList(self):
- self._obj_list=list(self._obj_list)
- self._obj_list.sort(reverse=True)
- return self._obj_list
+ self._obj_list=list(self._obj_list)
+ self._obj_list.sort(reverse=True)
+ return self._obj_list
def InsertObj(self, obj_title,obj_name,image_path):
- self._obj_list=list(self._obj_list)
- self._obj_list.append((obj_title,obj_name,ustr(image_path)))
- self._obj_list.sort(reverse=True)
+ self._obj_list=list(self._obj_list)
+ self._obj_list.append((obj_title,obj_name,ustr(image_path)))
+ self._obj_list.sort(reverse=True)
def DeleteObject(self,sel_text):
- self._obj_list=list(self._obj_list)
- for obj in self._obj_list:
- if obj[0] == sel_text:
- self._obj_list.remove(obj)
- break
+ self._obj_list=list(self._obj_list)
+ for obj in self._obj_list:
+ if obj[0] == sel_text:
+ self._obj_list.remove(obj)
+ break
def ArchiveToOpenERP(self, recs, mail):
+<<<<<<< TREE
import win32con
conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
flag = False
@@ -167,61 +170,97 @@
return
attachments=mail.Attachments
for rec in recs: #[('res.partner', 3, 'Agrolait')]
+=======
+ import win32con
+ conn = xmlrpclib.ServerProxy(self._uri + '/xmlrpc/object')
+ flag = False
+ new_msg = ext_msg =""
+ message_id = referances = None
+ try:
+ session = win32com.client.Dispatch("MAPI.session")
+ session.Logon('Outlook')
+ objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+ objFields = objMessage.Fields
+ strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+ strheader = ustr(strheader).encode('iso-8859-1')
+ headers = {}
+ strheader = strheader.replace("\n ", " ").splitlines()
+ for line in strheader:
+ split_here = line.find(":")
+ headers[line[:split_here]] = line[split_here:]
+ temp1 = headers.get('Message-ID')
+ temp2 = headers.get('Message-Id')
+ referances = headers.get('References')
+ if temp1 == None: message_id = temp2
+ if temp2 == None: message_id = temp1
+ startCut = message_id.find("<")
+ endCut = message_id.find(">")
+ message_id = message_id[startCut:endCut+1]
+ if not referances == None:
+ startCut = referances.find("<")
+ endCut = referances.find(">")
+ referances = referances[startCut:endCut+1]
+ except Exception,e:
+ win32ui.MessageBox(str(e),"Archive To OpenERP")
+ return
+ attachments=mail.Attachments
+ for rec in recs: #[('res.partner', 3, 'Agrolait')]
+>>>>>>> MERGE-SOURCE
model = rec[0]
res_id = rec[1]
#Check if mailgate installed
object_id = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','mailgate.message')])
if not object_id:
- win32ui.MessageBox("Mailgate is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mailgate not installed",win32con.MB_ICONERROR)
- return
+ win32ui.MessageBox("Mailgate is not installed on your configured database '%s' !!\n\nPlease install it to archive the mail."%(self._dbname),"Mailgate not installed",win32con.MB_ICONERROR)
+ return
object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',model)])
object_name = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
#Reading the Object ir.model Name
ext_ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'mailgate.message','search',[('message_id','=',message_id),('model','=',model),('res_id','=',res_id)])
if ext_ids:
- name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
- ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
- flag = True
- continue
+ name = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,model,'read',res_id,['name'])['name']
+ ext_msg += """This mail is already archived to {0} '{1}'.\n""".format(object_name,name)
+ flag = True
+ continue
msg = {
- 'subject':mail.Subject,
- 'date':str(mail.ReceivedTime),
- 'body':mail.Body,
- 'cc':mail.CC,
- 'from':mail.SenderEmailAddress,
- 'to':mail.To,
- 'message-id':message_id,
- 'references':ustr(referances),
+ 'subject':mail.Subject,
+ 'date':str(mail.ReceivedTime),
+ 'body':mail.Body,
+ 'cc':mail.CC,
+ 'from':mail.SenderEmailAddress,
+ 'to':mail.To,
+ 'message-id':message_id,
+ 'references':ustr(referances),
}
obj_list= ['crm.lead','project.issue','hr.applicant','res.partner']
if rec[0] not in obj_list:
ids = self.CreateEmailAttachment(rec,mail)
result = {}
if attachments:
- result = self.MakeAttachment([rec], mail)
+ result = self.MakeAttachment([rec], mail)
attachment_ids = result.get(model, {}).get(res_id, [])
new_msg += """- {0} : {1}\n""".format(object_name,str(rec[2]))
flag = True
-
- if flag:
- t = """Mail archived Successfully with attachments.\n"""+ext_msg
- t += "\n"+new_msg
- win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
- return flag
+ if flag:
+ t = """Mail archived Successfully with attachments.\n"""+ext_msg
+ t += "\n"+new_msg
+ win32ui.MessageBox(t,"Archived to OpenERP",win32con.MB_ICONINFORMATION)
+ return flag
def IsCRMInstalled(self):
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','crm.lead')])
- return id
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=','crm.lead')])
+ return id
def GetCSList(self):
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- ids = execute(conn,'execute',self._dbname,int(int(self._uid)),self._pwd,'crm.case.section','search',[])
- objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'crm.case.section','read',ids,['name'])
- obj_list = [ustr(item['name']).encode('iso-8859-1') for item in objects]
- return obj_list
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids = execute(conn,'execute',self._dbname,int(int(self._uid)),self._pwd,'crm.case.section','search',[])
+ objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'crm.case.section','read',ids,['name'])
+ obj_list = [ustr(item['name']).encode('iso-8859-1') for item in objects]
+ return obj_list
def GetPartners(self, search_partner=''):
+<<<<<<< TREE
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
ids=[]
obj_list=[]
@@ -237,8 +276,26 @@
obj_list.append((object['id'], ustr(object['name'])))
obj_list.sort(lambda x, y: cmp(x[1],y[1]))
return obj_list
+=======
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids=[]
+ obj_list=[]
+ domain = []
+ if not search_partner.strip() == '':
+ domain.append(('name','ilike',ustr(search_partner)))
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',domain)
+ if ids:
+ ids.sort()
+ obj_list.append((-999, ustr('')))
+ for id in ids:
+ object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','read',[id],['id','name'])[0]
+ obj_list.append((object['id'], ustr(object['name'])))
+ obj_list.sort(lambda x, y: cmp(x[1],y[1]))
+ return obj_list
+>>>>>>> MERGE-SOURCE
def GetObjectItems(self, search_list=[], search_text=''):
+<<<<<<< TREE
res = []
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
for obj in search_list:
@@ -261,8 +318,33 @@
name = ustr(rec['name'])
res.append((obj,rec['id'],name,object_name))
return res
+=======
+ res = []
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ for obj in search_list:
+ object_ids = execute ( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[('model','=',obj)])
+ object_name = execute( conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',object_ids,['name'])[0]['name']
+ if obj == "res.partner.address":
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',['|',('name','ilike',ustr(search_text)),('email','ilike',ustr(search_text))])
+ recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name','street','city'])
+ for rec in recs:
+ name = ustr(rec['name'])
+ if rec['street']:
+ name += ', ' + ustr(rec['street'])
+ if rec['city']:
+ name += ', ' + ustr(rec['city'])
+ res.append((obj,rec['id'],name,object_name))
+ else:
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'search',[('name','ilike',ustr(search_text))])
+ recs = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,obj,'read',ids,['id','name'])
+ for rec in recs:
+ name = ustr(rec['name'])
+ res.append((obj,rec['id'],name,object_name))
+ return res_id
+>>>>>>> MERGE-SOURCE
def CreateCase(self, section, mail, partner_ids, with_attachments=True):
+<<<<<<< TREE
import eml
flag = False
id = -1
@@ -299,76 +381,115 @@
except Exception,e:
win32ui.MessageBox("Create Case\n"+str(e),"Mail Reading Error")
return flag
+=======
+ import eml
+ flag = False
+ id = -1
+ try:
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ email=eml.generateEML(mail)
+ message_id = None
+ session = win32com.client.Dispatch("MAPI.session")
+ session.Logon('Outlook')
+ objMessage = session.GetMessage(mail.EntryID, mail.Parent.StoreID)
+ objFields = objMessage.Fields
+ strheader = objFields.Item(mapitags.PR_TRANSPORT_MESSAGE_HEADERS)
+ strheader = ustr(strheader).encode('iso-8859-1')
+ headers = {}
+ strheader = strheader.replace("\n ", " ").splitlines()
+ for line in strheader:
+ split_here = line.find(":")
+ headers[line[:split_here]] = line[split_here:]
+ temp1 = headers.get('Message-ID')
+ temp2 = headers.get('Message-Id')
+ if temp1 == None: message_id = temp2
+ if temp2 == None: message_id = temp1
+ startCut = message_id.find("<")
+ endCut = message_id.find(">")
+ message_id = message_id[startCut:endCut+1]
+ email.replace_header('Message-Id',message_id)
+ id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'email.server.tools','process_email',section, str(email))
+ if id > 0:
+ flag = True
+ return flag
+ else:
+ flag = False
+ return flag
+ except Exception,e:
+ win32ui.MessageBox("Create Case\n"+str(e),"Mail Reading Error")
+ return flag
+>>>>>>> MERGE-SOURCE
def MakeAttachment(self, recs, mail):
- attachments = mail.Attachments
- result = {}
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
- if not os.path.exists(att_folder_path):
- os.makedirs(att_folder_path)
- for rec in recs: #[('res.partner', 3, 'Agrolait')]
- obj = rec[0]
- obj_id = rec[1]
- res={}
- res['res_model'] = obj
- attachment_ids = []
- if obj not in result:
- result[obj] = {}
- for i in xrange(1, attachments.Count+1):
- fn = ustr(attachments[i].FileName)
- if len(fn) > 64:
- l = 64 - len(fn)
- f = fn.split('.')
- fn = f[0][0:l] + '.' + f[-1]
- att_path = os.path.join(att_folder_path,fn)
- attachments[i].SaveAsFile(att_path)
- f=open(att_path,"rb")
- content = "".join(f.readlines()).encode('base64')
- f.close()
- res['name'] = ustr(attachments[i].DisplayName)
- res['datas_fname'] = ustr(fn)
- res['datas'] = content
- res['res_id'] = obj_id
- id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
- attachment_ids.append(id)
- result[obj].update({obj_id: attachment_ids})
- return result
+ attachments = mail.Attachments
+ result = {}
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ att_folder_path = os.path.abspath(os.path.dirname("%temp%\\"))
+ if not os.path.exists(att_folder_path):
+ os.makedirs(att_folder_path)
+ for rec in recs: #[('res.partner', 3, 'Agrolait')]
+ obj = rec[0]
+ obj_id = rec[1]
+ res={}
+ res['res_model'] = obj
+ attachment_ids = []
+ if obj not in result:
+ result[obj] = {}
+ for i in xrange(1, attachments.Count+1):
+ fn = ustr(attachments[i].FileName)
+ if len(fn) > 64:
+ l = 64 - len(fn)
+ f = fn.split('.')
+ fn = f[0][0:l] + '.' + f[-1]
+ att_path = os.path.join(att_folder_path,fn)
+ attachments[i].SaveAsFile(att_path)
+ f=open(att_path,"rb")
+ content = "".join(f.readlines()).encode('base64')
+ f.close()
+ res['name'] = ustr(attachments[i].DisplayName)
+ res['datas_fname'] = ustr(fn)
+ res['datas'] = content
+ res['res_id'] = obj_id
+ id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
+ attachment_ids.append(id)
+ result[obj].update({obj_id: attachment_ids})
+ return result
def CreateContact(self, res=None):
- res=eval(str(res))
- partner = res['partner_id']
- state = res['state_id']
- country = res['country_id']
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- if not partner.strip() == '':
- partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
- res.update({'partner_id' : partner_id[0]})
- else:
- res.pop('partner_id')
- if not state == "":
- country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country))])
- res.update({'country_id' : country_id[0]})
- else:
- res.pop('country_id')
- if not country == "":
- state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state))])
- res.update({'state_id' : state_id[0]})
- else:
- res.pop('state_id')
- id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner.address','create',res)
- return id
+ res=eval(str(res))
+ partner = res['partner_id']
+ state = res['state_id']
+ country = res['country_id']
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ if not partner.strip() == '':
+ partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
+ res.update({'partner_id' : partner_id[0]})
+ else:
+ res.pop('partner_id')
+ if not state == "":
+ country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country))])
+ res.update({'country_id' : country_id[0]})
+ else:
+ res.pop('country_id')
+ if not country == "":
+ state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state))])
+ res.update({'state_id' : state_id[0]})
+ else:
+ res.pop('state_id')
+ id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner.address','create',res)
+ return id
def CreatePartner(self, res):
- res=eval(str(res))
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',[('name','=',res['name'])])
- if ids:
- return False
- id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','create',res)
- return id
+ res=eval(str(res))
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','search',[('name','=',res['name'])])
+ if ids:
+ return False
+ id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.partner','create',res)
+ return id
def SearchPartnerDetail(self, search_email_id):
+<<<<<<< TREE
res_vals = []
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
address_id = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','ilike',ustr(search_email_id))])
@@ -378,8 +499,20 @@
for key, vals in address.items():
res_vals.append([key,vals])
return res_vals
+=======
+ res_vals = []
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ address_id = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','ilike',ustr(search_email_id))])
+ if not address_id :
+ return
+ address = execute(conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','name','street','street2','city','state_id','country_id','phone','mobile','email','fax','zip'])
+ for key, vals in address.items():
+ res_vals.append([key,vals])
+ return res_vals
+>>>>>>> MERGE-SOURCE
def WritePartnerValues(self, new_vals):
+<<<<<<< TREE
flag = -1
new_dict = dict(new_vals)
email=new_dict['email']
@@ -412,8 +545,44 @@
else:
flag=0
return flag
+=======
+ flag = -1
+ new_dict = dict(new_vals)
+ email=new_dict['email']
+ partner = new_dict['partner']
+ country_val = new_dict['country']
+ state_val = new_dict['state']
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ partner_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner', 'search', [('name','=',ustr(partner))])
+ country_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [('name','=',ustr(country_val))])
+ state_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [('name','=',ustr(state_val))])
+ address_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(email))])
+ if not partner_id or not address_id or not country_id or not state_id:
+ return flag
+ address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address','read',address_id[0],['id','partner_id','state_id','country_id'])
+ vals_res_address={
+ 'partner_id' : partner_id[0],
+ 'name' : new_dict['name'],
+ 'street':new_dict['street'],
+ 'street2' : new_dict['street2'],
+ 'city' : new_dict['city'],
+ 'phone' : new_dict['phone'],
+ 'mobile' : new_dict['mobile'],
+ 'fax' : new_dict['fax'],
+ 'zip' : new_dict['zip'],
+ 'country_id' : country_id[0],
+ 'state_id' : state_id[0]
+ }
+ temp = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'write', address_id, vals_res_address)
+ if temp:
+ flag=1
+ else:
+ flag=0
+ return flag
+>>>>>>> MERGE-SOURCE
def GetAllState(self):
+<<<<<<< TREE
state_list = []
state_ids = []
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
@@ -422,8 +591,19 @@
obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'read', [state_id],['id','name'])[0]
state_list.append((obj['id'], ustr(obj['name'])))
return state_list
+=======
+ state_list = []
+ state_ids = []
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ state_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'search', [])
+ for state_id in state_ids:
+ obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country.state', 'read', [state_id],['id','name'])[0]
+ state_list.append((obj['id'], ustr(obj['name'])))
+ return state_list
+>>>>>>> MERGE-SOURCE
def GetAllCountry(self):
+<<<<<<< TREE
country_list = []
country_ids = []
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
@@ -432,8 +612,19 @@
obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country','read', [country_id], ['id','name'])[0]
country_list.append((obj['id'], ustr(obj['name'])))
return country_list
+=======
+ country_list = []
+ country_ids = []
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ country_ids = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country', 'search', [])
+ for country_id in country_ids:
+ obj = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.country','read', [country_id], ['id','name'])[0]
+ country_list.append((obj['id'], ustr(obj['name'])))
+ return country_list
+>>>>>>> MERGE-SOURCE
def SearchPartner(self, mail_id = ""):
+<<<<<<< TREE
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])
if not address:
@@ -444,8 +635,21 @@
if partner:
return partner[0]
return True
+=======
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])
+ if not address:
+ return None
+ else:
+ add_rec = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'read', address[0])
+ partner = add_rec.get('partner_id',False)
+ if partner:
+ return partner[0]
+ return True
+>>>>>>> MERGE-SOURCE
def SearchEmailResources(self, message_id):
+<<<<<<< TREE
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
res_vals = []
mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])
@@ -456,24 +660,36 @@
res_vals.append([key,vals])
return res_vals
+=======
+ connector = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ res_vals = []
+ mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('message_id','=',message_id)])
+ if not mail_id:
+ return None
+ address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message','read',mail_id[0],['model','res_id'])
+ for key, vals in address.items():
+ res_vals.append([key,vals])
+ return res_vals
+>>>>>>> MERGE-SOURCE
def GetCountry(self, country_search=''):
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- ids=[]
- obj_list=[]
- domain = []
- if not country_search.strip() == '':
- domain.append(('name','ilike',ustr(country_search)))
- ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',domain)
- if ids:
- ids.sort()
- for id in ids:
- object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','read',[id],['id','name'])[0]
- obj_list.append((object['id'], ustr(object['name'])))
- obj_list.sort(lambda x, y: cmp(x[1],y[1]))
- return obj_list
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids=[]
+ obj_list=[]
+ domain = []
+ if not country_search.strip() == '':
+ domain.append(('name','ilike',ustr(country_search)))
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',domain)
+ if ids:
+ ids.sort()
+ for id in ids:
+ object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','read',[id],['id','name'])[0]
+ obj_list.append((object['id'], ustr(object['name'])))
+ obj_list.sort(lambda x, y: cmp(x[1],y[1]))
+ return obj_list
def GetStates(self, state_search='', country=None):
+<<<<<<< TREE
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
ids = []
c_id = []
@@ -481,7 +697,30 @@
domain = []
if not state_search.strip() == '':
domain.append(('name','ilike',ustr(state_search)))
+=======
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids = []
+ c_id = []
+ obj_list = []
+ domain = []
+ if not state_search.strip() == '':
+ domain.append(('name','ilike',ustr(state_search)))
+ if country == None:
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
+ if not country == None:
+ c_id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country','search',[('name','=',ustr(country))])
+ domain.append(('country_id','=',c_id[0]))
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
+ if ids:
+ ids.sort()
+ for id in ids:
+ object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',[id],['id','name'])[0]
+ obj_list.append((object['id'], ustr(object['name'])))
+ obj_list.sort(lambda x, y: cmp(x[1],y[1]))
+ return obj_list
+>>>>>>> MERGE-SOURCE
+<<<<<<< TREE
if country == None:
ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',domain)
if not country == None:
@@ -496,7 +735,10 @@
obj_list.sort(lambda x, y: cmp(x[1],y[1]))
return obj_list
+=======
+>>>>>>> MERGE-SOURCE
def FindCountryForState(self, state_search=''):
+<<<<<<< TREE
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))])
if not ids:
@@ -505,8 +747,22 @@
country = object['country_id'][1]
return country
+=======
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','search',[('name','=',ustr(state_search))])
+ if not ids:
+ return None
+ object = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'res.country.state','read',ids)[0]
+ country = object['country_id'][1]
+ return country
+
+>>>>>>> MERGE-SOURCE
def CreateEmailAttachment(self, rec, mail):
+<<<<<<< TREE
conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+=======
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+>>>>>>> MERGE-SOURCE
obj = rec[0]
obj_id = rec[1]
res = {}
@@ -514,15 +770,15 @@
ls = ['*', '/', '\\', '<', '>', ':', '?', '"', '|', '\t', '\n',':','~']
fn = (mail.Subject).replace(' ','')
for c in ls:
- fn = fn.replace(c,'')
+ fn = fn.replace(c,'')
if len(fn) > 64:
- l = 64 - len(fn)
- f = fn.split('-')
- fn = '-'.join(f[1:])
- if len(fn) > 64:
- l = 64 - len(fn)
- f = fn.split('.')
- fn = f[0][0:l] + '.' + f[-1]
+ l = 64 - len(fn)
+ f = fn.split('-')
+ fn = '-'.join(f[1:])
+ if len(fn) > 64:
+ l = 64 - len(fn)
+ f = fn.split('.')
+ fn = f[0][0:l] + '.' + f[-1]
fn = fn[:-4]+'.txt'
f = open(fn,"w")
body = mail.Body.encode("utf-8")
@@ -537,3 +793,4 @@
res['res_id'] = obj_id
id = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.attachment','create',res)
return id
+
=== modified file 'project_caldav/project_caldav_setup.xml'
--- project_caldav/project_caldav_setup.xml 2010-10-12 10:41:21 +0000
+++ project_caldav/project_caldav_setup.xml 2010-11-12 11:52:57 +0000
@@ -24,7 +24,7 @@
</record>
<record id="basic_calendar_lines_vtodo0" model="basic.calendar.lines">
<field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
- <field name="domain">[('user_id','=', dctx_user_id)]</field>
+ <field name="domain">[('user_id','=', uid)]</field>
<field name="name">vtodo</field>
<field name="object_id" ref="project.model_project_task"/>
</record>
@@ -269,4 +269,4 @@
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
=== modified file 'project_timesheet/i18n/de.po'
--- project_timesheet/i18n/de.po 2010-11-12 04:49:27 +0000
+++ project_timesheet/i18n/de.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:43+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 09:17+0000\n"
+"Last-Translator: Thorsten Vocks <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
=== modified file 'stock/i18n/de.po'
--- stock/i18n/de.po 2010-11-12 04:49:27 +0000
+++ stock/i18n/de.po 2010-11-12 11:52:57 +0000
@@ -8,13 +8,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 10:12+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-11 01:09+0000\n"
+"Last-Translator: Ferdinand Gassauer <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <kde-i18n-doc@xxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:43+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
=== modified file 'stock/i18n/fr.po'
--- stock/i18n/fr.po 2010-11-12 04:49:27 +0000
+++ stock/i18n/fr.po 2010-11-12 11:52:57 +0000
@@ -7,13 +7,22 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2010-11-11 08:16+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-10 10:52+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+=======
+"X-Launchpad-Export-Date: 2010-11-11 04:43+0000\n"
+>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
