From 344a48ab55e29e5bcef33273403da079cdf3c64f Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Fri, 15 Jul 2011 18:35:40 +0530
Subject: [PATCH 01/30] [FIX] Fixed DATA_ERROR, dhtmlx is not supported
 datetime formate, Then when render parent task it reduce the hours.

bzr revid: sma@tinyerp.com-20110715130540-y7par5uca2xxmlpp
---
 addons/base_gantt/static/src/js/gantt.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index cf0ce449d60..6d8db18b5bd 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -246,7 +246,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
             for (i in all_events){
                 res = all_events[i];
                 if ((typeof(res['evt'][3])) == "object"){
-                    res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3]);
+                    res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true);
                 }
 
                 k = res['evt'][0].toString().indexOf('_');
@@ -356,14 +356,14 @@ init: function(view_manager, session, element_id, dataset, view_id) {
          return dat;
     },
 
-    hours_between: function(date1, date2) {
+    hours_between: function(date1, date2, parent_task) {
 
         var ONE_DAY = 1000 * 60 * 60 * 24;
         var date1_ms = date1.getTime();
         var date2_ms = date2.getTime();
         var difference_ms = Math.abs(date1_ms - date2_ms);
 
-        d = Math.floor(difference_ms / ONE_DAY);
+        d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY);
         h = (difference_ms % ONE_DAY)/(1000 * 60 * 60);
         num = (d * this.day_length) + h;
         return parseFloat(num.toFixed(2));

From ff5acb435146bff358b98a93374b4d967397bd90 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Mon, 18 Jul 2011 11:47:22 +0530
Subject: [PATCH 02/30] [IMP] Improve edit, when open popup on dblclick of
 tasks.

bzr revid: sma@tinyerp.com-20110718061722-8uy5eqw9tzu04bqg
---
 addons/base_gantt/static/src/js/gantt.js | 62 +++++++++++++++++-------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 6d8db18b5bd..c68e704a14e 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -289,7 +289,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
         ganttChartControl.attachEvent("onTaskStartDrag", function(task) {self.on_drag_start(task);});
         ganttChartControl.attachEvent("onTaskEndResize", function(task) {self.on_resize_drag_end(task, "resize");});
         ganttChartControl.attachEvent("onTaskEndDrag", function(task) {self.on_resize_drag_end(task, "drag");});
-        ganttChartControl.attachEvent("onTaskDblClick", function(task) {self.open_popup(task);});
+        ganttChartControl.attachEvent("onTaskDblClick", function(task, evt) {self.open_popup(task); evt.stopPropagation(); evt.preventDefault();});
 
         taskdiv = jQuery("div.taskPanel").parent();
         taskdiv.addClass('ganttTaskPanel');
@@ -372,27 +372,53 @@ init: function(view_manager, session, element_id, dataset, view_id) {
 
     open_popup : function(task) {
         var event_id = task.getId();
-        
         if(event_id.toString().search("_") != -1)
             return;
-        if (event_id) {
-            event_id = parseInt(event_id, 10);
-            var dataset_event_index = jQuery.inArray(event_id, this.ids);
-        } else  {
-            var dataset_event_index = null;
+        if(event_id) event_id = parseInt(event_id, 10);
+
+        var action = {
+            "res_model": this.dataset.model,
+            "res_id": event_id,
+            "views":[[false,"form"]],
+            "type":"ir.actions.act_window",
+            "view_type":"form",
+            "view_mode":"form"
         }
-        this.dataset.index = dataset_event_index;
+
+        action.flags = {
+            search_view: false,
+            sidebar : false,
+            views_switcher : false,
+            action_buttons : false,
+            pager: false
+            }
         var element_id = _.uniqueId("act_window_dialog");
-        var dialog = jQuery('<div>', 
-                        {'id': element_id
-                    }).dialog({
-                        title: 'Gantt Chart',
-                        modal: true,
-                        minWidth: 800,
-                        position: 'top'
-                    });
-        var event_form = new openerp.base.FormView(this.view_manager, this.session, element_id, this.dataset, false);
-        event_form.start();
+        var dialog = jQuery('<div>', {
+            'id': element_id
+            }).dialog({
+                modal: true,
+                width: 'auto',
+                height: 'auto',
+                buttons: {
+                    Cancel: function() {
+                        $(this).dialog("destroy");
+                    },
+                    Save: function() {
+                        var view_manager = action_manager.viewmanager;
+                        var _dialog = this;
+                        view_manager.views[view_manager.active_view].controller.do_save(function(r) {
+                            $(_dialog).dialog("destroy");
+                            self.reload_gantt();
+                        })
+                    }
+                }
+        });
+        var action_manager = new openerp.base.ActionManager(this.session, element_id);
+        action_manager.start();
+        action_manager.do_action(action);
+        
+        //Default_get
+        if(!event_id) action_manager.viewmanager.dataset.index = null;
     },
 
     on_drag_start : function(task){

From 9ed55ee3f545029143bed141fbce788701ba8db5 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Wed, 27 Jul 2011 12:32:20 +0530
Subject: [PATCH 03/30] [FIX] Show Save/Edit and New buttons in popups.

bzr revid: sma@tinyerp.com-20110727070220-vyk3w7001lpi7l04
---
 addons/base_gantt/static/src/js/gantt.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index c68e704a14e..e3c2b79fc58 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -389,7 +389,6 @@ init: function(view_manager, session, element_id, dataset, view_id) {
             search_view: false,
             sidebar : false,
             views_switcher : false,
-            action_buttons : false,
             pager: false
             }
         var element_id = _.uniqueId("act_window_dialog");

From f61dadb8490a45e9b9cf07384fb65c1e9cb2e8af Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Tue, 2 Aug 2011 11:22:16 +0530
Subject: [PATCH 04/30] [IMP] Use parent and remove session from ganttview.

bzr revid: sma@tinyerp.com-20110802055216-0t9fq66nmthdwzyp
---
 addons/base_gantt/static/src/js/gantt.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 06ec4be2634..cde8cd18b9d 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -1,16 +1,14 @@
 /*---------------------------------------------------------
  * OpenERP base_gantt
  *---------------------------------------------------------*/
-
 openerp.base_gantt = function (openerp) {
 QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml');
 openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView');
-openerp.base_gantt.GanttView = openerp.base.Widget.extend({
+openerp.base_gantt.GanttView = openerp.base.View.extend({
 
-init: function(view_manager, session, element_id, dataset, view_id) {
-
-        this._super(session, element_id);
-        this.view_manager = view_manager;
+init: function(parent, element_id, dataset, view_id) {
+        this._super(parent, element_id);
+        this.view_manager = parent || new openerp.base.NullViewManager();
         this.dataset = dataset;
         this.model = dataset.model;
         this.view_id = view_id;
@@ -29,7 +27,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
         this.calendar_fields = {};
         this.info_fields = [];
         this.domain = this.dataset._domain ? this.dataset._domain: [];
-        this.context = {};
+        this.context = this.dataset.context || {};
     },
 
     start: function() {

From 72f7aa772edfae4162ba450db5b57229df49d631 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Tue, 2 Aug 2011 11:40:30 +0530
Subject: [PATCH 05/30] [FIX] Need to load all js files for calendar, gantt,
 graph view.

bzr revid: sma@tinyerp.com-20110802061030-eqvqab8ruwxjhpuy
---
 addons/base/static/src/js/chrome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index ed84c32071b..50d4c6e418e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -250,9 +250,9 @@ openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Sessi
                 if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done )
                     return;
                 tag.onload_done = true;
-                self.do_load_js(files);
             };
-            document.head.appendChild(tag);
+            $('head').append(tag);
+            self.do_load_js(files);
         } else {
             this.on_modules_loaded();
         }

From 5075601ddc655111b41bb34b6daec2e646a6aa4d Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Tue, 2 Aug 2011 12:00:45 +0530
Subject: [PATCH 06/30] [FIX] Fixed session.

bzr revid: sma@tinyerp.com-20110802063045-4q4c3rf45tqdf25l
---
 addons/base_gantt/static/src/js/gantt.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index cde8cd18b9d..dc31eb0a9d7 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -410,10 +410,10 @@ init: function(parent, element_id, dataset, view_id) {
                     }
                 }
         });
-        var action_manager = new openerp.base.ActionManager(this.session, element_id);
+        var action_manager = new openerp.base.ActionManager(this, element_id);
         action_manager.start();
         action_manager.do_action(action);
-        
+
         //Default_get
         if(!event_id) action_manager.viewmanager.dataset.index = null;
     },

From e0a7ee0df10db7df30c72e10312abe74730ee9fd Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Tue, 2 Aug 2011 12:03:14 +0530
Subject: [PATCH 07/30] [FIX] Fixed click events.

bzr revid: sma@tinyerp.com-20110802063314-yb41yj6m53tobpso
---
 addons/base_gantt/static/src/js/gantt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index dc31eb0a9d7..7513948125a 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -287,7 +287,7 @@ init: function(parent, element_id, dataset, view_id) {
         ganttChartControl.attachEvent("onTaskStartDrag", function(task) {self.on_drag_start(task);});
         ganttChartControl.attachEvent("onTaskEndResize", function(task) {self.on_resize_drag_end(task, "resize");});
         ganttChartControl.attachEvent("onTaskEndDrag", function(task) {self.on_resize_drag_end(task, "drag");});
-        ganttChartControl.attachEvent("onTaskDblClick", function(task, evt) {self.open_popup(task); evt.stopPropagation(); evt.preventDefault();});
+        ganttChartControl.attachEvent("onTaskDblClick", function(task) {self.open_popup(task);});
 
         taskdiv = jQuery("div.taskPanel").parent();
         taskdiv.addClass('ganttTaskPanel');

From d70785e2e8abef875a18a9e983f1938decfe2990 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Fri, 5 Aug 2011 12:52:34 +0530
Subject: [PATCH 08/30] [FIX] Replace group name False to Undefined.

bzr revid: sma@tinyerp.com-20110805072234-f4zvl4fnzhiewkcv
---
 addons/base_gantt/static/src/js/gantt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 7513948125a..9b86f791f32 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -173,7 +173,7 @@ init: function(parent, element_id, dataset, view_id) {
                     }
 
                     if (grp_key == false){
-                        grp_key = "False";
+                        grp_key = "Undefined";
                     }
 
                     if (j == 0){

From 5be9b44ac8c77e6eb56296e83b5932cc325c25bf Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Wed, 10 Aug 2011 14:15:28 +0530
Subject: [PATCH 09/30] [IMP] Consider to remove level tag from xml and display
 first time without group_by.

bzr revid: sma@tinyerp.com-20110810084528-059auhvl25neb63p
---
 addons/base_gantt/static/src/js/gantt.js | 84 ++++++++++++++----------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 9b86f791f32..b31e02eeb78 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -50,8 +50,7 @@ init: function(parent, element_id, dataset, view_id) {
         this.color_field = this.fields_view.arch.attrs.color;
         this.day_length = this.fields_view.arch.attrs.day_length || 8;
         this.colors = this.fields_view.arch.attrs.colors;
-
-        this.text = this.fields_view.arch.children[0].children[0].attrs.name;
+        this.text = this.fields_view.arch.children[0].attrs.name;
         this.parent = this.fields_view.arch.children[0].attrs.link;
 
         this.format = "yyyy-MM-dd";
@@ -98,7 +97,7 @@ init: function(parent, element_id, dataset, view_id) {
 
         if (result.length != 0){
             var show_event = [];
-            for (i in result){
+            for (var i in result){
                 var res = result[i];
                 if (res[this.date_start] != false){
                     
@@ -130,7 +129,7 @@ init: function(parent, element_id, dataset, view_id) {
         var child_event = {};
         var temp_id = "";
         var final_events = [];
-        for (i in show_event) {
+        for (var i in show_event) {
 
             var res = show_event[i];
 
@@ -159,11 +158,8 @@ init: function(parent, element_id, dataset, view_id) {
             if (duration == false)
                 duration = 0
 
-            if (self.grp.length == 0){
-               self.grp.push({'group_by' : this.parent})
-            }
-            if (self.grp != undefined){
-                for (j in self.grp){
+            if (self.grp.length){
+                for (var j in self.grp){
                     var grp_key = res[self.grp[j]['group_by']];
                     if (typeof(grp_key) == "object"){
                         grp_key = res[self.grp[j]['group_by']][1];
@@ -205,9 +201,18 @@ init: function(parent, element_id, dataset, view_id) {
                 all_events[id] = {'parent': temp_id, 'evt':[id , text, start_date, duration, 100, "", color_box[color]]};
                 final_events.push(id);
             }
+            else {
+                if (i == 0) {
+                    var mod_id = "_" + i;
+                    child_event[mod_id] = {};
+                    all_events[mod_id] = {'parent': "", 'evt': [mod_id, this.name, start_date, start_date, 100, "", "white"]};
+                }
+                all_events[id] = {'parent': mod_id, 'evt':[id , text, start_date, duration, 100, "", color_box[color]]};
+                final_events.push(id);
+            }
         }
 
-        for (i in final_events){
+        for (var i in final_events){
             var evt_id = final_events[i];
             var evt_date = all_events[evt_id]['evt'][2];
             while (all_events[evt_id]['parent'] != "") {
@@ -223,7 +228,7 @@ init: function(parent, element_id, dataset, view_id) {
         var evt_duration = "";
         var evt_end_date = "";
 
-        for (i in final_events){
+        for (var i in final_events){
             evt_id = final_events[i];
             evt_date = all_events[evt_id]['evt'][2];
             evt_duration = all_events[evt_id]['evt'][3];
@@ -240,32 +245,17 @@ init: function(parent, element_id, dataset, view_id) {
             }
         }
 
-        for (j in self.grp){
-            for (i in all_events){
-                res = all_events[i];
-                if ((typeof(res['evt'][3])) == "object"){
-                    res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true);
-                }
-
-                k = res['evt'][0].toString().indexOf('_');
-                if (k != -1){
-                    if (res['evt'][0].substring(k) == "_"+j){
-                        if (j == 0){
-                            task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]);
-                            project.addTask(task);
-                        } else {
-                            task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]);
-                            prt = project.getTaskById(res['parent']);
-                            prt.addChildTask(task);
-                        }
-                    }
-                }
-            }
+        for (var j in self.grp) {
+            self.render_events(all_events, j);
         }
-        for (i in final_events){
+
+        if (!self.grp.length) {
+            self.render_events(all_events, 0);
+        }
+
+        for (var i in final_events){
             evt_id = final_events[i];
             res = all_events[evt_id];
-
             task=new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]);
             prt = project.getTaskById(res['parent']);
             prt.addChildTask(task);
@@ -368,6 +358,32 @@ init: function(parent, element_id, dataset, view_id) {
 
     },
 
+    render_events : function(all_events, j) {
+
+        var self = this;
+        for (var i in all_events){
+            var res = all_events[i];
+            if ((typeof(res['evt'][3])) == "object"){
+                res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true);
+            }
+
+            k = res['evt'][0].toString().indexOf('_');
+
+            if (k != -1) {
+                if (res['evt'][0].substring(k) == "_"+j){
+                    if (j == 0){
+                        task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]);
+                        project.addTask(task);
+                    } else {
+                        task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]);
+                        prt = project.getTaskById(res['parent']);
+                        prt.addChildTask(task);
+                    }
+                }
+            }
+        }
+    },
+
     open_popup : function(task) {
         var event_id = task.getId();
         if(event_id.toString().search("_") != -1)

From 15aef31efd1f6f2a92cf3ac5c822eba08b8c28b3 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Wed, 10 Aug 2011 15:11:38 +0530
Subject: [PATCH 10/30] [FIX] Initialize implicit globals.

bzr revid: sma@tinyerp.com-20110810094138-sb0ed029xsfrs239
---
 addons/base_gantt/static/src/js/gantt.js | 39 ++++++++++++------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index b31e02eeb78..18c8617022c 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -50,7 +50,8 @@ init: function(parent, element_id, dataset, view_id) {
         this.color_field = this.fields_view.arch.attrs.color;
         this.day_length = this.fields_view.arch.attrs.day_length || 8;
         this.colors = this.fields_view.arch.attrs.colors;
-        this.text = this.fields_view.arch.children[0].attrs.name;
+        var arch_children = this.fields_view.arch.children[0];
+        this.text = arch_children.children[0] ? arch_children.children[0].attrs.name : arch_children.attrs.name;
         this.parent = this.fields_view.arch.children[0].attrs.link;
 
         this.format = "yyyy-MM-dd";
@@ -65,7 +66,7 @@ init: function(parent, element_id, dataset, view_id) {
 
     create_gantt: function() {
 
-        ganttChartControl = new GanttChart(this.day_length);
+        var ganttChartControl = new GanttChart(this.day_length);
         ganttChartControl.setImagePath("/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/");
         ganttChartControl.setEditable(true);
         ganttChartControl.showTreePanel(true);
@@ -204,7 +205,6 @@ init: function(parent, element_id, dataset, view_id) {
             else {
                 if (i == 0) {
                     var mod_id = "_" + i;
-                    child_event[mod_id] = {};
                     all_events[mod_id] = {'parent': "", 'evt': [mod_id, this.name, start_date, start_date, 100, "", "white"]};
                 }
                 all_events[id] = {'parent': mod_id, 'evt':[id , text, start_date, duration, 100, "", color_box[color]]};
@@ -261,11 +261,11 @@ init: function(parent, element_id, dataset, view_id) {
             prt.addChildTask(task);
         }
 
-        oth_hgt = 264;
-        min_hgt = 150;
-        name_min_wdt = 150;
-        gantt_hgt = jQuery(window).height() - oth_hgt;
-        search_wdt = jQuery("#oe_app_search").width();
+        var oth_hgt = 264;
+        var min_hgt = 150;
+        var name_min_wdt = 150;
+        var gantt_hgt = jQuery(window).height() - oth_hgt;
+        var search_wdt = jQuery("#oe_app_search").width();
 
         if (gantt_hgt > min_hgt){
             jQuery('#GanttDiv').height(gantt_hgt).width(search_wdt);
@@ -279,13 +279,13 @@ init: function(parent, element_id, dataset, view_id) {
         ganttChartControl.attachEvent("onTaskEndDrag", function(task) {self.on_resize_drag_end(task, "drag");});
         ganttChartControl.attachEvent("onTaskDblClick", function(task) {self.open_popup(task);});
 
-        taskdiv = jQuery("div.taskPanel").parent();
+        var taskdiv = jQuery("div.taskPanel").parent();
         taskdiv.addClass('ganttTaskPanel');
         taskdiv.prev().addClass('ganttDayPanel');
-        $gantt_panel = jQuery(".ganttTaskPanel , .ganttDayPanel");
+        var $gantt_panel = jQuery(".ganttTaskPanel , .ganttDayPanel");
 
-        ganttrow = jQuery('.taskPanel').closest('tr');
-        gtd =  ganttrow.children(':first-child');
+        var ganttrow = jQuery('.taskPanel').closest('tr');
+        var gtd =  ganttrow.children(':first-child');
         gtd.children().addClass('task-name');
 
         jQuery(".toggle-sidebar").click(function(e) {
@@ -307,9 +307,8 @@ init: function(parent, element_id, dataset, view_id) {
         $gantt_panel.width(1);
         jQuery(".ganttTaskPanel").parent().width(1);
 
-        search_wdt = jQuery("#oe_app_search").width();
-        day_wdt = jQuery(".ganttDayPanel").children().children().width();
-        name_wdt = jQuery('.task-name').width();
+        var search_wdt = jQuery("#oe_app_search").width();
+        var day_wdt = jQuery(".ganttDayPanel").children().children().width();
         jQuery('#GanttDiv').css('width','100%');
 
         if (search_wdt - day_wdt <= name_min_wdt){
@@ -333,7 +332,7 @@ init: function(parent, element_id, dataset, view_id) {
 
          var self = this;
 
-         dat = this.convert_str_date(dat);
+         var dat = this.convert_str_date(dat);
 
          var day = Math.floor(duration/self.day_length);
          var hrs = duration % self.day_length;
@@ -351,9 +350,9 @@ init: function(parent, element_id, dataset, view_id) {
         var date2_ms = date2.getTime();
         var difference_ms = Math.abs(date1_ms - date2_ms);
 
-        d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY);
-        h = (difference_ms % ONE_DAY)/(1000 * 60 * 60);
-        num = (d * this.day_length) + h;
+        var d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY);
+        var h = (difference_ms % ONE_DAY)/(1000 * 60 * 60);
+        var num = (d * this.day_length) + h;
         return parseFloat(num.toFixed(2));
 
     },
@@ -435,7 +434,7 @@ init: function(parent, element_id, dataset, view_id) {
     },
 
     on_drag_start : function(task){
-        st_date = task.getEST();
+        var st_date = task.getEST();
         if(st_date.getHours()){
             self.hh = st_date.getHours();
             self.mm = st_date.getMinutes();

From 33f984d056f6fc367ed1194f7e81aba4c0deca3e Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Thu, 11 Aug 2011 12:49:34 +0530
Subject: [PATCH 11/30] [FIX] Minor changes.

bzr revid: sma@tinyerp.com-20110811071934-adjiwyspxegdpzk5
---
 addons/base_gantt/static/src/js/gantt.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index 18c8617022c..61f9a443d56 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -66,7 +66,7 @@ init: function(parent, element_id, dataset, view_id) {
 
     create_gantt: function() {
 
-        var ganttChartControl = new GanttChart(this.day_length);
+        ganttChartControl = new GanttChart(this.day_length);
         ganttChartControl.setImagePath("/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/");
         ganttChartControl.setEditable(true);
         ganttChartControl.showTreePanel(true);

From 18de9c065a33e6cb0e32195be0d374ec93a3e763 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 12 Aug 2011 13:10:21 +0530
Subject: [PATCH 12/30] [FIX] typo fied name

lp bug: https://launchpad.net/bugs/825008 fixed

bzr revid: jam@tinyerp.com-20110812074021-7cbge6mgfamim32w
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 23f12b3907f..86e232e91b5 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -153,7 +153,7 @@
                             <field name="write_date" />
                             <field name="date_closed"/>
                             <field name="date_open"/>
-                            <field name="last_action_date"/>
+                            <field name="date_action_last"/>
                             </group>
                             <group colspan="2" col="2">
                             <separator string="Statistics" colspan="2" col="2"/>

From 4e5f4bd565bbaff2a8f89117c791de9299015e08 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Aug 2011 11:45:41 +0200
Subject: [PATCH 13/30] [IMP] simple style fixes

bzr revid: xmo@openerp.com-20110812094541-zeb5lz6nk0jgq21y
---
 addons/base/static/src/js/search.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 4b746832a65..63ccec088a6 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -875,11 +875,10 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
         this._super();
         var _this = this;
         this.add_prop();
-        this.$element.find('.searchview_extended_add_proposition').click(function (e) {
+        this.$element.find('.searchview_extended_add_proposition').click(function () {
             _this.add_prop();
         });
-        var delete_btn = this.$element.find('.searchview_extended_delete_group');
-        delete_btn.click(function (e) {
+        this.$element.find('.searchview_extended_delete_group').click(function () {
             _this.stop();
         });
     },
@@ -889,7 +888,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
         }).compact().value();
         var choice = this.$element.find(".searchview_extended_group_choice").val();
         var op = choice == "all" ? "&" : "|";
-        return [].concat(choice == "none" ? ['!'] : [],
+        return choice == "none" ? ['!'] : [].concat(
             _.map(_.range(_.max([0,props.length - 1])), function() { return op; }),
             props);
     },
@@ -901,10 +900,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
         parent.check_last_element();
     },
     set_last_group: function(is_last) {
-        if(is_last)
-            this.$element.addClass("last_group");
-        else
-            this.$element.removeClass("last_group");
+        this.$element.toggleClass('last_group', is_last);
     }
 });
 
@@ -927,8 +923,7 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.OldWidget.extend({
         this.$element.find(".searchview_extended_prop_field").change(function() {
             _this.changed();
         });
-        var delete_btn = this.$element.find('.searchview_extended_delete_prop');
-        delete_btn.click(function (e) {
+        this.$element.find('.searchview_extended_delete_prop').click(function () {
             _this.stop();
         });
     },

From d6074e66195065581a002f865df76d192fbc8ab1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Aug 2011 12:36:43 +0200
Subject: [PATCH 14/30] [IMP] move openerp.base.Widget to relevant section of
 the actual dogs (as a guide), remove old manual openerp.base.Widget APIDoc

bzr revid: xmo@openerp.com-20110812103643-2ew32jiqdsm71jqe
---
 addons/base/controllers/main.py   |   8 +-
 addons/base/static/src/js/core.js |  53 ------
 doc/source/addons.rst             | 291 +++++++++++-------------------
 doc/source/development.rst        |  12 +-
 4 files changed, 115 insertions(+), 249 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 4f6b3ea4f70..36db03d6bba 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -772,8 +772,8 @@ class View(openerpweb.Controller):
         """ Parses an arbitrary string containing a domain, transforms it
         to either a literal domain or a :class:`openerpweb.nonliterals.Domain`
 
-        :param domain: the domain to parse, if the domain is not a string it is assumed to
-        be a literal domain and is returned as-is
+        :param domain: the domain to parse, if the domain is not a string it
+                       is assumed to be a literal domain and is returned as-is
         :param session: Current OpenERP session
         :type session: openerpweb.openerpweb.OpenERPSession
         """
@@ -789,8 +789,8 @@ class View(openerpweb.Controller):
         """ Parses an arbitrary string containing a context, transforms it
         to either a literal context or a :class:`openerpweb.nonliterals.Context`
 
-        :param context: the context to parse, if the context is not a string it is assumed to
-        be a literal domain and is returned as-is
+        :param context: the context to parse, if the context is not a string it
+               is assumed to be a literal domain and is returned as-is
         :param session: Current OpenERP session
         :type session: openerpweb.openerpweb.OpenERPSession
         """
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 859c96645a1..da9b5abf3e8 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -373,59 +373,6 @@ openerp.base.SessionAware = openerp.base.Class.extend({
     }
 });
 
-/**
- * Base class for all visual components. Provides a lot of functionalities helpful
- * for the management of a part of the DOM.
- *
- * Widget handles:
- * - Rendering with QWeb.
- * - Life-cycle management and parenting (when a parent is destroyed, all its children are
- *     destroyed too).
- * - Insertion in DOM.
- *
- * Widget also extends SessionAware for ease of use.
- *
- * Guide to create implementations of the Widget class:
- * ==============================================
- *
- * Here is a sample child class:
- *
- * MyWidget = openerp.base.Widget.extend({
- *     // the name of the QWeb template to use for rendering
- *     template: "MyQWebTemplate",
- *     // identifier prefix, it is useful to put an obvious one for debugging
- *     identifier_prefix: 'my-id-prefix-',
- *
- *     init: function(parent) {
- *         this._super(parent);
- *         // stuff that you want to init before the rendering
- *     },
- *     start: function() {
- *         this._super();
- *         // stuff you want to make after the rendering, `this.$element` holds a correct value
- *         this.$element.find(".my_button").click(/* an example of event binding * /);
- *
- *         // if you have some asynchronous operations, it's a good idea to return
- *         // a promise in start()
- *         var promise = this.rpc(...);
- *         return promise;
- *     }
- * });
- *
- * Now this class can simply be used with the following syntax:
- *
- * var my_widget = new MyWidget(this);
- * my_widget.appendTo($(".some-div"));
- *
- * With these two lines, the MyWidget instance was inited, rendered, it was inserted into the
- * DOM inside the ".some-div" div and its events were binded.
- *
- * And of course, when you don't need that widget anymore, just do:
- *
- * my_widget.stop();
- *
- * That will kill the widget in a clean way and erase its content from the dom.
- */
 openerp.base.Widget = openerp.base.SessionAware.extend({
     /**
      * The name of the QWeb template that will be used for rendering. Must be
diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index 4f371192760..7261e57ebd3 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -113,6 +113,98 @@ initializing the addon.
 Creating new standard roles
 ---------------------------
 
+Widget
+++++++
+
+This is the base class for all visual components. It provides a number of
+services for the management of a DOM subtree:
+
+* Rendering with QWeb
+
+* Parenting-child relations
+
+* Life-cycle management (including facilitating children destruction when a
+  parent object is removed)
+
+* DOM insertion, via jQuery-powered insertion methods. Insertion targets can
+  be anything the corresponding jQuery method accepts (generally selectors,
+  DOM nodes and jQuery objects):
+
+  :js:func:`~openerp.base.Widget.appendTo`
+    Renders the widget and inserts it as the last child of the target, uses
+    `.appendTo()`_
+
+  :js:func:`~openerp.base.Widget.prependTo`
+    Renders the widget and inserts it as the first child of the target, uses
+    `.prependTo()`_
+
+  :js:func:`~openerp.base.Widget.insertAfter`
+    Renders the widget and inserts it as the preceding sibling of the target,
+    uses `.insertAfter()`_
+
+  :js:func:`~openerp.base.Widget.insertBefore`
+    Renders the widget and inserts it as the following sibling of the target,
+    uses `.insertBefore()`_
+
+:js:class:`~openerp.base.Widget` inherits from
+:js:class:`~openerp.base.SessionAware`, so subclasses can easily access the
+RPC layers.
+
+Subclassing Widget
+~~~~~~~~~~~~~~~~~~
+
+:js:class:`~openerp.base.Widget` is subclassed in the standard manner (via the
+:js:func:`~openerp.base.Class.extend` method), and provides a number of
+abstract properties and concrete methods (which you may or may not want to
+override). Creating a subclass looks like this:
+
+.. code-block:: javascript
+
+    var MyWidget = openerp.base.Widget.extend({
+        // QWeb template to use when rendering the object
+        template: "MyQWebTemplate",
+        // autogenerated id prefix, specificity helps when debugging
+        identifier_prefix: 'my-id-prefix-',
+
+        init: function(parent) {
+            this._super(parent);
+            // insert code to execute before rendering, for object
+            // initialization
+        },
+        start: function() {
+            this._super();
+            // post-rendering initialization code, at this point
+            // ``this.$element`` has been initialized
+            this.$element.find(".my_button").click(/* an example of event binding * /);
+
+            // if ``start`` is asynchronous, return a promise object so callers
+            // know when the object is done initializing
+            return this.rpc(/* … */)
+        }
+    });
+
+The new class can then be used in the following manner:
+
+.. code-block:: javascript
+
+    // Create the instance
+    var my_widget = new MyWidget(this);
+    // Render and insert into DOM
+    my_widget.appendTo(".some-div");
+
+After these two lines have executed (and any promise returned by ``appendTo``
+has been resolved if needed), the widget is ready to be used.
+
+If the widget is not needed anymore (because it's transient), simply terminate
+it:
+
+.. code-block:: javascript
+
+    my_widget.stop();
+
+will unbind all DOM events, remove the widget's content from the DOM and
+destroy all widget data.
+
 Views
 +++++
 
@@ -236,193 +328,6 @@ replace ``addons`` by the directory in which your own addon lives.
      and run ``nosetests addons`` instead of the ``unit2`` command,
      the result should be exactly the same.
 
-APIs
-----
-
-Javascript
-++++++++++
-
-.. js:class:: openerp.base.Widget(view, node)
-
-    :param openerp.base.Controller view: The view to which the widget belongs
-    :param Object node: the ``fields_view_get`` descriptor for the widget
-
-    .. js:attribute:: $element
-
-        The widget's root element as jQuery object
-
-.. js:class:: openerp.base.DataSet(session, model)
-
-    :param openerp.base.Session session: the RPC session object
-    :param String model: the model managed by this dataset
-
-    The DataSet is the abstraction for a sequence of records stored in
-    database.
-
-    It provides interfaces for reading records based on search
-    criteria, and for selecting and fetching records based on
-    activated ids.
-
-    .. js:function:: fetch([offset][, limit])
-
-       :param Number offset: the index from which records should start
-                             being returned (section)
-       :param Number limit: the maximum number of records to return
-       :returns: the dataset instance it was called on
-
-       Asynchronously fetches the records selected by the DataSet's
-       domain and context, in the provided sort order if any.
-
-       Only fetches the fields selected by the DataSet.
-
-       On success, triggers :js:func:`on_fetch`
-
-    .. js:function:: on_fetch(records, event)
-
-        :param Array records: an array of
-                             :js:class:`openerp.base.DataRecord`
-                             matching the DataSet's selection
-        :param event: a data holder letting the event handler fetch
-                     meta-informations about the event.
-        :type event: OnFetchEvent
-
-        Fired after :js:func:`fetch` is done fetching the records
-        selected by the DataSet.
-
-    .. js:function:: active_ids
-
-        :returns: the dataset instance it was called on
-
-        Asynchronously fetches the active records for this DataSet.
-
-        On success, triggers :js:func:`on_active_ids`
-
-    .. js:function:: on_active_ids(records)
-
-        :param Array records: an array of
-                              :js:class:`openerp.base.DataRecord`
-                              matching the currently active ids
-
-        Fired after :js:func:`active_ids` fetched the records matching
-        the DataSet's active ids.
-
-    .. js:function:: active_id
-
-        :returns: the dataset instance in was called on
-
-        Asynchronously fetches the current active record.
-
-        On success, triggers :js:func:`on_active_id`
-
-    .. js:function:: on_active_id(record)
-
-        :param Object record: the record fetched by
-                              :js:func:`active_id`, or ``null``
-        :type record: openerp.base.DataRecord
-
-        Fired after :js:func:`active_id` fetched the record matching
-        the dataset's active id
-
-    .. js:function:: set(options)
-
-        :param Object options: the options to set on the dataset
-        :type options: DataSetOptions
-        :returns: the dataset instance it was called on
-
-        Configures the data set by setting various properties on it
-
-    .. js:function:: prev
-
-        :returns: the dataset instance it was called on
-
-        Activates the id preceding the current one in the active ids
-        sequence of the dataset.
-
-        If the current active id is at the start of the sequence,
-        wraps back to the last id of the sequence.
-
-    .. js:function:: next
-
-        :returns: the dataset instance it was called on
-
-        Activates the id following the current one in the active ids
-        sequence.
-
-        If the current active id is the last of the sequence, wraps
-        back to the beginning of the active ids sequence.
-
-    .. js:function:: select(ids)
-
-        :param Array ids: the identifiers to activate on the dataset
-        :returns: the dataset instance it was called on
-
-        Activates all the ids specified in the dataset, resets the
-        current active id to be the first id of the new sequence.
-
-        The internal order will be the same as the ids list provided.
-
-    .. js:function:: get_active_ids
-
-        :returns: the list of current active ids for the dataset
-
-    .. js:function:: activate(id)
-
-        :param Number id: the id to activate
-        :returns: the dataset instance it was called on
-
-        Activates the id provided in the dataset. If no ids are
-        selected, selects the id in the dataset.
-
-        If ids are already selected and the provided id is not in that
-        selection, raises an error.
-
-    .. js:function:: get_active_id
-
-        :returns: the dataset's current active id
-
-Ad-hoc objects and structural types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-These objects are not associated with any specific class, they're
-generally literal objects created on the spot. Names are merely
-convenient ways to refer to them and their properties.
-
-.. js:class:: OnFetchEvent
-
-    .. js:attribute:: context
-
-        The context used for the :js:func:`fetch` call (domain set on
-        the :js:class:`openerp.base.DataSet` when ``fetch`` was
-        called)
-
-    .. js:attribute:: domain
-
-        The domain used for the :js:func:`fetch` call
-
-    .. js:attribute:: limit
-
-        The limit with which the original :js:func:`fetch` call was
-        performed
-
-    .. js:attribute:: offset
-
-        The offset with which the original :js:func:`fetch` call was
-        performed
-
-    .. js:attribute:: sort
-
-       The sorting criteria active on the
-       :js:class:`openerp.base.DataSet` when :js:func:`fetch` was
-       called
-
-.. js:class:: DataSetOptions
-
-    .. js:attribute:: context
-
-    .. js:attribute:: domain
-
-    .. js:attribute:: sort
-
 Python
 ++++++
 
@@ -499,3 +404,15 @@ Python
 
 .. _promise object:
     http://api.jquery.com/deferred.promise/
+
+.. _.appendTo():
+    http://api.jquery.com/appendTo/
+
+.. _.prependTo():
+    http://api.jquery.com/prependTo/
+
+.. _.insertAfter():
+    http://api.jquery.com/insertAfter/
+
+.. _.insertBefore():
+    http://api.jquery.com/insertBefore/
diff --git a/doc/source/development.rst b/doc/source/development.rst
index bfb176cb5c5..85fbebcceb3 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -374,11 +374,13 @@ Deletion can be overridden by replacing the
 calls :js:func:`~openerp.base.DataSet.unlink` in order to remove the records
 entirely.
 
-.. note:: the list-wise deletion button (next to the record addition button)
-          simply proxies to :js:func:`~openerp.base.ListView.do_delete` after
-          obtaining all selected record ids, but it is possible to override it
-          alone by replacing
-          :js:func:`~openerp.base.ListView.do_delete_selected`.
+.. note::
+
+ the list-wise deletion button (next to the record addition button)
+  simply proxies to :js:func:`~openerp.base.ListView.do_delete` after
+  obtaining all selected record ids, but it is possible to override it
+  alone by replacing
+  :js:func:`~openerp.base.ListView.do_delete_selected`.
 
 Internal API Doc
 ----------------

From 2c2fe7a691fb31a72a19662750dda0422105c4e5 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Fri, 12 Aug 2011 16:08:18 +0530
Subject: [PATCH 15/30] [FIX] Remove conflicts.

bzr revid: sma@tinyerp.com-20110812103818-q8wet6opinckiv1a
---
 addons/base/static/src/js/chrome.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 1ff49eb773a..92e3c298420 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -4,7 +4,7 @@
 
 openerp.base.chrome = function(openerp) {
 
-<<<<<<< TREE
+
 openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Session# */{
     /**
      * @constructs
@@ -273,8 +273,6 @@ openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Sessi
     }
 });
 
-=======
->>>>>>> MERGE-SOURCE
 openerp.base.Notification =  openerp.base.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);

From ee581f8247fa3d0df9ace2505f6977f48fcd0257 Mon Sep 17 00:00:00 2001
From: "sma (Tiny)" <sma@tinyerp.com>
Date: Fri, 12 Aug 2011 17:14:02 +0530
Subject: [PATCH 16/30] [IMP] simplify code of padding function in date
 formatting.

bzr revid: sma@tinyerp.com-20110812114402-u9u8vxxp1fnonq3m
---
 addons/base/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js
index fb1ada544a4..eb5ff6d8368 100644
--- a/addons/base/static/src/js/formats.js
+++ b/addons/base/static/src/js/formats.js
@@ -83,7 +83,7 @@ openerp.base.parse_time = function(str) {
  */
 var zpad = function(str, size) {
     str = "" + str;
-    return new Array(size - str.length).join('0') + str;
+    return new Array(_.range(size - str.length)).join('0') + str;
 };
 
 /**

From 964ae3f196f1b61bbb8b924cbd3862af41b7fd12 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Aug 2011 14:11:27 +0200
Subject: [PATCH 17/30] [FIX] stupid bug introduced in revision
 xmo@openerp.com-20110810141545-k98nvymjy5r7sslb

bzr revid: xmo@openerp.com-20110812121127-m50vupb36bv0tnjy
---
 addons/base/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js
index fb1ada544a4..074cabe5eee 100644
--- a/addons/base/static/src/js/formats.js
+++ b/addons/base/static/src/js/formats.js
@@ -83,7 +83,7 @@ openerp.base.parse_time = function(str) {
  */
 var zpad = function(str, size) {
     str = "" + str;
-    return new Array(size - str.length).join('0') + str;
+    return new Array(size - str.length + 1).join('0') + str;
 };
 
 /**

From 5b4f60bcd046aa7da54195c614665b171b570f5b Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 12 Aug 2011 18:36:24 +0530
Subject: [PATCH 18/30] [IMP]project_issue: Add new field(days_since_creation)
 as a diffrence between create_date and today()

bzr revid: ron@tinyerp.com-20110812130624-34exduud974omfhn
---
 addons/project_issue/project_issue.py       | 8 ++++++++
 addons/project_issue/project_issue_view.xml | 1 +
 2 files changed, 9 insertions(+)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 628ae886b50..794ee59e2ad 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -116,6 +116,12 @@ class project_issue(crm.crm_case, osv.osv):
                         hours = cal_obj.interval_hours_get(cr, uid, issue.project_id.resource_calendar_id.id,
                                 datetime.strptime(issue.create_date, '%Y-%m-%d %H:%M:%S'),
                                 datetime.strptime(issue.date_closed, '%Y-%m-%d %H:%M:%S'))
+                elif field in ['days_since_creation']:
+                    if issue.create_date:
+                        days_since_creation = datetime.today() - datetime.strptime(issue.create_date, "%Y-%m-%d %H:%M:%S")
+                        res[issue.id][field] = days_since_creation.days
+                    continue
+
                 elif field in ['inactivity_days']:
                     res[issue.id][field] = 0
                     if issue.date_action_last:
@@ -177,6 +183,8 @@ class project_issue(crm.crm_case, osv.osv):
         'active': fields.boolean('Active', required=False),
         'create_date': fields.datetime('Creation Date', readonly=True,select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
+        'days_since_creation': fields.function(_compute_day, string='Days since create date', \
+                                               multi='compute_day', type="float", help="Difference in days between create date and current date"),
         'date_deadline': fields.date('Deadline'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 86e232e91b5..1d1474ab255 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -162,6 +162,7 @@
                             <field name="working_hours_open" widget="float_time"/>
                             <field name="working_hours_close" widget="float_time"/>
                             <field name="inactivity_days"/>
+                            <field name="days_since_creation"/>
                             </group>
                             <group colspan="2" col="2">
                             <separator string="References" colspan="2"/>

From 672a71be9384755f9e29d43eaaf316c85d200467 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 12 Aug 2011 18:59:33 +0530
Subject: [PATCH 19/30] [IMP]project_issue: Improved in fields

bzr revid: ron@tinyerp.com-20110812132933-cqdqnise609ubesr
---
 addons/project_issue/project_issue.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 794ee59e2ad..12bfa85b283 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -183,8 +183,8 @@ class project_issue(crm.crm_case, osv.osv):
         'active': fields.boolean('Active', required=False),
         'create_date': fields.datetime('Creation Date', readonly=True,select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
-        'days_since_creation': fields.function(_compute_day, string='Days since create date', \
-                                               multi='compute_day', type="float", help="Difference in days between create date and current date"),
+        'days_since_creation': fields.function(_compute_day, string='Days since creation date', \
+                                               multi='compute_day', type="integer", help="Difference in days between creation date and current date"),
         'date_deadline': fields.date('Deadline'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\

From a4f9eb398b39978be8c35a8eb2e1eb561ef26ecf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Aug 2011 15:31:08 +0200
Subject: [PATCH 20/30] [REM] listview columns filtering on a name being
 present: don't try to read buttons with a name, it's kinda stupid

bzr revid: xmo@openerp.com-20110812133108-5bync0jgo0krn0u4
---
 addons/base/static/src/js/list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 3032e702a73..a0440221520 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -772,7 +772,7 @@ openerp.base.ListView.List = openerp.base.Class.extend( /** @lends openerp.base.
             var old_index = this.dataset.index;
             this.dataset.index = record_index;
             read_p = this.dataset.read_index(
-                _.filter(_.pluck(this.columns, 'name'), _.identity),
+                _.pluck(_(this.columns).filter(function (r) {return r.tag === 'field';}), 'name'),
                 function (record) {
                     var form_record = self.transform_record(record);
                     self.rows.splice(record_index, 1, form_record);
@@ -1035,7 +1035,7 @@ openerp.base.ListView.Groups = openerp.base.Class.extend( /** @lends openerp.bas
             page = this.datagroup.openable ? this.page : view.page;
 
         dataset.read_slice({
-                fields: _.filter(_.pluck(_.select(this.columns, function(x) {return x.tag == "field";}), 'name'), _.identity),
+                fields: _.pluck(_.select(this.columns, function(x) {return x.tag == "field"}), 'name'),
                 offset: page * limit,
                 limit: limit
             }, function (records) {

From a0c1d305e1dc6635ce3e7c0124cb48752420695b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 12 Aug 2011 17:14:50 +0200
Subject: [PATCH 21/30] [ADD] account_invoice_be: added the support of
 structured communication on outgoing invoices (bba communication), made by
 Noviat.

bzr revid: qdp-launchpad@openerp.com-20110812151450-2nq5sre7ili1xnpq
---
 addons/account_invoice_be/__init__.py         |  24 ++
 addons/account_invoice_be/__openerp__.py      |  55 +++++
 .../account_invoice_view.xml                  |  23 ++
 addons/account_invoice_be/i18n/fr.po          |  26 +++
 addons/account_invoice_be/i18n/nl.po          |  26 +++
 addons/account_invoice_be/invoice.py          | 215 ++++++++++++++++++
 addons/account_invoice_be/partner.py          |  48 ++++
 addons/account_invoice_be/partner_view.xml    |  20 ++
 8 files changed, 437 insertions(+)
 create mode 100644 addons/account_invoice_be/__init__.py
 create mode 100644 addons/account_invoice_be/__openerp__.py
 create mode 100644 addons/account_invoice_be/account_invoice_view.xml
 create mode 100644 addons/account_invoice_be/i18n/fr.po
 create mode 100644 addons/account_invoice_be/i18n/nl.po
 create mode 100644 addons/account_invoice_be/invoice.py
 create mode 100644 addons/account_invoice_be/partner.py
 create mode 100644 addons/account_invoice_be/partner_view.xml

diff --git a/addons/account_invoice_be/__init__.py b/addons/account_invoice_be/__init__.py
new file mode 100644
index 00000000000..176d1b9a904
--- /dev/null
+++ b/addons/account_invoice_be/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    
+#    Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
+# 
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import partner
+import invoice
diff --git a/addons/account_invoice_be/__openerp__.py b/addons/account_invoice_be/__openerp__.py
new file mode 100644
index 00000000000..c8d08d02a81
--- /dev/null
+++ b/addons/account_invoice_be/__openerp__.py
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    
+#    Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
+# 
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Add support for Belgian structured communication to Invoices',
+    'version': '1.2',
+    'license': 'AGPL-3',
+    'author': 'Noviat',
+    'category' : 'Localization/Accounting',
+    'description': """
+    
+Belgian localisation for in- and outgoing invoices (prereq to account_coda):
+    - Rename 'reference' field labels to 'Communication'
+    - Add support for Belgian Structured Communication
+
+A Structured Communication can be generated automatically on outgoing invoices according to the following algorithms:
+    1) Random : +++RRR/RRRR/RRRDD+++
+        R..R = Random Digits, DD = Check Digits
+    2) Date : +++DOY/YEAR/SSSDD+++
+        DOY = Day of the Year, SSS = Sequence Number, DD = Check Digits)
+    3) Customer Reference +++RRR/RRRR/SSSDDD+++
+        R..R = Customer Reference without non-numeric characters, SSS = Sequence Number, DD = Check Digits)  
+        
+The preferred type of Structured Communication and associated Algorithm can be specified on the Partner records. 
+A 'random' Structured Communication will generated if no algorithm is specified on the Partner record. 
+
+    """,
+    'depends': ['account', 'account_cancel'],
+    'demo_xml': [],
+    'init_xml': [],
+    'update_xml' : [
+        'partner_view.xml',
+        'account_invoice_view.xml',        
+    ],
+    'active': False,
+    'installable': True,}
diff --git a/addons/account_invoice_be/account_invoice_view.xml b/addons/account_invoice_be/account_invoice_view.xml
new file mode 100644
index 00000000000..8cabe036dfb
--- /dev/null
+++ b/addons/account_invoice_be/account_invoice_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <!-- Adapt Customer Invoices to support bba structured communication -->   
+    <record id="customer_invoice_bbacomm_form" model="ir.ui.view">
+      <field name="name">account.invoice.form.inherit</field>
+      <field name="model">account.invoice</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="account.invoice_form"/>
+      <field name="arch" type="xml">
+        <field name="payment_term" position="after">
+          <group col="4" colspan="2">
+              <field name="reference_type" nolabel="1" select="2" size="0" attrs="{'readonly':[('state','!=','draft')]}"
+                 on_change="generate_bbacomm(type,reference_type,algorithm,partner_id,reference)" colspan="1"/>
+              <field name="reference" nolabel="1" select="1" colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
+          </group>
+        </field>
+      </field>
+    </record>
+    
+  </data>
+</openerp>
diff --git a/addons/account_invoice_be/i18n/fr.po b/addons/account_invoice_be/i18n/fr.po
new file mode 100644
index 00000000000..f6f88f0c9a0
--- /dev/null
+++ b/addons/account_invoice_be/i18n/fr.po
@@ -0,0 +1,26 @@
+# French translation of openobject-addons.
+# This file contains the translation of the following modules:
+#	* l10n_be_extra
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@noviat.be\n"
+"POT-Creation-Date: 2011-01-16 17:06:14.002000\n"
+"PO-Revision-Date: 2011-01-16 17:06:14.002000\n"
+"Last-Translator: Luc De Meyer (Noviat nv/sa)\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. module: l10n_be_extra
+#: field:account.invoice,reference:0
+msgid "Communication"
+msgstr "Communication"
+
+#. module: l10n_be_extra
+#: field:account.invoice,reference_type:0
+msgid "Communication Type"
+msgstr "Type de communication"
+
diff --git a/addons/account_invoice_be/i18n/nl.po b/addons/account_invoice_be/i18n/nl.po
new file mode 100644
index 00000000000..42221219bbe
--- /dev/null
+++ b/addons/account_invoice_be/i18n/nl.po
@@ -0,0 +1,26 @@
+# Dutch translation of openobject-addons.
+# This file contains the translation of the following modules:
+#	* l10n_be_extra
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@noviat.be\n"
+"POT-Creation-Date: 2011-01-16 17:05:57.465000\n"
+"PO-Revision-Date: 2011-01-16 17:05:57.465000\n"
+"Last-Translator: Luc De Meyer (Noviat nv/sa)\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. module: l10n_be_extra
+#: field:account.invoice,reference:0
+msgid "Communication"
+msgstr "Mededeling"
+
+#. module: l10n_be_extra
+#: field:account.invoice,reference_type:0
+msgid "Communication Type"
+msgstr "Type mededeling"
+
diff --git a/addons/account_invoice_be/invoice.py b/addons/account_invoice_be/invoice.py
new file mode 100644
index 00000000000..6aea22376fc
--- /dev/null
+++ b/addons/account_invoice_be/invoice.py
@@ -0,0 +1,215 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    
+#    Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
+# 
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import re, time, random
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+logger=netsvc.Logger()
+
+"""
+account.invoice object:
+    - Add support for Belgian structured communication
+    - Rename 'reference' field labels to 'Communication'
+"""
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+
+    def _get_reference_type(self, cursor, user, context=None):
+        """Add BBA Structured Communication Type and change labels from 'reference' into 'communication' """  
+        res = super(account_invoice, self)._get_reference_type(cursor, user,
+                context=context)
+        res[[i for i,x in enumerate(res) if x[0] == 'none'][0]] = ('none', 'Free Communication')
+        res.append(('bba', 'BBA Structured Communication'))
+        #logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'reference_type =  %s' %res ) 
+        return res
+
+    def check_bbacomm(self, val):
+        supported_chars = '0-9+*/ '
+        pattern = re.compile('[^' + supported_chars + ']')
+        if pattern.findall(val or ''):
+            return False                
+        bbacomm = re.sub('\D', '', val or '')
+        if len(bbacomm) == 12:
+            base = int(bbacomm[:10])
+            mod = base % 97 or 97      
+            if mod == int(bbacomm[-2:]):
+                return True
+        return False
+
+    def _check_communication(self, cr, uid, ids):
+        for inv in self.browse(cr, uid, ids):
+            if inv.reference_type == 'bba':
+                return self.check_bbacomm(inv.reference)
+        return True
+
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):       
+        result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
+            date_invoice, payment_term, partner_bank_id, company_id)
+#        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
+#        logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'partner_id %s' % partner_id)
+        reference = False
+        reference_type = 'none'
+        if partner_id:        
+            if (type == 'out_invoice'):
+                reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
+                if reference_type:
+                    algorithm = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_algorithm
+                    if not algorithm:
+                        algorithm = 'random' 
+                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, algorithm, partner_id, '')['value']['reference']
+        res_update = {       
+            'reference_type': reference_type,
+            'reference': reference,
+        }
+        result['value'].update(res_update)
+        return result                    
+
+    def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference):
+        partner_obj =  self.pool.get('res.partner')
+        reference = reference or ''  
+        if (type == 'out_invoice'):
+            if reference_type == 'bba':
+                if not algorithm:
+                    if partner_id:
+                        algorithm = partner_obj.browse(cr, uid, partner_id).out_inv_comm_algorithm
+                    if not algorithm:
+                        if not algorithm:   
+                            algorithm = 'random'
+                if algorithm == 'date':
+                    if not self.check_bbacomm(reference):
+                        doy = time.strftime('%j')
+                        year = time.strftime('%Y')
+                        seq = '001'
+                        seq_ids = self.search(cr, uid, 
+                            [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
+                             ('reference', 'like', '+++%s/%s/%%' % (doy, year))], order='reference')
+                        if seq_ids:
+                            prev_seq = int(self.browse(cr, uid, seq_ids[-1]).reference[12:15])
+                            if prev_seq < 999:
+                                seq = '%03d' % (prev_seq + 1)
+                            else:
+                                raise osv.except_osv(_('Warning!'),
+                                    _('The daily maximum of outgoing invoices with an automatically generated BBA Structured Communications has been exceeded!' \
+                                      '\nPlease create manually a unique BBA Structured Communication.'))
+                        bbacomm = doy + year + seq
+                        base = int(bbacomm)
+                        mod = base % 97 or 97   
+                        reference = '+++%s/%s/%s%02d+++' % (doy, year, seq, mod)
+                elif algorithm == 'partner_ref':
+                    if not self.check_bbacomm(reference):
+                        partner_ref = self.pool.get('res.partner').browse(cr, uid, partner_id).ref
+                        partner_ref_nr = re.sub('\D', '', partner_ref or '')
+                        if (len(partner_ref_nr) < 3) or (len(partner_ref_nr) > 7):
+                            raise osv.except_osv(_('Warning!'),
+                                _('The Partner should have a 3-7 digit Reference Number for the generation of BBA Structured Communications!' \
+                                  '\nPlease correct the Partner record.'))                            
+                        else:
+                            partner_ref_nr = partner_ref_nr.ljust(7, '0')
+                            seq = '001'
+                            seq_ids = self.search(cr, uid, 
+                                [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
+                                 ('reference', 'like', '+++%s/%s/%%' % (partner_ref_nr[:3], partner_ref_nr[3:]))], order='reference')                            
+                            if seq_ids:
+                                prev_seq = int(self.browse(cr, uid, seq_ids[-1]).reference[12:15])
+                                if prev_seq < 999:
+                                    seq = '%03d' % (prev_seq + 1)
+                                else:
+                                    raise osv.except_osv(_('Warning!'),
+                                        _('The daily maximum of outgoing invoices with an automatically generated BBA Structured Communications has been exceeded!' \
+                                          '\nPlease create manually a unique BBA Structured Communication.'))                            
+                        bbacomm = partner_ref_nr + seq
+                        base = int(bbacomm)
+                        mod = base % 97 or 97                           
+                        reference = '+++%s/%s/%s%02d+++' % (partner_ref_nr[:3], partner_ref_nr[3:], seq, mod)
+                elif algorithm == 'random':
+                    if not self.check_bbacomm(reference):
+                        base = random.randint(1, 9999999999)
+                        bbacomm = str(base).rjust(7, '0')
+                        base = int(bbacomm)
+                        mod = base % 97 or 97
+                        mod = str(mod).rjust(2, '0')               
+                        reference = '+++%s/%s/%s%s+++' % (bbacomm[:3], bbacomm[3:7], bbacomm[7:], mod)
+                else:
+                    raise osv.except_osv(_('Error!'),
+                        _("Unsupported Structured Communication Type Algorithm '%s' !" \
+                          "\nPlease contact your OpenERP support channel.") % algorithm)   
+        return {'value': {'reference': reference}}    
+    
+    def create(self, cr, uid, vals, context=None):
+        if vals.has_key('reference_type'):
+            reference_type = vals['reference_type']
+            if reference_type == 'bba':               
+                if vals.has_key('reference'):
+                    bbacomm = vals['reference']
+                else:
+                    raise osv.except_osv(_('Warning!'),
+                        _('Empty BBA Structured Communication!' \
+                          '\nPlease fill in a unique BBA Structured Communication.'))       
+                if self.check_bbacomm(bbacomm):
+                    reference = re.sub('\D', '', bbacomm)
+                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'     
+                    same_ids = self.search(cr, uid, 
+                        [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
+                         ('reference', '=', vals['reference'])])
+                    if same_ids:
+                        raise osv.except_osv(_('Warning!'),
+                            _('The BBA Structured Communication has already been used!' \
+                              '\nPlease create manually a unique BBA Structured Communication.'))                 
+        return super(account_invoice, self).create(cr, uid, vals, context=context)     
+
+    def write(self, cr, uid, ids, vals, context={}):
+        for inv in self.browse(cr, uid, ids, context):    
+            if vals.has_key('reference_type'):
+                reference_type = vals['reference_type']
+            else:    
+                reference_type = inv.reference_type or ''
+            if reference_type == 'bba':               
+                if vals.has_key('reference'):
+                    bbacomm = vals['reference']
+                else:
+                    bbacomm = inv.reference or ''
+                if self.check_bbacomm(bbacomm):
+                    reference = re.sub('\D', '', bbacomm)
+                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'     
+                    same_ids = self.search(cr, uid, 
+                        [('id', '!=', inv.id), ('type', '=', 'out_invoice'), 
+                         ('reference_type', '=', 'bba'), ('reference', '=', vals['reference'])])
+                    if same_ids:
+                        raise osv.except_osv(_('Warning!'),
+                            _('The BBA Structured Communication has already been used!' \
+                              '\nPlease create manually a unique BBA Structured Communication.'))                 
+        return super(account_invoice, self).write(cr, uid, ids, vals, context)    
+
+    _columns = {
+        'reference': fields.char('Communication', size=64, help="The partner reference of this invoice."),
+        'reference_type': fields.selection(_get_reference_type, 'Communication Type',
+            required=True),
+    }
+    
+    _constraints = [
+        (_check_communication, 'Invalid BBA Structured Communication !', ['Communication']),
+        ]
+
+account_invoice()
diff --git a/addons/account_invoice_be/partner.py b/addons/account_invoice_be/partner.py
new file mode 100644
index 00000000000..2794b81670c
--- /dev/null
+++ b/addons/account_invoice_be/partner.py
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    
+#    Created by Luc De Meyer
+#    Copyright (c) 2010 Noviat nv/sa (www.noviat.be). All rights reserved.
+# 
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import time
+from tools.translate import _
+import netsvc
+logger=netsvc.Logger()
+
+class res_partner(osv.osv):  
+    """ add field to indicate default 'Communication Type' on customer invoices """
+    _inherit = 'res.partner'
+    
+    def _get_comm_type(self, cr, uid, context=None):
+        res = self.pool.get('account.invoice')._get_reference_type(cr, uid,context=context)
+        return res
+    
+    _columns = {
+        'out_inv_comm_type': fields.selection(_get_comm_type, 'Communication Type', change_default=True,
+            help='Select Default Communication Type for Outgoing Invoices.' ),
+        'out_inv_comm_algorithm': fields.selection([
+            ('random','Random'),
+            ('date','Date'),
+            ('partner_ref','Customer Reference'),
+            ], 'Communication Algorithm',
+            help='Select Algorithm to generate the Structured Communication on Outgoing Invoices.' ),
+    }
+res_partner()    
diff --git a/addons/account_invoice_be/partner_view.xml b/addons/account_invoice_be/partner_view.xml
new file mode 100644
index 00000000000..7489322a665
--- /dev/null
+++ b/addons/account_invoice_be/partner_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+    <!-- Extension to Partner Form to support outgoing invoices with automatic generation of structured communication -->
+    <record id="view_partner_inv_comm_type_form" model="ir.ui.view">
+      <field name="name">res.partner.inv_comm_type.form.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_partner_form"/>
+      <field name="arch" type="xml">
+        <field name="property_payment_term" position="after">
+          <field name="out_inv_comm_type" groups="base.group_extended"/>
+          <field name="out_inv_comm_algorithm" groups="base.group_extended" attrs="{'invisible':[('out_inv_comm_type','!=','bba')]}"/>
+        </field>
+      </field>
+    </record>    
+
+  </data>
+</openerp>

From 5e92ffeaccab8b0234c5757ed6ade4998e42fd88 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 12 Aug 2011 17:28:12 +0200
Subject: [PATCH 22/30] [IMP] account_invoice_l10nbe: better naming of
 previously named account_invoice_be module

bzr revid: qdp-launchpad@openerp.com-20110812152812-d3jp9j7a82wr3w3d
---
 addons/{account_invoice_be => account_invoice_l10nbe}/__init__.py | 0
 .../{account_invoice_be => account_invoice_l10nbe}/__openerp__.py | 0
 .../account_invoice_view.xml                                      | 0
 addons/{account_invoice_be => account_invoice_l10nbe}/i18n/fr.po  | 0
 addons/{account_invoice_be => account_invoice_l10nbe}/i18n/nl.po  | 0
 addons/{account_invoice_be => account_invoice_l10nbe}/invoice.py  | 0
 addons/{account_invoice_be => account_invoice_l10nbe}/partner.py  | 0
 .../partner_view.xml                                              | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/__init__.py (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/__openerp__.py (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/account_invoice_view.xml (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/i18n/fr.po (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/i18n/nl.po (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/invoice.py (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/partner.py (100%)
 rename addons/{account_invoice_be => account_invoice_l10nbe}/partner_view.xml (100%)

diff --git a/addons/account_invoice_be/__init__.py b/addons/account_invoice_l10nbe/__init__.py
similarity index 100%
rename from addons/account_invoice_be/__init__.py
rename to addons/account_invoice_l10nbe/__init__.py
diff --git a/addons/account_invoice_be/__openerp__.py b/addons/account_invoice_l10nbe/__openerp__.py
similarity index 100%
rename from addons/account_invoice_be/__openerp__.py
rename to addons/account_invoice_l10nbe/__openerp__.py
diff --git a/addons/account_invoice_be/account_invoice_view.xml b/addons/account_invoice_l10nbe/account_invoice_view.xml
similarity index 100%
rename from addons/account_invoice_be/account_invoice_view.xml
rename to addons/account_invoice_l10nbe/account_invoice_view.xml
diff --git a/addons/account_invoice_be/i18n/fr.po b/addons/account_invoice_l10nbe/i18n/fr.po
similarity index 100%
rename from addons/account_invoice_be/i18n/fr.po
rename to addons/account_invoice_l10nbe/i18n/fr.po
diff --git a/addons/account_invoice_be/i18n/nl.po b/addons/account_invoice_l10nbe/i18n/nl.po
similarity index 100%
rename from addons/account_invoice_be/i18n/nl.po
rename to addons/account_invoice_l10nbe/i18n/nl.po
diff --git a/addons/account_invoice_be/invoice.py b/addons/account_invoice_l10nbe/invoice.py
similarity index 100%
rename from addons/account_invoice_be/invoice.py
rename to addons/account_invoice_l10nbe/invoice.py
diff --git a/addons/account_invoice_be/partner.py b/addons/account_invoice_l10nbe/partner.py
similarity index 100%
rename from addons/account_invoice_be/partner.py
rename to addons/account_invoice_l10nbe/partner.py
diff --git a/addons/account_invoice_be/partner_view.xml b/addons/account_invoice_l10nbe/partner_view.xml
similarity index 100%
rename from addons/account_invoice_be/partner_view.xml
rename to addons/account_invoice_l10nbe/partner_view.xml

From 1f61d5c2e29901a87507af250cf09af61c5a2936 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 14 Aug 2011 04:45:01 +0000
Subject: [PATCH 23/30] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110814044430-2o7xhfo8phslwwbm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110814044501-phnxu5mn3aex6dzp
---
 addons/account/i18n/cs.po            | 278 +++++++++++++++++----------
 addons/product_margin/i18n/cs.po     |  50 ++---
 debian/po/bg.po                      |   4 +-
 debian/po/ca.po                      |   4 +-
 debian/po/cs.po                      |   4 +-
 debian/po/da.po                      |   4 +-
 debian/po/de.po                      |   4 +-
 debian/po/el.po                      |   4 +-
 debian/po/en_GB.po                   |   4 +-
 debian/po/es.po                      |   4 +-
 debian/po/es_CL.po                   |   4 +-
 debian/po/es_EC.po                   |   4 +-
 debian/po/fa.po                      |   4 +-
 debian/po/fi.po                      |   4 +-
 debian/po/fr.po                      |   4 +-
 debian/po/gl.po                      |   4 +-
 debian/po/he.po                      |   4 +-
 debian/po/hr.po                      |   4 +-
 debian/po/hu.po                      |   4 +-
 debian/po/it.po                      |   4 +-
 debian/po/ja.po                      |   4 +-
 debian/po/ko.po                      |   4 +-
 debian/po/lv.po                      |   4 +-
 debian/po/mn.po                      |   4 +-
 debian/po/nb.po                      |   4 +-
 debian/po/nl.po                      |   4 +-
 debian/po/pl.po                      |   4 +-
 debian/po/pt.po                      |   4 +-
 debian/po/pt_BR.po                   |   4 +-
 debian/po/ro.po                      |   4 +-
 debian/po/ru.po                      |   4 +-
 debian/po/sk.po                      |   4 +-
 debian/po/sq.po                      |   4 +-
 debian/po/sr.po                      |   4 +-
 debian/po/sv.po                      |   4 +-
 debian/po/tr.po                      |   4 +-
 debian/po/uk.po                      |   4 +-
 debian/po/vi.po                      |   4 +-
 debian/po/zh_CN.po                   |   4 +-
 debian/po/zh_TW.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/bg.po       |   4 +-
 openerp/addons/base/i18n/bs.po       |   4 +-
 openerp/addons/base/i18n/ca.po       |   4 +-
 openerp/addons/base/i18n/cs.po       |   8 +-
 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_CL.po    |   4 +-
 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       |  18 +-
 openerp/addons/base/i18n/fr.po       |   4 +-
 openerp/addons/base/i18n/gl.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/ko.po       |   4 +-
 openerp/addons/base/i18n/lt.po       |   4 +-
 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/pl.po       |   4 +-
 openerp/addons/base/i18n/pt.po       |   4 +-
 openerp/addons/base/i18n/pt_BR.po    |   4 +-
 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/ur.po       |   4 +-
 openerp/addons/base/i18n/vi.po       |   4 +-
 openerp/addons/base/i18n/zh_CN.po    |   6 +-
 openerp/addons/base/i18n/zh_TW.po    |   4 +-
 96 files changed, 404 insertions(+), 320 deletions(-)

diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 7cd2ad13673..b5151f9ab0d 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-15 02:11+0000\n"
-"Last-Translator: Chronos <robie@centrum.cz>\n"
+"PO-Revision-Date: 2011-08-13 17:32+0000\n"
+"Last-Translator: Jan B. Krejčí <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-16 04:56+0000\n"
-"X-Generator: Launchpad (build 13405)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
@@ -40,13 +40,12 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
-"Nemůžete odstranit/deaktivovat účet, který je nastaven jako vlastnost "
-"některého partnera"
+"Nemůžete odstranit/deaktivovat účet, který je přiřazen některému partnerovi"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Likvidace záznamu v knize"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
@@ -71,12 +70,12 @@ msgstr "Zbytek"
 #: code:addons/account/invoice.py:793
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr "Prosím nadefinujte sekvenci knihy faktur"
+msgstr "Prosím nadefinujte číselnou řadu knihy faktur"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Chyba! Délku období (s) je / jsou neplatné. "
+msgstr "Chyba! Neplatná délka období. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
@@ -91,12 +90,12 @@ msgstr "Definice potomků"
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "Splatné pohledávky do dnešního dne"
+msgstr "Pohledávky splatné ke dnešku"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr ""
+msgstr "Zahrnout zlikvidované záznamy"
 
 #. module: account
 #: view:account.pl.report:0
@@ -104,13 +103,13 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
-"Výkaz zisku a ztrát Vám dá přehled o zisku a ztrátě společnosti v jediném "
+"Výkaz zisku a ztráty Vám dá přehled o zisku či ztrátě společnosti v jediném "
 "dokumentu"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr "Importovat z faktur nebo plateb"
+msgstr "Importovat z faktury nebo platby"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -128,17 +127,19 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
+"Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, "
+"které se k nim váží, protože tyto nebudou zrušeny"
 
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr "Účetní zápisy-"
+msgstr "Účetní záznamy -"
 
 #. module: account
 #: code:addons/account/account.py:1305
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "Nemůžet smazat vložené pohyby: \"%s\"!"
+msgstr "Nemůžet smazat zaúčtované pohyby: \"%s\"!"
 
 #. module: account
 #: report:account.invoice:0
@@ -154,7 +155,7 @@ msgstr "Původ"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "Vyrovnání"
+msgstr "Likvidace"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -169,7 +170,7 @@ msgstr "Odkaz"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "Vyberte Daňový rok "
+msgstr "VYberte fiskální rok "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -178,7 +179,7 @@ msgid ""
 "term without removing it."
 msgstr ""
 "Pokud je pole nastaveno na Nepravda, umožní vám to skrýt platební období bez "
-"jejího odebrání."
+"jeho odebrání."
 
 #. module: account
 #: code:addons/account/invoice.py:1436
@@ -195,12 +196,12 @@ msgstr "Zdroj účtu"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Všechny analytické položky"
+msgstr "Všechny analytické záznamy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Faktury vytvořené v posledních 15 dnech"
 
 #. module: account
 #: selection:account.account.type,sign:0
@@ -211,7 +212,7 @@ msgstr "Záporné"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "Deník: %s"
+msgstr "Kniha: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -220,6 +221,9 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
+"Udává typ analytické knihy. Pokud mají být pro dokument (např. fakturu) "
+"vytvořeny analytické položky, OpenERP bude hledet vyhovující knihu shodného "
+"typu."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -239,13 +243,13 @@ msgid ""
 "No period defined for this date: %s !\n"
 "Please create a fiscal year."
 msgstr ""
-"Není určena perioda pro tento datum: %s !\n"
-"Prosíme vytvořte daňový rok."
+"Pro toto datum: %s není definováno období.\n"
+"Prosím vytvořte fiskální rok."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr ""
+msgstr "Výběr likvidace pohybu"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -253,6 +257,8 @@ msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones"
 msgstr ""
+"Pole \"sequence\" je použito pro řazení záznamů od nejnižšího čísla k "
+"nejvyššímu"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -261,17 +267,19 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
+"Zaškrtněte toto pole, pokud nechcete, aby se ve fakturách objevovalo k "
+"tomuto daňovému kódu žádné DPH"
 
 #. module: account
 #: code:addons/account/invoice.py:1224
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "Faktura '%s' je částečně zaplacená: %s%s of %s%s (%s%s zbývá)"
+msgstr "Faktura '%s' je zaplacená částečně: %s%s z %s%s (zbývá %s%s)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Účetní položky jsou vstupem vyrovnání."
+msgstr "Účetní záznamy jsou vstupem likvidace"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -282,12 +290,12 @@ msgstr "Belgické výkazy"
 #: code:addons/account/account_move_line.py:1182
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "Nemůžete přida/upravit položky v uzavřeném deníku."
+msgstr "Nemůžete přidávat/upravovat položky v uzavřené knize."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Calculated Balance"
-msgstr "Spočítat rozvahu"
+msgstr "Vypočtený zůstatek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -299,7 +307,7 @@ msgstr "Ruční opakování"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr "Uzavřít finační rok"
+msgstr "Uzávěrka fiskálního roku"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -314,13 +322,13 @@ msgstr "Vyberte období pro analýzu"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "Sv."
 
 #. module: account
 #: code:addons/account/invoice.py:532
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr ""
+msgstr "Firma řádku faktury nesouhlasí s firmou faktury"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -333,6 +341,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Nainstaluje lokalizované účtové rozvrhy, co nejlépe odpovídající účetním "
+"potřebám vaší firmy a vaší země."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -343,11 +353,15 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"Pro tuto firmu neexistuje účetní kniha typu %s.\n"
+"\n"
+"Můžete ji vytvořit v nabídce:\n"
+"Konfigurace/Finanční účetnictví/Účty/Knihy"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Zrušit likvidaci"
 
 #. module: account
 #: view:product.product:0
@@ -377,6 +391,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"Tento pohled je používán účetními pro hromadné vytváření záznamů. OpenERP "
+"vytvoří záznamy, když použijete bankovní výpisy, pokladnu nebo platby "
+"klientů či dodavatelům."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -397,12 +414,12 @@ msgstr "Datum vytvoření"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Dobropis přijatý"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Počáteční/konečný stav"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -412,7 +429,7 @@ msgstr "Měna použitá k zadání příkazu"
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Finanční rok k otevření"
+msgstr "Fiskální rok k otevření"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -420,11 +437,12 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Toto pole obsahuje informace související s číslováním záznamů této knihy."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr "Výchozí dluhový účet"
+msgstr "Výchozí debetní účet"
 
 #. module: account
 #: view:account.move:0
@@ -439,7 +457,7 @@ msgstr "Kladný"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr "Otevřít pro vyrovnání"
+msgstr "Otevřít pro zrušení likvidace"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -460,6 +478,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Když je vytvořen záznam v knize, jeho stav je \"Draft\". Když je vytištěn "
+"report, stav se změní na \"Printed\". Když jsou hotovy všechny transakce, "
+"záznam přejde do stavu \"Done\"."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -469,6 +490,10 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"Daňový přehled je strom reprezentující strukturu daňových kódů či případů, "
+"který zobrazuje aktuální daňovou situaci. Přehled zobrazuje výši všech "
+"oblastí daňového přiznání pro vaši zemi. Je strukturován hierarchicky a může "
+"být podle potřeby upraven."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -502,7 +527,7 @@ msgstr ""
 #: field:validate.account.move,journal_id:0
 #, python-format
 msgid "Journal"
-msgstr "Deník"
+msgstr "Kniha"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -517,7 +542,7 @@ msgstr "Nadřazený cíl"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Účet použitý v tomto deníku"
+msgstr "Účet použitý v této knize"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -536,17 +561,17 @@ msgstr "Účet použitý v tomto deníku"
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Vyberte účtový rozvrh"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "Daně nákupu"
+msgstr "Nákupní daně"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Vrácení faktury"
+msgstr "Dobropis vydaný"
 
 #. module: account
 #: report:account.overdue:0
@@ -556,13 +581,13 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Žádné vyrovnané transakce"
+msgstr "Nezlikvidované transakce"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:349
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr ""
+msgstr "Stav pokladny neodpovídá vypočtenému zůstatku!"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -575,12 +600,12 @@ msgstr "Mapování daně"
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Uzavřít finanční rok"
+msgstr "Uzavřít fiskální rok"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr "Účetní potvrzuje příkaz"
+msgstr "Účetní potvrzuje výpis."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -596,12 +621,12 @@ msgstr "Vše"
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr "Jméno adresy faktury"
+msgstr "Název příjemce faktury"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr "3 měsíce"
+msgstr "Kvartální"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -609,6 +634,8 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Pokud zrušíte likvidaci transakcí, musíte také zkontrolovat všechny akce, "
+"které s nimi souvisejí, protože tyto nebudou zrušeny"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -618,7 +645,7 @@ msgstr "   30 dní   "
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "Posloupnosti"
+msgstr "Číselné řady"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -628,12 +655,12 @@ msgstr "Mapování daní"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Centralizovaný deník"
+msgstr "Centralizovaná kniha"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr "Hlavní posloupnost musí být odlišná od aktuální !"
+msgstr "Hlavní číselná řada musí být odlišná od současné!"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -645,18 +672,18 @@ msgstr "Částka kódu daně"
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
-msgstr ""
+msgstr "KFV"
 
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
 msgid "closing balance entered by the cashbox verifier"
-msgstr ""
+msgstr "konečný zůstatek zadaný ověřovatelem pokladny"
 
 #. module: account
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Ukončit období"
+msgstr "Uzavřít období"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
@@ -666,19 +693,19 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "Období otvíracích položek"
+msgstr "Období počátečních zůstatků"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "Období deníku"
+msgstr "Období knihy"
 
 #. module: account
 #: code:addons/account/account_move_line.py:723
 #: code:addons/account/account_move_line.py:767
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr ""
+msgstr "Při likvidaci záznamů by u všech měla být stejná firma"
 
 #. module: account
 #: view:account.account:0
@@ -690,12 +717,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr "Účety pohledávek"
+msgstr "Pohledávky"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "ˇ"
+msgstr "Hlavní kniha"
 
 #. module: account
 #: view:account.invoice:0
@@ -705,17 +732,17 @@ msgstr "Znovu otevřít"
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "Chcete opravdu vytvořit položky?"
+msgstr "Opravdu chcete vytvořit záznamy?"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr "Zkontrolovat"
+msgstr "Šekový"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Dnes likvidovaní partneři"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -864,6 +891,7 @@ msgstr "Vytvořit 3-měsíční období"
 
 #. module: account
 #: report:account.overdue:0
+#: report:account.aged_trial_balance:0
 msgid "Due"
 msgstr "Do"
 
@@ -916,7 +944,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr "Bankovní příkaz"
+msgstr "Bankovní výpis"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -955,6 +983,10 @@ msgstr "Položky modelu"
 #: field:account.journal,code:0
 #: report:account.partner.balance:0
 #: field:account.period,code:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Code"
 msgstr "Kód"
 
@@ -1072,7 +1104,7 @@ msgstr "Začátek období"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr "Potvrdit příkaz"
+msgstr "Potvrdit výpis"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1276,6 +1308,7 @@ msgstr "Analýza položek deníku"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
+#: report:account.aged_trial_balance:0
 msgid "Partners"
 msgstr "Partneři"
 
@@ -1286,7 +1319,7 @@ msgstr "Partneři"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Bankovní příkaz"
+msgstr "Bankovní výpis"
 
 #. module: account
 #: view:res.partner:0
@@ -1373,6 +1406,9 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"Záznam v knize se skládá z položek, kde každá je debetní nebo kreditní "
+"transakcí. OpenERP automaticky vytvoří jeden záznam v knize pro každý účetní "
+"dokument: fakturu, dobropis, platbu dodavateli, bankovní výpis atd."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1475,7 +1511,7 @@ msgstr "Jít na dalšího partnera"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Hledat bankovní příkazy"
+msgstr "Hledat v bankovních výpisech"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -1499,7 +1535,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Řádky příkazů"
+msgstr "Řádky výpisu"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1511,6 +1547,10 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"Bankovní výpis je souhrn všech transakcí v daném období na bankovním účtu. "
+"Počáteční zůstatek je vyplněn automaticky, konečný byste měli najít na "
+"výpisu z banky. Když jste ve sloupci Platba v položce, stiskem F1 vyvoláte "
+"likvidaci."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1704,7 +1744,7 @@ msgstr "Tyto období se mohou překrývat."
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Návrh příkazu"
+msgstr "Rozpracovaný výpis"
 
 #. module: account
 #: view:account.tax:0
@@ -1916,6 +1956,8 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"Jestliže zadáte název jiný než \"/\", budou se stejně jmenovat i vytvořené "
+"účetní záznamy."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -1948,7 +1990,7 @@ msgstr "Účty k vyrovnání"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Import výpisu v elektronické podobě."
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -2125,8 +2167,13 @@ msgstr "Šablona výrobku"
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 #: model:ir.model,name:account.model_account_fiscalyear
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Fiscal Year"
-msgstr "Přestupný rok(Fiscal Year)"
+msgstr "Účetní období"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2145,17 +2192,17 @@ msgstr "Přestupný rok(Fiscal Year)"
 #: help:account.report.general.ledger,fiscalyear_id:0
 #: help:account.vat.declaration,fiscalyear_id:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Nechat prázdné pro všechny otevřené finanční pozice"
+msgstr "Pro vybrání všech účetních období nechte pole prázdné"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Položka účtu"
+msgstr "Účetní záznam"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr "Hlavní posloupnosti"
+msgstr "Hlavní číselná řada"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2467,7 +2514,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr "Bankovní příkazy"
+msgstr "Bankovní výpisy"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2651,7 +2698,7 @@ msgstr ""
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr ""
+msgstr "použito v rámci likvidace výpisu, nemělo by se používat jinde"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -3822,6 +3869,8 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Ručně vytvořené účetní záznamy jsou typicky založeny jako nezaúčtované. Toto "
+"jde pro vybrané knihy přeskakovat, takže založené záznamy se rovnou zaúčtují."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
@@ -3920,7 +3969,7 @@ msgstr "Režim zobrazení"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Výpis z faktury nebo platby"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3952,7 +4001,7 @@ msgstr "Statistiky faktur"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Bankovní výpisy jsou zadány do systému."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
@@ -4301,7 +4350,7 @@ msgstr "Jste si jisti?"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "Bankovní výpis použitý pro likvidaci banky"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4511,6 +4560,11 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Target Moves"
 msgstr "Cílové pohyby"
 
@@ -4627,6 +4681,8 @@ msgstr "Výsledek vyrovnání"
 #: view:account.bs.report:0
 #: model:ir.actions.act_window,name:account.action_account_bs_report
 #: model:ir.ui.menu,name:account.menu_account_bs_report
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
 msgid "Balance Sheet"
 msgstr "Zůstatkový list"
 
@@ -4663,7 +4719,7 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Vypočítat kód (pokud typ = kód)"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -4854,7 +4910,7 @@ msgstr "Analytické účetnictví"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Dobropis vystavený"
 
 #. module: account
 #: view:account.account:0
@@ -5555,7 +5611,7 @@ msgstr "Šablony účtů"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr "Daňový příkaz"
+msgstr "Daňový výkaz"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
@@ -6018,6 +6074,8 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"Likvidace banky spočívá v kontrole, že bankovní výpis odpovídá záznamům v "
+"účetnictví."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6301,6 +6359,8 @@ msgstr ""
 #: report:account.general.journal:0
 #: report:account.invoice:0
 #: report:account.partner.balance:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Total:"
 msgstr "Celkem:"
 
@@ -6374,7 +6434,7 @@ msgstr "Dokončeno"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Výpis s ručně zadanými položkami je nastaven jako rozpracovaný."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6409,7 +6469,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr "Vyrovnání příkazů"
+msgstr "Likvidace výpisů"
 
 #. module: account
 #: report:account.invoice:0
@@ -6531,7 +6591,7 @@ msgstr "Nadřazená šablona účtu"
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "Příkaz"
+msgstr "Výpis"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
@@ -6627,7 +6687,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Řádek bankovního výpisu"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -7327,6 +7387,9 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"Tento daňový přehled slouží k vytváření pravidelných daňových výkazů. "
+"Uvidíte v něm daně a jejich kódy příslušející k daňovým přiznáním podle vaší "
+"země."
 
 #. module: account
 #: view:account.installer.modules:0
@@ -7492,6 +7555,11 @@ msgstr "Měna společnosti"
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
+#: report:account.aged_trial_balance:0
 msgid "Chart of Account"
 msgstr ""
 
@@ -7607,6 +7675,10 @@ msgstr "Deník vrácení peněz"
 #: report:account.general.journal:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Filter By"
 msgstr "Filtrovat podle"
 
@@ -7663,7 +7735,7 @@ msgstr "Mezivýsledek"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "Tisknout daňový příkaz"
+msgstr "Tisk daňového výkazu"
 
 #. module: account
 #: view:account.model.line:0
@@ -7810,7 +7882,7 @@ msgstr ""
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Částka na dokladu musí odpovídat částce v řádku výpisu"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1137
@@ -7869,7 +7941,7 @@ msgstr "Měna"
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "Určuje pořadí v zobrazení seznamu řádků výpisu"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
@@ -8146,6 +8218,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8262,6 +8335,10 @@ msgstr "Nechejte prázdné pro použití příjmového účtu"
 #: report:account.third_party_ledger_other:0
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Balance"
 msgstr "Zůstatek"
 
@@ -8273,6 +8350,10 @@ msgstr "Ručně nebo automaticky zadáno do systému"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
+#: report:account.balancesheet.horizontal:0
+#: report:account.balancesheet:0
+#: report:pl.account.horizontal:0
+#: report:pl.account:0
 msgid "Display Account"
 msgstr "Zobrazit účet"
 
@@ -8337,7 +8418,7 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:391
 #, python-format
 msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
+msgstr "Nelze smazat bankovní výpis, který už byl potvrzen!"
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -8408,7 +8489,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Bankovní příkazy"
+msgstr "Bankovní výpisy"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -8575,6 +8656,7 @@ msgstr "Vstupní předplatné"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
+#: report:account.aged_trial_balance:0
 msgid "Start Date"
 msgstr "Počáteční datum"
 
@@ -9045,6 +9127,7 @@ msgstr "Stavy"
 #: field:report.account.sales,amount_total:0
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
+#: report:account.aged_trial_balance:0
 msgid "Total"
 msgstr "Celkem"
 
@@ -9125,13 +9208,13 @@ msgstr "t"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr ""
+msgstr "Rozpracované výpisy"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
-msgstr ""
+msgstr "Manuální nebo automatické vytvoření záznamů o platbách podle výpisů"
 
 #. module: account
 #: view:account.invoice:0
@@ -9363,7 +9446,7 @@ msgstr "Další volitelná měna, pokud je položka více-měnová."
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Import výpisu do systému z vydané nebo přijaté faktury"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -9543,6 +9626,7 @@ msgstr "account.addtmpl.wizard"
 #: field:account.partner.ledger,result_selection:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: report:account.aged_trial_balance:0
 msgid "Partner's"
 msgstr "Partneři"
 
@@ -9867,10 +9951,6 @@ msgstr ""
 #~ msgid "Taxed Amount"
 #~ msgstr "Zdaněná částka"
 
-#, python-format
-#~ msgid "The statement balance is incorrect !\n"
-#~ msgstr "Zůstatek příkaz není správný !\n"
-
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Faktura "
@@ -9878,3 +9958,7 @@ msgstr ""
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "není platné."
+
+#, python-format
+#~ msgid "The statement balance is incorrect !\n"
+#~ msgstr "Nesprávný zůstatek výpisu!\n"
diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po
index d1cbb07b7a1..6d2f2c8f769 100644
--- a/addons/product_margin/i18n/cs.po
+++ b/addons/product_margin/i18n/cs.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-08-03 09:09+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-08-13 17:31+0000\n"
+"Last-Translator: Jan B. Krejčí <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:36+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: product_margin
 #: view:product.product:0
 #: field:product.product,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Obrat"
 
 #. module: product_margin
 #: field:product.product,expected_margin_rate:0
 msgid "Expected Margin (%)"
-msgstr ""
+msgstr "Očekávaná marže (%)"
 
 #. module: product_margin
 #: field:product.margin,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: product_margin
 #: field:product.margin,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Do"
 
 #. module: product_margin
 #: field:product.product,date_to:0
@@ -62,18 +62,18 @@ msgstr "Od data"
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Draft, Open and Paid"
-msgstr ""
+msgstr "Draft, Otevřený a Zaplacený"
 
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
 msgid "Avg. Unit Price"
-msgstr ""
+msgstr "Prům. jedn. cena"
 
 #. module: product_margin
 #: model:ir.module.module,shortdesc:product_margin.module_meta_information
 msgid "Margins in Product"
-msgstr ""
+msgstr "Marže produktu"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
@@ -83,13 +83,13 @@ msgstr ""
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr ""
+msgstr "Katalogová cena"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Paid"
-msgstr ""
+msgstr "Zaplaceno"
 
 #. module: product_margin
 #: help:product.product,sales_gap:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
-msgstr ""
+msgstr "Suma součinu nákladové ceny a množství v přijatých fakturách"
 
 #. module: product_margin
 #: help:product.product,expected_margin:0
@@ -134,12 +134,12 @@ msgstr "Kritérium analýzy"
 #: view:product.product:0
 #: field:product.product,total_cost:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Celkové náklady"
 
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
-msgstr ""
+msgstr "Očekávaná marže"
 
 #. module: product_margin
 #: view:product.product:0
@@ -155,7 +155,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
 msgid "Expected margin * 100 / Expected Sale"
-msgstr ""
+msgstr "Očekávaná marže * 100 / Očekávaný prodej"
 
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
@@ -166,18 +166,18 @@ msgstr "Prům. cena ve faktůrách zákazníků)"
 #: help:product.product,total_cost:0
 msgid ""
 "Sum of Multification of Invoice price and quantity of Supplier Invoices "
-msgstr ""
+msgstr "Suma součinu fakturované ceny a množství na přijatých fakturách "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
 #: field:product.product,invoice_state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "Stav faktury"
 
 #. module: product_margin
 #: help:product.product,purchase_gap:0
 msgid "Normal Cost - Total Cost"
-msgstr ""
+msgstr "Normální náklady - Celkové náklady"
 
 #. module: product_margin
 #: field:product.product,total_margin:0
@@ -208,7 +208,7 @@ msgstr "Prům. cena ve fakturách zásobitelů "
 #. module: product_margin
 #: help:product.product,purchase_num_invoiced:0
 msgid "Sum of Quantity in Supplier Invoices"
-msgstr ""
+msgstr "Suma množství v přijatých fakturách"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -224,7 +224,7 @@ msgstr "Celkový rozsah * 100 / Obrat"
 #: field:product.product,purchase_num_invoiced:0
 #: field:product.product,sale_num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# Fakturováno"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -244,7 +244,7 @@ msgstr "Prodeje"
 #: view:product.product:0
 #, python-format
 msgid "Product Margins"
-msgstr ""
+msgstr "Marže produktů"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -259,12 +259,12 @@ msgstr ""
 #. module: product_margin
 #: field:product.product,purchase_gap:0
 msgid "Purchase Gap"
-msgstr ""
+msgstr "Nákupní rozdíl"
 
 #. module: product_margin
 #: field:product.product,total_margin_rate:0
 msgid "Total Margin (%)"
-msgstr ""
+msgstr "Celková marže (%)"
 
 #. module: product_margin
 #: view:product.margin:0
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 237f2b4c6b2..b8b59ed7477 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ca.po b/debian/po/ca.po
index d78ea80c6d6..277525e763b 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 59d83e4468c..c8d4327e19a 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/da.po b/debian/po/da.po
index f3afb84f539..3c1ab98b5c4 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/de.po b/debian/po/de.po
index a29ae6ef7f2..db89f7ca666 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/el.po b/debian/po/el.po
index aba757554f3..30ab6f392ca 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index 9c010a6e997..64be141c7c9 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es.po b/debian/po/es.po
index a2ff2bfcade..af18e467d53 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 164489b3910..2cac6a953a1 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index cde9a0d9562..5e12c661bce 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fa.po b/debian/po/fa.po
index 165ce297eab..f02901cb4c6 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 6cc9e384219..ead16bd6dff 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/fr.po b/debian/po/fr.po
index cadc6b38c28..7294520b38e 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 695bccd2263..5d5861d3253 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/he.po b/debian/po/he.po
index 4ff529ffe72..b6abd19c4f3 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hr.po b/debian/po/hr.po
index c526a9c7f9c..1d64614f75a 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/hu.po b/debian/po/hu.po
index fd7fbbc41b9..ec27e63c66c 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/it.po b/debian/po/it.po
index f40bc73a4e4..c0c55387657 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ja.po b/debian/po/ja.po
index da8679eed6e..2b0b8ecae9d 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ko.po b/debian/po/ko.po
index e2030b6603b..535f76d42ee 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/lv.po b/debian/po/lv.po
index 4579b1dd5f1..4006ca8e7aa 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/mn.po b/debian/po/mn.po
index eecb8291af1..aa80ced1387 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nb.po b/debian/po/nb.po
index ffa73979796..22167473f37 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 1e712de2721..0139ddfd1c9 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 141fd7be6e7..efa21e2cb9e 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 52cbf6c4aa9..870a10982ea 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index f5709b4714d..4ebb91a03d4 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 51b4dc85f5d..454d1208f17 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/ru.po b/debian/po/ru.po
index c5c0cf40689..a62d56135be 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sk.po b/debian/po/sk.po
index d4eb3f0e938..2e64c468c20 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 5550c306840..2fd401f07b8 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sr.po b/debian/po/sr.po
index 09b4b5c9450..d28f2812596 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 081480fc235..ef404a44c15 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "X-Poedit-Language: Swedish\n"
 
 #. Type: string
diff --git a/debian/po/tr.po b/debian/po/tr.po
index f4fd357482a..134f48eae01 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 211c0184720..16b418d8c4f 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 6f00faeddc0..9495f3be262 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index f366835628a..ce11bdaa420 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. Type: string
 #. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 24c27ac3fb2..0594a718c6e 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index a5fb9bb85f5..ce51ecf45c9 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 9f4a242a575..f85334c78fb 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 5106646a7f7..ee7f8f0fc06 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 250be02237f..775497880f4 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 9f4a6dd194e..87a6f927bb3 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 750800445fb..1a2e0cfa1b6 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 3996f631942..f842644827f 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-15 18:58+0000\n"
+"PO-Revision-Date: 2011-08-13 17:34+0000\n"
 "Last-Translator: Chronos <robie@centrum.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
@@ -2125,7 +2125,7 @@ msgstr "Koncept"
 #: selection:res.config.view,view:0
 #: selection:res.users,view:0
 msgid "Extended"
-msgstr "Rozšířený"
+msgstr "Rozšířené"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_title_contact
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 476174e41d8..7f21a346790 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 52e60f0a158..8289e5c376c 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 9c1eeb6605e..334a58a2235 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 819ebc88f20..1f8bc5daf79 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 02c98328d6a..b77151221a8 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 67604a603f6..e51d5b9361f 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 545e8d9d2f1..fa554c25b73 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 50a7a609592..cd1e0799b8c 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 6916e0fca5c..e5b8d24f9b7 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 6f050b63eb9..75eacf72ac1 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index f36744f9254..bdfce3a4680 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index eb12afab6d7..c840b901d66 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -2950,7 +2950,7 @@ msgstr "Liipaisuobjekti"
 #. module: base
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Nykyinen aktiviteetti"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4259,7 +4259,7 @@ msgstr "Pankit"
 #. module: base
 #: view:res.log:0
 msgid "Unread"
-msgstr ""
+msgstr "Lukemattomat"
 
 #. module: base
 #: field:ir.cron,doall:0
@@ -7286,7 +7286,7 @@ msgstr "Tunisia"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_mrp_root
 msgid "Manufacturing"
-msgstr "Valmistava"
+msgstr "Valmistus"
 
 #. module: base
 #: model:res.country,name:base.km
@@ -7668,7 +7668,7 @@ msgstr "Kategoria"
 #: selection:ir.attachment,type:0
 #: selection:ir.property,type:0
 msgid "Binary"
-msgstr ""
+msgstr "Binäärinen"
 
 #. module: base
 #: field:ir.actions.server,sms:0
@@ -8079,7 +8079,7 @@ msgstr "Asetukset"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_consumers0
 msgid "Consumers"
-msgstr ""
+msgstr "Kuluttajat"
 
 #. module: base
 #: view:res.config:0
@@ -8781,7 +8781,7 @@ msgstr "Virhe! Et voi luoda rekursiivista valikkoa."
 #: model:ir.ui.menu,name:base.menu_publisher_warranty_contract_add
 #: view:publisher_warranty.contract.wizard:0
 msgid "Register a Contract"
-msgstr "Rekisteröi kontakti"
+msgstr "Rekisteröi sopimus"
 
 #. module: base
 #: view:ir.rule:0
@@ -9086,7 +9086,7 @@ msgstr "Bulgaria / български език"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr "Jälkimarkkinointi"
+msgstr "Jälkimarkkinapalvelut"
 
 #. module: base
 #: view:ir.actions.todo:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 72e556ca0b6..807f13d3fac 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index f032077f599..32dea586fa8 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index cbf4aa5d2ab..ede6a0babe3 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 37f273dfa6e..16d1bd77537 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 59e6d3c7784..a471ee47e9d 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 92450cdeeb8..d22a2e16aba 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 785ad80ae63..1028ec1f65e 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 1f2e848fb3d..867bda823d6 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:54+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:39+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 8621750ca76..5240c94c6ad 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index bc08b18fb84..6464d1a8f3d 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 1c65d8855e0..1a161d148b8 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 8f782400c4c..720a5b0da58 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 858e75fd362..b91b48ca5bc 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 0d66bbfbcdc..9805c306546 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 9fd6c96d98f..a99e476d842 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:55+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:40+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 4a0ba940896..5a8a443e3d2 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index a241280ea9a..0eb8fee697b 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:53+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:38+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index ccf2043de97..baf38ceba4d 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 0981174df44..4b044d0d10f 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 3f0c496f29b..4b3dccedea3 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index ab16ee3b6b4..f4a0b467163 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index be2f7107ab4..b5d46379e7d 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 47cb98b5b98..eae5aae1b32 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 5d65c0911db..7ea85c64207 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 14d93634083..ce6ece7bb5f 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 035dbdebf04..a709f253137 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:52+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:37+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 9a06950b7fc..92da88ab1e9 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:56+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:41+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index d9874da338d..0b045d8aebd 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:59+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:44+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 407c323dcdf..39bd316d471 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 6fb52860c7d..831662befb2 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 0bda452db6c..3d0740a2e54 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index a8b5e0dfe3c..dd1ced6bb5a 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 55c832c0c72..f8a053da660 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:42+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index bdbd94c5e93..663fb1ad57e 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:57+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 7bcbe0f0060..bce78c257f9 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 5903603e3ba..69143d461fe 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0
@@ -8036,7 +8036,7 @@ msgstr "伊拉克"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_association
 msgid "Association"
-msgstr "关联"
+msgstr "商会"
 
 #. module: base
 #: model:res.country,name:base.cl
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index c0d5d10fb9e..ca3b3201309 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-06 04:58+0000\n"
-"X-Generator: Launchpad (build 13613)\n"
+"X-Launchpad-Export-Date: 2011-08-14 04:43+0000\n"
+"X-Generator: Launchpad (build 13674)\n"
 
 #. module: base
 #: view:ir.filters:0

From 941496a321565e65d67c87f29ed729d86fd96cf5 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Mon, 15 Aug 2011 16:16:43 +0200
Subject: [PATCH 24/30] [IMP] bank account management reviewed, improved groups
 name

bzr revid: fp@fp-laptop-20110815141643-ebg8rnuihkei6fni
---
 openerp/addons/base/__openerp__.py            |   4 +-
 openerp/addons/base/base_update.xml           |  26 ++-
 openerp/addons/base/res/__init__.py           |   1 -
 openerp/addons/base/res/bank.py               |  58 -----
 openerp/addons/base/res/bank_view.xml         |  58 -----
 openerp/addons/base/res/partner/__init__.py   |   1 +
 openerp/addons/base/res/partner/bank.py       | 221 ++++++++++++++++++
 openerp/addons/base/res/partner/bank_view.xml | 189 +++++++++++++++
 openerp/addons/base/res/partner/partner.py    | 116 ---------
 .../addons/base/res/partner/partner_data.xml  |  17 +-
 .../addons/base/res/partner/partner_view.xml  |  66 ------
 openerp/addons/base/res/res_company.py        |  15 +-
 openerp/addons/base/res/res_security.xml      |   2 +-
 .../addons/base/security/base_security.xml    |   4 +-
 14 files changed, 455 insertions(+), 323 deletions(-)
 delete mode 100644 openerp/addons/base/res/bank.py
 delete mode 100644 openerp/addons/base/res/bank_view.xml
 create mode 100644 openerp/addons/base/res/partner/bank.py
 create mode 100644 openerp/addons/base/res/partner/bank_view.xml

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 5b357263569..c36dcecdf30 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -62,7 +62,7 @@
         'res/partner/partner_report.xml',
         'res/partner/partner_view.xml',
         'res/partner/partner_shortcut_data.xml',
-        'res/bank_view.xml',
+        'res/partner/bank_view.xml',
         'res/country_view.xml',
         'res/res_currency_view.xml',
         'res/partner/crm_view.xml',
@@ -71,11 +71,9 @@
         'res/partner/wizard/partner_clear_ids_view.xml',
         'res/partner/wizard/partner_wizard_ean_check_view.xml',
         'res/partner/partner_data.xml',
-
         'res/ir_property_view.xml',
         'security/base_security.xml',
         'publisher_warranty/publisher_warranty_view.xml',
-
         'security/ir.model.access.csv',
         'res/res_widget_view.xml',
         'res/res_widget_data.xml',
diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index acc2d1d741d..5da43489e55 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -189,6 +189,16 @@
         <report id="preview_report" model="res.company" name="preview.report" multi="True"
             rml="base/report/preview_report.rml" string="Preview Report"/>
 
+        <record id="bank_account_update" model="ir.actions.act_window">
+            <field name="name">Company Bank Accounts</field>
+            <field name="res_model">res.partner.bank</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
+        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+        </record>
+
+
         <record id="view_company_form" model="ir.ui.view">
             <field name="name">res.company.form</field>
             <field name="model">res.company</field>
@@ -217,12 +227,16 @@
                             <field name="phone"/>
                             <field name="email"/>
                             <separator string="Header/Footer of Reports" colspan="4"/>
-                            <field name="rml_header1" colspan="4"/>
-                            <field name="rml_footer1" colspan="4"/>
-                            <field name="rml_footer2" colspan="4"/>
-                            <group colspan="4" col="8">
-                                <label string="" colspan="7"/>
-                                <button name="%(preview_report)d" string="Preview Report" type="action" icon="gtk-print"/>
+			    <group colspan="4" col="3">
+				<field name="rml_header1" colspan="3"/>
+				<newline/>
+				<field name="rml_footer1" colspan="3"/>
+				<newline/>
+				<field name="rml_footer2" colspan="2"/>
+                                <button name="%(bank_account_update)d" string="Bank Accounts" type="action" icon="gtk-go-forward"/>
+				<newline/>
+                                <label string="" colspan="2"/>
+                                <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
                             </group>
                         </page>
                         <page string="Header/Footer" groups="base.group_extended">
diff --git a/openerp/addons/base/res/__init__.py b/openerp/addons/base/res/__init__.py
index 1536f8b2d75..de00fc54153 100644
--- a/openerp/addons/base/res/__init__.py
+++ b/openerp/addons/base/res/__init__.py
@@ -22,7 +22,6 @@
 import tools
 
 import country
-import bank
 import res_lang
 import partner
 import res_config
diff --git a/openerp/addons/base/res/bank.py b/openerp/addons/base/res/bank.py
deleted file mode 100644
index f94777e4942..00000000000
--- a/openerp/addons/base/res/bank.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-
-class Bank(osv.osv):
-    _description='Bank'
-    _name = 'res.bank'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Name', size=128, required=True),
-        'code': fields.char('Code', size=64),
-        'street': fields.char('Street', size=128),
-        'street2': fields.char('Street2', size=128),
-        'zip': fields.char('Zip', change_default=True, size=24),
-        'city': fields.char('City', size=128),
-        'state': fields.many2one("res.country.state", 'State',
-            domain="[('country_id', '=', country)]"),
-        'country': fields.many2one('res.country', 'Country'),
-        'email': fields.char('E-Mail', size=64),
-        'phone': fields.char('Phone', size=64),
-        'fax': fields.char('Fax', size=64),
-        'active': fields.boolean('Active'),
-        'bic': fields.char('BIC/Swift code', size=11,
-            help="Bank Identifier Code"),
-    }
-    _defaults = {
-        'active': lambda *a: 1,
-    }
-    def name_get(self, cr, uid, ids, context=None):
-        result = []
-        for bank in self.browse(cr, uid, ids, context):
-            result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
-        return result
-
-Bank()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/openerp/addons/base/res/bank_view.xml b/openerp/addons/base/res/bank_view.xml
deleted file mode 100644
index 10c78e847a2..00000000000
--- a/openerp/addons/base/res/bank_view.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_res_bank_form" model="ir.ui.view">
-            <field name="name">res.bank.form</field>
-            <field name="model">res.bank</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Bank">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="active" select="2"/>
-                    <field name="bic" select="1"/>
-                    <newline/>
-                    <separator string="Address" colspan="2" col="4"/>
-                    <separator string="Communication" colspan="2" col="4"/>
-                    <group  colspan="2" col="4">
-                        <field name="street" select="2"/>
-                        <field name="street2" select="2"/>
-                        <field name="zip"/>
-                        <field name="city"/>
-                        <field name="country" select="2"/>
-                        <field name="state" select="2"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="email" widget="email"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_res_bank_tree" model="ir.ui.view">
-            <field name="name">res.bank.tree</field>
-            <field name="model">res.bank</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Banks">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="country"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_res_bank_form" model="ir.actions.act_window">
-            <field name="name">Banks</field>
-            <field name="res_model">res.bank</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help">Manage bank records you want to be used in the system.</field>
-        </record>
-
-        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form"
-            parent="base.menu_config_address_book" sequence="5"/>
-    </data>
-</openerp>
diff --git a/openerp/addons/base/res/partner/__init__.py b/openerp/addons/base/res/partner/__init__.py
index 96d625bd3e1..3a9b989162f 100644
--- a/openerp/addons/base/res/partner/__init__.py
+++ b/openerp/addons/base/res/partner/__init__.py
@@ -22,6 +22,7 @@
 import tools
 
 from partner import *
+from bank import *
 from crm import *
 
 import wizard
diff --git a/openerp/addons/base/res/partner/bank.py b/openerp/addons/base/res/partner/bank.py
new file mode 100644
index 00000000000..c8fcbb947c3
--- /dev/null
+++ b/openerp/addons/base/res/partner/bank.py
@@ -0,0 +1,221 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+class Bank(osv.osv):
+    _description='Bank'
+    _name = 'res.bank'
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Name', size=128, required=True),
+        'street': fields.char('Street', size=128),
+        'street2': fields.char('Street2', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'state': fields.many2one("res.country.state", 'State',
+            domain="[('country_id', '=', country)]"),
+        'country': fields.many2one('res.country', 'Country'),
+        'email': fields.char('E-Mail', size=64),
+        'phone': fields.char('Phone', size=64),
+        'fax': fields.char('Fax', size=64),
+        'active': fields.boolean('Active'),
+        'bic': fields.char('Bank Identifier Code', size=64,
+            help="Sometimes called BIC or Swift."),
+    }
+    _defaults = {
+        'active': lambda *a: 1,
+    }
+    def name_get(self, cr, uid, ids, context=None):
+        result = []
+        for bank in self.browse(cr, uid, ids, context):
+            result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
+        return result
+
+Bank()
+
+
+class res_partner_bank_type(osv.osv):
+    _description='Bank Account Type'
+    _name = 'res.partner.bank.type'
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Name', size=64, required=True, translate=True),
+        'code': fields.char('Code', size=64, required=True),
+        'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
+        'format_layout': fields.text('Format Layout', translate=True)
+    }
+    _defaults = {
+        'format_layout': lambda *args: "%(bank_name)s: %(acc_number)s"
+    }
+res_partner_bank_type()
+
+class res_partner_bank_type_fields(osv.osv):
+    _description='Bank type fields'
+    _name = 'res.partner.bank.type.field'
+    _order = 'name'
+    _columns = {
+        'name': fields.char('Field Name', size=64, required=True, translate=True),
+        'bank_type_id': fields.many2one('res.partner.bank.type', 'Bank Type', required=True, ondelete='cascade'),
+        'required': fields.boolean('Required'),
+        'readonly': fields.boolean('Readonly'),
+        'size': fields.integer('Max. Size'),
+    }
+res_partner_bank_type_fields()
+
+
+class res_partner_bank(osv.osv):
+    '''Bank Accounts'''
+    _name = "res.partner.bank"
+    _rec_name = "acc_number"
+    _description = __doc__
+    _order = 'sequence'
+
+    def _bank_type_get(self, cr, uid, context=None):
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+
+        result = []
+        type_ids = bank_type_obj.search(cr, uid, [])
+        bank_types = bank_type_obj.browse(cr, uid, type_ids, context=context)
+        for bank_type in bank_types:
+            result.append((bank_type.code, bank_type.name))
+        return result
+
+    def _default_value(self, cursor, user, field, context=None):
+        if field in ('country_id', 'state_id'):
+            value = False
+        else:
+            value = ''
+        if not context.get('address', False):
+            return value
+        for ham, spam, address in context['address']:
+            if address.get('type', False) == 'default':
+                return address.get(field, value)
+            elif not address.get('type', False):
+                value = address.get(field, value)
+        return value
+
+    _rec_name = 'acc_number'
+    _columns = {
+        'acc_number': fields.char('Account Number', size=64, required=True),
+        'bank': fields.many2one('res.bank', 'Bank'),
+        'bank_bic': fields.char('Bank Identifier Code', size=16),
+        'bank_name': fields.char('Bank Name', size=32),
+        'owner_name': fields.char('Account Owner Name', size=64),
+        'street': fields.char('Street', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'country_id': fields.many2one('res.country', 'Country',
+            change_default=True),
+        'state_id': fields.many2one("res.country.state", 'State',
+            change_default=True, domain="[('country_id','=',country_id)]"),
+        'company_id': fields.many2one('res.company', 'Company',
+            ondelete='cascade', help="Only if this bank account belong to your company"),
+        'partner_id': fields.many2one('res.partner', 'Account Owner', required=True,
+            ondelete='cascade', select=True),
+        'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
+            change_default=True),
+        'sequence': fields.integer('Sequence'),
+        'footer': fields.boolean("Display on Reports")
+    }
+    _defaults = {
+        'owner_name': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'name', context=context),
+        'street': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'street', context=context),
+        'city': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'city', context=context),
+        'zip': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'zip', context=context),
+        'country_id': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'country_id', context=context),
+        'state_id': lambda obj, cursor, user, context: obj._default_value(
+            cursor, user, 'state_id', context=context),
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        res = super(res_partner_bank, self).fields_get(cr, uid, fields, context)
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+        type_ids = bank_type_obj.search(cr, uid, [])
+        types = bank_type_obj.browse(cr, uid, type_ids)
+        for type in types:
+            for field in type.field_ids:
+                if field.name in res:
+                    res[field.name].setdefault('states', {})
+                    res[field.name]['states'][type.code] = [
+                            ('readonly', field.readonly),
+                            ('required', field.required)]
+        return res
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        bank_type_obj = self.pool.get('res.partner.bank.type')
+        res = []
+        for val in self.browse(cr, uid, ids, context=context):
+            result = val.acc_number
+            if val.state:
+                type_ids = bank_type_obj.search(cr, uid, [('code','=',val.state)])
+                if type_ids:
+                    t = bank_type_obj.browse(cr, uid, type_ids[0], context=context)
+                    try:
+                        result = t.format_layout % val._data[val.id]
+                    except:
+                        result += ' [Formating Error]'
+                        raise
+            res.append((val.id, result))
+        return res
+
+    def onchange_company_id(self, cr, uid, ids, company_id, context={}):
+        result = {}
+        if company_id:
+            c = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            if c.partner_id:
+                r = self.onchange_partner_id(cr, uid, ids, c.partner_id.id, context=context)
+                r['value']['partner_id'] = c.partner_id.id
+                r['value']['footer'] = 1
+                result = r
+        return result
+
+    def onchange_bank_id(self, cr, uid, ids, bank_id, context={}):
+        result = {}
+        if bank_id:
+            bank = self.pool.get('res.bank').browse(cr, uid, bank_id, context=context)
+            result['bank_name'] = bank.name
+            result['bank_bic'] = bank.bic
+        return {'value': result}
+
+
+    def onchange_partner_id(self, cr, uid, id, partner_id, context={}):
+        result = {}
+        if partner_id:
+            part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            result['owner_name'] = part.name
+            result['street'] = part.address and part.address[0].street or False
+            result['city'] = part.address and part.address[0].city or False
+            result['zip'] =  part.address and part.address[0].zip or False
+            result['country_id'] =  part.address and part.address[0].country_id and part.address[0].country_id.id or False
+            result['state_id'] = part.address and part.address[0].state_id and part.address[0].state_id.id or False
+        return {'value': result}
+
+res_partner_bank()
+
+
diff --git a/openerp/addons/base/res/partner/bank_view.xml b/openerp/addons/base/res/partner/bank_view.xml
new file mode 100644
index 00000000000..cf00dc6fe8c
--- /dev/null
+++ b/openerp/addons/base/res/partner/bank_view.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    <!-- Banks -->
+
+        <record id="view_res_bank_form" model="ir.ui.view">
+            <field name="name">res.bank.form</field>
+            <field name="model">res.bank</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank">
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="bic" select="1"/>
+                        <field name="active" select="2"/>
+                    </group>
+                    <newline/>
+                    <group  colspan="2" col="4">
+                        <separator string="Address" colspan="4"/>
+                        <field name="street" select="2"/>
+                        <field name="street2" select="2"/>
+                        <field name="zip"/>
+                        <field name="city"/>
+                        <field name="country" select="2"/>
+                        <field name="state" select="2"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Communication" colspan="2"/>
+                        <field name="phone"/>
+                        <field name="fax"/>
+                        <field name="email" widget="email"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_res_bank_tree" model="ir.ui.view">
+            <field name="name">res.bank.tree</field>
+            <field name="model">res.bank</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Banks">
+                    <field name="name"/>
+                    <field name="bic"/>
+                    <field name="country"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_res_bank_form" model="ir.actions.act_window">
+            <field name="name">Banks</field>
+            <field name="res_model">res.bank</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help">Manage bank records you want to be used in the system.</field>
+        </record>
+
+        <menuitem action="action_res_bank_form" id="menu_action_res_bank_form"
+            parent="base.menu_config_address_book" sequence="11"
+	    groups="base.group_no_one"/>
+
+
+
+        <record id="view_partner_bank_type_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.type.form</field>
+            <field name="model">res.partner.bank.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank Account Type">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="field_ids" colspan="4"/>
+                    <field name="format_layout" colspan="4"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_partner_bank_type_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.type.tree</field>
+            <field name="model">res.partner.bank.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Account Type">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="view_partner_bank_form" model="ir.ui.view">
+            <field name="name">res.partner.bank.form</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Bank account">
+                    <group colspan="4" col="6">
+                        <field name="state"/>
+                        <field name="company_id" on_change="onchange_company_id(company_id)" invisible="context.get('company_hide', True)" widget="selection"/>
+			<field name="footer" attrs="{'invisible': [('company_id','=',False)]}"/>
+                        <newline/>
+                        <field name="acc_number"/>
+                    </group>
+                    <group name="owner" colspan="2" col="2">
+                        <separator colspan="4" string="Bank Account Owner"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="owner_name"/>
+                        <field name="street"/>
+                        <field name="city"/>
+                        <field name="zip"/>
+                        <field name="state_id"/>
+                        <field name="country_id"/>
+                    </group>
+                    <group name="bank" colspan="2" col="2">
+                        <separator colspan="2" string="Information About the Bank"/>
+                        <field name="bank" on_change="onchange_bank_id(bank)" groups="base.group_extended"/>
+                        <field name="bank_name" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
+                        <field name="bank_bic"/>
+                    </group>
+
+                </form>
+            </field>
+        </record>
+
+        <record id="view_partner_bank_search" model="ir.ui.view">
+            <field name="name">res.partner.bank.search</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Bank Accounts">
+		    <filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
+                    <separator orientation="vertical"/>
+                    <field name="acc_number"/>
+		    <field name="company_id" invisible="context.get('company_hide', True)"/>
+                    <field name="partner_id"/>
+                    <field name="bank_name"/>
+                </search>
+            </field>
+        </record>
+
+
+        <record id="view_partner_bank_tree" model="ir.ui.view">
+            <field name="name">res.partner.bank.tree</field>
+            <field name="model">res.partner.bank</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Accounts">
+                    <field name="sequence" invisible="1"/>
+                    <field name="acc_number"/>
+                    <field name="bank_name"/>
+		    <field name="company_id" invisible="context.get('company_hide', True)"/>
+		    <field name="footer" invisible="context.get('company_hide', True)"/>
+                    <field name="partner_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_res_partner_bank_account_form" model="ir.actions.act_window">
+            <field name="name">Bank Accounts</field>
+            <field name="res_model">res.partner.bank</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_res_partner_bank_account_form"
+            id="menu_action_res_partner_bank_form"
+            parent="base.menu_config_address_book"
+            groups="base.group_no_one"
+            sequence="9"/>
+
+
+        <record id="action_res_partner_bank_type_form" model="ir.actions.act_window">
+            <field name="name">Bank Account Types</field>
+            <field name="res_model">res.partner.bank.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem action="action_res_partner_bank_type_form"
+            id="menu_action_res_partner_bank_typeform"
+            parent="base.menu_config_address_book"
+	    groups="base.group_no_one"
+            sequence="15"/>
+
+
+
+    </data>
+</openerp>
+
diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index e4cfba50f8e..4b8f1279787 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -347,122 +347,6 @@ class res_partner_address(osv.osv):
 
 res_partner_address()
 
-class res_partner_bank_type(osv.osv):
-    _description='Bank Account Type'
-    _name = 'res.partner.bank.type'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True),
-        'code': fields.char('Code', size=64, required=True),
-        'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
-    }
-res_partner_bank_type()
-
-class res_partner_bank_type_fields(osv.osv):
-    _description='Bank type fields'
-    _name = 'res.partner.bank.type.field'
-    _order = 'name'
-    _columns = {
-        'name': fields.char('Field Name', size=64, required=True, translate=True),
-        'bank_type_id': fields.many2one('res.partner.bank.type', 'Bank Type', required=True, ondelete='cascade'),
-        'required': fields.boolean('Required'),
-        'readonly': fields.boolean('Readonly'),
-        'size': fields.integer('Max. Size'),
-    }
-res_partner_bank_type_fields()
-
-
-class res_partner_bank(osv.osv):
-    '''Bank Accounts'''
-    _name = "res.partner.bank"
-    _rec_name = "acc_number"
-    _description = __doc__
-    _order = 'sequence,name'
-
-    def _bank_type_get(self, cr, uid, context=None):
-        bank_type_obj = self.pool.get('res.partner.bank.type')
-
-        result = []
-        type_ids = bank_type_obj.search(cr, uid, [])
-        bank_types = bank_type_obj.browse(cr, uid, type_ids, context=context)
-        for bank_type in bank_types:
-            result.append((bank_type.code, bank_type.name))
-        return result
-
-    def _default_value(self, cursor, user, field, context=None):
-        if field in ('country_id', 'state_id'):
-            value = False
-        else:
-            value = ''
-        if not context.get('address', False):
-            return value
-        for ham, spam, address in context['address']:
-            if address.get('type', False) == 'default':
-                return address.get(field, value)
-            elif not address.get('type', False):
-                value = address.get(field, value)
-        return value
-
-    _columns = {
-        'name': fields.char('Description', size=128),
-        'acc_number': fields.char('Account Number', size=64, required=False),
-        'bank': fields.many2one('res.bank', 'Bank', required=True),
-        'owner_name': fields.char('Account Owner', size=64),
-        'street': fields.char('Street', size=128),
-        'zip': fields.char('Zip', change_default=True, size=24),
-        'city': fields.char('City', size=128),
-        'country_id': fields.many2one('res.country', 'Country',
-            change_default=True),
-        'state_id': fields.many2one("res.country.state", 'State',
-            change_default=True, domain="[('country_id','=',country_id)]"),
-        'partner_id': fields.many2one('res.partner', 'Partner', required=True,
-            ondelete='cascade', select=True),
-        'state': fields.selection(_bank_type_get, 'Bank Type', required=True,
-            change_default=True),
-        'sequence': fields.integer('Sequence'),
-    }
-    _defaults = {
-        'owner_name': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'name', context=context),
-        'street': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'street', context=context),
-        'city': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'city', context=context),
-        'zip': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'zip', context=context),
-        'country_id': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'country_id', context=context),
-        'state_id': lambda obj, cursor, user, context: obj._default_value(
-            cursor, user, 'state_id', context=context),
-    }
-
-    def fields_get(self, cr, uid, fields=None, context=None):
-        res = super(res_partner_bank, self).fields_get(cr, uid, fields, context)
-        bank_type_obj = self.pool.get('res.partner.bank.type')
-        type_ids = bank_type_obj.search(cr, uid, [])
-        types = bank_type_obj.browse(cr, uid, type_ids)
-        for type in types:
-            for field in type.field_ids:
-                if field.name in res:
-                    res[field.name].setdefault('states', {})
-                    res[field.name]['states'][type.code] = [
-                            ('readonly', field.readonly),
-                            ('required', field.required)]
-        return res
-
-    def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        res = []
-        for val in self.browse(cr, uid, ids):
-            if val.bank.code:
-                res.append((val.id, val.bank.code + ': ' + val.acc_number))
-            else:
-                res.append((val.id, val.acc_number))
-        return res
-
-res_partner_bank()
-
 class res_partner_category(osv.osv):
     _inherit = 'res.partner.category'
     _columns = {
diff --git a/openerp/addons/base/res/partner/partner_data.xml b/openerp/addons/base/res/partner/partner_data.xml
index 46e9faac130..138e44176f0 100644
--- a/openerp/addons/base/res/partner/partner_data.xml
+++ b/openerp/addons/base/res/partner/partner_data.xml
@@ -35,20 +35,15 @@
 
         <!-- Default bank account description -->
         <record id="bank_normal" model="res.partner.bank.type">
-            <field name="name">Bank account</field>
+            <field name="name">Normal Bank Account</field>
             <field name="code">bank</field>
         </record>
-        <record id="bank_normal_field" model="res.partner.bank.type.field">
-            <field name="name">acc_number</field>
-            <field eval="True" name="required"/>
-            <field name="bank_type_id" ref="bank_normal"/>
-        </record>
-        <record id="bank_normal_field_contry" model="res.partner.bank.type.field">
-            <field name="name">country_id</field>
-            <field eval="True" name="readonly"/>
-            <field name="bank_type_id" ref="bank_normal"/>
-        </record>
 
+        <record id="bank_normal_field_bic" model="res.partner.bank.type.field">
+            <field name="name">bank_bic</field>
+            <field name="bank_type_id" ref="bank_normal"/>
+            <field name="required" eval="0"/>
+        </record>
         <!--
         Resource: res.request.link
         -->
diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml
index 7dc4a595adf..2b98fc6ccbb 100644
--- a/openerp/addons/base/res/partner/partner_view.xml
+++ b/openerp/addons/base/res/partner/partner_view.xml
@@ -5,7 +5,6 @@
                   web_icon="data/sales.png"
                   web_icon_hover="data/sales-hover.png"
                   groups="base.group_sale_salesman"/>
-                  
 
         <menuitem id="menu_address_book" name="Address Book" parent="menu_base_partner" sequence="2"/>
 
@@ -439,71 +438,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_payterm_form"/>
         </record>
-
-        <record id="view_partner_bank_type_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.type.form</field>
-            <field name="model">res.partner.bank.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Bank Account Type">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_partner_bank_type_tree" model="ir.ui.view">
-            <field name="name">res.partner.bank.type.tree</field>
-            <field name="model">res.partner.bank.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Bank Account Type">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record id="view_partner_bank_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Bank account">
-                    <field name="state"/>
-                    <field name="partner_id" select="1"/>
-                    <newline/>
-                    <field name="acc_number" select="1"/>
-                    <newline/>
-                    <field name="bank"/>
-                    <newline/>
-                    <field name="sequence"/>
-                    <field colspan="4" name="name"/>
-                    <separator colspan="4" string="Bank Account Owner"/>
-                    <field colspan="4" name="owner_name"/>
-                    <field colspan="4" name="street"/>
-                    <field name="city"/>
-                    <field name="zip"/>
-                    <field completion="1" name="country_id"/>
-                    <field name="state_id"/>
-                </form>
-            </field>
-        </record>
-        <record id="view_partner_bank_tree" model="ir.ui.view">
-            <field name="name">res.partner.bank.tree</field>
-            <field name="model">res.partner.bank</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Bank Accounts">
-                    <field name="state"/>
-                    <field name="acc_number"/>
-                    <field name="partner_id"/>
-                    <field name="owner_name"/>
-                </tree>
-            </field>
-        </record>
-
         <!--
           ======================
           Categories
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 14ef53199d5..93e003f8962 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -88,6 +88,18 @@ class res_company(osv.osv):
                         result[company.id][field] = address[field] or False
         return result
 
+
+    def _get_bank_data(self, cr, uid, ids, field_names, arg, context=None):
+        """ Read the 'address' functional fields. """
+        result = {}
+        for company in self.browse(cr, uid, ids, context=context):
+            r = []
+            for bank in company.bank_ids:
+                if bank.footer:
+                    r.append(bank.name_get(context=context)[0][1])
+            result[company.id] = ' | '.join(r)
+        return result
+
     def _set_address_data(self, cr, uid, company_id, name, value, arg, context=None):
         """ Write the 'address' functional fields. """
         company = self.browse(cr, uid, company_id, context=context)
@@ -109,7 +121,7 @@ class res_company(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'rml_header1': fields.char('Report Header', size=200),
         'rml_footer1': fields.char('Report Footer 1', size=200),
-        'rml_footer2': fields.char('Report Footer 2', size=200),
+        'rml_footer2': fields.function(_get_bank_data, type="char", string='Bank Accounts Footer', size=250, help="This field is computed automatically based on bank accounts defined, having the display on footer checkbox set."),
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
         'rml_header3': fields.text('RML Internal Header', required=True),
@@ -123,6 +135,7 @@ class res_company(osv.osv):
         'zip': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="Zip", multi='address'), 
         'city': fields.function(_get_address_data, fnct_inv=_set_address_data, size=24, type='char', string="City", multi='address'),         
         'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="State", multi='address'), 
+        'bank_ids': fields.one2many('res.partner.bank','company_id', 'Bank Accounts', help='Bank accounts related to this company'),
         'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'), 
         'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'), 
         'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'), 
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index 1708be790cb..6783e316a6c 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data noupdate="0">
 
-    <record model="res.groups" id="group_partner_manager">
+    <record model="res.groups" id="group_partner_manager" context="{'noadmin':True}">
         <field name="name">Partner Manager</field>
     </record>
 
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 7389b45c814..00aca6613d6 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -14,7 +14,7 @@
     </record>
 
     <record model="res.groups" id="group_user">
-        <field name="name">Employee</field>
+        <field name="name">Human Resources / Employee</field>
     </record>
 
     <record model="res.groups" context="{'noadmin':True}" id="group_multi_company">
@@ -26,7 +26,7 @@
     </record>
 
     <record model="res.groups" id="group_no_one" context="{'noadmin':True}">
-        <field name="name">Useability / No One</field>
+        <field name="name">Useability / Technical Features</field>
     </record>
 
     <record id="group_sale_salesman" context="{'noadmin':True}" model="res.groups">

From fa7874cddc48e7ba4bd7f74ce5159351536d1514 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Mon, 15 Aug 2011 16:21:41 +0200
Subject: [PATCH 25/30] [IMP] Improved bank account management, report footer,
 stages by default on projects

bzr revid: fp@fp-laptop-20110815142141-938zg1laoe8wtbkd
---
 addons/account/__init__.py                    |   1 +
 addons/account/__openerp__.py                 |   3 +-
 addons/account/account.py                     |   9 +-
 addons/account/account_bank.py                | 103 ++++++++++++++++++
 addons/account/account_bank_view.xml          |  48 ++++++++
 addons/account/account_view.xml               |   2 +-
 addons/account/partner_view.xml               |  37 ++++---
 .../account/project/analytic_account_demo.xml |   2 +-
 addons/base_iban/base_iban.py                 |  58 +++-------
 addons/base_iban/base_iban_data.xml           |  15 +--
 addons/base_iban/base_iban_view.xml           |  52 ---------
 addons/crm/security/crm_security.xml          |   4 +
 addons/hr/security/hr_security.xml            |   4 +-
 addons/mrp_repair/mrp_repair.py               |   2 +-
 addons/project/project.py                     |  16 ++-
 addons/project/project_data.xml               |  29 ++++-
 addons/project/project_demo.xml               |  20 +---
 addons/project/project_view.xml               |   5 +-
 addons/sale/security/sale_security.xml        |   4 +-
 19 files changed, 250 insertions(+), 164 deletions(-)
 create mode 100644 addons/account/account_bank.py
 create mode 100644 addons/account/account_bank_view.xml

diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 24129306e13..52c65f0c3da 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -25,6 +25,7 @@ import project
 import partner
 import invoice
 import account_bank_statement
+import account_bank
 import account_cash_statement
 import account_move_line
 import account_analytic_line
diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 23846183ddf..1b378e15e93 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -122,7 +122,8 @@ module named account_voucher.
         'company_view.xml',
         'board_account_view.xml',
         "wizard/account_report_profit_loss_view.xml",
-        "wizard/account_report_balance_sheet_view.xml"
+        "wizard/account_report_balance_sheet_view.xml",
+        "account_bank_view.xml"
     ],
     'demo_xml': [
         'demo/account_demo.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 72208314ed9..0cee9291e97 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -602,7 +602,7 @@ class account_journal(osv.osv):
     _description = "Journal"
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True),
-        'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
+        'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
         'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
                                  " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
@@ -2675,9 +2675,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         return False
 
     def _get_default_accounts(self, cr, uid, context=None):
-        return [{'acc_name': _('Current'),'account_type':'bank'},
-                    {'acc_name': _('Deposit'),'account_type':'bank'},
-                    {'acc_name': _('Cash'),'account_type':'cash'}]
+        return [
+            {'acc_name': _('Bank Account'),'account_type':'bank'},
+            {'acc_name': _('Cash'),'account_type':'cash'}
+        ]
 
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
new file mode 100644
index 00000000000..a3d66ccdf7c
--- /dev/null
+++ b/addons/account/account_bank.py
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from tools.translate import _
+from osv import fields, osv
+
+class bank(osv.osv):
+    _inherit = "res.partner.bank"
+    _columns = {
+        'journal_id': fields.many2one('account.journal', 'Account Journal', help="This journal will be created automatically for this bank account when you save the record"),
+    }
+    def create(self, cr, uid, data, context={}):
+        result = super(bank, self).create(cr, uid, data, context=context)
+        self.post_write(cr, uid, [result], context=context)
+        return result
+
+    def write(self, cr, uid, ids, data, context={}):
+        result = super(bank, self).write(cr, uid, ids, data, context=context)
+        self.post_write(cr, uid, ids, context=context)
+        return result
+
+    def post_write(self, cr, uid, ids, context={}):
+        obj_acc = self.pool.get('account.account')
+        obj_data = self.pool.get('ir.model.data')
+        for bank in self.browse(cr, uid, ids, context):
+            if bank.company_id and not bank.journal_id:
+                # Find the code and parent of the bank account to create
+                dig = 6
+                current_num = 1
+                ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) 
+                # No liquidity account exists, no template available
+                if not ids: continue
+
+                ref_acc_bank_temp = obj_acc.browse(cr, uid, ids[0], context=context)
+                ref_acc_bank = ref_acc_bank_temp.parent_id
+                while True:
+                    new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
+                    ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)])
+                    if not ids:
+                        break
+                    current_num += 1
+
+                acc = {
+                    'name': (bank.bank_name or '')+' '+bank.acc_number,
+                    'currency_id': bank.company_id.currency_id.id,
+                    'code': new_code,
+                    'type': 'liquidity',
+                    'user_type': ref_acc_bank_temp.user_type.id,
+                    'reconcile': False,
+                    'parent_id': ref_acc_bank.id,
+                    'company_id': bank.company_id.id,
+                }
+                acc_bank_id  = obj_acc.create(cr,uid,acc,context=context)
+
+                # Get the journal view id
+                data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
+                data = obj_data.browse(cr, uid, data_id[0], context=context)
+                view_id_cash = data.res_id
+                
+                jour_obj = self.pool.get('account.journal')
+                new_code = 1
+                while True:
+                    code = _('BNK')+str(new_code)
+                    ids = jour_obj.search(cr, uid, [('code','=',code)], context=context)
+                    if not ids:
+                        break
+                    new_code += 1
+
+                #create the bank journal
+                vals_journal = {
+                    'name':  (bank.bank_name or '')+' '+bank.acc_number,
+                    'code': code,
+                    'type': 'bank',
+                    'company_id': bank.company_id.id,
+                    'analytic_journal_id': False,
+                    'currency_id': False,
+                    'default_credit_account_id': acc_bank_id,
+                    'default_debit_account_id': acc_bank_id,
+                    'view_id': view_id_cash
+                }
+                journal_id = jour_obj.create(cr, uid, vals_journal, context=context)
+
+                self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context)
+        return True
+
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
new file mode 100644
index 00000000000..d91739817ac
--- /dev/null
+++ b/addons/account/account_bank_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!--
+      Bank Accounts
+    -->
+
+    <record id="view_partner_bank_form_inherit" model="ir.ui.view">
+        <field name="name">Partner Bank Accounts - Journal</field>
+        <field name="model">res.partner.bank</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="base.view_partner_bank_form"/>
+        <field name="arch" type="xml">
+            <group name="bank" position="after">
+                <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
+                    <separator string="Accounting Information" colspan="2"/>
+                    <field name="journal_id"/>
+                </group>
+            </group>
+        </field>
+    </record>
+
+
+    <record id="action_bank_tree" model="ir.actions.act_window">
+        <field name="name">Bank Accounts</field>
+        <field name="res_model">res.partner.bank</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
+        <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can drag &amp; drop bank in the list view to reorder bank accounts. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
+    </record>
+    <menuitem
+        sequence="0"
+    	parent="account.account_account_menu"
+        id="menu_action_bank_tree"
+        action="action_bank_tree"/>
+
+
+    <record id="account_configuration_bank_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_bank_tree"/>
+        <field name="category_id" ref="category_accounting_configuration"/>
+        <field name="sequence">4</field>
+    </record>
+
+
+</data>
+</openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 19def9fff12..5de205e1690 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -767,7 +767,7 @@
             <field name="search_view_id" ref="view_account_type_search"/>
             <field name="help">An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company.</field>
         </record>
-        <menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu"/>
+        <menuitem action="action_account_type_form" sequence="6" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_extended"/>
         <!--
     Entries
     -->
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index cfb98ffb1ae..fbee97875ae 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -97,27 +97,30 @@
                         <form string="Bank account">
                             <field name="state"/>
                             <newline/>
-                            <field name="acc_number" attrs="{'invisible':[('state','!=','bank')]}"/>
+                            <field name="acc_number"/>
                             <newline/>
-                            <field name="bank"/>
-                            <newline/>
-                            <field name="sequence"/>
-                            <field colspan="4" name="name"/>
-                            <separator colspan="4" string="Bank account owner"/>
-                            <field colspan="4" name="owner_name"/>
-                            <field colspan="4" name="street"/>
-                            <newline/>
-                            <field name="zip"/>
-                            <field name="city"/>
-                            <newline/>
-                            <field completion="1" name="country_id"/>
-                            <field name="state_id"/>
+                            <group name="owner" colspan="2" col="2">
+                                <separator colspan="4" string="Bank Account Owner"/>
+                                <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                                <field name="owner_name"/>
+                                <field name="street"/>
+                                <field name="city"/>
+                                <field name="zip"/>
+                                <field name="state_id"/>
+                                <field name="country_id"/>
+                            </group>
+                            <group name="bank" colspan="2" col="2">
+                                <separator colspan="2" string="Information About the Bank"/>
+                                <field name="bank" on_change="onchange_bank_id(bank)" groups="base.group_extended"/>
+                                <field name="bank_name"/>
+                                <field name="bank_bic"/>
+                            </group>
                         </form>
                         <tree string="Bank Details">
-                            <field name="state"/>
-                            <field name="bank"/>
-                            <field name="owner_name"/>
+                            <field name="sequence" invisible="1"/>
                             <field name="acc_number"/>
+                            <field name="bank_name"/>
+                            <field name="owner_name"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 6df74d0a0ba..7cf5a59efc1 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="analytic_root" model="account.analytic.account">
-            <field name="name" model="res.company" use="name" search="[('id', '=', 1)]"/>
+            <field name="name" model="res.company" use="name" search="[]"/>
             <field name="code">0</field>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 37b5b841e23..9f37558d759 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -83,14 +83,14 @@ class res_partner_bank(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         #overwrite to format the iban number correctly
-        if 'iban' in vals and vals['iban']:
-            vals['iban'] = _format_iban(vals['iban'])
+        if (vals.get('state',False)=='iban') and vals.get('acc_number', False):
+            vals['acc_number'] = _format_iban(vals['acc_number'])
         return super(res_partner_bank, self).create(cr, uid, vals, context)
 
     def write(self, cr, uid, ids, vals, context=None):
         #overwrite to format the iban number correctly
-        if 'iban' in vals and vals['iban']:
-            vals['iban'] = _format_iban(vals['iban'])
+        if (vals.get('state',False)=='iban') and vals.get('acc_number', False):
+            vals['acc_number'] = _format_iban(vals['acc_number'])
         return super(res_partner_bank, self).write(cr, uid, ids, vals, context)
 
     def check_iban(self, cr, uid, ids, context=None):
@@ -98,9 +98,9 @@ class res_partner_bank(osv.osv):
         Check the IBAN number
         '''
         for bank_acc in self.browse(cr, uid, ids, context=context):
-            if not bank_acc.iban:
+            if bank_acc.state<>'iban':
                 continue
-            iban = _format_iban(bank_acc.iban).lower()
+            iban = _format_iban(bank_acc.acc_number).lower()
             if iban[:2] in _iban_len and len(iban) != _iban_len[iban[:2]]:
                 return False
             #the four first digits have to be shifted to the end
@@ -122,39 +122,11 @@ class res_partner_bank(osv.osv):
         def default_iban_check(iban_cn):
             return iban_cn[0] in string.ascii_lowercase and iban_cn[1] in string.ascii_lowercase
 
-        iban_country = self.browse(cr, uid, ids)[0].iban[:2]
+        iban_country = self.browse(cr, uid, ids)[0].acc_number[:2].lower()
         if default_iban_check(iban_country):
             iban_example = iban_country in _ref_iban and _ref_iban[iban_country] + ' \nWhere A = Account number, B = National bank code, S = Branch code, C = account No, N = branch No, K = National check digits....' or ''
             return _('The IBAN does not seem to be correct. You should have entered something like this %s'), (iban_example)
-        return _('The IBAN is invalid, It should begin with the country code'), ()
-
-    def name_get(self, cr, uid, ids, context=None):
-        res = []
-        to_check_ids = []
-        for val in self.browse(cr, uid, ids, context=context):
-            if val.state=='iban':
-                iban = _pretty_iban(val.iban or '')
-                bic = val.bank.bic or ''
-                res.append((val.id, _('IBAN: %s / BIC: %s') % (iban, bic)))
-            else:
-                to_check_ids.append(val.id)
-        res += super(res_partner_bank, self).name_get(cr, uid, to_check_ids, context=context)
-        return res
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
-    #overwrite the search method in order to search not only on bank type == basic account number but also on type == iban
-        res = super(res_partner_bank,self).search(cr, uid, args, offset, limit, order, context=context, count=count)
-        if filter(lambda x:x[0]=='acc_number' ,args):
-            #get the value of the search
-            iban_value = filter(lambda x:x[0]=='acc_number' ,args)[0][2]
-            #get the other arguments of the search
-            args1 =  filter(lambda x:x[0]!='acc_number' ,args)
-            #add the new criterion
-            args1 += [('iban','ilike',iban_value)]
-            #append the results to the older search
-            res += super(res_partner_bank,self).search(cr, uid, args1, offset, limit,
-                order, context=context, count=count)
-        return res
+        return _('The IBAN is invalid, it should begin with the country code'), ()
 
     def get_bban_from_iban(self, cr, uid, ids, context=None):
         '''
@@ -169,21 +141,23 @@ class res_partner_bank(osv.osv):
             'gb': lambda x: x[14:],
         }
         for record in self.browse(cr, uid, ids, context=context):
-            if not record.iban:
+            if not record.acc_number:
                 res[record.id] = False
                 continue
             res[record.id] = False
             for code, function in mapping_list.items():
-                if record.iban.lower().startswith(code):
-                    res[record.id] = function(record.iban)
+                if record.acc_number.lower().startswith(code):
+                    res[record.id] = function(record.acc_number)
                     break
         return res
 
     _columns = {
-        'iban': fields.char('IBAN', size=34, readonly=True, help="International Bank Account Number"),
+        # Deprecated: we keep it for backward compatibility, to be removed in v7
+        # We use acc_number instead of IBAN since v6.1, but we keep this field
+        # to not break community modules.
+        'iban': fields.related('acc_number', string='IBAN', size=34, readonly=True, help="International Bank Account Number", type="char"),
     }
-
-    _constraints = [(check_iban, _construct_constraint_msg, ["iban"])]
+    _constraints = [(check_iban, _construct_constraint_msg, ["acc_number"])]
 
 res_partner_bank()
 
diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index dae3999505e..ac481098254 100644
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -8,15 +8,10 @@
         <record id="bank_iban" model="res.partner.bank.type">
             <field name="name">IBAN Account</field>
             <field name="code">iban</field>
-        </record>
-        <record id="bank_iban_field" model="res.partner.bank.type.field">
-            <field name="name">iban</field>
-            <field name="bank_type_id" ref="bank_iban"/>
-            <field eval="True" name="required"/>
-            <field eval="False" name="readonly"/>
+            <field name="format_layout">%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s</field>
         </record>
         <record id="bank_swift_field" model="res.partner.bank.type.field">
-            <field name="name">bic</field>
+            <field name="name">bank_bic</field>
             <field name="bank_type_id" ref="bank_iban"/>
             <field eval="True" name="required"/>
             <field eval="False" name="readonly"/>
@@ -33,11 +28,5 @@
             <field eval="False" name="required"/>
             <field eval="False" name="readonly"/>
         </record>
-        <record id="bank_acc_number_field" model="res.partner.bank.type.field">
-            <field name="name">acc_number</field>
-            <field name="bank_type_id" ref="bank_iban"/>
-            <field eval="False" name="required"/>
-            <field eval="True" name="readonly"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/base_iban/base_iban_view.xml b/addons/base_iban/base_iban_view.xml
index e1e73f28f3b..30816750035 100644
--- a/addons/base_iban/base_iban_view.xml
+++ b/addons/base_iban/base_iban_view.xml
@@ -2,57 +2,5 @@
 <openerp>
     <data>
 
-        <record id="view_partner_bank_iban_form" model="ir.ui.view">
-            <field name="name">res.partner.bank.form.iban.inherit</field>
-            <field name="model">res.partner.bank</field>
-            <field name="inherit_id" ref="base.view_partner_bank_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <newline/>
-                    <field name="iban"/>
-                    <newline/>
-                </field>
-            </field>
-        </record>
-        
-        <record id="view_partner_abnk_iban_tree" model="ir.ui.view">
-            <field name="name">res.partner.bank.tree.iban.inherit</field>
-            <field name="model">res.partner.bank</field>
-            <field name="inherit_id" ref="base.view_partner_bank_tree"/>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <field name="iban"/>
-                </field>
-            </field>
-        </record>
-
-    <!-- view for res.partner -->
-        <record id="view_partner_iban_form" model="ir.ui.view">
-            <field name="name">res.partner.form.iban.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="acc_number" position="after">
-                    <newline/>
-                    <field name="iban" attrs="{'invisible':[('state','!=','iban')]}"/>
-                    <newline/>
-                </field>
-            </field>
-        </record>
-        <record id="view_partner_iban_list" model="ir.ui.view">
-            <field name="name">res.partner.form.iban.inherit.list</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
-                	<field name="iban"/>
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 45b7ccb017e..8ac32086cfd 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -16,6 +16,10 @@
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
+    <record model="res.users" id="base.user_admin">
+        <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
+    </record>
+
     <record id="crm_rule_personal_lead" model="ir.rule">
         <field name="name">Personal Leads</field>
         <field ref="model_crm_lead" name="model_id"/>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index aadadd224e9..1ec0e42c47e 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,10 +3,10 @@
 <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / Officer</field>
+        <field name="name">Human Resources / HR Officer</field>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / Manager</field>
+        <field name="name">Human Resources / HR Manager</field>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
     </record>
 
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index caacb2e3247..3a538590d10 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -121,7 +121,7 @@ class mrp_repair(osv.osv):
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
-            ('confirmed','Confirmed'),
+            ('confirmed','Confirmed, to repair'),
             ('ready','Ready to Repair'),
             ('under_repair','Under Repair'),
             ('2binvoiced','To be Invoiced'),
diff --git a/addons/project/project.py b/addons/project/project.py
index b1461da424c..622b5ffc2c2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,10 +26,10 @@ from datetime import datetime, date
 from tools.translate import _
 from osv import fields, osv
 
-class project_project(osv.osv):
-    _name = 'project.project'
-    
-project_project()    
+# I think we can remove this in v6.1 since VMT's improvements in the framework ?
+#class project_project(osv.osv):
+#    _name = 'project.project'
+#project_project()
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -39,13 +39,12 @@ class project_task_type(osv.osv):
         'name': fields.char('Stage Name', required=True, size=64, translate=True),
         'description': fields.text('Description'),
         'sequence': fields.integer('Sequence'),
+        'project_default': fields.boolean('Common to All Projects', help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
     }
-
     _defaults = {
         'sequence': 1
     }
-
 project_task_type()
 
 class project(osv.osv):
@@ -150,11 +149,16 @@ class project(osv.osv):
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
      }
+    def _get_type_common(self, cr, uid, context):
+        ids = self.pool.get('project.task.type').search(cr, uid, [('project_default','=',1)], context=context)
+        return ids
+
     _order = "sequence"
     _defaults = {
         'active': True,
         'priority': 1,
         'sequence': 10,
+        'type_ids': _get_type_common
     }
 
     # TODO: Why not using a SQL contraints ?
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a2df2e2e76c..d78f208526a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -15,10 +15,9 @@
             <field name="object">project.task</field>
         </record>
         
-
         <!--
-		Resource: project.project
-		-->
+        Resource: project.project
+        -->
 
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
@@ -26,5 +25,29 @@
         </record>
         <function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
 
+
+        <!-- Task Stages -->
+        <record id="project_tt_specification" model="project.task.type">
+            <field name="sequence">1</field>
+            <field name="name">Design</field>
+            <field name="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_development" model="project.task.type">
+            <field name="sequence">2</field>
+            <field name="name">Development</field>
+            <field name="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_testing" model="project.task.type">
+            <field name="sequence">3</field>
+            <field name="name">Testing</field>
+            <field name="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_merge" model="project.task.type">
+            <field name="sequence">4</field>
+            <field name="name">Deployment</field>
+            <field name="project_default" eval="1"/>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index a2a5bb8c17c..999d16c07cc 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -221,26 +221,8 @@
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.uom_hour"></field>
         </record>
-
-        <!-- Task Types -->
-        <record id="project_tt_specification" model="project.task.type">
-            <field name="sequence">1</field>
-            <field name="name">Specification</field>
-        </record>
-        <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">2</field>
-            <field name="name">Development</field>
-        </record>
-        <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">3</field>
-            <field name="name">Testing</field>
-        </record>
-        <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">4</field>
-            <field name="name">Merge</field>
-        </record>
-
         <!-- Projects -->
+
         <!-- <record id="all_projects_account" model="project.project">
             <field name="name">Projects</field>
             <field name="code">3</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 731134d0cc6..435bf64fe8d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -247,7 +247,7 @@
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
-                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
+                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
@@ -481,8 +481,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task Stage">
+                    <group colspan="4" col="6">
                     <field name="name" select="1"/>
+                    <field name="project_default"/>
                     <field name="sequence"/>
+                    </group>
                     <separator string="Description" colspan="4"/>
                     <field colspan="4" name="description" nolabel="1"/>
                 </form>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index bed44a8d726..e62ec56dd45 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -17,10 +17,12 @@
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
     </record>
 
+    <record model="res.users" id="base.user_admin">
+        <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
+    </record>
     <record model="ir.ui.menu" id="base.menu_base_partner">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
     </record>
-
     <record model="ir.ui.menu" id="base.menu_base_config">
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>

From 8c2256b8fd01360b8ac4c03cf1f3a59fb02b2ba2 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Mon, 15 Aug 2011 17:28:25 +0200
Subject: [PATCH 26/30] [IMP] company configuration, report header and footer

bzr revid: fp@fp-laptop-20110815152825-n2njyvgmqoyuqwwi
---
 openerp/addons/base/base_update.xml    |  23 +++++++++++++----------
 openerp/addons/base/res/res_company.py |  21 +++++++++++++++++----
 pixmaps/your_logo.png                  | Bin 0 -> 25194 bytes
 3 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 pixmaps/your_logo.png

diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 5da43489e55..6f4dbf6a1f9 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -224,17 +224,20 @@
                             <field name="city"/>
                             <field name="country_id"/>
                             <field name="state_id"/>
-                            <field name="phone"/>
-                            <field name="email"/>
+                            <field name="phone" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="email" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="fax" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="website" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="vat" on_change="on_change_header(phone, email, fax, website, vat)"/>
                             <separator string="Header/Footer of Reports" colspan="4"/>
-			    <group colspan="4" col="3">
-				<field name="rml_header1" colspan="3"/>
-				<newline/>
-				<field name="rml_footer1" colspan="3"/>
-				<newline/>
-				<field name="rml_footer2" colspan="2"/>
-                                <button name="%(bank_account_update)d" string="Bank Accounts" type="action" icon="gtk-go-forward"/>
-				<newline/>
+                            <group colspan="4" col="3">
+                                <field name="rml_header1" colspan="3"/>
+                                <newline/>
+                                <field name="rml_footer1" colspan="3"/>
+                                <newline/>
+                                <field name="rml_footer2" colspan="2"/>
+                                <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
+                                <newline/>
                                 <label string="" colspan="2"/>
                                 <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
                             </group>
diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 93e003f8962..b292dc6e5fc 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -114,13 +114,14 @@ class res_company(osv.osv):
                 address_obj.create(cr, uid, {name: value or False, 'partner_id': company.partner_id.id}, context=context)
         return True
 
+
     _columns = {
         'name': fields.char('Company Name', size=64, required=True),
         'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
         'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'rml_header1': fields.char('Report Header', size=200),
-        'rml_footer1': fields.char('Report Footer 1', size=200),
+        'rml_header1': fields.char('Report Header / Company Slogan', size=200),
+        'rml_footer1': fields.char('General Information Footer', size=200),
         'rml_footer2': fields.function(_get_bank_data, type="char", string='Bank Accounts Footer', size=250, help="This field is computed automatically based on bank accounts defined, having the display on footer checkbox set."),
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
@@ -139,7 +140,19 @@ class res_company(osv.osv):
         'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'), 
         'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'), 
         'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'), 
+        'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'), 
+        'website': fields.related('partner_id', 'website', string="Website", type="char", size=64), 
+        'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32), 
     }
+    def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, context={}):
+        val = []
+        if phone: val.append(_('Phone: ')+phone)
+        if email: val.append(_('Email: ')+email)
+        if fax: val.append(_('Fax: ')+fax)
+        if website: val.append(_('Website: ')+website)
+        if vat: val.append(_('VAT: ')+vat)
+        return {'value': {'rml_footer1':' | '.join(val)}}
+
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
@@ -235,7 +248,7 @@ class res_company(osv.osv):
 
     def _get_logo(self, cr, uid, ids):
         return open(os.path.join(
-            tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'),
+            tools.config['root_path'], '..', 'pixmaps', 'your_logo.png'),
                     'rb') .read().encode('base64')
 
     _header = """
@@ -306,7 +319,7 @@ class res_company(osv.osv):
         'rml_header':_get_header,
         'rml_header2': _header2,
         'rml_header3': _header3,
-        #'logo':_get_logo
+        'logo':_get_logo
     }
 
     _constraints = [
diff --git a/pixmaps/your_logo.png b/pixmaps/your_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f8a9cde168761b057d1b2bb336f45b8292c7062
GIT binary patch
literal 25194
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

literal 0
HcmV?d00001


From 04b7ce8425477bd3aee90f02baf464eecea7d454 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Mon, 15 Aug 2011 17:32:02 +0200
Subject: [PATCH 27/30] imp

bzr revid: fp@fp-laptop-20110815153202-20pjs3u2vo28iqox
---
 openerp/addons/base/res/res_company.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index b292dc6e5fc..b0ebeb8ac27 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -147,7 +147,6 @@ class res_company(osv.osv):
     def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, context={}):
         val = []
         if phone: val.append(_('Phone: ')+phone)
-        if email: val.append(_('Email: ')+email)
         if fax: val.append(_('Fax: ')+fax)
         if website: val.append(_('Website: ')+website)
         if vat: val.append(_('VAT: ')+vat)

From aef3fdd67f7453dae522739617f1adb70dcc99aa Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Tue, 16 Aug 2011 01:02:43 +0200
Subject: [PATCH 28/30] [IMP] better logo

bzr revid: fp@fp-laptop-20110815230243-9gws07bt6ewc7yqk
---
 pixmaps/your_logo.png | Bin 25194 -> 12661 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pixmaps/your_logo.png b/pixmaps/your_logo.png
index 6f8a9cde168761b057d1b2bb336f45b8292c7062..f5f05b08653803ed0eb914de54395a122738eb0b 100644
GIT binary patch
literal 12661
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

literal 25194
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


From d2ac8defd8d167ffcba77c4f4cd8d7767903214e Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Tue, 16 Aug 2011 01:06:37 +0200
Subject: [PATCH 29/30] [FIX] fixed yml tests due to removed fields on account
 payments

bzr revid: fp@fp-laptop-20110815230637-q86iamto5atzycfg
---
 addons/account_payment/test/account_payment.yml       | 4 +---
 addons/hr_payroll_account/test/hr_payroll_account.yml | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/account_payment/test/account_payment.yml b/addons/account_payment/test/account_payment.yml
index dba2a9052fd..13c5b5b20a4 100644
--- a/addons/account_payment/test/account_payment.yml
+++ b/addons/account_payment/test/account_payment.yml
@@ -4,13 +4,11 @@
   Creating a res.partner.bank record
 -
   !record {model: res.partner.bank, id: res_partner_bank_0}:
-    name: 'Test Bank Account'
-    acc_number: '0001'
+    acc_number: '126-2013269-08'
     partner_id: base.res_partner_9
     sequence: 0.0
     state: bank
     bank: base.res_bank_1
-
 -
   I created a new Payment Mode
 -
diff --git a/addons/hr_payroll_account/test/hr_payroll_account.yml b/addons/hr_payroll_account/test/hr_payroll_account.yml
index 98747539bb3..c399789f439 100644
--- a/addons/hr_payroll_account/test/hr_payroll_account.yml
+++ b/addons/hr_payroll_account/test/hr_payroll_account.yml
@@ -4,9 +4,8 @@
   I create a bank record
 -
   !record {model: res.partner.bank, id: res_partner_bank_0}:
-    acc_number: '987654321'
+    acc_number: '001-9876543-21'
     partner_id: base.res_partner_desertic_hispafuentes
-    name: Fortis
     state: bank
     bank: base.res_bank_1
 -
@@ -113,4 +112,4 @@
   !python {model: hr.payslip}: |
     from tools.translate import _
     payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
-    assert(payslip_brw.state == 'done'), _('State not changed!')
\ No newline at end of file
+    assert(payslip_brw.state == 'done'), _('State not changed!')

From 0676727e6eabed0868e17c7b9c0751018dc46880 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Tue, 16 Aug 2011 01:09:06 +0200
Subject: [PATCH 30/30] compat

bzr revid: fp@fp-laptop-20110815230906-46spht70zgk6nq4l
---
 openerp/addons/base/res/partner/bank.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/partner/bank.py b/openerp/addons/base/res/partner/bank.py
index c8fcbb947c3..5a7c73c7f6d 100644
--- a/openerp/addons/base/res/partner/bank.py
+++ b/openerp/addons/base/res/partner/bank.py
@@ -115,6 +115,7 @@ class res_partner_bank(osv.osv):
 
     _rec_name = 'acc_number'
     _columns = {
+        'name': fields.char('Bank Account', size=64), # to be removed in v6.2 ?
         'acc_number': fields.char('Account Number', size=64, required=True),
         'bank': fields.many2one('res.bank', 'Bank'),
         'bank_bic': fields.char('Bank Identifier Code', size=16),
@@ -149,6 +150,7 @@ class res_partner_bank(osv.osv):
             cursor, user, 'country_id', context=context),
         'state_id': lambda obj, cursor, user, context: obj._default_value(
             cursor, user, 'state_id', context=context),
+        'name': lambda *args: '/'
     }
 
     def fields_get(self, cr, uid, fields=None, context=None):