From 62d202d2599da47d1934ad8d190cee825f20ebe3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 9 Jan 2013 13:33:57 +0100
Subject: [PATCH 01/22] [FIX] linkedin: display a button to connect on linkedin
 if there are an error of connected linkedin module

bzr revid: chm@openerp.com-20130109123357-2e2ogcy510ctqk8q
---
 .../web_linkedin/static/src/css/linkedin.css  | 10 +++++++
 addons/web_linkedin/static/src/js/linkedin.js | 28 ++++++++++++++++++-
 .../web_linkedin/static/src/xml/linkedin.xml  | 14 ++++++----
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index 992dc48aeb8..d6e8dc5067b 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -42,3 +42,13 @@
     color: grey;
     margin-bottom: 10px;
 }
+
+.openerp .oe_social_network_login {
+    margin-bottom: 10px;
+}
+
+.openerp .oe_social_network_login .oe_error {
+    display: none;
+    cursor: pointer;
+}
+
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index d6237e48d51..8fca845673a 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -6,6 +6,13 @@ openerp.web_linkedin = function(instance) {
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
     
+    openerp.web_linkedin.onLinkedInAuth = function () {
+      IN.API.Profile("me")
+        .result( function(me) {
+            console.log("me", me);
+        });
+    };
+
     instance.web_linkedin.LinkedinTester = instance.web.Class.extend({
         init: function() {
             this.linkedin_added = false;
@@ -15,8 +22,12 @@ openerp.web_linkedin = function(instance) {
         test_linkedin: function() {
             var self = this;
             return this.test_api_key().then(function() {
-                if (self.linkedin_added)
+                if (self.linkedin_added) {
+                    if (IN.User.isAuthorized()) {
+                        self.auth_def.resolve();
+                    }
                     return self.linkedin_def.promise();
+                }
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
@@ -178,6 +189,7 @@ openerp.web_linkedin = function(instance) {
     instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({
         template: "Linkedin.popup",
         init: function(parent, text) {
+            var self = this;
             this._super(parent, {title:_t("LinkedIn search")});
             this.text = text;
             this.limit = 5;
@@ -189,6 +201,20 @@ openerp.web_linkedin = function(instance) {
             instance.web_linkedin.tester.test_authentication().done(function() {
                 self.trigger("authentified");
             });
+
+            this.bind_error();
+        },
+        bind_error: function() {
+            var self = this;
+            this.error_message = window.setTimeout(function() {self.$(".oe_social_network_login .oe_error").show();}, 500);
+            this.$el.on("DOMNodeInserted", function (e) {
+                self.$el.off("DOMNodeInserted");
+                window.clearTimeout(self.error_message);
+                self.$(".oe_social_network_login .oe_error").hide();
+            });
+            this.$(".oe_social_network_login .oe_error").click(function () {
+                IN.User.authorize();
+            });
         },
         authentified: function() {
             var self = this;
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 4956fd7df5a..6230ef894fd 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -8,12 +8,16 @@
     </t>
     <t t-name="Linkedin.popup">
         <div>
-            <script type="in/Login">
-            </script>
-            <h2 style="margin-top: -10px;">People</h2>
-            <div class="oe_linkedin_pop_p" style='display: table;width:100%'/>
+            <div class="oe_social_network_login">
+                <script type="in/Login">
+                    &lt;b&gt;&lt;?js= firstName ?&gt; &lt;?js= lastName ?&gt;&lt;/b&gt;, is your account on LinkedIn.
+                </script>
+                <img src="http://developer.linkedin.com/sites/default/files/js-signin.png" class="oe_error"/>
+            </div>
+            <h2>People</h2>
+            <div class="oe_linkedin_pop_p"></div>
             <h2>Companies</h2>
-            <div class="oe_linkedin_pop_c" style='display: table;width:100%'/>
+            <div class="oe_linkedin_pop_c"></div>
         </div>
     </t>
     <t t-name="Linkedin.EntityWidget">

From 60d2a36fed2aec1c876efca6bba3fab65ec136c2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 9 Jan 2013 16:51:25 +0100
Subject: [PATCH 02/22] [IMP] linkedin: search for user company and location

bzr revid: chm@openerp.com-20130109155125-ikx26yyo5gro9p22
---
 .../web_linkedin/static/src/css/linkedin.css  |  2 +-
 addons/web_linkedin/static/src/js/linkedin.js | 66 +++++++++++++------
 .../web_linkedin/static/src/xml/linkedin.xml  |  7 +-
 3 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index d6e8dc5067b..e251d8eca83 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -47,7 +47,7 @@
     margin-bottom: 10px;
 }
 
-.openerp .oe_social_network_login .oe_error {
+.openerp .oe_social_network_login .oe_linkedin_error {
     display: none;
     cursor: pointer;
 }
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 8fca845673a..12937473f7f 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -6,13 +6,6 @@ openerp.web_linkedin = function(instance) {
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
     
-    openerp.web_linkedin.onLinkedInAuth = function () {
-      IN.API.Profile("me")
-        .result( function(me) {
-            console.log("me", me);
-        });
-    };
-
     instance.web_linkedin.LinkedinTester = instance.web.Class.extend({
         init: function() {
             this.linkedin_added = false;
@@ -31,7 +24,7 @@ openerp.web_linkedin = function(instance) {
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
-                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo';
+                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo r_fullprofile r_emailaddress';
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
                 $(tag).load(function() {
@@ -146,9 +139,8 @@ openerp.web_linkedin = function(instance) {
                 }, function() {
                     return $.when();
                 }));
-                /* TODO
+
                 to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
-                */
             } else { // people
                 to_change.is_company = false;
                 to_change.name = entity.formattedName;
@@ -169,10 +161,27 @@ openerp.web_linkedin = function(instance) {
                     }
                 });
                 var positions = (entity.positions || {}).values || [];
-                to_change.function = positions.length > 0 ? positions[0].title : false;
-                /* TODO
+                if (positions.length && positions[0].isCurrent) {
+                    to_change.function = positions[0].title;
+                    var company_name = positions[0].company ? positions[0].company.name : false;
+                    if (company_name) {
+                        defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
+                            to_change.parent_id = data[0] || false;
+                        }));
+                    }
+                }
+
                 to_change.linkedinUrl = entity.publicProfileUrl;
-                */
+                to_change.linkedinId = entity.id;
+                to_change.linkedinId = entity.id;
+                var country_code = (entity.location && entity.location.country && entity.location.country.code) || false;
+                if (country_code) {
+                    defs.push(new instance.web.DataSetSearch(this, 'res.country').call("search", [[["code", "=", country_code.toUpperCase()]]]).then(function (data) {
+                        to_change.country_id = data[0] || false;
+                    }));
+                }
+                to_change.comment = entity.summary;
+                
             }
             return $.when.apply($, defs).then(function() {
                 return to_change;
@@ -184,7 +193,10 @@ openerp.web_linkedin = function(instance) {
     
     var commonPeopleFields = ["id", "picture-url", "public-profile-url",
                             "formatted-name", "location", "phone-numbers", "im-accounts",
-                            "main-address", "headline", "positions"];
+                            "main-address", "headline", "positions", "summary", "specialties",
+                            "email-address",
+                            "languages", "skills", "certifications", "educations", "three-current-positions", "three-past-positions",
+                            "date-of-birth", "twitter-accounts"];
     
     instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({
         template: "Linkedin.popup",
@@ -197,27 +209,39 @@ openerp.web_linkedin = function(instance) {
         start: function() {
             this._super();
             var self = this;
+            this.$network = this.$(".oe_social_network_login");
             this.on("authentified", this, this.authentified);
+            this.init_authentified();
+        },
+        init_authentified: function() {
+            var self = this;
             instance.web_linkedin.tester.test_authentication().done(function() {
                 self.trigger("authentified");
             });
-
-            this.bind_error();
-        },
-        bind_error: function() {
-            var self = this;
+            // if there are an error on loading add a button to open the linkedin session
             this.error_message = window.setTimeout(function() {self.$(".oe_social_network_login .oe_error").show();}, 500);
             this.$el.on("DOMNodeInserted", function (e) {
                 self.$el.off("DOMNodeInserted");
                 window.clearTimeout(self.error_message);
-                self.$(".oe_social_network_login .oe_error").hide();
+                self.$network.find(".oe_error").hide();
             });
-            this.$(".oe_social_network_login .oe_error").click(function () {
+            this.$network.find(".oe_error").click(function () {
                 IN.User.authorize();
             });
+            this.$network.on("click", ".oe_linkedin_logout", function () {
+                IN.User.logout();
+                self.$(".oe_linkedin_pop_p, .oe_linkedin_pop_c").empty();
+                self.$network.find(".oe_linkedin_login").remove();
+            });
         },
         authentified: function() {
             var self = this;
+            IN.API.Profile("me")
+                .fields(["firstName", "lastName"])
+                .result(function (result) {
+                    $(QWeb.render('LinkedIn.loginInformation', result.values[0])).appendTo(self.$network);
+            })
+
             cdef = $.Deferred();
             pdef = $.Deferred();
             IN.API.Raw(_.str.sprintf(
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 6230ef894fd..1fa1a8edcd2 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -9,9 +9,7 @@
     <t t-name="Linkedin.popup">
         <div>
             <div class="oe_social_network_login">
-                <script type="in/Login">
-                    &lt;b&gt;&lt;?js= firstName ?&gt; &lt;?js= lastName ?&gt;&lt;/b&gt;, is your account on LinkedIn.
-                </script>
+                <script type="in/Login"></script>
                 <img src="http://developer.linkedin.com/sites/default/files/js-signin.png" class="oe_error"/>
             </div>
             <h2>People</h2>
@@ -37,4 +35,7 @@
             Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
         </div>
     </t>
+    <t t-name="LinkedIn.loginInformation">
+        <span class="oe_linkedin_login">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on Linkedin, <a class="oe_linkedin_logout">please click here to logout this account on LinkedIn</a>.</span>
+    </t>
 </templates>
\ No newline at end of file

From 00cdc2227cecf88400b6654b73435b82cb30e66f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 10 Jan 2013 15:03:45 +0100
Subject: [PATCH 03/22] [IMP] linkedin: fix bug off connection and improve
 LinkedinTester widget

bzr revid: chm@openerp.com-20130110140345-79hv4urkv9zkgw77
---
 .../web_linkedin/static/src/css/linkedin.css  |  11 +-
 addons/web_linkedin/static/src/js/linkedin.js | 155 +++++++++++-------
 .../web_linkedin/static/src/xml/linkedin.xml  |   8 +-
 addons/web_linkedin/web_linkedin.py           |   5 +
 4 files changed, 102 insertions(+), 77 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index e251d8eca83..1185403e43a 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -43,12 +43,7 @@
     margin-bottom: 10px;
 }
 
-.openerp .oe_social_network_login {
-    margin-bottom: 10px;
+.openerp .oe_linkedin_authentified {
+    font-size: 11px;
+    text-align: center;
 }
-
-.openerp .oe_social_network_login .oe_linkedin_error {
-    display: none;
-    cursor: pointer;
-}
-
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 12937473f7f..e2ace2732ed 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -6,6 +6,13 @@ openerp.web_linkedin = function(instance) {
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
     
+    /*
+    * instance.web_linkedin.tester.test_authentication()
+    * Call check if the Linkedin session is open or open a connection popup
+    * return a deferrer :
+    *   - resolve if the authentication is true
+    *   - reject if the authentication is wrong or when the user logout
+    */
     instance.web_linkedin.LinkedinTester = instance.web.Class.extend({
         init: function() {
             this.linkedin_added = false;
@@ -19,8 +26,17 @@ openerp.web_linkedin = function(instance) {
                     if (IN.User.isAuthorized()) {
                         self.auth_def.resolve();
                     }
-                    return self.linkedin_def.promise();
+                    return self.linkedin_def.resolve();
                 }
+
+                $login = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
+                $login.appendTo("body");
+                $login.on("DOMNodeInserted", function (e) {
+                    $login.off("DOMNodeInserted");
+                    self.linkedin_def.resolve();
+                    console.debug("LinkedIn DOM node is inserted.");
+                });
+
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
@@ -31,7 +47,10 @@ openerp.web_linkedin = function(instance) {
                     IN.Event.on(IN, "auth", function() {
                         self.auth_def.resolve();
                     });
-                    self.linkedin_def.resolve();
+                    IN.Event.on(IN, "logout", function() {
+                        self.auth_def.reject();
+                        //self.auth_def = $.Deferred();
+                    });
                 });
                 return self.linkedin_def.promise();
             });
@@ -51,6 +70,9 @@ openerp.web_linkedin = function(instance) {
             });
         },
         test_authentication: function() {
+           this.linkedin_def.done(function () {
+                IN.User.authorize();
+            });
             return this.auth_def.promise();
         },
     });
@@ -74,11 +96,18 @@ openerp.web_linkedin = function(instance) {
         search_linkedin: function() {
             var self = this;
             this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
-                var pop = new instance.web_linkedin.LinkedinPopup(self, self.get("value"));
-                pop.open();
-                pop.on("selected", this, function(entity) {
-                    self.selected_entity(entity);
-                });
+                var text = (self.get("value") || "").replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
+                if (text !== "") {
+                    instance.web_linkedin.tester.test_authentication().done(function() {
+                        var pop = new instance.web_linkedin.LinkedinPopup(self, self.get("value"));
+                        pop.open();
+                        pop.on("selected", this, function(entity) {
+                            self.selected_entity(entity);
+                        });
+                    });
+                } else {
+                    self.focus();
+                }
             }).fail(_.bind(this.linkedin_disabled, this));
         },
         linkedin_disabled: function() {
@@ -202,87 +231,87 @@ openerp.web_linkedin = function(instance) {
         template: "Linkedin.popup",
         init: function(parent, text) {
             var self = this;
-            this._super(parent, {title:_t("LinkedIn search")});
+            if (!IN.User.isAuthorized()) {
+                this.destroy();
+            }
+            this._super(parent, { 'title':_t("LinkedIn search")});
             this.text = text;
             this.limit = 5;
         },
         start: function() {
             this._super();
             var self = this;
-            this.$network = this.$(".oe_social_network_login");
-            this.on("authentified", this, this.authentified);
-            this.init_authentified();
-        },
-        init_authentified: function() {
-            var self = this;
-            instance.web_linkedin.tester.test_authentication().done(function() {
-                self.trigger("authentified");
-            });
-            // if there are an error on loading add a button to open the linkedin session
-            this.error_message = window.setTimeout(function() {self.$(".oe_social_network_login .oe_error").show();}, 500);
-            this.$el.on("DOMNodeInserted", function (e) {
-                self.$el.off("DOMNodeInserted");
-                window.clearTimeout(self.error_message);
-                self.$network.find(".oe_error").hide();
-            });
-            this.$network.find(".oe_error").click(function () {
-                IN.User.authorize();
-            });
-            this.$network.on("click", ".oe_linkedin_logout", function () {
+            self.$el.parent().on("click", ".oe_linkedin_logout", function () {
                 IN.User.logout();
-                self.$(".oe_linkedin_pop_p, .oe_linkedin_pop_c").empty();
-                self.$network.find(".oe_linkedin_login").remove();
+                self.destroy();
             });
+            this.display_linkedin_account();
+            this.do_search();
         },
-        authentified: function() {
+        display_linkedin_account: function() {
             var self = this;
             IN.API.Profile("me")
                 .fields(["firstName", "lastName"])
                 .result(function (result) {
-                    $(QWeb.render('LinkedIn.loginInformation', result.values[0])).appendTo(self.$network);
+                    $(QWeb.render('LinkedIn.loginInformation', result.values[0])).appendTo(self.$el.parent().find(".ui-dialog-buttonpane"));   
             })
-
-            cdef = $.Deferred();
-            pdef = $.Deferred();
+        },
+        do_search: function() {
+            var self = this;
+            var deferrers = [];
+            var deferrer = $.Deferred();
+            deferrers.push(deferrer);
             IN.API.Raw(_.str.sprintf(
                     "company-search:(companies:" +
                     "(id,name,logo-url,description,industry,website-url,locations))?keywords=%s&count=%d",
                     encodeURI(this.text), this.limit)).result(function (result) {
-                cdef.resolve(result);
-            });
-            var def = cdef.then(function(companies) {
-                var lst = companies.companies.values || [];
-                lst = _.first(lst, self.limit);
-                lst = _.map(lst, function(el) {
-                    el.__type = "company";
-                    return el;
-                });
-                console.debug("Linkedin companies found:", lst.length, lst);
-                return self.display_result(lst, self.$(".oe_linkedin_pop_c"));
+                self.do_result_companies(result);
+                deferrer.resolve();
             });
+            var deferrer = $.Deferred();
+            deferrers.push(deferrer);
             IN.API.PeopleSearch().fields(commonPeopleFields).
-                params({"keywords": this.text, "count": this.limit}).result(function(result) {
-                pdef.resolve(result);
+                params({"keywords": this.text, "facet": ["network,F,S,A,O"], "count": this.limit}).result(function(result) {
+                self.do_result_people(result);
+                deferrer.resolve();
             });
-            var def2 = pdef.then(function(people) {
-                var plst = people.people.values || [];
-                plst = _.first(plst, self.limit);
-                plst = _.map(plst, function(el) {
-                    el.__type = "people";
-                    return el;
-                });
-                console.debug("Linkedin people found:", plst.length, plst);
-                return self.display_result(plst, self.$(".oe_linkedin_pop_p"));
+            // new search for pass the restriction on LinkedIn (2012: search only on first and second level if it's not the last-name and first-name search)
+            var deferrer = $.Deferred();
+            deferrers.push(deferrer);
+            IN.API.PeopleSearch().fields(commonPeopleFields).
+                params({"first-name": this.text.split(' ')[0], "last-name": this.text.split(' ').slice(1).join(' '), "facet": ["network,F,S,A,O"], "count": this.limit}).result(function(result) {
+                self.do_result_people(result);
+                deferrer.resolve();
             });
-            return $.when(def, def2);
+            return $.when.apply($, deferrers);
+        },
+        do_result_companies: function(companies) {
+            var lst = companies.companies.values || [];
+            lst = _.first(lst, this.limit);
+            lst = _.map(lst, function(el) {
+                el.__type = "company";
+                return el;
+            });
+            console.debug("Linkedin companies found:", companies.companies._total, '=>', lst.length, lst);
+            return this.display_result(lst, this.$(".oe_linkedin_pop_c"));
+        },
+        do_result_people: function(people) {
+            var plst = people.people.values || [];
+            plst = _.first(plst, this.limit);
+            plst = _.map(plst, function(el) {
+                el.__type = "people";
+                return el;
+            });
+            console.debug("Linkedin people found:", people.numResults, '=>', plst.length, plst);
+            return this.display_result(plst, this.$(".oe_linkedin_pop_p"));
         },
         display_result: function(result, $elem) {
             var self = this;
-            var i = 0;
             var $row;
+            $elem.find(".oe_no_result").remove();
             _.each(result, function(el) {
                 var pc = new instance.web_linkedin.EntityWidget(self, el);
-                if (i % 5 === 0) {
+                if (!$elem.find("div").size() || $elem.find(" > div:last > div").size() >= 5) {
                     $row = $("<div style='display: table-row;width:100%'/>");
                     $row.appendTo($elem);
                 }
@@ -293,12 +322,12 @@ openerp.web_linkedin = function(instance) {
                     self.trigger("selected", data);
                     self.destroy();
                 });
-                i++;
             });
-            if (result.length === 0) {
-                $elem.text(_t("No results found"));
+            if (!$elem.find("div").size()) {
+                $elem.append($('<div class="oe_no_result">').text(_t("No results found")));
             }
         },
+        
     });
     
     instance.web_linkedin.EntityWidget = instance.web.Widget.extend({
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 1fa1a8edcd2..4460c6de752 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -8,11 +8,7 @@
     </t>
     <t t-name="Linkedin.popup">
         <div>
-            <div class="oe_social_network_login">
-                <script type="in/Login"></script>
-                <img src="http://developer.linkedin.com/sites/default/files/js-signin.png" class="oe_error"/>
-            </div>
-            <h2>People</h2>
+            <h2 style="margin-top:-10px;">People</h2>
             <div class="oe_linkedin_pop_p"></div>
             <h2>Companies</h2>
             <div class="oe_linkedin_pop_c"></div>
@@ -36,6 +32,6 @@
         </div>
     </t>
     <t t-name="LinkedIn.loginInformation">
-        <span class="oe_linkedin_login">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on Linkedin, <a class="oe_linkedin_logout">please click here to logout this account on LinkedIn</a>.</span>
+        <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on LinkedIn, <a class="oe_linkedin_logout">please click here to logout LinkedIn</a>.</div>
     </t>
 </templates>
\ No newline at end of file
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index dc429cd2f29..1296bb7aa28 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -49,3 +49,8 @@ class web_linkedin_settings(osv.osv_memory):
         key = self.browse(cr, uid, ids[0], context)["api_key"] or ""
         self.pool.get("ir.config_parameter").set_param(cr, uid, "web.linkedin.apikey", key)
 
+class web_linkedin_fields(osv.osv_memory):
+    _inherit = 'res.partner'
+    _columns = {
+        'linkedin_id': fields.char(string="LinkedIn ID", size=50),
+    }
\ No newline at end of file

From 09b2527ddb1a9ee30779a382f550ac3440cdae29 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 11 Jan 2013 14:24:38 +0100
Subject: [PATCH 04/22] [IMP] linkedin: improve the popup of linkedin search

bzr revid: chm@openerp.com-20130111132438-cvoomovagqcvukvq
---
 .../web_linkedin/static/src/css/linkedin.css  |  15 ++
 addons/web_linkedin/static/src/js/linkedin.js | 151 +++++++++++-------
 .../web_linkedin/static/src/xml/linkedin.xml  |   5 +
 3 files changed, 115 insertions(+), 56 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index 1185403e43a..6396c5c3e5b 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -35,6 +35,7 @@
 }
 
 .openerp .oe_linkedin_entity h3 {
+    margin-top: 5px;
     margin-bottom: 5px;
 }
 
@@ -47,3 +48,17 @@
     font-size: 11px;
     text-align: center;
 }
+
+.openerp .oe_linkedin_advanced_search {
+    margin: auto;
+    position: absolute;
+    right: 60px;
+    top: 16px;
+    line-height: 12px;
+    font-size: 12px;
+}
+
+.openerp .oe_linkedin_advanced_search button {
+    line-height: 12px;
+    font-size: 12px;
+}
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index e2ace2732ed..8ac5ce22453 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -23,9 +23,6 @@ openerp.web_linkedin = function(instance) {
             var self = this;
             return this.test_api_key().then(function() {
                 if (self.linkedin_added) {
-                    if (IN.User.isAuthorized()) {
-                        self.auth_def.resolve();
-                    }
                     return self.linkedin_def.resolve();
                 }
 
@@ -40,7 +37,7 @@ openerp.web_linkedin = function(instance) {
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
-                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo r_fullprofile r_emailaddress';
+                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_basicprofile'; // r_contactinfo r_fullprofile r_emailaddress';
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
                 $(tag).load(function() {
@@ -49,7 +46,7 @@ openerp.web_linkedin = function(instance) {
                     });
                     IN.Event.on(IN, "logout", function() {
                         self.auth_def.reject();
-                        //self.auth_def = $.Deferred();
+                        self.auth_def = $.Deferred();
                     });
                 });
                 return self.linkedin_def.promise();
@@ -70,8 +67,13 @@ openerp.web_linkedin = function(instance) {
             });
         },
         test_authentication: function() {
+            var self = this;
            this.linkedin_def.done(function () {
-                IN.User.authorize();
+                if (IN.User.isAuthorized()) {
+                    self.auth_def.resolve();
+                } else {
+                    IN.User.authorize();
+                }
             });
             return this.auth_def.promise();
         },
@@ -91,23 +93,18 @@ openerp.web_linkedin = function(instance) {
             this.$(".oe_linkedin_input").append($in);
             this.$(".oe_linkedin_img").click(_.bind(this.search_linkedin, this));
             this._super();
-
         },
         search_linkedin: function() {
             var self = this;
             this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
                 var text = (self.get("value") || "").replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
-                if (text !== "") {
-                    instance.web_linkedin.tester.test_authentication().done(function() {
-                        var pop = new instance.web_linkedin.LinkedinPopup(self, self.get("value"));
-                        pop.open();
-                        pop.on("selected", this, function(entity) {
-                            self.selected_entity(entity);
-                        });
+                instance.web_linkedin.tester.test_authentication().done(function() {
+                    var pop = new instance.web_linkedin.LinkedinSearchPopup(self, text);
+                    pop.open();
+                    pop.on("selected", this, function(entity) {
+                        self.selected_entity(entity);
                     });
-                } else {
-                    self.focus();
-                }
+                });
             }).fail(_.bind(this.linkedin_disabled, this));
         },
         linkedin_disabled: function() {
@@ -200,16 +197,9 @@ openerp.web_linkedin = function(instance) {
                     }
                 }
 
-                to_change.linkedinUrl = entity.publicProfileUrl;
-                to_change.linkedinId = entity.id;
-                to_change.linkedinId = entity.id;
-                var country_code = (entity.location && entity.location.country && entity.location.country.code) || false;
-                if (country_code) {
-                    defs.push(new instance.web.DataSetSearch(this, 'res.country').call("search", [[["code", "=", country_code.toUpperCase()]]]).then(function (data) {
-                        to_change.country_id = data[0] || false;
-                    }));
-                }
-                to_change.comment = entity.summary;
+                to_change.linkedinUrl = entity.publicProfileUrl || false;
+                to_change.linkedinId = entity.id || false;
+                to_change.comment = entity.summary || false;
                 
             }
             return $.when.apply($, defs).then(function() {
@@ -222,31 +212,49 @@ openerp.web_linkedin = function(instance) {
     
     var commonPeopleFields = ["id", "picture-url", "public-profile-url",
                             "formatted-name", "location", "phone-numbers", "im-accounts",
-                            "main-address", "headline", "positions", "summary", "specialties",
-                            "email-address",
-                            "languages", "skills", "certifications", "educations", "three-current-positions", "three-past-positions",
-                            "date-of-birth", "twitter-accounts"];
+                            "main-address", "headline", "positions", "summary", "specialties"];
     
-    instance.web_linkedin.LinkedinPopup = instance.web.Dialog.extend({
+    instance.web_linkedin.LinkedinSearchPopup = instance.web.Dialog.extend({
         template: "Linkedin.popup",
         init: function(parent, text) {
             var self = this;
             if (!IN.User.isAuthorized()) {
+                this.$buttons = $("<div/>");
                 this.destroy();
             }
-            this._super(parent, { 'title':_t("LinkedIn search")});
+            this._super(parent, { 'title':_t("LinkedIn search") + '<div class="oe_linkedin_advanced_search">'+_t("Search by LinkedIn by url or keywords") +' : <input name="url"/> <button>'+_t("Search") +'</button></div>'});
             this.text = text;
             this.limit = 5;
         },
         start: function() {
             this._super();
+            this.bind_event();
+            this.display_linkedin_account();
+            this.do_search();
+        },
+        bind_event: function() {
             var self = this;
-            self.$el.parent().on("click", ".oe_linkedin_logout", function () {
+            this.$el.parent().on("click", ".oe_linkedin_logout", function () {
                 IN.User.logout();
                 self.destroy();
             });
-            this.display_linkedin_account();
-            this.do_search();
+            this.$search = this.$el.parent().find(".oe_linkedin_advanced_search" );
+            this.$url = this.$search.find("input[name='url']" );
+            this.$button = this.$search.find("button");
+
+            this.$button.on("click", function (e) {
+                e.stopPropagation();
+                self.do_search(self.$url.val() || '');
+            });
+            this.$url
+                .on("click mousedown mouseup", function (e) {
+                    e.stopPropagation();
+                }).on("keydown", function (e) {
+                    if(e.keyCode == 13) {
+                        $(e.target).blur();
+                        self.$button.click();
+                    }
+                });
         },
         display_linkedin_account: function() {
             var self = this;
@@ -256,47 +264,77 @@ openerp.web_linkedin = function(instance) {
                     $(QWeb.render('LinkedIn.loginInformation', result.values[0])).appendTo(self.$el.parent().find(".ui-dialog-buttonpane"));   
             })
         },
-        do_search: function() {
+        do_search: function(url) {
+            if (!IN.User || !IN.User.isAuthorized()) {
+                this.destroy();
+            }
             var self = this;
             var deferrers = [];
-            var deferrer = $.Deferred();
-            deferrers.push(deferrer);
+            this.$(".oe_linkedin_pop_c, .oe_linkedin_pop_p").empty();
+
+            if (url && url.length) {
+                var deferrer_c = $.Deferred();
+                var deferrer_p = $.Deferred();
+                deferrers.push(deferrer_c, deferrer_p);
+
+                var url = url.replace(/\/+$/, '');
+                var uid = url.replace(/(.*linkedin\.com\/[a-z]+\/)|(^.*\/company\/)|(\&.*$)/gi, '');
+
+                IN.API.Raw(_.str.sprintf(
+                        "companies/universal-name=%s:(id,name,logo-url,description,industry,website-url,locations)",
+                        encodeURIComponent(uid.toLowerCase()))).result(function (result) {
+                    self.do_result_companies({'companies': {'values': [result]}});
+                    deferrer_c.resolve();
+                }).error(function (error) {
+                    self.do_result_companies({});
+                    deferrer_c.resolve();
+                });
+
+                var url_public = "http://www.linkedin.com/pub/"+uid;
+                IN.API.Profile("url="+ encodeURI(url_public).replace(/%2F/g, '/'))
+                    .fields(commonPeopleFields)
+                    .result(function(result) {
+                       console.log("public", result);
+                        self.do_result_people({'people': result});
+                        deferrer_p.resolve();
+                }).error(function (error) {
+                    self.do_warn( _t("LinkedIn error"), _t("LinkedIn is temporary down for the searches by url."));
+                    self.do_result_people({});
+                    deferrer_p.resolve();
+                });
+
+                this.text = url;
+            }
+
+            var deferrer_c_k = $.Deferred();
+            var deferrer_p_k = $.Deferred();
+            deferrers.push(deferrer_c_k, deferrer_p_k);
             IN.API.Raw(_.str.sprintf(
                     "company-search:(companies:" +
                     "(id,name,logo-url,description,industry,website-url,locations))?keywords=%s&count=%d",
                     encodeURI(this.text), this.limit)).result(function (result) {
                 self.do_result_companies(result);
-                deferrer.resolve();
+                deferrer_c_k.resolve();
             });
-            var deferrer = $.Deferred();
-            deferrers.push(deferrer);
-            IN.API.PeopleSearch().fields(commonPeopleFields).
-                params({"keywords": this.text, "facet": ["network,F,S,A,O"], "count": this.limit}).result(function(result) {
+            IN.API.PeopleSearch().fields(commonPeopleFields).params({"keywords": this.text, "count": this.limit}).result(function(result) {
                 self.do_result_people(result);
-                deferrer.resolve();
-            });
-            // new search for pass the restriction on LinkedIn (2012: search only on first and second level if it's not the last-name and first-name search)
-            var deferrer = $.Deferred();
-            deferrers.push(deferrer);
-            IN.API.PeopleSearch().fields(commonPeopleFields).
-                params({"first-name": this.text.split(' ')[0], "last-name": this.text.split(' ').slice(1).join(' '), "facet": ["network,F,S,A,O"], "count": this.limit}).result(function(result) {
-                self.do_result_people(result);
-                deferrer.resolve();
+                deferrer_p_k.resolve();
             });
+
             return $.when.apply($, deferrers);
         },
         do_result_companies: function(companies) {
-            var lst = companies.companies.values || [];
+            var lst = (companies.companies || {}).values || [];
             lst = _.first(lst, this.limit);
             lst = _.map(lst, function(el) {
                 el.__type = "company";
                 return el;
             });
-            console.debug("Linkedin companies found:", companies.companies._total, '=>', lst.length, lst);
+            console.debug("Linkedin companies found:", (companies.companies || {})._total, '=>', lst.length, lst);
             return this.display_result(lst, this.$(".oe_linkedin_pop_c"));
         },
         do_result_people: function(people) {
-            var plst = people.people.values || [];
+            var plst = (people.people || {}).values || [];
             plst = _.first(plst, this.limit);
             plst = _.map(plst, function(el) {
                 el.__type = "people";
@@ -344,6 +382,7 @@ openerp.web_linkedin = function(instance) {
             if (this.data.__type === "company") {
                 this.$("h3").text(this.data.name);
                 self.$("img").attr("src", this.data.logoUrl);
+                self.$(".oe_linkedin_entity_headline").text(this.data.industry);
             } else { // people
                 this.$("h3").text(this.data.formattedName);
                 self.$("img").attr("src", this.data.pictureUrl);
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 4460c6de752..364208005d1 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -34,4 +34,9 @@
     <t t-name="LinkedIn.loginInformation">
         <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on LinkedIn, <a class="oe_linkedin_logout">please click here to logout LinkedIn</a>.</div>
     </t>
+    <t t-name="LinkedIn.AdvancedSearch">
+        <div class="oe_linkedin_advanced_search">
+            No results found.<br/>
+        </div>
+    </t>
 </templates>
\ No newline at end of file

From 762a3635ebbdd7d0017dee237090a82193748088 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 21 Jan 2013 09:43:19 +0100
Subject: [PATCH 05/22] [IMP] linkedin

bzr revid: chm@openerp.com-20130121084319-aa0tdiz2vgbql726
---
 .../web_linkedin/static/src/css/linkedin.css  |  4 +-
 addons/web_linkedin/static/src/js/linkedin.js | 63 ++++++++++++-------
 .../web_linkedin/static/src/xml/linkedin.xml  |  8 ++-
 addons/web_linkedin/web_linkedin.py           | 13 +++-
 addons/web_linkedin/web_linkedin_view.xml     |  5 ++
 5 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index 6396c5c3e5b..aa4a110a40a 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -49,7 +49,7 @@
     text-align: center;
 }
 
-.openerp .oe_linkedin_advanced_search {
+.openerp .oe_network_advanced_search {
     margin: auto;
     position: absolute;
     right: 60px;
@@ -58,7 +58,7 @@
     font-size: 12px;
 }
 
-.openerp .oe_linkedin_advanced_search button {
+.openerp .oe_network_advanced_search button {
     line-height: 12px;
     font-size: 12px;
 }
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 8ac5ce22453..75e0fea28ab 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -23,7 +23,7 @@ openerp.web_linkedin = function(instance) {
             var self = this;
             return this.test_api_key().then(function() {
                 if (self.linkedin_added) {
-                    return self.linkedin_def.resolve();
+                    return self.linkedin_def;
                 }
 
                 $login = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
@@ -118,6 +118,17 @@ openerp.web_linkedin = function(instance) {
         selected_entity: function(entity) {
             var self = this;
             this.create_on_change(entity).done(function(to_change) {
+                var values = self.view.get_fields_values();
+                console.log(values, to_change);
+                _.each(to_change, function (value, key) {
+                    if (!/linkedin/.test(key) && !!values[key]) {
+                        if(_.isArray(values[key])) {
+
+                        } else {
+                            delete to_change[key];
+                        }
+                    }
+                })
                 self.view.set_values(to_change);
             });
         },
@@ -142,9 +153,9 @@ openerp.web_linkedin = function(instance) {
                 });
                 var children_def = $.Deferred();
                 IN.API.PeopleSearch().fields(commonPeopleFields).params({
-                        "company-name" : entity.name,
+                        "company-name" : entity.universalName,
                         "current-company": true,
-                        "count": 25,
+                        "count": 50,
                     }).result(function(result) {
                         children_def.resolve(result);
                     }).error(function() {
@@ -159,14 +170,16 @@ openerp.web_linkedin = function(instance) {
                         return self.create_on_change(el);
                     });
                     return $.when.apply($, defs).then(function() {
-                        var p_to_change = _.toArray(arguments);
+                        var p_to_change = _.map(_.toArray(arguments), function (val) {
+                            return val.id ? [1, val.id, val] : [0, 0, val];
+                        })
                         to_change.child_ids = p_to_change;
                     });
                 }, function() {
                     return $.when();
                 }));
 
-                to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
+                to_change.linkedin_url = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
             } else { // people
                 to_change.is_company = false;
                 to_change.name = entity.formattedName;
@@ -196,10 +209,16 @@ openerp.web_linkedin = function(instance) {
                         }));
                     }
                 }
+                to_change.linkedin_url = to_change.linkedin_public_url = entity.publicProfileUrl || false;
+                to_change.linkedin_id = entity.id || false;
 
-                to_change.linkedinUrl = entity.publicProfileUrl || false;
-                to_change.linkedinId = entity.id || false;
-                to_change.comment = entity.summary || false;
+                // find similar partners
+                defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
+                        "|", ["linkedin_id", "=", entity.id], "&", ["linkedin_id", "=", false],
+                        "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
+                    ]]).then(function (data) {
+                    to_change.id = data[0] || false;
+                }));
                 
             }
             return $.when.apply($, defs).then(function() {
@@ -210,26 +229,26 @@ openerp.web_linkedin = function(instance) {
     
     instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin');
     
-    var commonPeopleFields = ["id", "picture-url", "public-profile-url",
+    var commonPeopleFields = ["id", "picture-url", "public-profile-url", "first-name", "last-name",
                             "formatted-name", "location", "phone-numbers", "im-accounts",
                             "main-address", "headline", "positions", "summary", "specialties"];
     
     instance.web_linkedin.LinkedinSearchPopup = instance.web.Dialog.extend({
         template: "Linkedin.popup",
-        init: function(parent, text) {
+        init: function(parent, search) {
             var self = this;
             if (!IN.User.isAuthorized()) {
                 this.$buttons = $("<div/>");
                 this.destroy();
             }
-            this._super(parent, { 'title':_t("LinkedIn search") + '<div class="oe_linkedin_advanced_search">'+_t("Search by LinkedIn by url or keywords") +' : <input name="url"/> <button>'+_t("Search") +'</button></div>'});
-            this.text = text;
+            this._super(parent, { 'title': QWeb.render('LinkedIn.AdvancedSearch', {'title': _t("LinkedIn search")}) });
+            this.search = search;
             this.limit = 5;
         },
         start: function() {
             this._super();
             this.bind_event();
-            this.display_linkedin_account();
+            this.display_account();
             this.do_search();
         },
         bind_event: function() {
@@ -238,8 +257,8 @@ openerp.web_linkedin = function(instance) {
                 IN.User.logout();
                 self.destroy();
             });
-            this.$search = this.$el.parent().find(".oe_linkedin_advanced_search" );
-            this.$url = this.$search.find("input[name='url']" );
+            this.$search = this.$el.parent().find(".oe_network_advanced_search" );
+            this.$url = this.$search.find("input[name='search']" );
             this.$button = this.$search.find("button");
 
             this.$button.on("click", function (e) {
@@ -256,7 +275,7 @@ openerp.web_linkedin = function(instance) {
                     }
                 });
         },
-        display_linkedin_account: function() {
+        display_account: function() {
             var self = this;
             IN.API.Profile("me")
                 .fields(["firstName", "lastName"])
@@ -281,7 +300,7 @@ openerp.web_linkedin = function(instance) {
                 var uid = url.replace(/(.*linkedin\.com\/[a-z]+\/)|(^.*\/company\/)|(\&.*$)/gi, '');
 
                 IN.API.Raw(_.str.sprintf(
-                        "companies/universal-name=%s:(id,name,logo-url,description,industry,website-url,locations)",
+                        "companies/universal-name=%s:(id,name,logo-url,description,industry,website-url,locations,universal-name)",
                         encodeURIComponent(uid.toLowerCase()))).result(function (result) {
                     self.do_result_companies({'companies': {'values': [result]}});
                     deferrer_c.resolve();
@@ -294,7 +313,6 @@ openerp.web_linkedin = function(instance) {
                 IN.API.Profile("url="+ encodeURI(url_public).replace(/%2F/g, '/'))
                     .fields(commonPeopleFields)
                     .result(function(result) {
-                       console.log("public", result);
                         self.do_result_people({'people': result});
                         deferrer_p.resolve();
                 }).error(function (error) {
@@ -303,7 +321,7 @@ openerp.web_linkedin = function(instance) {
                     deferrer_p.resolve();
                 });
 
-                this.text = url;
+                this.search = url;
             }
 
             var deferrer_c_k = $.Deferred();
@@ -311,12 +329,12 @@ openerp.web_linkedin = function(instance) {
             deferrers.push(deferrer_c_k, deferrer_p_k);
             IN.API.Raw(_.str.sprintf(
                     "company-search:(companies:" +
-                    "(id,name,logo-url,description,industry,website-url,locations))?keywords=%s&count=%d",
-                    encodeURI(this.text), this.limit)).result(function (result) {
+                    "(id,name,logo-url,description,industry,website-url,locations,universal-name))?keywords=%s&count=%d",
+                    encodeURI(this.search), this.limit)).result(function (result) {
                 self.do_result_companies(result);
                 deferrer_c_k.resolve();
             });
-            IN.API.PeopleSearch().fields(commonPeopleFields).params({"keywords": this.text, "count": this.limit}).result(function(result) {
+            IN.API.PeopleSearch().fields(commonPeopleFields).params({"keywords": this.search, "count": this.limit}).result(function(result) {
                 self.do_result_people(result);
                 deferrer_p_k.resolve();
             });
@@ -367,6 +385,7 @@ openerp.web_linkedin = function(instance) {
         },
         
     });
+// http://api.linkedin.com/v1/companies?email-domain=apple.com&email-domain=linkedin.com&email-domain=nhl.com
     
     instance.web_linkedin.EntityWidget = instance.web.Widget.extend({
         template: "Linkedin.EntityWidget",
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 364208005d1..92104c2b400 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -32,11 +32,13 @@
         </div>
     </t>
     <t t-name="LinkedIn.loginInformation">
-        <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account on LinkedIn, <a class="oe_linkedin_logout">please click here to logout LinkedIn</a>.</div>
+        <div class="oe_linkedin_authentified">If "<b><t t-raw="firstName"/> <t t-raw="lastName"/></b>" is not your account, <a class="oe_linkedin_logout">please click here to logout</a>.</div>
     </t>
     <t t-name="LinkedIn.AdvancedSearch">
-        <div class="oe_linkedin_advanced_search">
-            No results found.<br/>
+        <t t-raw="title"/>
+        <div class="oe_network_advanced_search">
+            Search by url or keywords : <input name="search"/> <button>Search</button>
         </div>
     </t>
+
 </templates>
\ No newline at end of file
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 1296bb7aa28..7305ca4b016 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -21,6 +21,7 @@
 
 import base64
 import urllib2
+import linkedin # TODO add depensy in packaging
 
 import openerp
 from openerp.osv import fields, osv
@@ -49,8 +50,18 @@ class web_linkedin_settings(osv.osv_memory):
         key = self.browse(cr, uid, ids[0], context)["api_key"] or ""
         self.pool.get("ir.config_parameter").set_param(cr, uid, "web.linkedin.apikey", key)
 
-class web_linkedin_fields(osv.osv_memory):
+class web_linkedin_fields(osv.Model):
     _inherit = 'res.partner'
+
+    def _get_url(self, cr, uid, ids, name, arg, context=None):
+        res = dict((id, False) for id in ids)
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = partner.linkedin_url
+        return res
+
     _columns = {
         'linkedin_id': fields.char(string="LinkedIn ID", size=50),
+        'linkedin_url': fields.char(string="LinkedIn url", size=100, store=True),
+        'linkedin_public_url': fields.function(_get_url, type='text', string="LinkedIn url", 
+            help="This url is set automatically when you join the partner with a LinkedIn account."),
     }
\ No newline at end of file
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index e2d4903a2d6..205a70cb192 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -9,6 +9,11 @@
                 <field name="name" position="replace">
                     <field name="name" default_focus="1" nolabel="1" widget="linkedin" />
                 </field>
+                <field name="website" position="after">
+                    <field name="linkedin_id" invisible="1"/>
+                    <field name="linkedin_url" invisible="1"/>
+                    <field name="linkedin_public_url" widget="url" placeholder="LinkedIn url automatically set..."/>
+                </field>
             </field>
        </record>
         

From b4128a3fcd1f398b2e4abc9f3d2c268d7c5adc61 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 21 Jan 2013 11:41:11 +0100
Subject: [PATCH 06/22] [IMP] linkedin: find similar partners and update only
 the empty field

bzr revid: chm@openerp.com-20130121104111-4bifnvr7ftnic80r
---
 addons/web_linkedin/static/src/js/linkedin.js | 66 +++++++++++++------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 75e0fea28ab..8e17ddd2541 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -119,7 +119,6 @@ openerp.web_linkedin = function(instance) {
             var self = this;
             this.create_on_change(entity).done(function(to_change) {
                 var values = self.view.get_fields_values();
-                console.log(values, to_change);
                 _.each(to_change, function (value, key) {
                     if (!/linkedin/.test(key) && !!values[key]) {
                         if(_.isArray(values[key])) {
@@ -132,7 +131,7 @@ openerp.web_linkedin = function(instance) {
                 self.view.set_values(to_change);
             });
         },
-        create_on_change: function(entity) {
+        create_on_change: function(entity, search_similar_partner) {
             var self = this;
             var to_change = {};
             var defs = [];
@@ -167,11 +166,13 @@ openerp.web_linkedin = function(instance) {
                     });
                     var defs = _.map(result, function(el) {
                         el.__type = "people";
-                        return self.create_on_change(el);
+                        el.parent_id = self.field_manager.datarecord.id || false;
+                        return self.create_on_change(el, true);
                     });
                     return $.when.apply($, defs).then(function() {
-                        var p_to_change = _.map(_.toArray(arguments), function (val) {
-                            return val.id ? [1, val.id, val] : [0, 0, val];
+                        var p_to_change = _.map(_.toArray(arguments), function (data) {
+                            // [0,0,data] if it's a new partner
+                            return data.id ? [1, data.id, data] : [0, 0, data];
                         })
                         to_change.child_ids = p_to_change;
                     });
@@ -183,15 +184,12 @@ openerp.web_linkedin = function(instance) {
             } else { // people
                 to_change.is_company = false;
                 to_change.name = entity.formattedName;
-                to_change.image = false;
                 if (entity.pictureUrl) {
                     defs.push(self.rpc('/web_linkedin/binary/url2binary',
                                        {'url': entity.pictureUrl}).then(function(data){
                         to_change.image = data;
                     }));
                 }
-                to_change.mobile = false;
-                to_change.phone = false;
                 _.each((entity.phoneNumbers || {}).values || [], function(el) {
                     if (el.phoneType === "mobile") {
                         to_change.mobile = el.phoneNumber;
@@ -202,23 +200,53 @@ openerp.web_linkedin = function(instance) {
                 var positions = (entity.positions || {}).values || [];
                 if (positions.length && positions[0].isCurrent) {
                     to_change.function = positions[0].title;
-                    var company_name = positions[0].company ? positions[0].company.name : false;
-                    if (company_name) {
-                        defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
-                            to_change.parent_id = data[0] || false;
-                        }));
+                    if (!entity.parent_id) {
+                        var company_name = positions[0].company ? positions[0].company.name : false;
+                        if (company_name) {
+                            defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
+                                if(data[0]) to_change.parent_id = data[0];
+                            }));
+                        }
                     }
                 }
+                if (entity.parent_id) {
+                    to_change.parent_id = entity.parent_id;
+                }
                 to_change.linkedin_url = to_change.linkedin_public_url = entity.publicProfileUrl || false;
                 to_change.linkedin_id = entity.id || false;
 
                 // find similar partners
-                defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
-                        "|", ["linkedin_id", "=", entity.id], "&", ["linkedin_id", "=", false],
-                        "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
-                    ]]).then(function (data) {
-                    to_change.id = data[0] || false;
-                }));
+                if (search_similar_partner) {
+                    defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
+                            "|", ["linkedin_id", "=", to_change.linkedin_id], "&", ["linkedin_id", "=", false],
+                            "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
+                        ]]).then(function (data) {
+                        to_change.id = data[0] || false;
+                        if (to_change.id) {
+                            // remove data if allready set
+                            defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("read", [[to_change.id], [
+                                "image",
+                                "mobile",
+                                "phone",
+                                "parent_id",
+                                "name",
+                                "email",
+                                "function",
+                                "linkedin_id",
+                            ]]).then(function (partners) {
+                                if (partners[0].linkedin_id && partners[0].linkedin_id != to_change.linkedin_id) {
+                                    delete to_change.id;
+                                } else {
+                                    _.each(partners[0], function (val, key) {
+                                        if (val) {
+                                            to_change[key] = val;
+                                        }
+                                    });
+                                }
+                            }));
+                        }
+                    }));
+                }
                 
             }
             return $.when.apply($, defs).then(function() {

From 9dcd319514dd278dc54d6e62f5009a354116875d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 21 Jan 2013 13:18:09 +0100
Subject: [PATCH 07/22] [IMP] linkedin: split create_on_change in 2 methods,
 one for company and one for partner

bzr revid: chm@openerp.com-20130121121809-6rc4g0dtg69f3q5g
---
 addons/web_linkedin/static/src/js/linkedin.js | 234 +++++++++---------
 1 file changed, 121 insertions(+), 113 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 8e17ddd2541..1e375fd2050 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -25,14 +25,7 @@ openerp.web_linkedin = function(instance) {
                 if (self.linkedin_added) {
                     return self.linkedin_def;
                 }
-
-                $login = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
-                $login.appendTo("body");
-                $login.on("DOMNodeInserted", function (e) {
-                    $login.off("DOMNodeInserted");
-                    self.linkedin_def.resolve();
-                    console.debug("LinkedIn DOM node is inserted.");
-                });
+                $("body").append('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
 
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
@@ -41,6 +34,14 @@ openerp.web_linkedin = function(instance) {
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
                 $(tag).load(function() {
+                    console.debug("LinkedIn JavaScript inserted.");
+                    IN.Event.on(IN, "frameworkLoaded", function() {
+                        console.debug("LinkedIn DOM node inserted and frameworkLoaded.");
+                    });
+                    IN.Event.on(IN, "systemReady", function() {
+                        self.linkedin_def.resolve();
+                        console.debug("LinkedIn systemReady.");
+                    });
                     IN.Event.on(IN, "auth", function() {
                         self.auth_def.resolve();
                     });
@@ -131,125 +132,132 @@ openerp.web_linkedin = function(instance) {
                 self.view.set_values(to_change);
             });
         },
-        create_on_change: function(entity, search_similar_partner) {
+        create_on_change: function(entity) {
+            return entity.__type === "company" ? this.create_or_modify_company(entity) : this.create_or_modify_partner(entity);
+        },
+        create_or_modify_company: function (entity) {
             var self = this;
             var to_change = {};
             var defs = [];
-            if (entity.__type === "company") {
-                to_change.is_company = true;
-                to_change.name = entity.name;
-                to_change.image = false;
-                if (entity.logoUrl) {
-                    defs.push(self.rpc('/web_linkedin/binary/url2binary',
-                                       {'url': entity.logoUrl}).then(function(data){
-                        to_change.image = data;
-                    }));
-                }
-                to_change.website = entity.websiteUrl;
-                to_change.phone = false;
-                _.each((entity.locations || {}).values || [], function(el) {
-                    to_change.phone = el.contactInfo.phone1;
-                });
-                var children_def = $.Deferred();
-                IN.API.PeopleSearch().fields(commonPeopleFields).params({
-                        "company-name" : entity.universalName,
-                        "current-company": true,
-                        "count": 50,
-                    }).result(function(result) {
-                        children_def.resolve(result);
-                    }).error(function() {
-                        children_def.reject();
-                    });
-                defs.push(children_def.then(function(result) {
+            to_change.is_company = true;
+            to_change.name = entity.name;
+            to_change.image = false;
+            if (entity.logoUrl) {
+                defs.push(self.rpc('/web_linkedin/binary/url2binary',
+                                   {'url': entity.logoUrl}).then(function(data){
+                    to_change.image = data;
+                }));
+            }
+            to_change.website = entity.websiteUrl;
+            to_change.phone = false;
+            _.each((entity.locations || {}).values || [], function(el) {
+                to_change.phone = el.contactInfo.phone1;
+            });
+            to_change.linkedin_url = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
+
+            to_change.child_ids = [];
+            var children_def = $.Deferred();
+            defs.push(children_def);
+            IN.API.PeopleSearch().fields(commonPeopleFields).params({
+                    "company-name" : entity.universalName,
+                    "current-company": true,
+                    "count": 50,
+                }).result(function (result) {
+                    console.debug("Linkedin pepople in this company found :", result.numResults, "=>", result.people._count, result.people.values);
                     result = _.reject(result.people.values || [], function(el) {
                         return ! el.formattedName;
                     });
-                    var defs = _.map(result, function(el) {
+                    var defs = [];
+                    _.each(result, function (el) {
                         el.__type = "people";
                         el.parent_id = self.field_manager.datarecord.id || false;
-                        return self.create_on_change(el, true);
-                    });
-                    return $.when.apply($, defs).then(function() {
-                        var p_to_change = _.map(_.toArray(arguments), function (data) {
+                        defs.push(self.create_or_modify_partner(el, true).then(function (data) {
                             // [0,0,data] if it's a new partner
-                            return data.id ? [1, data.id, data] : [0, 0, data];
-                        })
-                        to_change.child_ids = p_to_change;
+                            to_change.child_ids.push( data.id ? [1, data.id, data] : [0, 0, data] );
+                        }));
                     });
-                }, function() {
-                    return $.when();
-                }));
-
-                to_change.linkedin_url = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
-            } else { // people
-                to_change.is_company = false;
-                to_change.name = entity.formattedName;
-                if (entity.pictureUrl) {
-                    defs.push(self.rpc('/web_linkedin/binary/url2binary',
-                                       {'url': entity.pictureUrl}).then(function(data){
-                        to_change.image = data;
-                    }));
-                }
-                _.each((entity.phoneNumbers || {}).values || [], function(el) {
-                    if (el.phoneType === "mobile") {
-                        to_change.mobile = el.phoneNumber;
-                    } else {
-                        to_change.phone = el.phoneNumber;
-                    }
+                    $.when.apply($, defs).then(function () {
+                        children_def.resolve();
+                    });
+                }).error(function () {
+                    children_def.reject();
                 });
-                var positions = (entity.positions || {}).values || [];
-                if (positions.length && positions[0].isCurrent) {
-                    to_change.function = positions[0].title;
-                    if (!entity.parent_id) {
-                        var company_name = positions[0].company ? positions[0].company.name : false;
-                        if (company_name) {
-                            defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
-                                if(data[0]) to_change.parent_id = data[0];
-                            }));
-                        }
+            
+            return $.when.apply($, defs).then(function () {
+                return to_change;
+            });
+        },
+        create_or_modify_partner: function (entity, search_similar_partner) {
+            var self = this;
+            var to_change = {};
+            var defs = [];
+            to_change.is_company = false;
+            to_change.name = entity.formattedName;
+            if (entity.pictureUrl) {
+                defs.push(self.rpc('/web_linkedin/binary/url2binary',
+                                   {'url': entity.pictureUrl}).then(function(data){
+                    to_change.image = data;
+                }));
+            }
+            _.each((entity.phoneNumbers || {}).values || [], function(el) {
+                if (el.phoneType === "mobile") {
+                    to_change.mobile = el.phoneNumber;
+                } else {
+                    to_change.phone = el.phoneNumber;
+                }
+            });
+            var positions = (entity.positions || {}).values || [];
+            if (positions.length && positions[0].isCurrent) {
+                to_change.function = positions[0].title;
+                if (!entity.parent_id) {
+                    var company_name = positions[0].company ? positions[0].company.name : false;
+                    if (company_name) {
+                        defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
+                            if(data[0]) to_change.parent_id = data[0];
+                        }));
                     }
                 }
-                if (entity.parent_id) {
-                    to_change.parent_id = entity.parent_id;
-                }
-                to_change.linkedin_url = to_change.linkedin_public_url = entity.publicProfileUrl || false;
-                to_change.linkedin_id = entity.id || false;
-
-                // find similar partners
-                if (search_similar_partner) {
-                    defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
-                            "|", ["linkedin_id", "=", to_change.linkedin_id], "&", ["linkedin_id", "=", false],
-                            "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
-                        ]]).then(function (data) {
-                        to_change.id = data[0] || false;
-                        if (to_change.id) {
-                            // remove data if allready set
-                            defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("read", [[to_change.id], [
-                                "image",
-                                "mobile",
-                                "phone",
-                                "parent_id",
-                                "name",
-                                "email",
-                                "function",
-                                "linkedin_id",
-                            ]]).then(function (partners) {
-                                if (partners[0].linkedin_id && partners[0].linkedin_id != to_change.linkedin_id) {
-                                    delete to_change.id;
-                                } else {
-                                    _.each(partners[0], function (val, key) {
-                                        if (val) {
-                                            to_change[key] = val;
-                                        }
-                                    });
-                                }
-                            }));
-                        }
-                    }));
-                }
-                
             }
-            return $.when.apply($, defs).then(function() {
+            if (entity.parent_id) {
+                to_change.parent_id = entity.parent_id;
+            }
+            to_change.linkedin_url = to_change.linkedin_public_url = entity.publicProfileUrl || false;
+            to_change.linkedin_id = entity.id || false;
+
+            // find similar partners
+            if (search_similar_partner) {
+                defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
+                        "|", ["linkedin_id", "=", to_change.linkedin_id], "&", ["linkedin_id", "=", false],
+                        "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
+                    ]]).then(function (data) {
+                    to_change.id = data[0] || false;
+                    if (to_change.id) {
+                        // remove data if allready set
+                        defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("read", [[to_change.id], [
+                            "image",
+                            "mobile",
+                            "phone",
+                            "parent_id",
+                            "name",
+                            "email",
+                            "function",
+                            "linkedin_id",
+                        ]]).then(function (partners) {
+                            if (partners[0].linkedin_id && partners[0].linkedin_id != to_change.linkedin_id) {
+                                delete to_change.id;
+                            } else {
+                                _.each(partners[0], function (val, key) {
+                                    if (val) {
+                                        to_change[key] = val;
+                                    }
+                                });
+                            }
+                        }));
+                    }
+                }));
+            }
+            
+            return $.when.apply($, defs).then(function () {
                 return to_change;
             });
         },

From 0742601e749cdf4f6892fbbc90b236190f685c66 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 21 Jan 2013 14:41:57 +0100
Subject: [PATCH 08/22] [IMP] linkedin: don't overwrite informations

bzr revid: chm@openerp.com-20130121134157-2kksdmtfirlue0o0
---
 .../web_linkedin/static/src/css/linkedin.css  |  6 +++---
 addons/web_linkedin/static/src/js/linkedin.js | 19 +++++++++++++++----
 .../web_linkedin/static/src/xml/linkedin.xml  |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index aa4a110a40a..30a037d61de 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -49,7 +49,7 @@
     text-align: center;
 }
 
-.openerp .oe_network_advanced_search {
+.openerp .oe_linkedin_advanced_search {
     margin: auto;
     position: absolute;
     right: 60px;
@@ -58,7 +58,7 @@
     font-size: 12px;
 }
 
-.openerp .oe_network_advanced_search button {
+.openerp .oe_linkedin_advanced_search button {
     line-height: 12px;
     font-size: 12px;
-}
+}
\ No newline at end of file
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 1e375fd2050..0c2ce837cd0 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -155,6 +155,12 @@ openerp.web_linkedin = function(instance) {
             });
             to_change.linkedin_url = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
 
+            _.each(to_change, function (val, key) {
+                if (self.field_manager.datarecord[key]) {
+                    to_change[key] = self.field_manager.datarecord[key];
+                }
+            });
+
             to_change.child_ids = [];
             var children_def = $.Deferred();
             defs.push(children_def);
@@ -187,7 +193,7 @@ openerp.web_linkedin = function(instance) {
                 return to_change;
             });
         },
-        create_or_modify_partner: function (entity, search_similar_partner) {
+        create_or_modify_partner: function (entity, rpc_search_similar_partner) {
             var self = this;
             var to_change = {};
             var defs = [];
@@ -225,7 +231,7 @@ openerp.web_linkedin = function(instance) {
             to_change.linkedin_id = entity.id || false;
 
             // find similar partners
-            if (search_similar_partner) {
+            if (rpc_search_similar_partner) {
                 defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
                         "|", ["linkedin_id", "=", to_change.linkedin_id], "&", ["linkedin_id", "=", false],
                         "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
@@ -255,6 +261,12 @@ openerp.web_linkedin = function(instance) {
                         }));
                     }
                 }));
+            } else {
+                _.each(to_change, function (val, key) {
+                    if (self.field_manager.datarecord[key]) {
+                        to_change[key] = self.field_manager.datarecord[key];
+                    }
+                });
             }
             
             return $.when.apply($, defs).then(function () {
@@ -293,7 +305,7 @@ openerp.web_linkedin = function(instance) {
                 IN.User.logout();
                 self.destroy();
             });
-            this.$search = this.$el.parent().find(".oe_network_advanced_search" );
+            this.$search = this.$el.parent().find(".oe_linkedin_advanced_search" );
             this.$url = this.$search.find("input[name='search']" );
             this.$button = this.$search.find("button");
 
@@ -421,7 +433,6 @@ openerp.web_linkedin = function(instance) {
         },
         
     });
-// http://api.linkedin.com/v1/companies?email-domain=apple.com&email-domain=linkedin.com&email-domain=nhl.com
     
     instance.web_linkedin.EntityWidget = instance.web.Widget.extend({
         template: "Linkedin.EntityWidget",
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 92104c2b400..95f2b4e26a0 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -36,7 +36,7 @@
     </t>
     <t t-name="LinkedIn.AdvancedSearch">
         <t t-raw="title"/>
-        <div class="oe_network_advanced_search">
+        <div class="oe_linkedin_advanced_search">
             Search by url or keywords : <input name="search"/> <button>Search</button>
         </div>
     </t>

From 1bb9d9982d33f95d72c78e06144d25f4419a54a6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 25 Jan 2013 16:25:33 +0100
Subject: [PATCH 09/22] [IMP] linkedin: remove wrong import linkedin

bzr revid: chm@openerp.com-20130125152533-j90juz6z0awymb04
---
 addons/web_linkedin/web_linkedin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 7305ca4b016..8c6fad8cd46 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -21,7 +21,6 @@
 
 import base64
 import urllib2
-import linkedin # TODO add depensy in packaging
 
 import openerp
 from openerp.osv import fields, osv

From e914b45c104257cbc62163ce5fde0ab3fe356b51 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 30 Jan 2013 16:48:57 +0100
Subject: [PATCH 10/22] [FIX] linkedin: catch library error

bzr revid: chm@openerp.com-20130130154857-2avus5m64n4tj7t2
---
 addons/web_linkedin/static/src/js/linkedin.js | 22 ++++++++++++++++++-
 addons/web_linkedin/web_linkedin_view.xml     |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 0c2ce837cd0..5130fb357ce 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -31,11 +31,31 @@ openerp.web_linkedin = function(instance) {
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
                 tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_basicprofile'; // r_contactinfo r_fullprofile r_emailaddress';
+                
+                // error catcher for library exception
+                var crashmanager = false;
+                var $head = $("head:first");
+                var DOMNodeInserted = function (event) {
+                    if(event.srcElement.previousSibling == tag) {
+                        console.debug("LinkedIn JavaScript userspace inserted.");
+                        crashmanager = window.onerror;
+                        window.onerror = function() {
+                            crashmanager("You have a Linkedin error integration.\nPlease check your API Domain and your API Key's configuration", "", "");
+                            window.onerror = crashmanager;
+                        };
+                        $head.off("DOMNodeInserted", DOMNodeInserted);
+                    }
+                };
+                $head.on("DOMNodeInserted", DOMNodeInserted);
+                window.setTimeout(function () {$head.off("DOMNodeInserted", DOMNodeInserted);}, 60000);
+                // end
+
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
-                $(tag).load(function() {
+                $(tag).load(function(event) {
                     console.debug("LinkedIn JavaScript inserted.");
                     IN.Event.on(IN, "frameworkLoaded", function() {
+                        if(crashmanager) window.onerror = crashmanager;
                         console.debug("LinkedIn DOM node inserted and frameworkLoaded.");
                     });
                     IN.Event.on(IN, "systemReady", function() {
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index 205a70cb192..a0cbdc3f381 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -34,8 +34,9 @@
                             <li>Log into LinkedIn.</li>
                             <li>Add a new application and fill the form:
                                 <ul>
-                                    <li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li>
+                                    <li>Website URL: <field name="server_domain" readonly="1" style="width:0;white-space: nowrap;"/></li>
                                     <li>The programming tool is Javascript</li>
+                                    <li>JavaScript API Domains: <field name="server_domain" readonly="1" style="width:0;white-space: nowrap;"/></li>
                                 </ul>
                             </li>
                             <li>Copy the <strong>API key</strong> here:

From e4ab06a2090393975f1688b9a257ddca10af058f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 31 Jan 2013 11:02:48 +0100
Subject: [PATCH 11/22] [IMP] web_linkedin: catch error

bzr revid: chm@openerp.com-20130131100248-fsmycwner7es1tz6
---
 addons/web_linkedin/static/src/js/linkedin.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 5130fb357ce..e8d9086dffe 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -39,8 +39,12 @@ openerp.web_linkedin = function(instance) {
                     if(event.srcElement.previousSibling == tag) {
                         console.debug("LinkedIn JavaScript userspace inserted.");
                         crashmanager = window.onerror;
-                        window.onerror = function() {
-                            crashmanager("You have a Linkedin error integration.\nPlease check your API Domain and your API Key's configuration", "", "");
+                        window.onerror = function(e,a,l) {
+                            if (!a.length && !l) {
+                                crashmanager("You have a Linkedin error integration.\nPlease check your API Domain and your API Key's configuration", "", "");
+                            } else {
+                                crashmanager(e,a,l);
+                            }
                             window.onerror = crashmanager;
                         };
                         $head.off("DOMNodeInserted", DOMNodeInserted);

From 0e860b795431b8c90977cdb907f5078d1cf4f297 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 31 Jan 2013 14:25:29 +0100
Subject: [PATCH 12/22] [IMP] web_linkedin: error catcher with better message
 and popup

bzr revid: chm@openerp.com-20130131132529-oglfd4csbzs03k5r
---
 addons/web_linkedin/static/src/js/linkedin.js | 82 +++++++++++--------
 .../web_linkedin/static/src/xml/linkedin.xml  |  6 +-
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index e8d9086dffe..951da738fab 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -19,47 +19,73 @@ openerp.web_linkedin = function(instance) {
             this.linkedin_def = $.Deferred();
             this.auth_def = $.Deferred();
         },
+        error_catcher: function (callback) {
+            var self = this;
+            if (!this.realError) {
+                this.realError = Error;
+                this.window_onerror = window.onerror;
+            }
+            if (!callback) {
+                window.onerror = self.window_onerror;
+                Error = self.realError;
+            }
+            this.callback = callback;
+            Error = function (message, fileName, lineNumber) {
+                this.name = message;
+                this.message = message;
+                this.fileName = fileName;
+                this.lineNumber = lineNumber;
+                if (Error.caller.toString().match(/API Key is invalid/)) {
+                    self.callback.apply(self, [this]);
+                    Error.prototype.catched = true;
+                }
+            };
+            Error.prototype.toString = function () {return this.name;};
+            Error.prototype.catched = false;
+            window.onerror = function(message, fileName, lineNumber) {
+                if (!Error.prototype.catched) {
+                    self.window_onerror(message, fileName, lineNumber);
+                }
+                Error.prototype.catched = false;
+            };
+        },
+        linkedin_disabled: function(error) {
+            instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning", {'error': error})), {
+                title: _t("LinkedIn is not enabled"),
+                buttons: [
+                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                ]
+            });
+        },
         test_linkedin: function() {
             var self = this;
             return this.test_api_key().then(function() {
                 if (self.linkedin_added) {
                     return self.linkedin_def;
                 }
-                $("body").append('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
 
+                self.error_catcher(function (error) {
+                    self.linkedin_disabled(error);
+                    self.auth_def.reject();
+                    self.linkedin_def.reject();
+                    self.$linkedin.remove();
+                    IN = false;
+                    self.linkedin_added = false;
+                    self.error_catcher(false);
+                });
+
+                self.$linkedin = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
+                $("body").append(self.$linkedin);
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
                 tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_basicprofile'; // r_contactinfo r_fullprofile r_emailaddress';
                 
-                // error catcher for library exception
-                var crashmanager = false;
-                var $head = $("head:first");
-                var DOMNodeInserted = function (event) {
-                    if(event.srcElement.previousSibling == tag) {
-                        console.debug("LinkedIn JavaScript userspace inserted.");
-                        crashmanager = window.onerror;
-                        window.onerror = function(e,a,l) {
-                            if (!a.length && !l) {
-                                crashmanager("You have a Linkedin error integration.\nPlease check your API Domain and your API Key's configuration", "", "");
-                            } else {
-                                crashmanager(e,a,l);
-                            }
-                            window.onerror = crashmanager;
-                        };
-                        $head.off("DOMNodeInserted", DOMNodeInserted);
-                    }
-                };
-                $head.on("DOMNodeInserted", DOMNodeInserted);
-                window.setTimeout(function () {$head.off("DOMNodeInserted", DOMNodeInserted);}, 60000);
-                // end
-
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
                 $(tag).load(function(event) {
                     console.debug("LinkedIn JavaScript inserted.");
                     IN.Event.on(IN, "frameworkLoaded", function() {
-                        if(crashmanager) window.onerror = crashmanager;
                         console.debug("LinkedIn DOM node inserted and frameworkLoaded.");
                     });
                     IN.Event.on(IN, "systemReady", function() {
@@ -130,14 +156,6 @@ openerp.web_linkedin = function(instance) {
                         self.selected_entity(entity);
                     });
                 });
-            }).fail(_.bind(this.linkedin_disabled, this));
-        },
-        linkedin_disabled: function() {
-            instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
-                title: _t("LinkedIn is not enabled"),
-                buttons: [
-                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-                ]
             });
         },
         selected_entity: function(entity) {
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 95f2b4e26a0..628cdc400a2 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -27,8 +27,10 @@
     </t>
     <t t-name="LinkedIn.DisabledWarning">
         <div>
-            LinkedIn access was not enabled on this server.
-            Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
+            <img t-att-src='_s + "/web/static/src/img/warning.png"' style="float: left; margin: 5px"/>
+            <p>LinkedIn access was not enabled on this server.</p>
+            <p>Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.</p>
+            <p>LinkedIn: <t t-raw="error.name"/></p>
         </div>
     </t>
     <t t-name="LinkedIn.loginInformation">

From 9b748c3d375480bc4d56c0166f34ed703ea5837f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 31 Jan 2013 14:52:54 +0100
Subject: [PATCH 13/22] [IMP] web_linkedin: error catcher

bzr revid: chm@openerp.com-20130131135254-cor4tdu0uulf7ax9
---
 addons/web_linkedin/static/src/js/linkedin.js | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 951da738fab..0841ca85616 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -26,30 +26,36 @@ openerp.web_linkedin = function(instance) {
                 this.window_onerror = window.onerror;
             }
             if (!callback) {
-                window.onerror = self.window_onerror;
                 Error = self.realError;
+                return false;
             }
             this.callback = callback;
+            window.onerror = function(message, fileName, lineNumber) {
+                if (!window.onerror.prototype.catched) {
+                    self.window_onerror(message, fileName, lineNumber);
+                }
+                if (self.realError != Error) {
+                    window.onerror.prototype.catched = false;
+                } else {
+                    window.onerror = self.window_onerror;
+                }
+            };
+            window.onerror.prototype.catched = false;
             Error = function (message, fileName, lineNumber) {
                 this.name = message;
                 this.message = message;
                 this.fileName = fileName;
                 this.lineNumber = lineNumber;
-                if (Error.caller.toString().match(/API Key is invalid/)) {
-                    self.callback.apply(self, [this]);
-                    Error.prototype.catched = true;
-                }
+                this.caller = Error.caller.toString();
+                window.onerror.prototype.catched = self.callback.apply(self, [this]);
+                return this;
             };
             Error.prototype.toString = function () {return this.name;};
-            Error.prototype.catched = false;
-            window.onerror = function(message, fileName, lineNumber) {
-                if (!Error.prototype.catched) {
-                    self.window_onerror(message, fileName, lineNumber);
-                }
-                Error.prototype.catched = false;
-            };
         },
         linkedin_disabled: function(error) {
+            this.linkedin_def.reject();
+            this.auth_def.reject();
+            IN = false;
             instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning", {'error': error})), {
                 title: _t("LinkedIn is not enabled"),
                 buttons: [
@@ -65,13 +71,16 @@ openerp.web_linkedin = function(instance) {
                 }
 
                 self.error_catcher(function (error) {
-                    self.linkedin_disabled(error);
-                    self.auth_def.reject();
-                    self.linkedin_def.reject();
-                    self.$linkedin.remove();
-                    IN = false;
-                    self.linkedin_added = false;
-                    self.error_catcher(false);
+                    if (!!error.caller.match(/API Key is invalid/)) {
+                        self.linkedin_disabled(error);
+                        self.$linkedin.remove();
+                        console.debug("LinkedIn JavaScript removed.");
+                        self.linkedin_added = false;
+                        self.error_catcher(false);
+                        return true;
+                    } else {
+                        return false;
+                    }
                 });
 
                 self.$linkedin = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
@@ -86,6 +95,7 @@ openerp.web_linkedin = function(instance) {
                 $(tag).load(function(event) {
                     console.debug("LinkedIn JavaScript inserted.");
                     IN.Event.on(IN, "frameworkLoaded", function() {
+                        self.error_catcher(false);
                         console.debug("LinkedIn DOM node inserted and frameworkLoaded.");
                     });
                     IN.Event.on(IN, "systemReady", function() {

From f56421f57a04e4eb63d94f2be970b1f3773c72fd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 31 Jan 2013 15:21:15 +0100
Subject: [PATCH 14/22] [IMP] web_linkedin: remove empty line

bzr revid: chm@openerp.com-20130131142115-71jxh14zrcp1hdz0
---
 addons/web_linkedin/static/src/js/linkedin.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 0841ca85616..3f769bdafd1 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -174,9 +174,7 @@ openerp.web_linkedin = function(instance) {
                 var values = self.view.get_fields_values();
                 _.each(to_change, function (value, key) {
                     if (!/linkedin/.test(key) && !!values[key]) {
-                        if(_.isArray(values[key])) {
-
-                        } else {
+                        if(!_.isArray(values[key])) {
                             delete to_change[key];
                         }
                     }

From 27625e4f8835e2568d9709322f4dc1df1bebf09f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 5 Feb 2013 10:22:15 +0100
Subject: [PATCH 15/22] [FIX] linkedin: parent_id and job position

bzr revid: chm@openerp.com-20130205092215-0uy1rr2mmlj3qsby
---
 addons/web_linkedin/static/src/js/linkedin.js | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 3f769bdafd1..423b7d5aade 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -226,6 +226,7 @@ openerp.web_linkedin = function(instance) {
                     var defs = [];
                     _.each(result, function (el) {
                         el.__type = "people";
+                        el.__company = entity.universalName;
                         el.parent_id = self.field_manager.datarecord.id || false;
                         defs.push(self.create_or_modify_partner(el, true).then(function (data) {
                             // [0,0,data] if it's a new partner
@@ -263,17 +264,23 @@ openerp.web_linkedin = function(instance) {
                 }
             });
             var positions = (entity.positions || {}).values || [];
-            if (positions.length && positions[0].isCurrent) {
-                to_change.function = positions[0].title;
-                if (!entity.parent_id) {
-                    var company_name = positions[0].company ? positions[0].company.name : false;
-                    if (company_name) {
+            for (key in positions) {
+                var position = positions[key];
+                if (position.isCurrent) {
+                    var company_name = position.company ? position.company.name : false;
+                    if (!entity.parent_id && company_name) {
                         defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
                             if(data[0]) to_change.parent_id = data[0];
+                            else position.title = position.title + ' (' + company_name + ') ';
+                            to_change.function = position.title;
                         }));
+                    } else if (!entity.__company || !company_name || company_name == entity.__company) {
+                        to_change.function = position.title + (company_name ? ' (' + company_name + ') ':'');
                     }
+                    break;
                 }
-            }
+            };
+
             if (entity.parent_id) {
                 to_change.parent_id = entity.parent_id;
             }
@@ -304,7 +311,7 @@ openerp.web_linkedin = function(instance) {
                             } else {
                                 _.each(partners[0], function (val, key) {
                                     if (val) {
-                                        to_change[key] = val;
+                                        to_change[key] = typeof val == "object" && key.match(/_id$/) ? val[0] : val;
                                     }
                                 });
                             }

From 522bc243b5f416dc79f5cba17d653eb560776f45 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 5 Feb 2013 10:26:22 +0100
Subject: [PATCH 16/22] [FIX] mail_followers: message_subtype_data on create

bzr revid: chm@openerp.com-20130205092622-mhqt5ei3uvqrhydq
---
 addons/mail/static/src/js/mail_followers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 9f88116acc7..d08a0e7876b 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -217,7 +217,7 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             var subtype_list_ul = this.$('.oe_subtype_list');
             subtype_list_ul.empty();
-            var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
+            var records = data[this.view.datarecord.id || 'null'].message_subtype_data;
             var nb_subtype = 0;
             _(records).each(function (record) {nb_subtype++;});
             if (nb_subtype > 1) {

From 8f2466155f8141fb4edd6adde69ade0d1bb60d0c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 5 Feb 2013 11:14:45 +0100
Subject: [PATCH 17/22] [IMP] web_linkedin: url with linkedin image

bzr revid: chm@openerp.com-20130205101445-9ffl4r64j11lkvv9
---
 addons/web_linkedin/static/src/css/linkedin.css |  8 +++++++-
 addons/web_linkedin/static/src/js/linkedin.js   | 15 +++++++++++++--
 addons/web_linkedin/static/src/xml/linkedin.xml |  8 ++++++--
 addons/web_linkedin/web_linkedin_view.xml       |  5 +----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/addons/web_linkedin/static/src/css/linkedin.css b/addons/web_linkedin/static/src/css/linkedin.css
index 30a037d61de..48c168eeb4d 100644
--- a/addons/web_linkedin/static/src/css/linkedin.css
+++ b/addons/web_linkedin/static/src/css/linkedin.css
@@ -1,12 +1,18 @@
 
 
-.openerp .oe_linkedin_img {
+.openerp .oe_linkedin_form_img {
     float: right;
     width: 1.5em;
     margin-top: -1px;
     cursor: pointer;
 }
 
+.openerp .oe_linkedin_img {
+    width: 1em;
+    margin-top: -2px;
+    cursor: pointer;
+}
+
 .openerp .oe_linkedin_input {
     margin-right:1.5em;
 }
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 423b7d5aade..637ae0e7cd8 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -148,13 +148,24 @@ openerp.web_linkedin = function(instance) {
             this.display_dm = new instance.web.DropMisordered(true);
         },
         initialize_content: function() {
-            var $ht = $(QWeb.render("FieldChar.linkedin"));
+            var $ht = $(QWeb.render("FieldChar.linkedin.form"));
             var $in = this.$("input");
             $in.replaceWith($ht);
             this.$(".oe_linkedin_input").append($in);
-            this.$(".oe_linkedin_img").click(_.bind(this.search_linkedin, this));
+            this.$(".oe_linkedin_form_img").click(_.bind(this.search_linkedin, this));
+
+            var $ht = $(QWeb.render("FieldChar.linkedin"));
+            var $span = this.$("span");
+            $span.replaceWith($ht);
+            this.$(".oe_linkedin_span").replaceWith($span);
+
             this._super();
         },
+        render_value: function() {
+            var result = this._super();
+            this.$(".oe_linkedin_url").attr("href", this.field_manager.datarecord.linkedin_url || "#").toggle(!!this.field_manager.datarecord.linkedin_url);
+            return result;
+        },
         search_linkedin: function() {
             var self = this;
             this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 628cdc400a2..15265b77523 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -2,10 +2,14 @@
 <!-- vim:fdl=1:
 -->
 <templates xml:space="preserve">
-    <t t-name="FieldChar.linkedin">
-        <img class="oe_linkedin_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/>
+    <t t-name="FieldChar.linkedin.form">
+        <img class="oe_linkedin_form_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/>
         <div class="oe_linkedin_input"/>
     </t>
+    <t t-name="FieldChar.linkedin">
+        <div class="oe_linkedin_span"/>
+        <a class="oe_linkedin_url" href="#" target="_blank"><img class="oe_linkedin_img" t-att-src='_s + "/web_linkedin/static/src/img/Linkedin_blue.png"'/></a>
+    </t>
     <t t-name="Linkedin.popup">
         <div>
             <h2 style="margin-top:-10px;">People</h2>
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index a0cbdc3f381..4cc3063ffd7 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -7,12 +7,9 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="name" position="replace">
-                    <field name="name" default_focus="1" nolabel="1" widget="linkedin" />
-                </field>
-                <field name="website" position="after">
                     <field name="linkedin_id" invisible="1"/>
                     <field name="linkedin_url" invisible="1"/>
-                    <field name="linkedin_public_url" widget="url" placeholder="LinkedIn url automatically set..."/>
+                    <field name="name" default_focus="1" nolabel="1" widget="linkedin" />
                 </field>
             </field>
        </record>

From 97db848ae8288ba88c5536456b386b91449ad6cf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 7 Feb 2013 09:40:19 +0100
Subject: [PATCH 18/22] [FIX] web_linkedin: change comment of install procedure

bzr revid: chm@openerp.com-20130207084019-swffegbhrzklkkgg
---
 addons/web_linkedin/web_linkedin_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index e05e878b412..917cae3c14e 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -37,7 +37,7 @@
                                 <ul>
                                     <li>Website URL: <field name="server_domain" readonly="1" style="width:0;white-space: nowrap;"/></li>
                                     <li>The programming tool is Javascript</li>
-                                    <li>JavaScript API Domains: <field name="server_domain" readonly="1" style="width:0;white-space: nowrap;"/></li>
+                                    <li>Website URL inside "JavaScript API Domains" field</li>
                                 </ul>
                             </li>
                             <li>Copy the <strong>API key</strong> here:

From f5cb973b1b5bdbd84fde9876b5c40d8a9067656a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 7 Feb 2013 09:58:24 +0100
Subject: [PATCH 19/22] [FIX] web_linkedin: click event

bzr revid: chm@openerp.com-20130207085824-5khb8niyjxz4mecs
---
 addons/web_linkedin/static/src/js/linkedin.js | 22 +++++++++++--------
 addons/web_linkedin/web_linkedin_view.xml     |  2 --
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index a2471000c91..063c5ce0479 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -152,21 +152,25 @@ openerp.web_linkedin = function(instance) {
             var $in = this.$("input");
             $in.replaceWith($ht);
             this.$(".oe_linkedin_input").append($in);
-            this.$(".oe_linkedin_form_img").click(_.bind(this.search_linkedin, this));
+            this.$(".oe_linkedin_img").click(_.bind(this.search_linkedin, this));
             this._super();
         },
         search_linkedin: function() {
             var self = this;
-            this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
-                var text = (self.get("value") || "").replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
-                instance.web_linkedin.tester.test_authentication().done(function() {
-                    var pop = new instance.web_linkedin.LinkedinSearchPopup(self, text);
-                    pop.open();
-                    pop.on("selected", this, function(entity) {
-                        self.selected_entity(entity);
+            if (!this.open_in_process) {
+                this.open_in_process = true;
+                this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
+                    self.open_in_process = false;
+                    var text = (self.get("value") || "").replace(/^\s+|\s+$/g, "").replace(/\s+/g, " ");
+                    instance.web_linkedin.tester.test_authentication().done(function() {
+                        var pop = new instance.web_linkedin.LinkedinSearchPopup(self, text);
+                        pop.open();
+                        pop.on("selected", this, function(entity) {
+                            self.selected_entity(entity);
+                        });
                     });
                 });
-            });
+            }
         },
         selected_entity: function(entity) {
             var self = this;
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index 917cae3c14e..f7c5dfa0a69 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -7,8 +7,6 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="name" position="replace">
-                    <field name="linkedin_id" invisible="1"/>
-                    <field name="linkedin_url" invisible="1"/>
                     <field name="name" default_focus="1" nolabel="1" widget="linkedin" />
                 </field>
                 <field name="website" position="after">

From c2fa5529490d68852a1ab70f029c6d90daa75c31 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 28 Feb 2013 09:48:40 +0100
Subject: [PATCH 20/22] [IMP] linkedin: dirty exception hack: additional
 timeout safeguard

bzr revid: chm@openerp.com-20130228084840-hzj22sya5b3ro4wi
---
 addons/web_linkedin/static/src/js/linkedin.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 063c5ce0479..f39177d04c7 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -69,6 +69,7 @@ openerp.web_linkedin = function(instance) {
                 if (self.linkedin_added) {
                     return self.linkedin_def;
                 }
+                self.$linkedin = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
 
                 self.error_catcher(function (error) {
                     if (!!error.caller.match(/API Key is invalid/)) {
@@ -82,8 +83,8 @@ openerp.web_linkedin = function(instance) {
                         return false;
                     }
                 });
+                window.setTimeout(function () {self.error_catcher(false);}, 60000);
 
-                self.$linkedin = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
                 $("body").append(self.$linkedin);
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';

From 019f267848acd0cffe9b22c276e768afa304bfe8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 28 Feb 2013 11:52:55 +0100
Subject: [PATCH 21/22] [IMP] linkedin: linkedin_check_similar_partner only one
 request

bzr revid: chm@openerp.com-20130228105255-r9kpmthhgc4zbgvq
---
 addons/web_linkedin/static/src/js/linkedin.js | 106 +++++++++---------
 addons/web_linkedin/web_linkedin.py           |  21 ++++
 2 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index f39177d04c7..af5fd5fb6e4 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -193,15 +193,15 @@ openerp.web_linkedin = function(instance) {
         create_or_modify_company: function (entity) {
             var self = this;
             var to_change = {};
-            var defs = [];
+            var image_def = null;
             to_change.is_company = true;
             to_change.name = entity.name;
             to_change.image = false;
             if (entity.logoUrl) {
-                defs.push(self.rpc('/web_linkedin/binary/url2binary',
+                image_def = self.rpc('/web_linkedin/binary/url2binary',
                                    {'url': entity.logoUrl}).then(function(data){
                     to_change.image = data;
-                }));
+                });
             }
             to_change.website = entity.websiteUrl;
             to_change.phone = false;
@@ -218,45 +218,48 @@ openerp.web_linkedin = function(instance) {
 
             to_change.child_ids = [];
             var children_def = $.Deferred();
-            defs.push(children_def);
             IN.API.PeopleSearch().fields(commonPeopleFields).params({
                     "company-name" : entity.universalName,
                     "current-company": true,
                     "count": 50,
                 }).result(function (result) {
                     console.debug("Linkedin pepople in this company found :", result.numResults, "=>", result.people._count, result.people.values);
-                    result = _.reject(result.people.values || [], function(el) {
+                    var result = _.reject(result.people.values || [], function(el) {
                         return ! el.formattedName;
                     });
-                    var defs = [];
-                    _.each(result, function (el) {
-                        el.__type = "people";
-                        el.__company = entity.universalName;
-                        el.parent_id = self.field_manager.datarecord.id || false;
-                        defs.push(self.create_or_modify_partner(el, true).then(function (data) {
+                    self.create_or_modify_company_partner(result).then(function (childs_to_change) {
+                        _.each(childs_to_change, function (data) {
                             // [0,0,data] if it's a new partner
                             to_change.child_ids.push( data.id ? [1, data.id, data] : [0, 0, data] );
-                        }));
-                    });
-                    $.when.apply($, defs).then(function () {
+                        });
                         children_def.resolve();
                     });
                 }).error(function () {
                     children_def.reject();
                 });
             
-            return $.when.apply($, defs).then(function () {
+            return $.when(image_def, children_def).then(function () {
                 return to_change;
             });
         },
         create_or_modify_partner: function (entity, rpc_search_similar_partner) {
             var self = this;
+            return this.create_or_modify_partner_change(entity).then(function (to_change) {
+                // find similar partners
+                _.each(to_change, function (val, key) {
+                    if (self.field_manager.datarecord[key]) {
+                        to_change[key] = self.field_manager.datarecord[key];
+                    }
+                });
+            });
+        },
+        create_or_modify_partner_change: function (entity) {
             var to_change = {};
             var defs = [];
             to_change.is_company = false;
             to_change.name = entity.formattedName;
             if (entity.pictureUrl) {
-                defs.push(self.rpc('/web_linkedin/binary/url2binary',
+                defs.push(this.rpc('/web_linkedin/binary/url2binary',
                                    {'url': entity.pictureUrl}).then(function(data){
                     to_change.image = data;
                 }));
@@ -273,7 +276,7 @@ openerp.web_linkedin = function(instance) {
                 var position = positions[key];
                 if (position.isCurrent) {
                     var company_name = position.company ? position.company.name : false;
-                    if (!entity.parent_id && company_name) {
+                    if (!entity.parent_id && entity.parent_id !== 0 && company_name) {
                         defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[["name", "=", company_name]]]).then(function (data) {
                             if(data[0]) to_change.parent_id = data[0];
                             else position.title = position.title + ' (' + company_name + ') ';
@@ -292,49 +295,40 @@ openerp.web_linkedin = function(instance) {
             to_change.linkedin_url = to_change.linkedin_public_url = entity.publicProfileUrl || false;
             to_change.linkedin_id = entity.id || false;
 
-            // find similar partners
-            if (rpc_search_similar_partner) {
-                defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("search", [[ 
-                        "|", ["linkedin_id", "=", to_change.linkedin_id], "&", ["linkedin_id", "=", false],
-                        "|", ["name", "ilike", entity.firstName +"%"+ entity.lastName], ["name", "ilike", entity.lastName +"%"+ entity.firstName] 
-                    ]]).then(function (data) {
-                    to_change.id = data[0] || false;
-                    if (to_change.id) {
-                        // remove data if allready set
-                        defs.push(new instance.web.DataSetSearch(this, 'res.partner').call("read", [[to_change.id], [
-                            "image",
-                            "mobile",
-                            "phone",
-                            "parent_id",
-                            "name",
-                            "email",
-                            "function",
-                            "linkedin_id",
-                        ]]).then(function (partners) {
-                            if (partners[0].linkedin_id && partners[0].linkedin_id != to_change.linkedin_id) {
-                                delete to_change.id;
-                            } else {
-                                _.each(partners[0], function (val, key) {
-                                    if (val) {
-                                        to_change[key] = typeof val == "object" && key.match(/_id$/) ? val[0] : val;
-                                    }
-                                });
-                            }
-                        }));
-                    }
-                }));
-            } else {
-                _.each(to_change, function (val, key) {
-                    if (self.field_manager.datarecord[key]) {
-                        to_change[key] = self.field_manager.datarecord[key];
-                    }
-                });
-            }
-            
             return $.when.apply($, defs).then(function () {
                 return to_change;
             });
         },
+        create_or_modify_company_partner: function (entities) {
+            var self = this;
+            var deferrer = $.Deferred();
+            var defs = [];
+            var childs_to_change = [];
+
+            _.each(entities, function (entity, key) {
+                var entity = _.extend(entity, {
+                    '__type': "people",
+                    '__company': entity.universalName,
+                    'parent_id': self.field_manager.datarecord.id || 0
+                });
+                defs.push(self.create_or_modify_partner_change(entity).then(function (to_change) {
+                    childs_to_change[key] = to_change;
+                }));
+            });
+            $.when.apply($, defs).then(function () {
+                new instance.web.DataSetSearch(this, 'res.partner').call("linkedin_check_similar_partner", [entities]).then(function (partners) {
+                    _.each(partners, function (partner, i) {
+                        _.each(partner, function (val, key) {
+                            if (val) {
+                                childs_to_change[i][key] = val;
+                            }
+                        });
+                    });
+                    deferrer.resolve(childs_to_change);
+                });
+            });
+            return deferrer;
+        }
     });
     instance.web.form.widgets.add('linkedin', 'instance.web_linkedin.Linkedin');
     
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 176b0cdfe20..92adb30d3dd 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -65,6 +65,27 @@ class web_linkedin_fields(osv.Model):
             res[partner.id] = partner.linkedin_url
         return res
 
+    def linkedin_check_similar_partner(self, cr, uid, linkedin_datas, context=None):
+        res = []
+        res_partner = self.pool.get('res.partner')
+        for linkedin_data in linkedin_datas:
+            partner_ids = res_partner.search(cr, uid, ["|", ("linkedin_id", "=", linkedin_data['id']), 
+                    "&", ("linkedin_id", "=", False), 
+                    "|", ("name", "ilike", linkedin_data['firstName'] + "%" + linkedin_data['lastName']), ("name", "ilike", linkedin_data['lastName'] + "%" + linkedin_data['firstName'])], context=context)
+            if partner_ids:
+                partner = res_partner.read(cr, uid, partner_ids[0], ["image", "mobile", "phone", "parent_id", "name", "email", "function", "linkedin_id"], context=context)
+                if partner['linkedin_id'] and partner['linkedin_id'] != linkedin_data['id']:
+                    partner.pop('id')
+                if partner['parent_id']:
+                    partner['parent_id'] = partner['parent_id'][0]
+                for key, val in partner.items():
+                    if not val:
+                        partner.pop(key)
+                res.append(partner)
+            else:
+                res.append({})
+        return res
+
     _columns = {
         'linkedin_id': fields.char(string="LinkedIn ID", size=50),
         'linkedin_url': fields.char(string="LinkedIn url", size=100, store=True),

From 8882eca92ec05b354f31de505569783bd368359a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 1 Mar 2013 04:43:47 +0000
Subject: [PATCH 22/22] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130301044347-0g40ffxeii67yxtr
---
 addons/account_analytic_plans/i18n/mk.po | 452 +++++++++++++++
 addons/account_budget/i18n/mk.po         | 422 ++++++++++++++
 addons/account_check_writing/i18n/mk.po  | 230 ++++++++
 addons/account_payment/i18n/mk.po        | 683 +++++++++++++++++++++++
 addons/account_sequence/i18n/mk.po       | 150 +++++
 addons/auth_crypt/i18n/mk.po             |  28 +
 addons/auth_oauth_signup/i18n/mk.po      |  23 +
 addons/auth_openid/i18n/mk.po            |  97 ++++
 addons/document_webdav/i18n/hu.po        |  30 +-
 addons/edi/i18n/hu.po                    |  31 +-
 addons/email_template/i18n/hu.po         | 125 +++--
 addons/event/i18n/hu.po                  | 119 ++--
 addons/event_moodle/i18n/hu.po           | 197 +++++++
 addons/event_sale/i18n/mk.po             |  90 +++
 addons/knowledge/i18n/mk.po              | 118 ++++
 addons/note_pad/i18n/mk.po               |  28 +
 16 files changed, 2696 insertions(+), 127 deletions(-)
 create mode 100644 addons/account_analytic_plans/i18n/mk.po
 create mode 100644 addons/account_budget/i18n/mk.po
 create mode 100644 addons/account_check_writing/i18n/mk.po
 create mode 100644 addons/account_payment/i18n/mk.po
 create mode 100644 addons/account_sequence/i18n/mk.po
 create mode 100644 addons/auth_crypt/i18n/mk.po
 create mode 100644 addons/auth_oauth_signup/i18n/mk.po
 create mode 100644 addons/auth_openid/i18n/mk.po
 create mode 100644 addons/event_moodle/i18n/hu.po
 create mode 100644 addons/event_sale/i18n/mk.po
 create mode 100644 addons/knowledge/i18n/mk.po
 create mode 100644 addons/note_pad/i18n/mk.po

diff --git a/addons/account_analytic_plans/i18n/mk.po b/addons/account_analytic_plans/i18n/mk.po
new file mode 100644
index 00000000000..b4d0f1a7f0b
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/mk.po
@@ -0,0 +1,452 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 18:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Сметка4 Id"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr "Краен датум"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Стапка (%)"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The total should be between %s and %s."
+msgstr "Вкупното треба да биде помеѓу %s и %s"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Аналитички план"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr "Моделот за редистрибуција е зачуван. Може да го користите покасно."
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Печати"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "До датум"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "План ИД"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Име на сметка"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "Процент"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Датум на печатење"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr "Не ги прикажува празните ставки"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "There are no analytic lines related to account %s."
+msgstr "Нема аналитички ставки поврзани со контото %s"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "or"
+msgstr "или"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Аналитичка ставка"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr "100.00%"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Валута"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Аналитичко конто:"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Име на план"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "Записи по подразбирање"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr "Аналитички планови"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr "Проц(%)"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr "Ставки во картица"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "analytic.plan.create.model"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Сметка1 ИД"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Максимално дозволено (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Коренска сметка"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Во ред"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Минимум дозволено (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error!"
+msgstr "Грешка!"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Износ"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error!"
+msgstr "Корисничка грешка!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Аналитички дневник"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Количина"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Код"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Дневник"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Нема аналитичка картица !"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr "analytic.plan.create.model.action"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Секвенца"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Ставка од фактура"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "There is no analytic plan defined."
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Банкарски извод"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Аналитичка сметка"
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model with this name and code already exists."
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Фактура"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Почетен датум"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "на"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ставка од налог за продажба"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Почетен датум"
diff --git a/addons/account_budget/i18n/mk.po b/addons/account_budget/i18n/mk.po
new file mode 100644
index 00000000000..c7dfcbfd8be
--- /dev/null
+++ b/addons/account_budget/i18n/mk.po
@@ -0,0 +1,422 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr "Одговорен корисник"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Потврдено"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
+#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
+msgid "Budgetary Positions"
+msgstr "Буџетски позиции"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Printed at:"
+msgstr "Печатено на:"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Потврди"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr "Валидирај корисник"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Резиме од печатењето"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Крај на период"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Нацрт"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "at"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Currency:"
+msgstr "Валута:"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr "Валидирано"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Процент"
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The Budget '%s' has no accounts!"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr "Опис"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Currency"
+msgstr "Валута"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Вкупно :"
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "до"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr "Ресетирај до нацрт"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr "Планиран износ"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Проц(%)"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Завршено"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Краен датум"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+msgid "Theoritical Amount"
+msgstr "Теоретски износ"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Име"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr "Ставка од буџет"
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr "Буџет"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve Budgets"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Duration"
+msgstr "Времетраење"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr "Овој волшебник се користи печатење на буџет"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Буџети"
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr "Овој волшебник се користи за печатење на резиме на буџети"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Откажано"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr "Одобри"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "За Одобрување"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Буџетска позиција"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr "Почеток на период"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr "Теоретски изн."
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr "Грешка!"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
+msgstr "Печати"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoretical Amount"
+msgstr "Теоретски износ"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "or"
+msgstr "или"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Аналитичко конто"
+
+#. module: account_budget
+#: report:account.budget:0
+msgid "Budget :"
+msgstr "Буџет:"
+
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"<p>\n"
+"                A budget is a forecast of your company's income and/or "
+"expenses\n"
+"                expected for a period in the future. A budget is defined on "
+"some\n"
+"                financial accounts and/or analytic accounts (that may "
+"represent\n"
+"                projects, departments, categories of products, etc.)\n"
+"              </p><p>\n"
+"                By keeping track of where your money goes, you may be less\n"
+"                likely to overspend, and more likely to meet your financial\n"
+"                goals. Forecast a budget by detailing the expected revenue "
+"per\n"
+"                analytic account and monitor its evolution based on the "
+"actuals\n"
+"                realised during that period.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
+msgstr "Планиран изн"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr "Конта"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr "Стафки од буџет"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+#: view:crossovered.budget:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Почетен датум"
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr "Анализа од"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Draft Budgets"
+msgstr "Нацрт буџети"
diff --git a/addons/account_check_writing/i18n/mk.po b/addons/account_check_writing/i18n/mk.po
new file mode 100644
index 00000000000..cd0da726558
--- /dev/null
+++ b/addons/account_check_writing/i18n/mk.po
@@ -0,0 +1,230 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Отворен биланс"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+#: view:account.voucher:0
+msgid "Print Check"
+msgstr "Испечати Чек"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr ""
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+msgid "Print Check (Middle)"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check (Top)"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr ""
diff --git a/addons/account_payment/i18n/mk.po b/addons/account_payment/i18n/mk.po
new file mode 100644
index 00000000000..3373dfa682d
--- /dev/null
+++ b/addons/account_payment/i18n/mk.po
@@ -0,0 +1,683 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a payment order.\n"
+"              </p><p>\n"
+"                A payment order is a payment request from your company to "
+"pay a\n"
+"                supplier invoice or a customer refund.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr "Валута на партнерот"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr "Постави на нацрт"
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Групирај по..."
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Ставки од уплата"
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_id:0
+#: field:payment.mode,company_id:0
+#: field:payment.order,company_id:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: account_payment
+#: model:res.groups,name:account_payment.group_account_payment
+msgid "Accounting / Payments"
+msgstr "Сметководство/Уплати"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr "Бесплатно"
+
+#. module: account_payment
+#: view:payment.order.create:0
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr "Записи"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr "Крајна дата"
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_invoice.py:43
+#, python-format
+msgid ""
+"You cannot cancel an invoice which has already been imported in a payment "
+"order. Remove it from the following payment order : %s."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_invoice.py:43
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error!"
+msgstr "Грешка!"
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Износ"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr "Вкупно во валута на компанијата"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr "Откажано"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Референца"
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr "Дирекно"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr "Ставка од уплата"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr "Износ вкупно"
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the status is 'Draft'.\n"
+" Once the bank is confirmed the status is set to 'Confirmed'.\n"
+" Then the order is paid the status is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr "Потврдено"
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr "Структурирано"
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import Payment Lines"
+msgstr "Увези ставки од уплати"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr "Информации за трансакцијата"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+#: field:payment.order,mode:0
+msgid "Payment Mode"
+msgstr "Начин на плаќање"
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr "Ефективен датум"
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr "Фиксен датум"
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr "Одредишно конто"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr "Одредишно конто"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr "Креирано"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr "Изврши уплата"
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr "Тип на комуникација"
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: field:payment.mode,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr "Ставка од извод"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr "Краен датум"
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr "Износ за плаќање"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr "Валута"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr "Да"
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr "Адреса на главниот партнер"
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "There is no partner defined on the entry line."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr "Тип на плаќање"
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Нацрт"
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+msgid "Payment Lines"
+msgstr "Стафки од уплата"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr "Ставки во картица"
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr "Барај"
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "Responsible"
+msgstr "Одговорен"
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr "Датум на плаќање"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr "Вкупно:"
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr "Износ за плаќање"
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr "Износ во валута на компанијата"
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr "Реф на вактура"
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr "Налог за уплата"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr "Општа информација"
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr "Завршено"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr "Фактура"
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr "Комуникација"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr "Информација"
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+#: view:payment.order:0
+msgid "Payment Order"
+msgstr "Налог за плаќање"
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled Date"
+msgstr "Планиран датум"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr "Дали сте сигурни дека сакате да извршите уплата?"
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr "Дневник"
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr "Банкарска сметка"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr "Потврди плаќања"
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr "Валута на компанијата"
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr "Плаќање"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr "Налог за уплата/Уплата"
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr "Стафка"
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr "Име"
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr "Банкарска сметка"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr "payment.order.create"
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr "Налог"
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr "Вкупно"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr "Изврши уплата"
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred Date"
+msgstr "Префериран датум"
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order.create:0
+msgid "or"
+msgstr "или"
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""
diff --git a/addons/account_sequence/i18n/mk.po b/addons/account_sequence/i18n/mk.po
new file mode 100644
index 00000000000..6073627d2b3
--- /dev/null
+++ b/addons/account_sequence/i18n/mk.po
@@ -0,0 +1,150 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Следен број од оваа секвенца"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Следен број"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Број за зголемување"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Следниот број од секвенцата ќе биде зголемен за овој број"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Конфигурирај"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Ставки во картица"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Внатрешен број"
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Име"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Внатрешна секвенца"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Запис на конто"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Суфикс"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "наслов"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Префикс"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Дневник"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
diff --git a/addons/auth_crypt/i18n/mk.po b/addons/auth_crypt/i18n/mk.po
new file mode 100644
index 00000000000..78ec8e84f97
--- /dev/null
+++ b/addons/auth_crypt/i18n/mk.po
@@ -0,0 +1,28 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 15:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Енкриптирана лозинка"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
+msgid "Users"
+msgstr "Корисници"
diff --git a/addons/auth_oauth_signup/i18n/mk.po b/addons/auth_oauth_signup/i18n/mk.po
new file mode 100644
index 00000000000..765e0488d7c
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/mk.po
@@ -0,0 +1,23 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Корисници"
diff --git a/addons/auth_openid/i18n/mk.po b/addons/auth_openid/i18n/mk.po
new file mode 100644
index 00000000000..1ada24b210f
--- /dev/null
+++ b/addons/auth_openid/i18n/mk.po
@@ -0,0 +1,97 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 15:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
+#, python-format
+msgid "Username"
+msgstr "Корисничко име"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:12
+#: view:res.users:0
+#, python-format
+msgid "OpenID"
+msgstr "OpenID"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:30
+#: field:res.users,openid_url:0
+#, python-format
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:9
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
+#, python-format
+msgid "Google"
+msgstr "Google"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:11
+#, python-format
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:18
+#, python-format
+msgid "Google Apps Domain"
+msgstr "Google Apps Domain"
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID Email"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr "OpenID клуч"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:8
+#, python-format
+msgid "Password"
+msgstr "Лозинка"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
+#, python-format
+msgid "Google Apps"
+msgstr ""
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "Users"
+msgstr "Корисници"
diff --git a/addons/document_webdav/i18n/hu.po b/addons/document_webdav/i18n/hu.po
index ab25a20ed33..45ce76a3696 100644
--- a/addons/document_webdav/i18n/hu.po
+++ b/addons/document_webdav/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-03 13:30+0000\n"
-"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
+"PO-Revision-Date: 2013-02-28 23:29+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:53+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -30,13 +30,13 @@ msgstr "Dokumentumok"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "Dokumentum tulajdonsága"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Dokumentum tulajdonságok keresése"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -44,7 +44,7 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Név helye"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
@@ -65,12 +65,12 @@ msgstr "Csoportosítás..."
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Ezek a tulajdonságok hozzá lesznek adva a WebDAV igényhez"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_file_props_form
 msgid "DAV Properties for Documents"
-msgstr ""
+msgstr "DAV tulajdonságok a dokumetumokhoz"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
@@ -91,7 +91,7 @@ msgstr "WebDAV tulajdonságok"
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
-msgstr ""
+msgstr "DAV tulajdonságok a könyvtárakhoz"
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -127,12 +127,12 @@ msgstr "Könyvtár"
 #: field:document.webdav.dir.property,write_uid:0
 #: field:document.webdav.file.property,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Utolsó módosítást végzó felhasználó"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "Mappa"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
@@ -149,18 +149,18 @@ msgstr "Létrehozó"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "Dokument tulajdonság"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
 msgid "DAV Properties"
-msgstr ""
+msgstr "DAV tuajdonság"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Helyettesítés"
 
 #~ msgid "Error! You can not create recursive Directories."
 #~ msgstr "Hiba! Nem hozhat létre körkörös mappahivatkozást."
diff --git a/addons/edi/i18n/hu.po b/addons/edi/i18n/hu.po
index b7ea301c870..488b25f10a6 100644
--- a/addons/edi/i18n/hu.po
+++ b/addons/edi/i18n/hu.po
@@ -8,58 +8,58 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-26 09:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-02-28 23:24+0000\n"
+"Last-Translator: Attila Tatár <Unknown>\n"
 "Language-Team: Hungarian <hu@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-12-27 05:22+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Az ok:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "A dokumentum sikeresen importálva lett!"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Sajnos a dokumentumot nem lehetett importálni."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Vállalatok"
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_currency
 msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Értesités dokumentum importálásról"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Hiányzó alkalmazás"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -69,19 +69,22 @@ msgid ""
 "You can install it by connecting as the administrator and opening the "
 "configuration assistant."
 msgstr ""
+"Az importálandó dokumentumnak szüksége van az OpenERP '%s' alkalmazására. "
+"Installálhatja, ha administratorként lép be a rendszerbe és megnyitja a "
+"konfiguráció menünpontot."
 
 #. module: edi
 #: code:addons/edi/models/edi.py:47
 #, python-format
 msgid "'%s' is an invalid external ID"
-msgstr ""
+msgstr "'%s' egy érvénytelen külső (xml) azonositó."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI alrendszer"
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index 1bd66d45e91..d0044f70db3 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-02 15:51+0000\n"
-"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
+"PO-Revision-Date: 2013-02-28 23:21+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:57+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -31,24 +31,24 @@ msgstr "Sablon"
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Oldalkeret billentyű az oldalkeret megnyitás művelethez"
 
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Kilép"
 
 #. module: email_template
 #: field:email.template,email_to:0
 #: field:email_template.preview,email_to:0
 msgid "To (Emails)"
-msgstr ""
+msgstr "(E-mailek) eléréséhez"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
 #: field:email_template.preview,mail_server_id:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Kimenő Mail szerver"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -57,6 +57,8 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Oldalkeret művelet ahhoz hogy ez a sablon elérhető legyen az ide vonatkozó "
+"dokumentum modell rekordokon"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -68,12 +70,12 @@ msgstr "Mező"
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Feladók címei (üres mezőket is lehet használni)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove context action"
-msgstr ""
+msgstr "Összefüggés művelet eltávolítása"
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -82,6 +84,8 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Kiegészítő előnyben részesített szerver a kimenő levelekhez. Ha nincs "
+"beállítva, akkor a legmagasabb prioritású lesz használva."
 
 #. module: email_template
 #: field:email.template,report_name:0
@@ -92,7 +96,7 @@ msgstr "Jelentés fájl neve"
 #. module: email_template
 #: view:email.template:0
 msgid "Preview"
-msgstr ""
+msgstr "Előnézet"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -103,7 +107,7 @@ msgstr "Válasz"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use template"
-msgstr ""
+msgstr "Sablon használata"
 
 #. module: email_template
 #: field:email.template,body_html:0
@@ -115,7 +119,7 @@ msgstr "Levéltörzs"
 #: code:addons/email_template/email_template.py:244
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (másolat)"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -124,16 +128,18 @@ msgid ""
 "If checked, the user's signature will be appended to the text version of the "
 "message"
 msgstr ""
+"Ha be van jelölve, akkor a felhasználó aláírása lesz mellékelve az üzenet "
+"szöveges változatához"
 
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP Szerver"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as new template"
-msgstr ""
+msgstr "Mentse mint új sablon"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -142,6 +148,8 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"Ha a kapcsolat mező van kiválasztva mint első mező, akkor ez a mező mutatja "
+"kihez kapcsolódik a dokumentum modell."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
@@ -155,12 +163,15 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Név, amit a létrehozott jelentés fájlhoz használ (üres mezőket is "
+"tartalmazhat)\n"
+"A kiterjesztés elhagyható, a jelentés típusából lesz létrehozva."
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Oldalkeret művelet"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -171,11 +182,15 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"E-amil kiküldésekor választható fordítási nyelv (ISO kód). Ha nincs "
+"beállítva, akkor az angolt használja. Ez általában egy aszóköz kifejezés "
+"kell legyen amely az erre utaló nyelvi kódról gondoskodik, pl. "
+"${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
 msgid "Sample Document"
-msgstr ""
+msgstr "Minta dokumentum"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -185,11 +200,14 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"Az ide vonatkozó dokumentum modellből válasszon cél mezőt.\n"
+"Ha ez egy kapcsolódó mező akkor lehetősége lesz mezőt választani a cél mezőt "
+"a kapcsolat célálomásán."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Value Builder"
-msgstr ""
+msgstr "Dinamikus érték alkotó"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -199,7 +217,7 @@ msgstr "Sablon megtekintése"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Mentse új sablonként"
 
 #. module: email_template
 #: view:email.template:0
@@ -207,33 +225,36 @@ msgid ""
 "Display an option on related documents to open a composition wizard with "
 "this template"
 msgstr ""
+"Jelezzen ki egy lehetőséget a dokumentumokon, ennek a sablonnak az "
+"összeállító varázslójának megnyitásához."
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Másolat címzettek (üres karaktereket is használhat)"
 
 #. module: email_template
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
+"Vesszővel elválasztott címzettek címei ((üres karaktereket is használhat)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced"
-msgstr ""
+msgstr "Haladó"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Preview of"
-msgstr ""
+msgstr "Ennek az előnézete"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Using sample document"
-msgstr ""
+msgstr "Minta dokumentum használata"
 
 #. module: email_template
 #: view:email.template:0
@@ -269,48 +290,51 @@ msgstr "E-mail előnézet"
 msgid ""
 "Remove the contextual action to use this template on related documents"
 msgstr ""
+"Távolítsa el a szöveges műveletet a kapcsolódó dokumentumokon a sablon "
+"használatához"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 #: field:email_template.preview,copyvalue:0
 msgid "Placeholder Expression"
-msgstr ""
+msgstr "Üres mező kifejezés"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 #: field:email_template.preview,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Alárendel-modell"
 
 #. module: email_template
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Tárgy (üres karakterek is használhatók itt)"
 
 #. module: email_template
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
+"Előnyben részesített válasz címek (üres karakterek is használhatók itt)"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
 #: field:email_template.preview,ref_ir_value:0
 msgid "Sidebar Button"
-msgstr ""
+msgstr "Oldal keret nyomógombja"
 
 #. module: email_template
 #: field:email.template,report_template:0
 #: field:email_template.preview,report_template:0
 msgid "Optional report to print and attach"
-msgstr ""
+msgstr "Szabadon választható jelentés nyomtatáshoz vagy mellékletnek"
 
 #. module: email_template
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Szabadon választható érték az üres cél mező kitöltéséhez"
 
 #. module: email_template
 #: view:email.template:0
@@ -320,24 +344,24 @@ msgstr "Modell"
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email összeállító varázsló"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add context action"
-msgstr ""
+msgstr "Összefüggés művelet hozzáadás"
 
 #. module: email_template
 #: help:email.template,model_id:0
 #: help:email_template.preview,model_id:0
 msgid "The kind of document with with this template can be used"
-msgstr ""
+msgstr "A dokumentum típusa amit ezzel a sablonnal használni lehet"
 
 #. module: email_template
 #: field:email.template,email_recipients:0
 #: field:email_template.preview,email_recipients:0
 msgid "To (Partners)"
-msgstr ""
+msgstr "Részére (Partnereknek)"
 
 #. module: email_template
 #: field:email.template,auto_delete:0
@@ -352,17 +376,19 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Utolsó helykitöltő kifejezés, amit a kívánt sablon mezőbe másolás-"
+"beilleszthet"
 
 #. module: email_template
 #: field:email.template,model:0
 #: field:email_template.preview,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Ide vonatkozó dokumentum modell"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addressing"
-msgstr ""
+msgstr "Címzés"
 
 #. module: email_template
 #: help:email.template,email_recipients:0
@@ -370,6 +396,8 @@ msgstr ""
 msgid ""
 "Comma-separated ids of recipient partners (placeholders may be used here)"
 msgstr ""
+"Vesszővel elválasztott átvevő partnerek ID azonosítói )üres helykitöltők is "
+"használhatók itt)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
@@ -381,30 +409,30 @@ msgstr "Mellékletek"
 #: code:addons/email_template/email_template.py:231
 #, python-format
 msgid "Deletion of the action record failed."
-msgstr ""
+msgstr "Sikertelen művelet rekord törlése."
 
 #. module: email_template
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Másolat"
 
 #. module: email_template
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Applies to"
-msgstr ""
+msgstr "Erre is vonatkozik"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 #: field:email_template.preview,sub_model_object_field:0
 msgid "Sub-field"
-msgstr ""
+msgstr "Alárendelt-mező"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Details"
-msgstr ""
+msgstr "E-mail részletek"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:196
@@ -418,12 +446,15 @@ msgid ""
 "If checked, this partner will not receive any automated email notifications, "
 "such as the availability of invoices."
 msgstr ""
+"Ha be van jelölve, akkor ez a partner nem fog automatikus e-mail értesítést "
+"kapni, mint a számlák elérhetősége."
 
 #. module: email_template
 #: help:email.template,auto_delete:0
 #: help:email_template.preview,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Tartósan törli ezt az üzenetet az elküldés után, hely felszabadítása miatt"
 
 #. module: email_template
 #: view:email.template:0
@@ -437,6 +468,9 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"Ha a kapcsolat mező van kiválasztva mint első mező, akkor ez a mező lehetővé "
+"teszi a cél dokumentum modell (alárendelt-modell) közül kiválasztani a cél "
+"mezőt."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:231
@@ -448,18 +482,18 @@ msgstr "Figyelmeztetés"
 #: field:email.template,user_signature:0
 #: field:email_template.preview,user_signature:0
 msgid "Add Signature"
-msgstr ""
+msgstr "Adjon hozzá aláírást"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: email_template
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Alapértelmezett érték"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -468,17 +502,20 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Hozzáadhat fájl mellékletet ehez a sablonhoz, ami minden ezzel a sablonnal "
+"készített levél melléklete lesz."
 
 #. module: email_template
 #: help:email.template,body_html:0
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Az üzenet Rich-text/HTML verziója (üres karakterek is használhatóak itt)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Contents"
-msgstr ""
+msgstr "Tartalmak"
 
 #. module: email_template
 #: field:email.template,subject:0
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index 7f00bba4cd2..400cb69a9a0 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-03 15:08+0000\n"
-"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
+"PO-Revision-Date: 2013-02-28 23:46+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:20+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
 
 #. module: event
 #: view:event.event:0
@@ -25,12 +25,12 @@ msgstr "Saját rendezvények"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Participants"
-msgstr ""
+msgstr "Résztvevő száma"
 
 #. module: event
 #: field:event.event,register_attended:0
 msgid "# of Participations"
-msgstr ""
+msgstr "# résztvevők száma"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -56,6 +56,9 @@ msgid ""
 "enough registrations you are not able to confirm your event. (put 0 to "
 "ignore this rule )"
 msgstr ""
+"Minden rendezvényhez minimum feliratkozási szintet határozhat meg. Ha nincs "
+"elég jelentkező akkor nem igazolhatja vissza az eseményt. (írjon be 0 "
+"értéket ennek a szabálynak a falülírásához)"
 
 #. module: event
 #: field:event.registration,date_open:0
@@ -65,7 +68,7 @@ msgstr "Regisztráció idopontja"
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
-msgstr ""
+msgstr "Esemény típusa"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -77,7 +80,7 @@ msgstr "Bon Jovi Koncert"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,registration_state:0
 msgid "Attended"
-msgstr ""
+msgstr "Meghívott"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -87,7 +90,7 @@ msgstr "Március"
 #. module: event
 #: view:event.registration:0
 msgid "Send Email"
-msgstr ""
+msgstr "E-mail küldése"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -101,22 +104,22 @@ msgstr "Vállalat"
 #: field:event.event,email_confirmation_id:0
 #: field:event.type,default_email_event:0
 msgid "Event Confirmation Email"
-msgstr ""
+msgstr "Eseményt visszaigazoló e-amil"
 
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "Alapértelmzett maximális jelentkező"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Display"
-msgstr ""
+msgstr "Megjelenítés"
 
 #. module: event
 #: field:event.event,register_avail:0
 msgid "Available Registrations"
-msgstr ""
+msgstr "Elérhető jelentkezek"
 
 #. module: event
 #: view:event.registration:0
@@ -127,12 +130,12 @@ msgstr "Rendezvény regisztráció"
 #. module: event
 #: model:ir.module.category,description:event.module_category_event_management
 msgid "Helps you manage your Events."
-msgstr ""
+msgstr "Segítséget nyújt az események/rendezvények szervezéséhez."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Day"
-msgstr ""
+msgstr "Nap"
 
 #. module: event
 #: view:report.event.registration:0
@@ -142,12 +145,12 @@ msgstr "Regisztráció a rendezvényre"
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr ""
+msgstr "Visszaigazolt események."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event Beginning Date"
-msgstr ""
+msgstr "Esemény kezdő dátuma"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -161,12 +164,14 @@ msgstr "Rendezvények elemzése"
 #: help:event.type,default_registration_max:0
 msgid "It will select this default maximum value when you choose this event"
 msgstr ""
+"Ezt a maximum alapértelmezett értéket választja ha ezt az eseményt "
+"kiválasztja"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id_registration:0
 msgid "Register"
-msgstr ""
+msgstr "Regisztráció"
 
 #. module: event
 #: field:event.event,message_ids:0
@@ -190,7 +195,7 @@ msgstr "Regisztrációk"
 #: code:addons/event/event.py:355
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hiba!"
 
 #. module: event
 #: view:event.event:0
@@ -214,7 +219,7 @@ msgstr "Törölt"
 #. module: event
 #: view:event.event:0
 msgid "ticket"
-msgstr ""
+msgstr "jegy"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -225,28 +230,28 @@ msgstr "Verdi-opera"
 #: help:event.event,message_unread:0
 #: help:event.registration,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ha be van jelölve, akkor figyelje az új üzeneteket."
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,registration_state:0
 msgid "Registration State"
-msgstr ""
+msgstr "Jelentkezés állapota"
 
 #. module: event
 #: view:event.event:0
 msgid "tickets"
-msgstr ""
+msgstr "jegyek"
 
 #. module: event
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Hamis"
 
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "Esemény vége dátuma"
 
 #. module: event
 #: help:event.event,message_summary:0
@@ -255,18 +260,20 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"A chettelés összegzést megállítja (üzenetek száma,...). Ez az összegzés "
+"direkt HTML formátumú ahhoz hogy beilleszthető legyen a kanban nézetekbe."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "A jelentkezés visszaigazolt vagy lezárt állapotú"
 
 #. module: event
 #: code:addons/event/event.py:106
 #: code:addons/event/event.py:108
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Figyelem!"
 
 #. module: event
 #: view:event.event:0
@@ -285,6 +292,8 @@ msgstr "Partner"
 #: help:event.type,default_registration_min:0
 msgid "It will select this default minimum value when you choose this event"
 msgstr ""
+"Ezt az alapértelmezett minimum értékel választja ha ez az eseményt lett "
+"kiválasztva"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
@@ -314,23 +323,23 @@ msgstr "Megerősítve"
 #. module: event
 #: view:event.registration:0
 msgid "Participant"
-msgstr ""
+msgstr "Résztvevő"
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "Megerősítés"
 
 #. module: event
 #: view:event.event:0
 msgid "Organized by"
-msgstr ""
+msgstr "Által szervezve"
 
 #. module: event
 #: view:event.event:0
 msgid "Register with this event"
-msgstr ""
+msgstr "Jelentkezés erre az eseményre"
 
 #. module: event
 #: help:event.type,default_email_registration:0
@@ -338,17 +347,19 @@ msgid ""
 "It will select this default confirmation registration mail value when you "
 "choose this event"
 msgstr ""
+"Ez lesz az alapértelmezett jelentkezés visszaigazoló levél érték ha ezt az "
+"eseményt választotta"
 
 #. module: event
 #: view:event.event:0
 msgid "Only"
-msgstr ""
+msgstr "Kizárólag"
 
 #. module: event
 #: field:event.event,message_follower_ids:0
 #: field:event.registration,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Követők"
 
 #. module: event
 #: view:event.event:0
@@ -361,13 +372,13 @@ msgstr "Helyszín"
 #: view:event.registration:0
 #: field:event.registration,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "Új"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -383,12 +394,12 @@ msgstr "E-mail"
 #: code:addons/event/event.py:329
 #, python-format
 msgid "New registration confirmed: %s."
-msgstr ""
+msgstr "Új jelentkezés visszaigazolva: %s."
 
 #. module: event
 #: view:event.event:0
 msgid "Upcoming"
-msgstr ""
+msgstr "Következő"
 
 #. module: event
 #: field:event.registration,create_date:0
@@ -399,7 +410,7 @@ msgstr "Létrehozás dátuma"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Event Responsible"
-msgstr ""
+msgstr "Esemény felelős"
 
 #. module: event
 #: view:event.event:0
@@ -416,17 +427,17 @@ msgstr "Július"
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To Email"
-msgstr ""
+msgstr "Válasz E-mail"
 
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "Visszaigazolt jelentések"
 
 #. module: event
 #: view:event.event:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Kezdő dátum"
 
 #. module: event
 #: view:event.event:0
@@ -446,7 +457,7 @@ msgstr "Rendezvények száma"
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "Felszólalók akik beszédet mondanak az eseményen."
 
 #. module: event
 #: view:event.event:0
@@ -457,12 +468,12 @@ msgstr "Rendezvény törlése"
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "Események megtöltésénak állapota"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Category"
-msgstr ""
+msgstr "Esemény kategória"
 
 #. module: event
 #: field:event.event,register_prospect:0
@@ -472,13 +483,13 @@ msgstr "Meg nem erősített regisztrációk"
 #. module: event
 #: model:ir.actions.client,name:event.action_client_event_menu
 msgid "Open Event Menu"
-msgstr ""
+msgstr "Esemény menü megnyitás"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,event_state:0
 msgid "Event State"
-msgstr ""
+msgstr "Esemény állapota"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -503,7 +514,7 @@ msgstr "December"
 #. module: event
 #: help:event.registration,origin:0
 msgid "Reference of the sales order which created the registration"
-msgstr ""
+msgstr "A jelentkezést létrehozó megrendelésre hivatkozás"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
@@ -514,7 +525,7 @@ msgstr " Tervezett regisztrációk száma"
 #: field:event.event,email_registration_id:0
 #: field:event.type,default_email_registration:0
 msgid "Registration Confirmation Email"
-msgstr ""
+msgstr "Jelentkezés visszaigazoló e-mail"
 
 #. module: event
 #: view:report.event.registration:0
@@ -530,17 +541,17 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Finish Event"
-msgstr ""
+msgstr "Esemény vége"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "A visszaigazoltalan állapotú jelentkezések"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Description"
-msgstr ""
+msgstr "Esemény leírása"
 
 #. module: event
 #: field:event.event,date_begin:0
@@ -550,18 +561,18 @@ msgstr "Kezdő dátum"
 #. module: event
 #: view:event.confirm:0
 msgid "or"
-msgstr ""
+msgstr "vagy"
 
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
-msgstr ""
+msgstr "Jelölje be a négyzetet, ha ez a kapcsolat felszólaló lesz."
 
 #. module: event
 #: code:addons/event/event.py:108
 #, python-format
 msgid "No Tickets Available!"
-msgstr ""
+msgstr "Nincs több jegy!"
 
 #. module: event
 #: help:event.event,state:0
diff --git a/addons/event_moodle/i18n/hu.po b/addons/event_moodle/i18n/hu.po
new file mode 100644
index 00000000000..51abf34f1a1
--- /dev/null
+++ b/addons/event_moodle/i18n/hu.po
@@ -0,0 +1,197 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 08:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with username and password"
+msgstr "Csatlakozás felhasználónévvel és jelszóval"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_moodle_config_wiz
+msgid "event.moodle.config.wiz"
+msgstr "event.moodle.config.wiz"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,server_moodle:0
+msgid ""
+"URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
+"'http://localhost'"
+msgstr ""
+"A moodle tanulási környezet szerver helyének URL elérési útja. Pédául: "
+"'http://127.0.0.1' or 'http://localhost'"
+
+#. module: event_moodle
+#: field:event.registration,moodle_user_password:0
+msgid "Password for Moodle User"
+msgstr "Jelszó a Moodle tanulási környezet felhasználónak"
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_password:0
+msgid "Moodle Password"
+msgstr "Moodle tanulási környezeti jelszó"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Your email '%s' is wrong."
+msgstr "Az '%s' e-mailje hibás."
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with a Token"
+msgstr "Szimbólum tokennel való belépés"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"The easiest way to connect OpenERP with a moodle server is to create a "
+"'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
+"application."
+msgstr ""
+"A legkönnyebb kapcsolódási lehetőség Moodle szerverrel az OpenERP "
+"rendszerhez úgy, hogy egy szimbólum 'tokent' hoz A Moodle-n. Ezt az OpenERP "
+"hitelesítésére lesz használva mint  hitelesített alkalmazás."
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,url:0
+msgid "URL to Moodle Server"
+msgstr "URL a Moodle szerverhez"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,url:0
+msgid "The url that will be used for the connection with moodle in xml-rpc"
+msgstr ""
+"Ezt az url elérési útat az xml-rpc fogja használni a Moodle tanulási "
+"környezet csatlakozására"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_registration
+msgid "Event Registration"
+msgstr "Rendezvény regisztráció"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"Another approach is to create a user for OpenERP in Moodle. If you do so, "
+"make sure that this user has appropriate access rights."
+msgstr ""
+"Másik lehetőség, hogy az OpenERP felhasználót a moodle tanulási környezetből "
+"állítja be. Ha így tesz, akkor győződjön meg, hogy ennek a felhasználónak "
+"megfelelő elérési jogosultságai vannak."
+
+#. module: event_moodle
+#: field:event.registration,moodle_uid:0
+msgid "Moodle User ID"
+msgstr "Moodle tanulási környezet felhasználó  ID azonosítója"
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,server_moodle:0
+msgid "Moodle Server"
+msgstr "Moodle szerver"
+
+#. module: event_moodle
+#: field:event.event,moodle_id:0
+msgid "Moodle ID"
+msgstr "Moodle ID azonosító"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Server"
+msgstr "Szerver"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#: code:addons/event_moodle/event_moodle.py:105
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Error!"
+msgstr "Hiba!"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:105
+#, python-format
+msgid "You must configure your moodle connection."
+msgstr "Be kell állítani a Moodle tanulási környezet csatlakozást."
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_username:0
+#: field:event.registration,moodle_username:0
+msgid "Moodle Username"
+msgstr "Moodle tanulási környezet felhasználó"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+#: model:ir.actions.act_window,name:event_moodle.configure_moodle
+msgid "Configure Moodle"
+msgstr "Moodle tanulási környezet beállítása"
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_token:0
+msgid "Moodle Token"
+msgstr "Moodle tanulási környezet Token"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_username:0
+msgid ""
+"You can also connect with your username that you define when you create a "
+"token"
+msgstr ""
+"A token létrehozásakor létrehozott felhasználó nevével is kapcsolódhat"
+
+#. module: event_moodle
+#: help:event.event,moodle_id:0
+msgid "The identifier of this event in Moodle"
+msgstr "Ennek az eseménynek az azonosítójaa moodle tanulási környezetben"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_token:0
+msgid "Put your token that you created in your moodle server"
+msgstr ""
+"Tegye ide a tokent amit a Moodle tanulási környezet szerveren létrehozott"
+
+#. module: event_moodle
+#: model:ir.ui.menu,name:event_moodle.wizard_moodle
+msgid "Moodle Configuration"
+msgstr "Moodle tanulási környezet beállítás"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "or"
+msgstr "vagy"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#, python-format
+msgid "First configure your moodle connection."
+msgstr "Előszőr állítsa be a Moodle tanulási környezet csatlakozást"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Apply"
+msgstr "Alkalmaz"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_event
+msgid "Event"
+msgstr "Esemény"
diff --git a/addons/event_sale/i18n/mk.po b/addons/event_sale/i18n/mk.po
new file mode 100644
index 00000000000..b67ee31e497
--- /dev/null
+++ b/addons/event_sale/i18n/mk.po
@@ -0,0 +1,90 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "Производ"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sales order line."
+msgstr ""
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Тип на настан"
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr "event_ok"
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "Тип на настан"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr "Техничка обука"
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "Настан"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ставка од налог за продажба"
diff --git a/addons/knowledge/i18n/mk.po b/addons/knowledge/i18n/mk.po
new file mode 100644
index 00000000000..b94f9e712f1
--- /dev/null
+++ b/addons/knowledge/i18n/mk.po
@@ -0,0 +1,118 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Documents"
+msgstr "Документи"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_config_settings
+msgid "knowledge.config.settings"
+msgstr "knowledge.config.settings"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_webdav:0
+msgid ""
+"Access your documents in OpenERP through WebDAV.\n"
+"                This installs the module document_webdav."
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_page:0
+msgid "This installs the module document_page."
+msgstr "Ова го инсталира модулот document_page."
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Колаборативна содржина"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
+#: view:knowledge.config.settings:0
+msgid "Configure Knowledge"
+msgstr "Конфигурирај го Знаење"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Knowledge and Documents Management"
+msgstr "Менаџирање на знаење и документи"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document:0
+msgid ""
+"This is a complete document management system, with: user authentication,\n"
+"                full document search (but pptx and docx are not supported), "
+"and a document dashboard.\n"
+"                This installs the module document."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_page:0
+msgid "Create static web pages"
+msgstr "Креирај статички веб страници"
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_ftp:0
+msgid "Share repositories (FTP)"
+msgstr "Сподели складишта (FTP)"
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document:0
+msgid "Manage documents"
+msgstr "Менаџирај документи"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Apply"
+msgstr "Примени"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Конфигурација"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_ftp:0
+msgid ""
+"Access your documents in OpenERP through an FTP interface.\n"
+"                This installs the module document_ftp."
+msgstr "Пристапи до документите во OpenERP преку FTP интерфејс."
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "or"
+msgstr "или"
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_webdav:0
+msgid "Share repositories (WebDAV)"
+msgstr "Сподели складишта(WebDAV)"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
+msgid "Knowledge"
+msgstr "Знаење"
diff --git a/addons/note_pad/i18n/mk.po b/addons/note_pad/i18n/mk.po
new file mode 100644
index 00000000000..5861eb7a497
--- /dev/null
+++ b/addons/note_pad/i18n/mk.po
@@ -0,0 +1,28 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-28 14:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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: 2013-03-01 04:43+0000\n"
+"X-Generator: Launchpad (build 16514)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Белешка"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Url на бележникот"