From 48f50f9944f72128119d48bea12670899919bcee Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 20 Jul 2012 18:50:03 +0530
Subject: [PATCH 01/18] Adding a rng for label in digram view

bzr revid: dhr@tinyerp.com-20120720132003-kq0ikv9b6ewkasxx
---
 openerp/addons/base/rng/view.rng | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index c583040495b..8f7b2647237 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -184,6 +184,9 @@
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:ref name="node"/>
             <rng:ref name="arrow"/>
+            <rng:oneOrMore>
+                <rng:optional><rng:ref name="label"/></rng:optional>
+            </rng:oneOrMore>
         </rng:element>
     </rng:define>
 

From bf7e2b0e762601f5aa2c54323158585649c3d7ac Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Fri, 20 Jul 2012 18:54:14 +0530
Subject: [PATCH 02/18] Modifying diagram view to set label in diagram header

bzr revid: dhr@tinyerp.com-20120720132414-pdftmig39m3ro93b
---
 addons/web_diagram/static/src/js/diagram.js        | 13 +++++++++++++
 addons/web_diagram/static/src/xml/base_diagram.xml |  1 +
 2 files changed, 14 insertions(+)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index f06e757f7f1..e7e85eea96a 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -51,6 +51,9 @@ instance.web.DiagramView = instance.web.View.extend({
             var action = $(this).data('pager-action');
             self.on_pager_action(action);
         });
+        this.labels = _.filter(this.fields_view.arch.children, function(label){ 
+        	return label.tag == "label" ;
+          });
 
         this.do_update_pager();
 
@@ -104,11 +107,21 @@ instance.web.DiagramView = instance.web.View.extend({
         );
     },
 
+    get_label : function(){
+    	var self = this
+    	var html_label = _.each(self.labels,function(label){
+    		html_label = "<span>" + label.attrs.string + "</span>"
+    		self.$element.find('.oe_diagram_diagram_header').append(html_label)
+    	})
+    	
+    },
+
     on_diagram_loaded: function(record) {
         var id_record = record['id'];
         if(id_record) {
             this.id = id_record;
             this.get_diagram_info();
+            this.get_label();
         }
     },
 
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index 96e32f59648..40a98a59413 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -14,6 +14,7 @@
     </div>
     
     <div class="diagram-container">
+        <div class="oe_diagram_diagram_header"/>
         <div class="oe_diagram_diagram"/>
     </div>
 </t>

From f78dfd6c26830ce066894a8644ec07b661bc8206 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 23 Jul 2012 13:11:11 +0530
Subject: [PATCH 03/18] [IMP]changing span to p and applying css

