[MERGE] upstream

bzr revid: hmo@tinyerp.com-20120716072742-jzalogwmc2va2cbn

14 files changed, 32 insertions, 31 deletions

diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po
index 4047918f385..3f276b68d53 100644
--- a/addons/plugin/i18n/ar.po
+++ b/addons/plugin/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/cs.po b/addons/plugin/i18n/cs.po
index 2991dd9970a..2b4796774d5 100644
--- a/addons/plugin/i18n/cs.po
+++ b/addons/plugin/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/de.po b/addons/plugin/i18n/de.po
index e11c7548e01..9957c24081e 100644
--- a/addons/plugin/i18n/de.po
+++ b/addons/plugin/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/es_CR.po b/addons/plugin/i18n/es_CR.po
index f42de440a47..5ce2a3de39a 100644
--- a/addons/plugin/i18n/es_CR.po
+++ b/addons/plugin/i18n/es_CR.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-17 20:49+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
 "Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-18 05:00+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
index 14830e380bf..a03326717ff 100644
--- a/addons/plugin/i18n/fi.po
+++ b/addons/plugin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-25 05:15+0000\n"
-"X-Generator: Launchpad (build 15482)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index 10c5f30904f..3cbf99b79e0 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-25 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ja.po b/addons/plugin/i18n/ja.po
index 7482a0eef84..a213e976987 100644
--- a/addons/plugin/i18n/ja.po
+++ b/addons/plugin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-30 04:41+0000\n"
-"X-Generator: Launchpad (build 15171)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po
index e6b5f2149de..b09b0aa7adb 100644
--- a/addons/plugin/i18n/nl.po
+++ b/addons/plugin/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po
index efc1467c3b2..b47574e5e40 100644
--- a/addons/plugin/i18n/pt.po
+++ b/addons/plugin/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt_BR.po b/addons/plugin/i18n/pt_BR.po
index 3dad6e326c5..20eb0bf2089 100644
--- a/addons/plugin/i18n/pt_BR.po
+++ b/addons/plugin/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-17 05:01+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ro.po b/addons/plugin/i18n/ro.po
index 3ce1bc7834c..da3e1216540 100644
--- a/addons/plugin/i18n/ro.po
+++ b/addons/plugin/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index 6d33164d1c4..b7fbcfc5451 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-05 04:54+0000\n"
-"X-Generator: Launchpad (build 15353)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po
index 4ff06d80baf..6c915adb541 100644
--- a/addons/plugin/i18n/zh_CN.po
+++ b/addons/plugin/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index ef990170e64..700b9648237 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -26,8 +26,9 @@ class plugin_handler(osv.osv_memory):
         return True
 
     def partner_get(self, cr, uid, address_email):
-        ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '!=', False), ('email', 'like', address_email)])
-        res_id = ids and self.pool.get('res.partner.address').browse(cr, uid, ids[0]).partner_id.id or 0
+        partner_obj = self.pool.get('res.partner')
+        partner_ids = partner_obj.search(cr, uid, [('email', 'like', address_email)])
+        res_id = partner_ids and partner_ids[0] or 0
         url = self._make_url(cr, uid, res_id, 'res.partner')
         return ('res.partner', res_id , url)
 
@@ -116,7 +117,7 @@ class plugin_handler(osv.osv_memory):
 
     def contact_create(self, cr, uid, data, partner_id):
         """
-            @param data : the data use to create the res.partner.address
+            @param data : the data use to create the res.partner
                 [('field_name', value)], field name is required
             @param partner_id : On which partner the address is attached 
              if partner_id = 0 then create a new partner with the same name that the address
@@ -127,7 +128,7 @@ class plugin_handler(osv.osv_memory):
         if partner_id == 0:
             partner_id =  partner_obj.create(cr, uid, {'name':dictcreate.get('name')})
         dictcreate['partner_id'] = partner_id
-        self.pool.get('res.partner.address').create(cr, uid, dictcreate)
+        self.pool.get('res.partner').create(cr, uid, dictcreate)
         url = self._make_url(cr, uid, partner_id, 'res.partner')
         return ('res.partner', partner_id, url)