bzr revid: dhr@tinyerp.com-20120723074111-43n05o11ixpb5kkk
---
 addons/web_diagram/static/src/js/diagram.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index e7e85eea96a..ad3e5e68411 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -110,8 +110,9 @@ instance.web.DiagramView = instance.web.View.extend({
     get_label : function(){
     	var self = this
     	var html_label = _.each(self.labels,function(label){
-    		html_label = "<span>" + label.attrs.string + "</span>"
+    		html_label = "<p>" + label.attrs.string + "</p>"
     		self.$element.find('.oe_diagram_diagram_header').append(html_label)
+    		self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
     	})
     	
     },

From 629d1041661e72361d0f34cc9477e37ae66536c0 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 30 Jul 2012 17:59:44 +0530
Subject: [PATCH 04/18] [IMP]improving code to add label only once on load

bzr revid: dhr@tinyerp.com-20120730122944-tlgjzovqbulbff1x
---
 addons/web_diagram/static/src/js/diagram.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index ad3e5e68411..b3c2a7dcee1 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -109,12 +109,13 @@ instance.web.DiagramView = instance.web.View.extend({
 
     get_label : function(){
     	var self = this
-    	var html_label = _.each(self.labels,function(label){
-    		html_label = "<p>" + label.attrs.string + "</p>"
-    		self.$element.find('.oe_diagram_diagram_header').append(html_label)
-    		self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
-    	})
-    	
+    	if(self.$element.find('.oe_diagram_diagram_header').text() == ""){
+	    	_.each(self.labels,function(label){
+	    		html_label = "<p>" + label.attrs.string + "</p>"
+		    	self.$element.find('.oe_diagram_diagram_header').append(html_label)
+		    	self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
+	    	})
+    	}
     },
 
     on_diagram_loaded: function(record) {

From 23c2f1fd40c4bbe9e9c9fc21c323e0cee327ffa1 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 30 Jul 2012 18:50:49 +0530
Subject: [PATCH 05/18] [IMP]

bzr revid: dhr@tinyerp.com-20120730132049-539qb9l5c4g50864
---
 addons/web_diagram/static/src/js/diagram.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index b3c2a7dcee1..54f02f3cd44 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -109,13 +109,12 @@ instance.web.DiagramView = instance.web.View.extend({
 
     get_label : function(){
     	var self = this
-    	if(self.$element.find('.oe_diagram_diagram_header').text() == ""){
-	    	_.each(self.labels,function(label){
-	    		html_label = "<p>" + label.attrs.string + "</p>"
-		    	self.$element.find('.oe_diagram_diagram_header').append(html_label)
+    	this.$element.find('.oe_diagram_diagram_header > p').remove();
+	    _.each(self.labels,function(label){
+	    	html_label = "<p>" + label.attrs.string + "</p>"
+	    	self.$element.find('.oe_diagram_diagram_header').append(html_label)
 		    	self.$element.find('.oe_diagram_diagram_header > p').css('padding-left','5px')
-	    	})
-    	}
+	    })
     },
 
     on_diagram_loaded: function(record) {

From 246b47602002424c6ec45ed854251e99846d75b9 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 13 Aug 2012 14:45:19 +0530
Subject: [PATCH 06/18] Workflow editor label.

bzr revid: tta@openerp.com-20120813091519-lcxiemc2wojfx2d6
---
 openerp/addons/base/ir/workflow/workflow_view.xml |  3 ++-
 openerp/addons/base/rng/view.rng                  | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index c20eeaed085..084d66f720f 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -41,7 +41,7 @@
       <field name="model">workflow</field>
       <field name="type">diagram</field>
       <field name="arch" type="xml">
-        <diagram string="Workflow Editor">
+        <diagram string="Workflow Editor">          
           <node object="workflow.activity" shape="rectangle:subflow_id!=False" bgcolor="gray:flow_start==True;grey:flow_stop==True">
             <field name="name"/>
             <field name="kind"/>
@@ -55,6 +55,7 @@
             <field name="act_to"/>
             <field name="signal"/>
           </arrow>
+          <label string="When customizing a workflow, be sure you do not modify an existing node or arrow, but rather add new nodes or arrows. If you absolutly need to modify a node or arrow, you can only change fields that are empty or set to the default value. If you don't do that, your customization will be overwrited at the next update or upgrade to a future version of OpenERP."/>
         </diagram>
       </field>
     </record>
diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 8f7b2647237..0d6527e5972 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -181,12 +181,12 @@
 
     <rng:define name="diagram">
         <rng:element name="diagram">
-            <rng:optional><rng:attribute name="string"/></rng:optional>
+            <rng:optional><rng:attribute name="string"/></rng:optional>                                    
             <rng:ref name="node"/>
-            <rng:ref name="arrow"/>
-            <rng:oneOrMore>
-                <rng:optional><rng:ref name="label"/></rng:optional>
-            </rng:oneOrMore>
+            <rng:ref name="arrow"/>            
+            <rng:zeroOrMore>
+                <rng:ref name="label"/>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>
 

From 65ac532462eeac41222ac1e863752c205bdad90d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 17:12:29 +0200
Subject: [PATCH 07/18] darker purple and config view alignment

bzr revid: mit@openerp.com-20120817151229-iuujaaw5aflujgzq
---
 addons/web/static/src/css/base.css  | 40 +++++++++++++++++------------
 addons/web/static/src/css/base.sass | 10 +++++---
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 87a83b4c70e..81e179c8de9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -234,7 +234,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -336,7 +336,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -547,7 +547,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #8a89ba;
+  color: #7c7bad;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -578,7 +578,7 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #8786b7;
+  background: #7c7bad;
   color: #eeeeee;
 }
 .openerp .oe_tags.oe_inline {
@@ -1180,7 +1180,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1202,7 +1202,7 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #8a89ba;
+  background: #7c7bad;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
@@ -1222,7 +1222,7 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #8a89ba;
+  background: #7c7bad;
   border-top: 1px solid lightGray;
   border-bottom: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1235,7 +1235,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1243,7 +1243,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1273,7 +1273,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1314,7 +1314,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1673,7 +1673,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #8786b7;
+  color: #7c7bad;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -1955,7 +1955,7 @@
   padding: 16px 0 48px;
 }
 .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
-  margin: 25px 0 10px 0;
+  margin: 12px 0 8px 0;
 }
 .openerp .oe_form div.oe_form_configuration p {
   color: #aaaaaa;
@@ -1964,6 +1964,12 @@
 .openerp .oe_form div.oe_form_configuration label {
   min-width: 150px;
 }
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label {
+  padding: 2px 0;
+}
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
+  padding: 1px 0;
+}
 .openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
   display: inline-block;
   padding-right: 18px;
@@ -2074,7 +2080,7 @@
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
 .openerp ul.oe_form_steps_clickable li .label {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;
@@ -2155,7 +2161,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 160px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -2187,7 +2193,7 @@
   font-weight: bold;
   font-size: 20px;
   margin: 8px 0px 8px 0px;
-  color: #53637e;
+  color: #7c7bad;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6472f7aaacd..3463a25ad79 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1522,12 +1522,16 @@ $sheet-max-width: 860px
             padding: 16px 0 48px
         div.oe_form_configuration
             div.oe_horizontal_separator 
-                margin: 25px 0 10px 0
+                margin: 12px 0 8px 0
             p
                 color: #aaa
                 max-width: 650px
             label
                 min-width: 150px
+            .oe_form_group_cell_label
+                padding: 2px 0
+            .oe_form_group_cell div div
+                padding: 1px 0
                 
 
     ul.oe_form_steps, ul.oe_form_steps_clickable
@@ -1650,7 +1654,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 160px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1680,7 +1684,7 @@ $sheet-max-width: 860px
         font-weight: bold
         font-size: 20px
         margin: 8px 0px 8px 0px
-        color: #53637e
+        color: $section-title-color
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator

From fff594348ae8ada571b4e9e7e6a0e16b5c306037 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 17:55:51 +0200
Subject: [PATCH 08/18] fixed the 'more' dropdown menu

bzr revid: mit@openerp.com-20120817155551-4eq9lumqderd09rl
---
 addons/web/static/src/css/base.css  | 16 ++++---------
 addons/web/static/src/css/base.sass | 35 +++++++++++++----------------
 addons/web/static/src/js/chrome.js  |  1 +
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 81e179c8de9..c15a37b26f5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1032,14 +1032,6 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_topbar .oe_topbar_item .oe_active {
-  background: #303030;
-  font-weight: bold;
-  color: white;
-  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-}
 .openerp .oe_topbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
@@ -1150,10 +1142,10 @@
   padding: 0;
   margin: 0;
 }
-.openerp .oe_menu li {
+.openerp .oe_menu > li {
   float: left;
 }
-.openerp .oe_menu a {
+.openerp .oe_menu > li > a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -1162,14 +1154,14 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp .oe_menu a:hover {
+.openerp .oe_menu > li > a:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_menu .oe_active {
+.openerp .oe_menu > li > .oe_active {
   background: #303030;
   font-weight: bold;
   color: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3463a25ad79..db56bdbacfa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -810,11 +810,6 @@ $sheet-max-width: 860px
                 background: #303030
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-            .oe_active
-                background: #303030
-                font-weight: bold
-                color: white
-                @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
 
         .oe_topbar_avatar
             width: 24px
@@ -902,25 +897,25 @@ $sheet-max-width: 860px
         float: left
         padding: 0
         margin: 0
-        li
+        > li
             float: left
-        a
-            display: block
-            padding: 5px 10px 7px
-            line-height: 20px
-            height: 20px
-            color: #eee
-            vertical-align: top
-            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            &:hover
+            > a
+                display: block
+                padding: 5px 10px 7px
+                line-height: 20px
+                height: 20px
+                color: #eee
+                vertical-align: top
+                text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+                &:hover
+                    background: #303030
+                    color: white
+                    @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+            > .oe_active
                 background: #303030
+                font-weight: bold
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-        .oe_active
-            background: #303030
-            font-weight: bold
-            color: white
-            @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
     .oe_secondary_menu_section
         font-weight: bold
         margin-left: 8px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ff066c9f425..e28aa97bbf5 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -730,6 +730,7 @@ instance.web.Menu =  instance.web.Widget.extend({
             var $more = $(QWeb.render('Menu.more')),
                 $index = this.$element.find('li').eq(maximum_visible_links - 1);
             $index.after($more);
+            //$('.oe_topbar').append($more);
             $more.find('.oe_menu_more').append($index.next().nextAll());
         }
     },

From e9d39f98a0c9ed6846d07df6323e1be19c9141db Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 19 Aug 2012 00:10:35 +0200
Subject: [PATCH 09/18] [FIX] form field statusbar clean version

bzr revid: al@openerp.com-20120818221035-zue58v11r1qmbcbo
---
 addons/web/static/src/js/view_form.js | 146 +++++++++-----------------
 addons/web/static/src/xml/base.xml    |  30 +-----
 2 files changed, 57 insertions(+), 119 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index f39740863f3..0ef17ac685a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4666,11 +4666,17 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
 
 instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     template: "FieldStatus",
-    clickable: false,
     start: function() {
         this._super();
         this.selected_value = null;
-        this.clickable = !!this.node.attrs.clickable;
+        // backward compatibility
+        this.options.clickable = this.options.clickable || (this.node.attrs || {}).clickable || false;
+        this.options.visible = this.options.visible || (this.node.attrs || {}).statusbar_visible || false;
+        this.loaded = new $.Deferred();
+        if (this.options.clickable) {
+            this.$element.on('click','li',this.on_click_stage);
+        }
+        // TODO move the following into css :after
         if (this.$element.parent().is('header')) {
             this.$element.after('<div class="oe_clear"/>');
         }
@@ -4688,121 +4694,73 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         }
         // trick to be sure all values are loaded in the form, therefore
         // enabling the evaluation of dynamic domains
+        self.selection = [];
         $.async_when().then(function() {
-            return self.render_list();
+            self.get_selection();
         });
+        return this.loaded;
     },
-    /** Get the status list and render them
-     *  to_show: [[identifier, value_to_display]] where
-     *   - identifier = key for a selection, id for a many2one
-     *   - display_val = label that will be displayed
-     *   - ex: [[0, "New"]] (many2one) or [["new", "In Progress"]] (selection)
-     */
-    render_list: function() {
-        var self = this;
-        // get selection values, filter them and render them
-        var selection_done = 
-        this.get_selection().pipe(self.proxy('filter_selection')).pipe(self.proxy('render_elements'));
-    },
-
-    /** Get the selection list to be displayed in the statusbar widget.
+    /** Get the selection and render it
+     *  selection: [[identifier, value_to_display], ...]
      *  For selection fields: this is directly given by this.field.selection
-     *  For many2one fields :
-     *  - perform a search on the relation of the many2one field (given by
-     *    field.relation )
-     *  - get the field domain for the search
-     *    - self.build_domain() gives the domain given by the view or by
-     *      the field
-     *    - if the optional statusbar_fold attribute is set to true, make
-     *      an AND with build_domain to hide all 'fold=true' columns
-     *    - make an OR with current value, to be sure it is displayed,
-     *      with the correct order, even if it is folded
+     *  For many2one fields:  perform a search on the relation of the many2one field
      */
     get_selection: function() {
         var self = this;
         if (this.field.type == "many2one") {
-            this.selection = [];
-            // get fold information from widget
-            var fold = ((this.node.attrs || {}).statusbar_fold || true);
-            // build final domain: if fold option required, add the
-            if (fold == true) {
-                var domain = new instance.web.CompoundDomain(['|'], ['&'], self.build_domain(), [['fold', '=', false]], [['id', '=', self.selected_value]]);
-            } else {
-                var domain = new instance.web.CompoundDomain(['|'], self.build_domain(), [['id', '=', self.selected_value]]);
+            var domain = new instance.web.CompoundDomain(['|'], self.build_domain(), [['id', '=', self.selected_value]]);
+            var ds = new instance.web.DataSetSearch(this, this.field.relation, self.build_context(), domain);
+            ds.read_slice(['name'], {}).done( function (records) {
+                for(var i = 0; i < records.length; i++) {
+                    self.selection.push([records[i].id, records[i].name]);
+                }
+                self.render_elements();
+                self.loaded.resolve();
+            });
+        } else {
+            this.loaded.resolve();
+            // For field type selection filter values according to
+            // statusbar_visible attribute of the field. For example:
+            // statusbar_visible="draft,open".
+            var selection = this.field.selection;
+            console.log(selection);
+            for(var i=0; i< selection.length; i++) {
+                var key = selection[i][0];
+                if(key == this.selected_value || !this.options.visible || this.options.visible.indexOf(key) != -1) {
+                    this.selection.push(selection[i]);
+                }
             }
-            // get a DataSetSearch on the current field relation (ex: crm.lead.stage_id -> crm.case.stage)
-            var model_ext = new instance.web.DataSetSearch(this, this.field.relation, self.build_context(), domain);
-            // fetch selection
-            var read_defer = model_ext.read_slice(['name'], {}).pipe( function (records) {
-                _(records).each(function (record) {
-                    self.selection.push([record.id, record.name]);
-                });
-            });
-        } else {
-            this.selection = this.field.selection;
-            var read_defer = new $.Deferred().resolve();
-        }
-        return read_defer;
-    },
-
-    /** Filters this.selection, according to values coming from the statusbar_visible
-     *  attribute of the field. For example: statusbar_visible="draft,open"
-     *  Currently, the key of (key, label) pairs has to be used in the
-     *  selection of visible items. This feature is not meant to be used
-     *  with many2one fields.
-     */
-    filter_selection: function() {
-        var self = this;
-        var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
-            function(x) { return _.str.trim(x); });
-        shown = _.select(shown, function(x) { return x.length > 0; });
-
-        if (shown.length == 0) {
-            this.to_show = this.selection;
-        } else {
-            this.to_show = _.select(this.selection, function(x) {
-                return _.indexOf(shown, x[0]) !== -1 || x[0] === self.selected_value;
-            });
+            console.log(this.selection);
+            this.render_elements();
         }
     },
-
     /** Renders the widget. This function also checks for statusbar_colors='{"pending": "blue"}'
      *  attribute in the widget. This allows to set a given color to a given
      *  state (given by the key of (key, label)).
      */
     render_elements: function () {
         var self = this;
-        var content = instance.web.qweb.render("FieldStatus.content", {widget: this, _:_});
+        var content = instance.web.qweb.render("FieldStatus.content", {widget: this});
         this.$element.html(content);
-        if (this.clickable) {
-            this.$element.addClass("oe_form_steps_clickable");
-            $('.oe_form_steps_arrow').remove();
-
-            var elemts = this.$element.find('li');
-            _.each(elemts, function(element){
-                $item = $(element);
-                if ($item.attr("data-id") != self.selected_value) {
-                    $item.click(function(event){
-                        var data_id = parseInt($(this).attr("data-id"))
-
-                        return this.view.recursive_save().pipe(exec_action);
-                        self.view.dataset.call('stage_set', [[self.view.datarecord.id],data_id]).then(function() {
-                            return self.view.reload();
-                        });
-                    });
-                }
-            });
-        } else {
-            this.$element.addClass("oe_form_steps");
-        }
         var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
         var color = colors[this.selected_value];
         if (color) {
-            var elem = this.$element.find("li.oe_form_steps_active span");
-            elem.css("color", color);
+            this.$("oe_active").css("color", color);
         }
     },
-    on_click_stage: function () {
+    on_click_stage: function (ev) {
+        var self = this;
+        var $li = $(ev.currentTarget);
+        var val = parseInt($li.data("id"));
+        if (val != self.selected_value) {
+            this.view.recursive_save().then(function() {
+                var change = {};
+                change[self.name] = val;
+                self.view.dataset.write(self.view.datarecord.id, change).then(function() {
+                    self.view.reload();
+                });
+            });
+        }
     },
 });
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f2e022c74e0..c91c156a2c4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1083,33 +1083,13 @@
     </span>
 </t>
 <t t-name="FieldStatus">
-    <ul class="" t-att-style="widget.node.attrs.style"/>
+    <ul t-att-class="widget.options.clickable ? 'oe_form_steps_clickable' : 'oe_form_steps'" t-att-style="widget.node.attrs.style"/>
 </t>
-
-
 <t t-name="FieldStatus.content">
-    <t t-set="size" t-value="widget.to_show.length"/>
-    <t t-foreach="_.range(size)" t-as="i">
-        <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : 'oe_form_steps_inactive'">
-            <div class="oe_form_steps_button" t-att-data-id="widget.to_show[i][0]">
-                <t t-esc="widget.to_show[i][1]"/>
-                <span class="oe_form_steps_arrow">
-                    <span></span>
-                </span>
-                <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
-            </div>
-        </li>
-    </t>
-</t>
-
-
-<t t-name="FieldStatus.content">
-    <t t-set="size" t-value="widget.to_show.length"/>
-    <t t-foreach="_.range(size)" t-as="i">
-        <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_active' : ''" t-att-data-id="widget.to_show[i][0]">
-            <span class="label">
-                <t t-esc="widget.to_show[i][1]"/>
-            </span>
+    <t t-foreach="widget.selection" t-as="i">
+        <li t-att-class="i[0] === widget.selected_value ? 'oe_active' : ''" t-att-data-id="i[0]">
+            <span class="label"><t t-esc="i[1]"/></span>
+            <!-- are you mit ? -->
             <span class="arrow"><span></span></span>
         </li>
     </t>

From d43eb323f12df787e4b317094aceae8f4e04c330 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 19 Aug 2012 00:51:51 +0200
Subject: [PATCH 10/18] [FIX] form field statusbar clickable class

bzr revid: al@openerp.com-20120818225151-y2nymkwwn10uvo7u
---
 addons/web/static/src/js/view_form.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0ef17ac685a..4f3f1c62f13 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4666,12 +4666,15 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
 
 instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     template: "FieldStatus",
-    start: function() {
-        this._super();
-        this.selected_value = null;
-        // backward compatibility
+    init: function(field_manager, node) {
+        this._super(field_manager, node);
         this.options.clickable = this.options.clickable || (this.node.attrs || {}).clickable || false;
         this.options.visible = this.options.visible || (this.node.attrs || {}).statusbar_visible || false;
+        this.selected_value = null;
+    },
+    start: function() {
+        this._super();
+        // backward compatibility
         this.loaded = new $.Deferred();
         if (this.options.clickable) {
             this.$element.on('click','li',this.on_click_stage);

From 7e7c583d24bbb1605f5a48e2e7b470d638e5b65f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 19 Aug 2012 03:06:46 +0200
Subject: [PATCH 11/18] [FIX] web_api example, renamed from web_rpc

bzr revid: al@openerp.com-20120819010646-ujct3dwe9j0pmjq6
---
 addons/{web_rpc => web_api}/__init__.py      |  0
 addons/web_api/__openerp__.py                | 13 +++++
 addons/{web_rpc => web_api}/i18n/es_CR.po    |  0
 addons/{web_rpc => web_api}/i18n/web_rpc.pot |  0
 addons/web_api/static/src/example.html       | 55 ++++++++++++++++++++
 addons/web_rpc/__openerp__.py                | 24 ---------
 addons/web_rpc/static/src/example.html       | 51 ------------------
 7 files changed, 68 insertions(+), 75 deletions(-)
 rename addons/{web_rpc => web_api}/__init__.py (100%)
 create mode 100644 addons/web_api/__openerp__.py
 rename addons/{web_rpc => web_api}/i18n/es_CR.po (100%)
 rename addons/{web_rpc => web_api}/i18n/web_rpc.pot (100%)
 create mode 100644 addons/web_api/static/src/example.html
 delete mode 100644 addons/web_rpc/__openerp__.py
 delete mode 100644 addons/web_rpc/static/src/example.html

diff --git a/addons/web_rpc/__init__.py b/addons/web_api/__init__.py
similarity index 100%
rename from addons/web_rpc/__init__.py
rename to addons/web_api/__init__.py
diff --git a/addons/web_api/__openerp__.py b/addons/web_api/__openerp__.py
new file mode 100644
index 00000000000..efc99afb7a9
--- /dev/null
+++ b/addons/web_api/__openerp__.py
@@ -0,0 +1,13 @@
+{
+    "name" : "OpenERP Web API",
+    "category" : "Hidden",
+    "description":"""Openerp Web API.""",
+    "version" : "2.0",
+    "depends" : ['web'],
+    "installable" : True,
+    'auto_install': False,
+    'js' : [
+    ],
+    'css' : [
+    ],
+}
diff --git a/addons/web_rpc/i18n/es_CR.po b/addons/web_api/i18n/es_CR.po
similarity index 100%
rename from addons/web_rpc/i18n/es_CR.po
rename to addons/web_api/i18n/es_CR.po
diff --git a/addons/web_rpc/i18n/web_rpc.pot b/addons/web_api/i18n/web_rpc.pot
similarity index 100%
rename from addons/web_rpc/i18n/web_rpc.pot
rename to addons/web_api/i18n/web_rpc.pot
diff --git a/addons/web_api/static/src/example.html b/addons/web_api/static/src/example.html
new file mode 100644
index 00000000000..9c920e31fa2
--- /dev/null
+++ b/addons/web_api/static/src/example.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html style="height: 100%"> 
+    <head> 
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
+        <style type="text/css">
+        body {
+            font-family: sans-serif;
+        }
+        pre.run {
+            border: 1px solid black; margin:0;padding:8px;
+        }
+        .result {
+            border: 1px solid black; margin:0;padding:8px;
+        }
+        </style>
+        <title>OpenERP web_api example</title> 
+        <script type="text/javascript" src="/web/webclient/js"></script> 
+        <script type="text/javascript">
+        $(function() {
+            $("body").on('click','button',function(ev){
+                eval($("pre.run").text());
+            });
+        });
+        </script> 
+    </head> 
+    <body>
+        <h1>OpenERP web_api examples</h1>
+        <h2>Example 1: Load the list of defined ir.model <button>Run it !</button></h2>
+        <blockquote>
+        <h3>Code: </h3>
+        <pre>
+&lt;script type="text/javascript" src="/web/webclient/js"&gt;&lt;/script&gt;
+&lt;script type="text/javascript"&gt;
+<pre id="ex1" class="run">
+    var instance = openerp.init(["web"]); // get a new instance
+    instance.session.session_bind(); // bind it to the right hostname
+    instance.session.session_authenticate("trunk", "admin", "admin", false).then(function() {
+        var ds = new instance.web.DataSetSearch(null, "ir.model");
+        ds.read_slice(['name','model'], {}).then(function(models){
+            _.each(models,function(m,i){
+                $("#ex1res").append("&lt;li&gt;" + m.model + " (" + m.name + ") &lt;/li&gt;")
+            });
+        });
+    });
+</pre>&lt;/script&gt;
+        </pre>
+        <h3>Div for output:</h3>
+        <div id="ex1res" class="result">
+        &nbsp;
+        </div>
+        </blockquote>
+        <h2>Help me to complete this examples on <a href="http://bazaar.launchpad.net/~openerp/openerp-web/trunk/view/head:/addons/web_api/static/src/example.html">launchpad</a></h2>
+    </body> 
+</html> 
+
diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py
deleted file mode 100644
index 44946d27cb5..00000000000
--- a/addons/web_rpc/__openerp__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name" : "OpenERP Web Web",
-    "category" : "Hidden",
-    "description":"""Openerp Web Web.""",
-    "version" : "2.0",
-    "depends" : [],
-    "installable" : False,
-    'auto_install': False,
-    'js' : [
-        "../web/static/lib/datejs/date-en-US.js",
-        "../web/static/lib/jquery/jquery-1.6.4.js",
-        "../web/static/lib/json/json2.js",
-        "../web/static/lib/qweb/qweb2.js",
-        "../web/static/lib/underscore/underscore.js",
-        "../web/static/lib/underscore/underscore.string.js",
-        "../web/static/src/js/boot.js",
-        "../web/static/src/js/core.js",
-        "../web/static/src/js/formats.js",
-        "../web/static/src/js/chrome.js",
-        "../web/static/src/js/data.js",
-    ],
-    'css' : [
-    ],
-}
diff --git a/addons/web_rpc/static/src/example.html b/addons/web_rpc/static/src/example.html
deleted file mode 100644
index fb5d12f73e3..00000000000
--- a/addons/web_rpc/static/src/example.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html> 
-<html style="height: 100%"> 
-    <head> 
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 
-        <title>OpenERP web_rpc example</title> 
-        <style type="text/css">
-        pre.run {
-            border: 1px solid black; margin:0;padding:4px;
-        }
-        </style>
-        <script type="text/javascript" src="/base/webclient/js?mods=web_rpc"></script> 
-        <script type="text/javascript">
-        $(function() {
-            $("#ex1but").bind("click",function(){
-                eval($("#ex1").text());
-            });
-        });
-        </script> 
-    </head> 
-    <body>
-        <h1>OpenERP web_rpc examples</h1>
-        <h2>Example 1: Display a list of defined ir.model <button id="ex1but">Run it !</button> </h2>
-        <h3>Code: </h3>
-        <pre>
-&lt;script type="text/javascript" src="/base/webclient/js?mods=web_rpc"&gt;&lt;/script&gt; 
-&lt;script type="text/javascript"&gt;
-<pre id="ex1" class="run">
-    var c = openerp.init(); // get a new webclient
-    c._modules_loaded = true; // Hack to prevent loading of additional modules
-
-    var s = new c.base.Session(); // setup a Session
-    s.login("web-trunk", "admin", "admin", function() {
-
-            var ds = new c.base.DataSetSearch(s, "ir.model"); // DataSetSearch used to search, read
-            ds.read_slice(['name','model'], {}, function(users){
-                for(var i in users) { 
-                    $("#ex1res").append("&lt;li&gt;" + users[i].model + " (" + users[i].name + ") &lt;/li&gt;")
-                }
-            });
-        }
-    );
-</pre>&lt;/script&gt;
-        </pre>
-        <h3>Div for output:</h3>
-        <div id="ex1res" style="border: 1px solid black;">
-        &nbsp;
-        </div>
-        <h2>Help me to complete this example page on <a href="http://bazaar.launchpad.net/~openerp/openerp-web/trunk/view/head:/addons/web_rpc/static/src/example.html">launchpad</a></h2>
-    </body> 
-</html> 
-

From 0b639b586b12d38065c092ba96f2db3e5cc1c6ec Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 20 Aug 2012 13:02:07 +0200
Subject: [PATCH 12/18] [FIX] account_voucher: supplier payment in
 multi-currency. Accounting entries generation fixed

bzr revid: qdp-launchpad@openerp.com-20120820110207-w2sow7o2rmpbqykl
---
 addons/account_voucher/account_voucher.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 1287c7b3c18..223705af85e 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1106,7 +1106,8 @@ class account_voucher(osv.osv):
                         # otherwise we use the rates of the system (giving the voucher date in the context)
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
                 if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
-                    foreign_currency_diff = line.move_line_id.amount_residual_currency + amount_currency
+                    sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                    foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)

From 1450ebd8476d81a5b3a4181a4526c280d85294a7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 20 Aug 2012 13:50:42 +0200
Subject: [PATCH 13/18] [FIX] base: restored translations for label 'VAT'
 changed into 'TIN' in revision 4344

bzr revid: qdp-launchpad@openerp.com-20120820115042-13epfxw99vzvumer
---
 openerp/addons/base/i18n/ab.po       | 4 ++--
 openerp/addons/base/i18n/af.po       | 4 ++--
 openerp/addons/base/i18n/am.po       | 4 ++--
 openerp/addons/base/i18n/ar.po       | 4 ++--
 openerp/addons/base/i18n/base.pot    | 4 ++--
 openerp/addons/base/i18n/bg.po       | 4 ++--
 openerp/addons/base/i18n/bs.po       | 4 ++--
 openerp/addons/base/i18n/ca.po       | 4 ++--
 openerp/addons/base/i18n/cs.po       | 4 ++--
 openerp/addons/base/i18n/da.po       | 4 ++--
 openerp/addons/base/i18n/de.po       | 4 ++--
 openerp/addons/base/i18n/el.po       | 4 ++--
 openerp/addons/base/i18n/en_GB.po    | 4 ++--
 openerp/addons/base/i18n/es.po       | 4 ++--
 openerp/addons/base/i18n/es_AR.po    | 4 ++--
 openerp/addons/base/i18n/es_CL.po    | 4 ++--
 openerp/addons/base/i18n/es_CR.po    | 6 +++---
 openerp/addons/base/i18n/es_EC.po    | 4 ++--
 openerp/addons/base/i18n/et.po       | 4 ++--
 openerp/addons/base/i18n/eu.po       | 4 ++--
 openerp/addons/base/i18n/fa.po       | 4 ++--
 openerp/addons/base/i18n/fa_AF.po    | 4 ++--
 openerp/addons/base/i18n/fi.po       | 4 ++--
 openerp/addons/base/i18n/fr.po       | 4 ++--
 openerp/addons/base/i18n/gl.po       | 4 ++--
 openerp/addons/base/i18n/gu.po       | 4 ++--
 openerp/addons/base/i18n/he.po       | 4 ++--
 openerp/addons/base/i18n/hr.po       | 4 ++--
 openerp/addons/base/i18n/hu.po       | 4 ++--
 openerp/addons/base/i18n/hy.po       | 4 ++--
 openerp/addons/base/i18n/id.po       | 4 ++--
 openerp/addons/base/i18n/is.po       | 4 ++--
 openerp/addons/base/i18n/it.po       | 4 ++--
 openerp/addons/base/i18n/ja.po       | 4 ++--
 openerp/addons/base/i18n/ka.po       | 4 ++--
 openerp/addons/base/i18n/kk.po       | 4 ++--
 openerp/addons/base/i18n/ko.po       | 4 ++--
 openerp/addons/base/i18n/lt.po       | 4 ++--
 openerp/addons/base/i18n/lt_LT.po    | 2 +-
 openerp/addons/base/i18n/lv.po       | 4 ++--
 openerp/addons/base/i18n/mk.po       | 4 ++--
 openerp/addons/base/i18n/mn.po       | 4 ++--
 openerp/addons/base/i18n/nb.po       | 4 ++--
 openerp/addons/base/i18n/nl.po       | 4 ++--
 openerp/addons/base/i18n/nl_BE.po    | 4 ++--
 openerp/addons/base/i18n/nl_NL.po    | 2 +-
 openerp/addons/base/i18n/pl.po       | 4 ++--
 openerp/addons/base/i18n/pt.po       | 4 ++--
 openerp/addons/base/i18n/pt_BR.po    | 6 +++---
 openerp/addons/base/i18n/ro.po       | 4 ++--
 openerp/addons/base/i18n/ru.po       | 4 ++--
 openerp/addons/base/i18n/sk.po       | 4 ++--
 openerp/addons/base/i18n/sl.po       | 4 ++--
 openerp/addons/base/i18n/sq.po       | 4 ++--
 openerp/addons/base/i18n/sr.po       | 4 ++--
 openerp/addons/base/i18n/sr@latin.po | 4 ++--
 openerp/addons/base/i18n/sv.po       | 4 ++--
 openerp/addons/base/i18n/th.po       | 4 ++--
 openerp/addons/base/i18n/tlh.po      | 4 ++--
 openerp/addons/base/i18n/tr.po       | 4 ++--
 openerp/addons/base/i18n/uk.po       | 4 ++--
 openerp/addons/base/i18n/uk_UA.po    | 2 +-
 openerp/addons/base/i18n/ur.po       | 4 ++--
 openerp/addons/base/i18n/vi.po       | 4 ++--
 openerp/addons/base/i18n/zh_CN.po    | 4 ++--
 openerp/addons/base/i18n/zh_HK.po    | 4 ++--
 openerp/addons/base/i18n/zh_TW.po    | 4 ++--
 67 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index e7888a8a720..5f5c450592a 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 4f2dd5fb776..597bf9ab330 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -3653,7 +3653,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9864,7 +9864,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 1ccb028cac0..4627d531674 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 1a2642d9e1f..8b2dbeb7c2e 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -3721,7 +3721,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ضريبة القيمة المضافة"
 
 #. module: base
@@ -9975,7 +9975,7 @@ msgstr "الأسابيع"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot
index b4d28052ba8..884dac7d821 100644
--- a/openerp/addons/base/i18n/base.pot
+++ b/openerp/addons/base/i18n/base.pot
@@ -3383,7 +3383,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9064,7 +9064,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index ab9556f269c..2bb32e19c40 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -3705,7 +3705,7 @@ msgstr "Проверка на EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ДДС"
 
 #. module: base
@@ -9961,7 +9961,7 @@ msgstr "Седмици"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 778679bb04d..97e44c61523 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -3642,7 +3642,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9853,7 +9853,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index fa5f95b14da..340ddb494f5 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -3757,7 +3757,7 @@ msgstr "Verificació EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "CIF/NIF"
 
 #. module: base
@@ -10082,7 +10082,7 @@ msgstr "Setmanes"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 4819a321dda..79939664d5c 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -3787,7 +3787,7 @@ msgstr "Kontrola Ean"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "DIČ"
 
 #. module: base
@@ -10090,7 +10090,7 @@ msgstr "Týdnů"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "DPH: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 2710b5c4629..854dd6e6293 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Moms"
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr "Uger"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 9db01f56eb0..017a2d48b6b 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -4266,7 +4266,7 @@ msgstr "EAN Prüfung"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "USt-IdNr. / UID"
 
 #. module: base
@@ -10907,7 +10907,7 @@ msgstr "Wochen"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "UID: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 7a9c9db6811..f8975ee4dad 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -3728,7 +3728,7 @@ msgstr "Έλεγχος ean"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ΦΠΑ"
 
 #. module: base
@@ -9997,7 +9997,7 @@ msgstr "Εβδομάδες"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index d7bc4f79bbf..259f120278d 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -4123,7 +4123,7 @@ msgstr "Ean check"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "VAT"
 
 #. module: base
@@ -10427,7 +10427,7 @@ msgstr "Weeks"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index ef47237de9f..2c3cc3414af 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -3977,7 +3977,7 @@ msgstr "Verificación EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "CIF/NIF"
 
 #. module: base
@@ -10306,7 +10306,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index fdc9c0340dd..b36b88a179a 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -3668,7 +3668,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "CUIT"
 
 #. module: base
@@ -9900,7 +9900,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 9c200b406c5..d484cdd7f94 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -3795,7 +3795,7 @@ msgstr "Verificación EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "RUT"
 
 #. module: base
@@ -10124,7 +10124,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index a5124cc2596..3eaeea2e0b0 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -1975,7 +1975,7 @@ msgstr ""
 "``BE0477472701``\n"
 "será validado con la normativa belga.\n"
 "\n"
-"Hay dos niveles diferentes de validación del número de VAT: \n"
+"Hay dos niveles diferentes de validación del número de TIN: \n"
 "\n"
 "*Por defecto, un simple fuera de linea de verificación se realiza mediante "
 "la validación conocida\n"
@@ -4391,7 +4391,7 @@ msgstr "Verificación EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "CIF/NIF"
 
 #. module: base
@@ -12421,7 +12421,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "IVA: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 9a8ee789f45..233214a8b3f 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -3971,7 +3971,7 @@ msgstr "Ean de verificación"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "CIF/NIF"
 
 #. module: base
@@ -10350,7 +10350,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "IVA "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 92461a33610..164dbde7e9b 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -3665,7 +3665,7 @@ msgstr "Ean kontroll"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Käibemaks"
 
 #. module: base
@@ -9890,7 +9890,7 @@ msgstr "Nädalad"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index cac59f27002..16081128c30 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 74885636856..fc9e0b5910a 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -3667,7 +3667,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "مالیات بر ارزش افزوده"
 
 #. module: base
@@ -9894,7 +9894,7 @@ msgstr "هفته‌ها"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 99a346be694..86d22d26b10 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index c2de09b902d..6cf9e4d0979 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -3751,7 +3751,7 @@ msgstr "EAN tarkistus"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ALV"
 
 #. module: base
@@ -10091,7 +10091,7 @@ msgstr "Viikot"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "ALV: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 3f755a59d14..4849ed703f7 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -4371,7 +4371,7 @@ msgstr "Vérification EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "TVA"
 
 #. module: base
@@ -11707,7 +11707,7 @@ msgstr "Semaines"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "TVA: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index 91ac9510620..bce4cfa8d20 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -3757,7 +3757,7 @@ msgstr "comprobar EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "IVE"
 
 #. module: base
@@ -10069,7 +10069,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 91597862bf5..91a923c6c5b 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -3692,7 +3692,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9903,7 +9903,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 967b11c89a0..51dc0b68178 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -3654,7 +3654,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "מע\"מ"
 
 #. module: base
@@ -9877,7 +9877,7 @@ msgstr "שבועות"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index e50c21bd73c..da97294a878 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -3784,7 +3784,7 @@ msgstr "Provjera Ean"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "PDV"
 
 #. module: base
@@ -10050,7 +10050,7 @@ msgstr "Tjedni"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "PDV "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index d98ee515473..94525dfaff2 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -3744,7 +3744,7 @@ msgstr "EAN ellenőrzés"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Közösségi/nemzetközi adószám"
 
 #. module: base
@@ -10063,7 +10063,7 @@ msgstr "Hetek"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 2c5ed383c32..8d3072b598f 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index de2d31683ee..f71c65e63e8 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -3638,7 +3638,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9849,7 +9849,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index bab1f557502..d84c81ee518 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -3668,7 +3668,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "VSK"
 
 #. module: base
@@ -9880,7 +9880,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index e1f369680a2..8b33bb7a1e7 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -3807,7 +3807,7 @@ msgstr "Verifica EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Partita IVA"
 
 #. module: base
@@ -10132,7 +10132,7 @@ msgstr "Settimane"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 35382f62daa..a3fe9843e4e 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -4131,7 +4131,7 @@ msgstr "EANチェック"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "VAT（Value Added Tax）"
 
 #. module: base
@@ -11571,7 +11571,7 @@ msgstr "週"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index a7a4c233c3c..9edba583232 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -4267,7 +4267,7 @@ msgstr "EAN-ის შემოწმება"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "დღგ"
 
 #. module: base
@@ -11688,7 +11688,7 @@ msgstr "კვირეები"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "დღგ: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index 09a985213b8..bffba2e7eb6 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr "апта"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index b66cb25933e..95a91eb27cb 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -3681,7 +3681,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "부가세"
 
 #. module: base
@@ -9906,7 +9906,7 @@ msgstr "주"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index eb59a102506..fd31f08f45d 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -3646,7 +3646,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "PVM"
 
 #. module: base
@@ -9877,7 +9877,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt_LT.po b/openerp/addons/base/i18n/lt_LT.po
index 13846af119e..be05dc522d1 100644
--- a/openerp/addons/base/i18n/lt_LT.po
+++ b/openerp/addons/base/i18n/lt_LT.po
@@ -4533,7 +4533,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 0a83e177d06..ddffb721e47 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -3678,7 +3678,7 @@ msgstr "EAN pārbaude"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "PVN"
 
 #. module: base
@@ -9919,7 +9919,7 @@ msgstr "Nedēļas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 3414ae7063c..c83e232dc72 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -3645,7 +3645,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9856,7 +9856,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index c80aa9afb14..3dfce8aabd9 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -4166,7 +4166,7 @@ msgstr "Зур.код чеклэх"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "НӨАТ"
 
 #. module: base
@@ -11762,7 +11762,7 @@ msgstr "7 хоног"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "НӨАТ: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 1542c677529..fc9ab46d995 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -3686,7 +3686,7 @@ msgstr "Ean sjekk"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "MVA"
 
 #. module: base
@@ -9926,7 +9926,7 @@ msgstr "Uker"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 45560f7e363..ba5b8b3cd07 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -3863,7 +3863,7 @@ msgstr "Ean controle"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "BTW"
 
 #. module: base
@@ -10292,7 +10292,7 @@ msgstr "Weken"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "BTW: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index cf2cc84f2fd..d7f03b217f4 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -3649,7 +3649,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9860,7 +9860,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_NL.po b/openerp/addons/base/i18n/nl_NL.po
index bfb371faf05..267b058bfef 100644
--- a/openerp/addons/base/i18n/nl_NL.po
+++ b/openerp/addons/base/i18n/nl_NL.po
@@ -4711,7 +4711,7 @@ msgstr "html"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "BTW"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index b0e489d3b03..a58a4b07acc 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -3730,7 +3730,7 @@ msgstr "Sprawdzanie EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "NIP"
 
 #. module: base
@@ -10025,7 +10025,7 @@ msgstr "Tygodni"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "NIP: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index b60b9b98d76..ef27a385d12 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -3959,7 +3959,7 @@ msgstr "Verificar EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "IVA"
 
 #. module: base
@@ -10340,7 +10340,7 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "IVA: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 97cbcce0eb6..01db31d7ebe 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -4164,7 +4164,7 @@ msgstr "Verificar EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Imposto"
 
 #. module: base
@@ -10849,8 +10849,8 @@ msgstr "Semanas"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
-msgstr "VAT: "
+msgid "TIN: "
+msgstr "TIN: "
 
 #. module: base
 #: model:res.country,name:base.af
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index f079b8bd10a..aa7d5de6a86 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -4363,7 +4363,7 @@ msgstr "Verificati codul EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "TVA"
 
 #. module: base
@@ -12351,7 +12351,7 @@ msgstr "Saptamani"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "TVA: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index c3ba2f63acd..d879ea9fefc 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -3811,7 +3811,7 @@ msgstr "Проверка кода Ean"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ИНН"
 
 #. module: base
@@ -10154,7 +10154,7 @@ msgstr "Недели"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 94ee24e819d..d1da2e46b6d 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -3712,7 +3712,7 @@ msgstr "Ean kontrola"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "DPH"
 
 #. module: base
@@ -9991,7 +9991,7 @@ msgstr "Týždne"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index f9eeb1456c2..8a800c2d8ea 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -3741,7 +3741,7 @@ msgstr "Preveri ean"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "DDV"
 
 #. module: base
@@ -10047,7 +10047,7 @@ msgstr "Tedni"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index b1f0478ed8a..735a237fbed 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -3633,7 +3633,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9844,7 +9844,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index e8c74060cc3..a1d444c03b0 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -3710,7 +3710,7 @@ msgstr "EAN provera"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "PDV"
 
 #. module: base
@@ -9975,7 +9975,7 @@ msgstr "Nedelje"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 5c187aeec8b..2632130f415 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -4309,7 +4309,7 @@ msgstr "EAN provera"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "PDV"
 
 #. module: base
@@ -11242,7 +11242,7 @@ msgstr "Nedelje"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "PDV: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 2e9ff2e0539..ba4f6334f63 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -3952,7 +3952,7 @@ msgstr "EAN kontroll"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Moms"
 
 #. module: base
@@ -10426,7 +10426,7 @@ msgstr "Veckor"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "Moms: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index df20f7a2adc..2e53f3a9734 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 805035cf850..58b349f8bbd 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -3633,7 +3633,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9844,7 +9844,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index b6670894b5c..9d54b0aed7e 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -3773,7 +3773,7 @@ msgstr "EAN kontrolü"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "KDV"
 
 #. module: base
@@ -10097,7 +10097,7 @@ msgstr "Hafta"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "VNO: "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 79d5db6ef59..8310cd833ce 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -3669,7 +3669,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ПДВ"
 
 #. module: base
@@ -9893,7 +9893,7 @@ msgstr "Тижні"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/uk_UA.po b/openerp/addons/base/i18n/uk_UA.po
index 8263fde5c5e..8a8f1d3613f 100644
--- a/openerp/addons/base/i18n/uk_UA.po
+++ b/openerp/addons/base/i18n/uk_UA.po
@@ -4551,7 +4551,7 @@ msgstr "html"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "ПДВ"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 4239bc2adf3..c48f39785d1 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 0255aaf2f57..51c018a9672 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -3661,7 +3661,7 @@ msgstr "Kiểm tra EAN"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "Thuế GTGT"
 
 #. module: base
@@ -9878,7 +9878,7 @@ msgstr "Tuần"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index ee0f43d8372..3cf1f1365fb 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -4032,7 +4032,7 @@ msgstr "条码检查"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "增值税"
 
 #. module: base
@@ -10638,7 +10638,7 @@ msgstr "周"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr "增值税： "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 96313cd3e58..216a05705bb 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -3634,7 +3634,7 @@ msgstr ""
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr ""
 
 #. module: base
@@ -9845,7 +9845,7 @@ msgstr ""
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index a4804f29e56..aad1201ccfa 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -3639,7 +3639,7 @@ msgstr "Ean 檢查"
 
 #. module: base
 #: field:res.partner,vat:0
-msgid "VAT"
+msgid "TIN"
 msgstr "增值稅"
 
 #. module: base
@@ -9858,7 +9858,7 @@ msgstr "週"
 #. module: base
 #: code:addons/base/res/res_company.py:157
 #, python-format
-msgid "VAT: "
+msgid "TIN: "
 msgstr ""
 
 #. module: base

From 2501b06ca0dec18c98f2b9d73b64a7b0aebe13e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 20 Aug 2012 14:22:43 +0200
Subject: [PATCH 14/18] [IMP] removed left and top bar from printing

bzr revid: fva@openerp.com-20120820122243-z9wtrkpb2ub79enf
---
 addons/web/static/src/css/base.css  | 41 ++++++++++++++++-------------
 addons/web/static/src/css/base.sass |  4 +++
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 87a83b4c70e..2276bb2445e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -64,6 +64,11 @@
   }
 }
 
+@media print {
+  .oe_topbar, .oe_leftbar, .oe_loading {
+    display: none !important;
+  }
+}
 .openerp.openerp_webclient_container {
   height: 100%;
   position: relative;
@@ -234,7 +239,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -336,7 +341,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -547,7 +552,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #8a89ba;
+  color: #7c7bad;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -578,7 +583,7 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #8786b7;
+  background: #7c7bad;
   color: #eeeeee;
 }
 .openerp .oe_tags.oe_inline {
@@ -1007,7 +1012,7 @@
 .openerp .oe_topbar {
   width: 100%;
   height: 31px;
-  border-top: solid 1px #d3d3d3;
+  border-top: solid 1px lightgrey;
   background-color: #646060;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
   background-image: -webkit-linear-gradient(top, #646060, #262626);
@@ -1180,7 +1185,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1202,11 +1207,11 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #8a89ba;
+  background: #7c7bad;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1222,9 +1227,9 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #8a89ba;
-  border-top: 1px solid lightGray;
-  border-bottom: 1px solid lightGray;
+  background: #7c7bad;
+  border-top: 1px solid lightgrey;
+  border-bottom: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1235,7 +1240,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1243,7 +1248,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1273,7 +1278,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1314,7 +1319,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1673,7 +1678,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #8786b7;
+  color: #7c7bad;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -2074,7 +2079,7 @@
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
 .openerp ul.oe_form_steps_clickable li .label {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;
@@ -2174,7 +2179,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6472f7aaacd..653adad7813 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -142,6 +142,10 @@ $sheet-max-width: 860px
         opacity: 1
 // }}}
 
+@media print
+    .oe_topbar, .oe_leftbar, .oe_loading
+        display: none !important
+
 .openerp.openerp_webclient_container
     height: 100%
     position: relative

From 8d1836bd30f8d06b2da6e36c8b34d250b73847b0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Aug 2012 11:30:00 +0200
Subject: [PATCH 15/18] [IMP] improved loading messages

bzr revid: nicolas.vanhoren@openerp.com-20120821093000-4jf6lh7a8o124hsd
---
 addons/web/static/src/js/coresetup.js | 25 +++++++++++++++++++++++++
 addons/web/static/src/xml/base.xml    |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 229a82a1784..a34a7dadd30 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -528,6 +528,14 @@ if ($.blockUI) {
     $.blockUI.defaults.css["background-color"] = '';
 }
 
+var messages_by_seconds = [
+    [0, "Loading..."],
+    [30, "Still Loading..."],
+    [60, "Still Loading...<br />Please be patient."],
+    [120, "Hey, guess what?<br />It's still loading."],
+    [300, "You may not believe it,<br/>but the application is actually loading..."],
+];
+
 instance.web.Throbber = instance.web.Widget.extend({
     template: "Throbber",
     start: function() {
@@ -548,6 +556,23 @@ instance.web.Throbber = instance.web.Widget.extend({
           left: 'auto' // Left position relative to parent in px
         };
         this.spin = new Spinner(opts).spin(this.$element[0]);
+        this.start_time = new Date().getTime();
+        this.act_message();
+    },
+    act_message: function() {
+        var self = this;
+        setTimeout(function() {
+            if (self.isDestroyed())
+                return;
+            var seconds = (new Date().getTime() - self.start_time) / 1000;
+            var mes;
+            _.each(messages_by_seconds, function(el) {
+                if (seconds >= el[0])
+                    mes = el[1];
+            });
+            self.$(".oe_throbber_message").html(mes);
+            self.act_message();
+        }, 1000);
     },
     destroy: function() {
         if (this.spin)
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c91c156a2c4..330a5b3928f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1736,7 +1736,7 @@
         <div class="oe_blockui_spin" style="height: 50px">
         </div>
         <br />
-        <div style="color:white">Loading...</div>
+        <div class="oe_throbber_message" style="color:white"></div>
     </div>
 </t>
 </templates>

From 0fdded4d4e8dd77ec8ee1739bbb97f20f0a8b557 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 21 Aug 2012 12:44:03 +0200
Subject: [PATCH 16/18] [IMP] minor improvement in linkedin module

bzr revid: nicolas.vanhoren@openerp.com-20120821104403-qbmv0tjyngauwfou
---
 addons/web_linkedin/static/src/js/linkedin.js   | 1 +
 addons/web_linkedin/static/src/xml/linkedin.xml | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index c15b995bff9..5bcb03aab33 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -270,6 +270,7 @@ openerp.web_linkedin = function(instance) {
         template: "LinkedIn.KeyWizard", 
         init: function(parent, text) {
             this._super(parent, {title:_t("LinkedIn API Key")});
+            this.api_domain = window.location.origin;
         },
         start: function() {
             this._super();
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 0d062e6fd8c..f114fa53803 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -41,8 +41,7 @@
                 <li>Log into LinkedIn.</li>
                 <li>Add a new application and fill the form:
                     <ul>
-                        <li>JavaScript API Domain is Your domain name (e.g. https://yourcompany.my.openerp.com)</li>
-                        <li>You can give multiple domain (e.g. yourcompany.my.openerp.com)</li>
+                        <li>JavaScript API Domain: <t t-esc="widget.api_domain"/></li>
                         <li>The programming tool is Javascript</li>
                     </ul>
                 </li>

From 552f5f8ef4b97bdd030f59f96763c821a36f5287 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 12:51:13 +0200
Subject: [PATCH 17/18] [FIX] add a missing dependence

bzr revid: abo@openerp.com-20120821105113-u7bty92d2lfea8q5
---
 addons/portal/__openerp__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 84a3b562133..84091a54347 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -25,6 +25,7 @@
     'depends' : [
         'base',
         'share',
+        'auth_anonymous',
         'auth_signup',
     ],
     'author' : 'OpenERP SA',
@@ -45,8 +46,8 @@ very handy when used in combination with the module 'share'.
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',
-        'portal_view.xml',
         'portal_data.xml',
+        'portal_view.xml',
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
     ],

From c06c6930718807781bc45052d2bea6cd0765abbb Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Tue, 21 Aug 2012 13:01:35 +0200
Subject: [PATCH 18/18] [IMP] organization of views and data

bzr revid: abo@openerp.com-20120821110135-12mud78ddjwhmd8c
---
 addons/portal/portal_data.xml | 23 ++---------------------
 addons/portal/portal_view.xml | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 58f2fc3e9d4..ddfb4cc6729 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="portal" model="res.portal">
             <field name="name">Portal</field>
@@ -10,7 +10,7 @@
 
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news feed</field>
+            <field name="name">Company's news</field>
         </record>
 
         <record id="action_news" model="ir.actions.act_window">
@@ -32,24 +32,5 @@
             <field name="view_mode">form</field>
         </record>
 
-        <!-- Top menu item -->
-        <menuitem name="Portal"
-            id="portal_menu"
-            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
-            sequence="20"/>
-
-            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
-            <!--
-                Create menu items that we'll leave empty for now - they'll be
-                filled up by other portal modules.
-            -->
-            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
-
     </data>
 </openerp>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 831db25e26a..dd720d448ef 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -2,6 +2,25 @@
 <openerp>
     <data>
 
+        <!-- Top menu item -->
+        <menuitem name="Portal"
+            id="portal_menu"
+            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+            sequence="20"/>
+
+            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
+                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+            <!--
+                Create menu items that we'll leave empty for now - they'll be
+                filled up by other portal modules.
+            -->
+            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
+            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
+            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+
         <!-- portal tree view -->
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>