From 5b6285ba7abcc54b2baeb42894d81a1bc29e0adb Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 19 Jul 2011 14:05:17 +0530
Subject: [PATCH 01/53] [IMP]:new module added project_todo and cem_todo

bzr revid: han@tinyerp.com-20110719083517-f1zxuh9jr6q88uvo
---
 addons/crm/crm_lead_view.xml                  |  4 +-
 addons/crm/crm_opportunity_view.xml           | 12 +--
 addons/crm_todo/__init__.py                   | 23 ++++++
 addons/crm_todo/__openerp__.py                | 48 +++++++++++
 addons/crm_todo/crm_todo.py                   | 39 +++++++++
 addons/crm_todo/crm_todo_demo.xml             | 11 +++
 addons/crm_todo/crm_todo_view.xml             | 25 ++++++
 addons/crm_todo/project_todo_view.xml         | 81 +++++++++++++++++++
 addons/mail_gateway/mail_gateway.py           | 24 +++---
 addons/project_gtd/project_gtd.py             |  2 +-
 addons/project_todo/__init__.py               | 23 ++++++
 addons/project_todo/__openerp__.py            | 48 +++++++++++
 addons/project_todo/project_todo.py           | 46 +++++++++++
 addons/project_todo/project_todo_demo.xml     | 11 +++
 addons/project_todo/project_todo_gtd_view.xml | 58 +++++++++++++
 addons/project_todo/project_todo_view.xml     | 81 +++++++++++++++++++
 16 files changed, 515 insertions(+), 21 deletions(-)
 create mode 100644 addons/crm_todo/__init__.py
 create mode 100644 addons/crm_todo/__openerp__.py
 create mode 100644 addons/crm_todo/crm_todo.py
 create mode 100644 addons/crm_todo/crm_todo_demo.xml
 create mode 100644 addons/crm_todo/crm_todo_view.xml
 create mode 100644 addons/crm_todo/project_todo_view.xml
 create mode 100644 addons/project_todo/__init__.py
 create mode 100644 addons/project_todo/__openerp__.py
 create mode 100644 addons/project_todo/project_todo.py
 create mode 100644 addons/project_todo/project_todo_demo.xml
 create mode 100644 addons/project_todo/project_todo_gtd_view.xml
 create mode 100644 addons/project_todo/project_todo_view.xml

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 55be89c2252..b5ebf4e1cbe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -183,7 +183,7 @@
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                        <tree string="History">
+                        <tree string="Notes">
                             <field name="display_text" string="History Information"/>
                             <field name="history" invisible="1"/>
                             <button
@@ -215,7 +215,7 @@
 
                                     </page>
                                     <page string="Attachments">
-                                        <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                        <field name="attachment_ids" colspan="4" nolabel="1"/>
                                     </page>
                                     </notebook>
                                 </form>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index b49edb850da..9fc8774649a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -137,11 +137,8 @@
                         </page>
 
                         <page string="Communication &amp; History" groups="base.group_extended">
-                            <group colspan="4">
-                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
-                            </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="History">
+                                <tree string="Note">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -150,7 +147,7 @@
                                         context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="History">
+                                <form string="Note">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
@@ -174,7 +171,7 @@
 
                                         </page>
                                         <page string="Attachments">
-                                            <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+                                            <field name="attachment_ids" colspan="4" nolabel="1"/>
                                         </page>
                                     </notebook>
                                 </form>
@@ -208,6 +205,9 @@
                             <field name="ref2"/>
                         </page>
                         </notebook>
+                        <group colspan="4">
+                            <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                        </group>
                     </form>
                 </field>
             </record>
diff --git a/addons/crm_todo/__init__.py b/addons/crm_todo/__init__.py
new file mode 100644
index 00000000000..348eae998b4
--- /dev/null
+++ b/addons/crm_todo/__init__.py
@@ -0,0 +1,23 @@
+# -*- 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/>.     
+#
+##############################################################################
+import crm_todo
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
new file mode 100644
index 00000000000..e3a609124d4
--- /dev/null
+++ b/addons/crm_todo/__openerp__.py
@@ -0,0 +1,48 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'TODO - Customer Relationship Management',
+    'version': '1.0',
+    'category': 'Sales',
+    'description': """
+
+    """,
+    'author': 'OpenERP SA',
+    #'images': ['images/project_gtd.jpeg'],
+    'depends': ['crm'],
+    'init_xml': [],
+    'update_xml': [
+        #'project_todo_view.xml',
+        'crm_todo_view.xml',
+        #'project_todo_demo.xml',
+        
+    ],
+    'demo_xml': [ ],
+    'test':[
+    
+    ],
+    'installable': True,
+    'active': False,
+    #'certificate': '0043525236301',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py
new file mode 100644
index 00000000000..ae186e5ba55
--- /dev/null
+++ b/addons/crm_todo/crm_todo.py
@@ -0,0 +1,39 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import sys
+
+from osv import fields, osv
+import tools
+from tools.translate import _
+
+class crm_todo(osv.osv):
+    _name ="crm.todo"
+    _description = "TODO"
+    _columns = {
+        'todo_ids': fields.one2many('project.gtd.timebox', 'name', 'TODO'),
+    }
+crm_todo()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_todo/crm_todo_demo.xml b/addons/crm_todo/crm_todo_demo.xml
new file mode 100644
index 00000000000..05be9a0eee8
--- /dev/null
+++ b/addons/crm_todo/crm_todo_demo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record model="project.gtd.timebox" id="timebox_todo">
+            <field name="name">TODO</field>
+            <field name="icon">terp-check</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
new file mode 100644
index 00000000000..e7e3d3dda99
--- /dev/null
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="crm_todo_form">
+        <field name="name">crm.todo.form</field>
+        <field name="model">crm.todo</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Category of ideas">
+                <field name="todo_ids" nolabel="1"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="crm_todo_action">
+        <field name="name">CRM TODO</field>
+        <field name="res_model">crm.todo</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+    </record>
+
+    <menuitem name="TODOs" id="menu_crm_todo" parent="base.menu_sales" action="crm_todo_action"/>
+    </data>
+</openerp>
diff --git a/addons/crm_todo/project_todo_view.xml b/addons/crm_todo/project_todo_view.xml
new file mode 100644
index 00000000000..57842bc72ee
--- /dev/null
+++ b/addons/crm_todo/project_todo_view.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="project_todo_form">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.todo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="TODO">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="icon"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_tree">
+            <field name="name">project.todo.tree</field>
+            <field name="model">project.todo</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="TODO">
+                    <field name="name"/>
+                    <field name="sequence" invisible="1"/>
+                    <field name="icon"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="project_todo_search" model="ir.ui.view">
+            <field name="name">project.todo.search</field>
+            <field name="model">project.todo</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            <search string="TODO">
+                    
+            </search>
+            </field>
+        </record>
+        
+        <!--<record id="action_view_project_todo" model="ir.actions.act_window">
+            <field name="name">Project TODO</field>
+            <field name="res_model">project.todo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>-->
+
+        <record model="ir.actions.act_window" id="open_project_todo_tree">
+            <field name="name">Title</field>
+            <field name="res_model">project.todo</field>
+            <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field>
+        </record>
+
+        <menuitem name="TODO" id="menu_open_todo" parent="project.menu_tasks_config" action="open_project_todo_tree"/>
+    
+        <record model="ir.ui.view" id="project_todo_task_tree">
+            <field name="name">project.task.todo</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="project.view_task_tree2" />
+            <field name="arch" type="xml">
+            <field name="remaining_hours" position="before">
+                <field string="TODO" name="todo_id"/>
+            </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_task">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="arch" type="xml">
+            <field name="progress" position="before">
+                <field name="todo_id" widget="selection"/>
+            </field>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c67a2668192..f0af0800962 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -264,24 +264,24 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     _order = 'date desc'
     _columns = {
-        'name':fields.text('Subject', readonly=True),
+        'name':fields.text('Subject'),
         'model': fields.char('Object Name', size=128, select=1, readonly=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
         'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date', readonly=True),
+        'date': fields.datetime('Date'),
         'history': fields.boolean('Is History?', readonly=True),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'user_id': fields.many2one('res.users', 'User Responsible'),
         'message': fields.text('Message', readonly=True),
-        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
-        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
-        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
-        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
-        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
-        'references': fields.text('References', readonly=True, help="References emails."),
-        'description': fields.text('Description', readonly=True),
+        'email_from': fields.char('From', size=128, help="Email From"),
+        'email_to': fields.char('To', help="Email Recipients", size=256),
+        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
+        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
+        'message_id': fields.char('Message Id', size=1024, help="Message Id on Email.", select=True),
+        'references': fields.text('References', help="References emails."),
+        'description': fields.text('Description'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
-        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Notes'),
     }
 
     def init(self, cr):
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index a3c9d48476b..7d2b355afc1 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -108,7 +108,7 @@ class project_task(osv.osv):
         if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]), context=context)
             search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s" />''' % (_('Inbox'),)
             search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Getting things done" string="%s"/>''' % (_('GTD'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
diff --git a/addons/project_todo/__init__.py b/addons/project_todo/__init__.py
new file mode 100644
index 00000000000..60b603fbbc6
--- /dev/null
+++ b/addons/project_todo/__init__.py
@@ -0,0 +1,23 @@
+# -*- 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/>.     
+#
+##############################################################################
+#import project_todo
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/project_todo/__openerp__.py b/addons/project_todo/__openerp__.py
new file mode 100644
index 00000000000..9d05c84c3d2
--- /dev/null
+++ b/addons/project_todo/__openerp__.py
@@ -0,0 +1,48 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'TODO - Project Management Module',
+    'version': '1.0',
+    'category': 'Project Management',
+    'description': """
+
+    """,
+    'author': 'OpenERP SA',
+    #'images': ['images/project_gtd.jpeg'],
+    'depends': ['project','project_gtd'],
+    'init_xml': [],
+    'update_xml': [
+        #'project_todo_view.xml',
+        'project_todo_gtd_view.xml',
+        #'project_todo_demo.xml',
+        
+    ],
+    'demo_xml': ['project_todo_demo.xml',],
+    'test':[
+    
+    ],
+    'installable': True,
+    'active': False,
+    #'certificate': '0043525236301',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_todo/project_todo.py b/addons/project_todo/project_todo.py
new file mode 100644
index 00000000000..62e9379fada
--- /dev/null
+++ b/addons/project_todo/project_todo.py
@@ -0,0 +1,46 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import sys
+
+from osv import fields, osv
+import tools
+from tools.translate import _
+
+class project_gtd_timebox(osv.osv):
+    _inherit = "project.gtd.timebox"
+    _description = "TODO"
+    _columns = {
+        'name': fields.char('Title', size=128, required=True, select=1, translate=1),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
+        'icon': fields.selection(tools.icons, 'Icon', size=64),
+    }
+    _defaults = {
+        'sequence': 1
+    }
+    _order = "sequence, name"
+
+project_gtd_timebox()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_todo/project_todo_demo.xml b/addons/project_todo/project_todo_demo.xml
new file mode 100644
index 00000000000..05be9a0eee8
--- /dev/null
+++ b/addons/project_todo/project_todo_demo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+        <record model="project.gtd.timebox" id="timebox_todo">
+            <field name="name">TODO</field>
+            <field name="icon">terp-check</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/project_todo/project_todo_gtd_view.xml b/addons/project_todo/project_todo_gtd_view.xml
new file mode 100644
index 00000000000..9a290675b13
--- /dev/null
+++ b/addons/project_todo/project_todo_gtd_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="project_task_todo_tree">
+        <field name="name">project.task.tree.timebox</field>
+        <field name="model">project.task</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="project.view_task_tree2" />
+        <field name="arch" type="xml">
+            <field name="remaining_hours" position="after">
+            
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="project_task_todo_form">
+        <field name="name">project.task.form.timebox</field>
+        <field name="model">project.task</field>
+        <field name="type">form</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <field name="progress" position="after">
+           
+            </field>
+        </field>
+    </record>
+
+    <record id="view_task_search_todo" model="ir.ui.view">
+            <field name="name">project.task.search.todo</field>
+            <field name="model">project.task</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+               <search string="Task Edition">
+                    <group col="20" colspan="4">
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        <separator orientation="vertical"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+    <record model="ir.actions.act_window" id="open_todo_timebox_tree">
+        <field name="name">TODO</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">project.task</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="project_task_todo_tree"/>
+        <field name="search_view_id" ref="view_task_search_todo"/>
+        <field name="context">{"search_default_todo":1,'group_by_no_leaf':1}</field>
+        <field name="help">Timeboxes are defined in the "Getting Things Done" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term.</field>
+    </record>
+
+    <menuitem name="TODO" id="menu_open_todo_time_timeboxes" parent="project.menu_project_management" action="open_todo_timebox_tree"/>
+    </data>
+</openerp>
diff --git a/addons/project_todo/project_todo_view.xml b/addons/project_todo/project_todo_view.xml
new file mode 100644
index 00000000000..57842bc72ee
--- /dev/null
+++ b/addons/project_todo/project_todo_view.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="project_todo_form">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.todo</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="TODO">
+                    <field name="name"/>
+                    <field name="sequence"/>
+                    <field name="icon"/>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_tree">
+            <field name="name">project.todo.tree</field>
+            <field name="model">project.todo</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="TODO">
+                    <field name="name"/>
+                    <field name="sequence" invisible="1"/>
+                    <field name="icon"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="project_todo_search" model="ir.ui.view">
+            <field name="name">project.todo.search</field>
+            <field name="model">project.todo</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+            <search string="TODO">
+                    
+            </search>
+            </field>
+        </record>
+        
+        <!--<record id="action_view_project_todo" model="ir.actions.act_window">
+            <field name="name">Project TODO</field>
+            <field name="res_model">project.todo</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>-->
+
+        <record model="ir.actions.act_window" id="open_project_todo_tree">
+            <field name="name">Title</field>
+            <field name="res_model">project.todo</field>
+            <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field>
+        </record>
+
+        <menuitem name="TODO" id="menu_open_todo" parent="project.menu_tasks_config" action="open_project_todo_tree"/>
+    
+        <record model="ir.ui.view" id="project_todo_task_tree">
+            <field name="name">project.task.todo</field>
+            <field name="model">project.task</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="project.view_task_tree2" />
+            <field name="arch" type="xml">
+            <field name="remaining_hours" position="before">
+                <field string="TODO" name="todo_id"/>
+            </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="project_todo_task">
+            <field name="name">project.todo.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="arch" type="xml">
+            <field name="progress" position="before">
+                <field name="todo_id" widget="selection"/>
+            </field>
+            </field>
+        </record>
+    </data>
+</openerp>

From 2196d2771613f106a282a2b53cfde01f868ec13c Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 26 Jul 2011 12:55:52 +0530
Subject: [PATCH 02/53] [IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072552-fmu0a40ohew417qf
---
 addons/mail_gateway/mail_gateway_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index d05bfbc0d91..6b36b87b545 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -12,7 +12,7 @@
             <field name="arch" type="xml">
              <form string="mailgate message">
                     <group colspan="4" col="6">
-                        <field name="name" string="Subject" required="1" select="1"  widget="char" size="512"/>
+                        <field name="name" string="Subject" select="1"  widget="char" size="512"/>
                         <field name="date" required="1" select="1"/>
                         <field name="user_id" string="Owner" select="1"/>
                         <field name="partner_id" readonly="1" />

From 06af6ca94e0a3a64d04dafc486105421bb327159 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Tue, 26 Jul 2011 12:58:29 +0530
Subject: [PATCH 03/53] [IMP]: confliction solved

bzr revid: han@tinyerp.com-20110726072829-z8ysp919hoicl8b6
---
 addons/mail_gateway/mail_gateway_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 6b36b87b545..b78acc737d7 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -13,7 +13,7 @@
              <form string="mailgate message">
                     <group colspan="4" col="6">
                         <field name="name" string="Subject" select="1"  widget="char" size="512"/>
-                        <field name="date" required="1" select="1"/>
+                        <field name="date" select="1"/>
                         <field name="user_id" string="Owner" select="1"/>
                         <field name="partner_id" readonly="1" />
                     </group>

From 8cb2df39c867f34b14e80e8d7a47d08e541e7bec Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Fri, 5 Aug 2011 18:10:01 +0530
Subject: [PATCH 04/53] [IMP]

bzr revid: han@tinyerp.com-20110805124001-eekluj7lsllns6l4
---
 addons/crm/crm_opportunity_view.xml | 66 ++++++++++++++---------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9fc8774649a..0c8225c9aa1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -57,13 +57,6 @@
                                     string="Contact"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
                                     colspan="1" />
-                                <group col="3" colspan="2">
-                                    <field name="email_from" string="Email" />
-                                    <button string="Send Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'new', 'model': 'crm.lead'}"
-                                    icon="terp-mail-message-new" type="action" />
-                                </group>
                                     <field name="phone"/>
 
                             </group>
@@ -135,10 +128,40 @@
                         		<field name="optout" on_change="on_change_optout(optout)"/>
                             </group>
                         </page>
-
-                        <page string="Communication &amp; History" groups="base.group_extended">
+                        <page string="Extra Info" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="create_date"/>
+                                <field name="write_date"/>
+                                <field name="date_closed"/>
+                                <field name="date_open"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator string="Misc" colspan="2"/>
+                                <field name="active"/>
+                                <field name="day_open"/>
+                                <field name="day_close"/>
+                                <field name="referred"/>
+                            </group>
+                            <separator colspan="4" string="References"/>
+                            <field name="ref"/>
+                            <field name="ref2"/>
+                        </page>
+                        </notebook>
+                        <group colspan="4">
+                            <group col="3" colspan="2">
+                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                            </group>
+                            <newline/>
+                            <group col="3" colspan="2">
+                                    <field name="email_from" string="Email" />
+                                    <button string="Send Email"
+                                    name="%(crm.action_crm_send_mail)d"
+                                    context="{'mail':'new', 'model': 'crm.lead'}"
+                                    icon="terp-mail-message-new" type="action" />
+                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Note">
+                            <tree string="Note">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -184,29 +207,6 @@
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
                                 icon="terp-mail-message-new" type="action" />
-                        </page>
-                        <page string="Extra Info" groups="base.group_extended">
-                            <group col="2" colspan="2">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                                <field name="date_open"/>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Misc" colspan="2"/>
-                                <field name="active"/>
-                                <field name="day_open"/>
-                                <field name="day_close"/>
-                                <field name="referred"/>
-                            </group>
-                            <separator colspan="4" string="References"/>
-                            <field name="ref"/>
-                            <field name="ref2"/>
-                        </page>
-                        </notebook>
-                        <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                         </group>
                     </form>
                 </field>

From c05dea763fa05b826fcf775785f3d33aaadf636d Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Fri, 12 Aug 2011 15:00:56 +0530
Subject: [PATCH 05/53] [FIX] Linking Analytical Account form SO for Task

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

bzr revid: jam@tinyerp.com-20110812093056-f63k8vnyx9cijz5n
---
 addons/project_mrp/project_procurement.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 0a7fa12ce6f..1602884078a 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -33,7 +33,18 @@ class procurement_order(osv.osv):
         return True
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
+        line_pool=self.pool.get('sale.order.line')
+        project_pool=self.pool.get('project.project')
         for procurement in self.browse(cr, uid, ids, context=context):
+            project_id = False
+            line_ids = line_pool.search(cr, uid , [('procurement_id', '=', procurement.id)])
+            order_lines = line_pool.browse(cr, uid, line_ids)
+            for line in order_lines:
+                if line.product_id and  line.product_id.project_id:            
+                    project_id = line.product_id.project_id.id
+                if not project_id and line.order_id.project_id:
+                    project_id = project_pool.search(cr, uid , [('name', '=', line.order_id.project_id.name)])
+                    project_id = project_id and project_id[0] or False
             self.write(cr, uid, [procurement.id], {'state': 'running'})
             planned_hours = procurement.product_qty
             task_id = self.pool.get('project.task').create(cr, uid, {
@@ -46,7 +57,7 @@ class procurement_order(osv.osv):
                 'procurement_id': procurement.id,
                 'description': procurement.note,
                 'date_deadline': procurement.date_planned,
-                'project_id': procurement.product_id.project_id and procurement.product_id.project_id.id or False,
+                'project_id':  project_id,
                 'state': 'draft',
                 'company_id': procurement.company_id.id,
             },context=context)

From 544bb8472561973166520f7eff93651d49a78d40 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Wed, 17 Aug 2011 12:34:20 +0530
Subject: [PATCH 06/53] [IMP]: added crm_todo module

bzr revid: han@tinyerp.com-20110817070420-shuzw3bks0i28bm9
---
 addons/crm/crm_installer.py               |  1 +
 addons/crm/crm_installer_view.xml         |  1 +
 addons/crm_todo/__openerp__.py            |  2 +-
 addons/crm_todo/crm_todo.py               |  5 +++--
 addons/crm_todo/crm_todo_view.xml         | 20 +++++++++++++++++---
 addons/project/installer.py               |  1 +
 addons/project/project_installer.xml      |  1 +
 addons/project_gtd/project_gtd.py         |  1 +
 addons/project_todo/project_todo_demo.xml |  1 -
 9 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 32551d438c4..38d0a10b4e8 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -37,6 +37,7 @@ class crm_installer(osv.osv_memory):
         'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
+        'crm_todo': fields.boolean('CRM TODO', help=" add a todo list in your Opportunities form."),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 35ff5a0a7cc..eb17934972f 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -32,6 +32,7 @@
                   <field name="crm_fundraising" />
                   <field name="wiki_sale_faq"/>
                     <field name="sale_crm" invisible="1"/>
+                    <field name="crm_todo"/>
             </group>
             <group colspan="2" col="2">
                 <separator string="Synchronization" colspan="4" />
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index e3a609124d4..709005b2cff 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -29,7 +29,7 @@
     """,
     'author': 'OpenERP SA',
     #'images': ['images/project_gtd.jpeg'],
-    'depends': ['crm'],
+    'depends': ['crm','project_gtd'],
     'init_xml': [],
     'update_xml': [
         #'project_todo_view.xml',
diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py
index ae186e5ba55..45caf957db2 100644
--- a/addons/crm_todo/crm_todo.py
+++ b/addons/crm_todo/crm_todo.py
@@ -26,10 +26,11 @@ import tools
 from tools.translate import _
 
 class crm_todo(osv.osv):
-    _name ="crm.todo"
+    """_name = 'crm.todo'"""
     _description = "TODO"
+    _inherit = 'crm.lead'
     _columns = {
-        'todo_ids': fields.one2many('project.gtd.timebox', 'name', 'TODO'),
+        'todo_ids': fields.one2many('project.gtd.timebox', 'todo_id', 'TODO'),
     }
 crm_todo()
 
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index e7e3d3dda99..4e8272fadf3 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -4,7 +4,7 @@
 
     <record model="ir.ui.view" id="crm_todo_form">
         <field name="name">crm.todo.form</field>
-        <field name="model">crm.todo</field>
+        <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Category of ideas">
@@ -15,11 +15,25 @@
 
     <record model="ir.actions.act_window" id="crm_todo_action">
         <field name="name">CRM TODO</field>
-        <field name="res_model">crm.todo</field>
+        <field name="res_model">crm.lead</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
     </record>
-
+	<record id="crm_todo_opportunity_add" model="ir.ui.view">
+          <field name="name">TODO</field>
+          <field name="model">crm.lead</field>
+          <field name="type">form</field>
+          <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
+          <field name="arch" type="xml">
+            <data>
+            <xpath expr="/form/group/field[@name = 'message_ids']" position="after">
+               		<field name="todo_ids" colspan="4" nolabel="1"/>
+             
+            </xpath>
+            
+            </data>
+          </field>
+        </record>
     <menuitem name="TODOs" id="menu_crm_todo" parent="base.menu_sales" action="crm_todo_action"/>
     </data>
 </openerp>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 693e2d58018..a06e897d9d4 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -46,6 +46,7 @@ class project_installer(osv.osv_memory):
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'project_todo': fields.boolean('Project TODO', help=" add a todo list in your Opportunities form."),
     }
 project_installer()
 
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32b235e4691..f3d6ce2b762 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -33,6 +33,7 @@
             <separator string="Methodologies" colspan="4"/>
             <field name="project_scrum"/>
             <field name="project_gtd"/>
+            <field name="project_todo"/>
           </group>
         </data>
       </field>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 7d2b355afc1..1503b53f734 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -47,6 +47,7 @@ class project_gtd_timebox(osv.osv):
         'name': fields.char('Timebox', size=64, required=True, select=1, translate=1),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of timebox."),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
+        'todo_id': fields.many2one('crm.lead','TODO'),
     }
 
 project_gtd_timebox()
diff --git a/addons/project_todo/project_todo_demo.xml b/addons/project_todo/project_todo_demo.xml
index 05be9a0eee8..971642bcf1b 100644
--- a/addons/project_todo/project_todo_demo.xml
+++ b/addons/project_todo/project_todo_demo.xml
@@ -6,6 +6,5 @@
             <field name="name">TODO</field>
             <field name="icon">terp-check</field>
         </record>
-
     </data>
 </openerp>

From 8ae9536d75bfce5d9710a20a701d88024426b32e Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 11:17:15 +0530
Subject: [PATCH 07/53] [IMP] remove confliction

bzr revid: han@tinyerp.com-20110829054715-pics8t7v7t9xyb01
---
 addons/crm/crm_installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 38d0a10b4e8..1c4706a10d9 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -37,7 +37,7 @@ class crm_installer(osv.osv_memory):
         'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
         'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
-        'crm_todo': fields.boolean('CRM TODO', help=" add a todo list in your Opportunities form."),
+        'crm_todo': fields.boolean('CRM TODO', help=" add a crm todo list in your Opportunities form."),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

From 875ecfcad9f380843441b02868153c20a670f3b5 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 11:40:51 +0530
Subject: [PATCH 08/53] [IMP] improved crm and project todo

bzr revid: han@tinyerp.com-20110829061051-jtympazkidl8s8xy
---
 addons/project/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/installer.py b/addons/project/installer.py
index a06e897d9d4..28a44e918b7 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -46,7 +46,7 @@ class project_installer(osv.osv_memory):
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'project_todo': fields.boolean('Project TODO', help=" add a todo list in your Opportunities form."),
+        'project_todo': fields.boolean('Project TODO', help=" add a project todo list in your Opportunities form."),
     }
 project_installer()
 

From 6eb0ddca6e4e24471b482065ec9850f213e633a0 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Mon, 29 Aug 2011 12:23:46 +0530
Subject: [PATCH 09/53] [IMP] confliction soved from project todo

bzr revid: han@tinyerp.com-20110829065346-mpz8hmh122dvcjqb
---
 addons/project/project_installer.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 32e162b8ed6..6349ea72340 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -10,13 +10,12 @@
           <data>
           <xpath expr="//group[@name='project']" position="replace">
             <newline/>
-<<<<<<< TREE
+            <group>
             <separator string="Methodologies" colspan="4"/>
             <field name="project_scrum"/>
             <field name="project_gtd"/>
             <field name="project_todo"/>
           </group>
-=======
             <separator  string="Project Management Features" colspan="4" />
             <field name="project_issue" />
             <field name="project_long_term" />
@@ -26,7 +25,6 @@
             <field name="project_scrum" />
             <field name="project_gtd" />
           </xpath>
->>>>>>> MERGE-SOURCE
         </data>
       </field>
     </record>

From e2bacf12cdd64a1ce7963783676ba2781546e372 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 29 Sep 2011 12:08:02 +0200
Subject: [PATCH 10/53] [FIX] allows XML exports of fields.selection with
 integer key

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

bzr revid: stefan@therp.nl-20110929100802-1fsffcccsul0n24a
---
 addons/base_module_record/base_module_record.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 0208e6cdc37..af63a0cf369 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -104,7 +104,8 @@ class base_module_record(osv.osv):
         for key,val in data.items():
             if not (val or (fields[key]['type']=='boolean')):
                 continue
-            if fields[key]['type'] in ('integer','float'):
+            if (fields[key]['type'] in ('integer','float') or
+                fields[key]['type'] == 'selection' and isinstance(val, int)):
                 field = doc.createElement('field')
                 field.setAttribute("name", key)
                 field.setAttribute("eval", val and str(val) or 'False' )

From 3feaa84beb11eb2b887fddcce6b82ec9df79aafe Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 4 Oct 2011 11:39:03 +0530
Subject: [PATCH 11/53] [IMP]edit node code at initial level modify by using
 widget.

bzr revid: kch@tinyerp.com-20111004060903-0se42632vpjlk24u
---
 addons/web/static/src/js/view_editor.js | 51 +++++++++++++++++++------
 addons/web/static/src/xml/base.xml      |  7 ----
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d0cc7d53eb3..7b68cdc3372 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,7 +1,6 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
-    'field' : ['name', 'string', 'required', 'readonly', 'select', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs', 'groups'],
+    'field' : ['required', 'readonly'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -31,6 +30,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.dataset = dataset;
         this.model = dataset.model;
         this.xml_id = 0;
+        this.property = openerp.web.ViewEditor.property_widget;
     },
 
     start: function() {
@@ -320,6 +320,17 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             case "side-remove":
                 break;
             case "side-edit":
+                var tag, fld_name;
+                var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
+                var tag_fld = tr.split(" ");
+                if (tag_fld.length > 3){
+                    tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
+                    fld_name = tag_fld[2].split("=")[1].replace(/[^a-zA-Z _ 0-9]+/g,'');
+                }else{
+                    tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
+                }
+                var properties = _PROPERTIES[tag];
+                self.on_edit_node(this,properties,fld_name);
                 break;
            case "side-up":
                 while(1){
@@ -406,7 +417,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(self,property,fld_name){
+    on_edit_node:function(self,properties,fld_name){
         var self = this;
         var result;
         this.dialog = new openerp.web.Dialog(this,{
@@ -427,17 +438,35 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
                 db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
-                    var data = [];
-                    _.each(property,function(record){
-                        var dict = {'key':record,'value':res[0][record]};
-                        data.push(dict);
+                    _.each(properties,function(record){
+                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (false, false);
+                        console.log("widget_view",type_widget);
                     });
-                    console.log("check data+++",data);
-                    /*self.dialog.$element.html(QWeb.render('Edit_Node_View',{
-                        'res': res
-                    }));*/
                 });
             });
     }
 });
+openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
+    init: function(view, node) {
+        //this._super(view, node);
+        console.log("view++++",view);
+        console.log("nodoe+++++",node);
+        this.template = "FieldBoolean";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    }
+});
+openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
+    'required' : 'openerp.web.ViewEditor.FieldBoolean',
+    'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
+    'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
+    'completion' : 'openerp.web.ViewEditor.FieldBoolean',
+    /*'widget' : '',
+    'groups' : '',
+    'position': '',
+    'icon': '',
+    'align': '' */
+});
 };
\ No newline at end of file
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 957415c8043..04bd475fd1c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1325,13 +1325,6 @@
             <t t-call="view_editor.row"/>
         </t>
     </tr>
-<t t-name="Edit_Node_View">
-    <table>
-        <tr t-foreach="res" t-as="rec">
-            <td><t t-esc="rec.ttype"/></td>
-        </tr>
-    </table>
-</t>
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>

From 02bbd4bd5c8b39cd3d5c60f49b79ed96f84a3012 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Wed, 5 Oct 2011 17:32:12 +0530
Subject: [PATCH 12/53] [IMP]Render boolean field with static data using
 widget.

bzr revid: kch@tinyerp.com-20111005120212-tj2jhlxwjmtp91z6
---
 addons/web/static/src/js/view_editor.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 7b68cdc3372..4378ac4a0a9 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -330,7 +330,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
                 }
                 var properties = _PROPERTIES[tag];
-                self.on_edit_node(this,properties,fld_name);
+                self.on_edit_node(properties,fld_name);
                 break;
            case "side-up":
                 while(1){
@@ -417,7 +417,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(self,properties,fld_name){
+    on_edit_node:function(properties,fld_name){
         var self = this;
         var result;
         this.dialog = new openerp.web.Dialog(this,{
@@ -438,9 +438,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
                 db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
+                    // res will use for getting value of fields.
+                    var k = {"attrs":{"modifiers":"{'readonly':true}","name":"name"},"children":[],"tag":"field"};
                     _.each(properties,function(record){
-                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (false, false);
-                        console.log("widget_view",type_widget);
+                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
+                        $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
                     });
                 });
             });
@@ -449,8 +451,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
     init: function(view, node) {
         //this._super(view, node);
-        console.log("view++++",view);
-        console.log("nodoe+++++",node);
         this.template = "FieldBoolean";
     },
     start: function() {
@@ -458,6 +458,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
         this._super.apply(this, arguments);
     }
 });
+
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',

From e4a103cfa007834845b6f41e47fa1163bc7d5310 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Wed, 12 Oct 2011 18:05:00 +0530
Subject: [PATCH 13/53] [FIX] account : generate open entries is not seems to
 working

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

bzr revid: bde@tinyerp.com-20111012123500-j4mb4p50k26nhw8c
---
 .../wizard/account_fiscalyear_close.py        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 297911f15f7..589b2514700 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -69,6 +69,9 @@ class account_fiscalyear_close(osv.osv_memory):
         cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),))
         fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall()))
 
+        if not fy_period_set or not fy2_period_set:
+            raise osv.except_osv(_('UserError'), _('No Periods found to generate opening entries'))
+
         period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context)
         new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context)
         old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context)
@@ -108,10 +111,10 @@ class account_fiscalyear_close(osv.osv_memory):
 
         #1. report of the accounts with defferal method == 'unreconciled'
         cr.execute('''
-            SELECT a.id 
+            SELECT a.id
             FROM account_account a
             LEFT JOIN account_account_type t ON (a.user_type = t.id)
-            WHERE a.active 
+            WHERE a.active
               AND a.type != 'view'
               AND t.close_method = %s''', ('unreconciled', ))
         account_ids = map(lambda x: x[0], cr.fetchall())
@@ -122,15 +125,15 @@ class account_fiscalyear_close(osv.osv_memory):
                      name, create_uid, create_date, write_uid, write_date,
                      statement_id, journal_id, currency_id, date_maturity,
                      partner_id, blocked, credit, state, debit,
-                     ref, account_id, period_id, date, move_id, amount_currency, 
-                     quantity, product_id, company_id) 
+                     ref, account_id, period_id, date, move_id, amount_currency,
+                     quantity, product_id, company_id)
                   (SELECT name, create_uid, create_date, write_uid, write_date,
                      statement_id, %s,currency_id, date_maturity, partner_id,
                      blocked, credit, 'draft', debit, ref, account_id,
                      %s, date, %s, amount_currency, quantity, product_id, company_id
                    FROM account_move_line
-                   WHERE account_id IN %s 
-                     AND ''' + query_line + ''' 
+                   WHERE account_id IN %s
+                     AND ''' + query_line + '''
                      AND reconcile_id IS NULL)''', (new_journal.id, period.id, move_id, tuple(account_ids),))
 
             #We have also to consider all move_lines that were reconciled
@@ -197,7 +200,7 @@ class account_fiscalyear_close(osv.osv_memory):
         query_1st_part = """
                 INSERT INTO account_move_line (
                      debit, credit, name, date, move_id, journal_id, period_id,
-                     account_id, currency_id, amount_currency, company_id, state) VALUES 
+                     account_id, currency_id, amount_currency, company_id, state) VALUES
         """
         query_2nd_part = ""
         query_2nd_part_args = []
@@ -207,7 +210,7 @@ class account_fiscalyear_close(osv.osv_memory):
                 cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \
                         'WHERE account_id = %s ' \
                             'AND ' + query_line + ' ' \
-                            'AND currency_id = %s', (account.id, account.currency_id.id)) 
+                            'AND currency_id = %s', (account.id, account.currency_id.id))
                 balance_in_currency = cr.dictfetchone()['balance_in_currency']
 
             company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id

From 47ccc4e421f0f04ce6c86f093f1b1e0ca800a1cb Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Thu, 13 Oct 2011 15:08:04 +0530
Subject: [PATCH 14/53] [imp] improved lead and opportunity

bzr revid: han@tinyerp.com-20111013093804-phr519y2k9vcy17d
---
 addons/crm/crm_lead_demo.xml                    | 17 +++++++++++++++++
 addons/crm/crm_lead_view.xml                    |  2 +-
 addons/crm/report/crm_lead_report_view.xml      |  1 -
 addons/crm/wizard/crm_lead_to_partner.py        | 16 ++++++++++++++--
 .../crm/wizard/crm_opportunity_to_phonecall.py  | 14 ++++++++++++--
 .../crm_opportunity_to_phonecall_view.xml       | 17 +++++++++++++----
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 390932c9e0a..ec6620f3756 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -270,6 +270,8 @@
             <field name="categ_id" ref="crm.categ_oppor3"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Pricing Information of Onsite Intervention'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/>
 	    <field eval="'Send price list regarding our interventions'" name="title_action"/>
             <field name="partner_name">BalmerInc S.A.</field>
             <field name="street">Rue des Palais 51, bte 33</field>
@@ -291,6 +293,8 @@
             <field name="categ_id" ref="crm.categ_oppor3"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Interest in your Kitchen Design Project'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/>
 	    <field eval="'Send Catalogue by E-Mail'" name="title_action"/>
             <field name="partner_name">Lucie Vonck</field>
             <field name="street">Chaussée de Namur</field>
@@ -313,6 +317,8 @@
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Plan train our students on your product'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/>
 	    <field eval="'Call to define real needs about training'" name="title_action"/>
             <field eval="4000" name="zip"/>
             <field name="partner_name">Université de Liège</field>
@@ -336,6 +342,8 @@
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Plan to buy 66 keyboards and 66 mouses'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/>
 	    <field eval="'Propose the kit keyboard+mouse'" name="title_action"/>
             <field name="partner_name">Bank Wealthy and sons</field>
             <field name="street">1 rue Rockfeller</field>
@@ -359,6 +367,7 @@
             <field name="categ_id" ref="crm.categ_oppor7"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
             <field eval="'Need 20 Days of Consultancy'" name="name"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_deadline"/>
             <field eval="'info@mycompany.net'" name="email_from"/>
         </record>
         <record id="crm_case_abcfuelcounits0" model="crm.lead">
@@ -376,6 +385,8 @@
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="'Need new design for my website'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_deadline"/>
             <field eval="'info@opensides.be'" name="email_from"/>
 	    <field eval="'Convert to quote'" name="title_action"/>
             <field name="partner_name">Dubois sprl</field>
@@ -428,6 +439,8 @@
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
             <field eval="'Plan to attend a training'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/>
 	    <field eval="'Call to give info about next training session'" name="title_action"/>
             <field name="partner_name">Axelor</field>
             <field name="street">12 rue Albert Einstein</field>
@@ -450,6 +463,8 @@
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="'Need customize the solution'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_deadline"/>
             <field eval="'Conf call with technical service'" name="title_action"/>
             <field name="partner_name">Thymbra</field>
             <field name="street">Palermo, Capital Federal</field>
@@ -473,6 +488,8 @@
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="'Interest in your customizable PC'" name="name"/>
+            <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_action"/>
+            <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_deadline"/>
             <field eval="'Ask for the good receprion of the proposition'" name="title_action"/>
             <field name="partner_name">Eric Dubois</field>
             <field name="street">Chaussée de Binche, 27</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 42587eea2b0..350e85b977e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -462,7 +462,7 @@
                     <field name="user_id"/>
 
                     <button string="Schedule/Log Call"
-                    name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
+                    name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/>
 
                     <field name="planned_revenue"/>
                     <field name="probability"/>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4c165d5aa81..18d4f5672b8 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -261,7 +261,6 @@
             parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
 
        <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree"
-            groups="base.group_extended"
             parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
 
     </data>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 88ccacffef5..65ecdca02e3 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -86,8 +86,20 @@ class crm_lead2partner(osv.osv_memory):
                     partner_ids = partner_obj.search(cr, uid, [('address', 'in', address_ids)], context=context)
                     
             # Find partner name that matches the name of the lead
-            if not partner_ids and lead.partner_name:
-                partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
+            if type(lead.partner_name).__name__ == 'unicode':
+                partner_name = str(lead.partner_name)
+            partner_name = partner_name.capitalize()
+            partner = ''
+            upper = False
+            for name in partner_name:
+	            if upper:
+		            partner+=name.upper()
+	            else:
+		            partner+=name
+	            upper = name.isspace()
+	        
+            if not partner_ids and partner:
+                partner_ids = partner_obj.search(cr, uid, [('name', '=', partner)], context=context)
                 
             partner_id = partner_ids and partner_ids[0] or False
             
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 714376766f6..b0bfbf3b817 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -35,13 +35,16 @@ class crm_opportunity2phonecall(osv.osv_memory):
     _columns = {
         'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users', "Assign To"),
+        'contact_name':fields.char('Contact', size=64),
+        'phone':fields.char('Phone', size=64),
         'partner_id' : fields.many2one('res.partner', "Partner"),
         'date': fields.datetime('Date'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_id': fields.many2one('crm.case.categ', 'Category',  \
                         domain="['|',('section_id','=',False),('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
-        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), 
+        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
+        'note':fields.text('Note'), 
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -64,7 +67,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
-        res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+        res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
             if 'name' in fields:
                 res.update({'name': opp.name})
@@ -76,6 +79,12 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'categ_id': categ_id})
             if 'partner_id' in fields:
                 res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
+            if 'note' in fields:
+                res.update({'note': opp.description})
+            if 'contact_name' in fields:
+                res.update({'contact_name': opp.partner_address_id and opp.partner_address_id.name or False})
+            if 'phone' in fields:
+                res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False)})
         return res
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -142,6 +151,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
                
                 if this.action == 'log':
                     phonecall_obj.case_close(cr, uid, [new_case])
+                    return {'type': 'ir.actions.act_window_close'}
 
             value = {
                 'name': _('Phone Call'),
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 764648a877b..980b93500d2 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,10 +16,19 @@
                     <field name="name"/>
                     <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                     <newline/>
-                    <field name="partner_id" readonly="True"/>
-                    <field name="user_id" />                    
-                    <field name="section_id" widget="selection" />
-                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <group colspan="4">
+                        <field name="partner_id" readonly="True"/>
+                        <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="contact_name"/>
+                        <field name="phone"/>
+                    </group>
+                    <group colspan="4">
+                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
+                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                    </group>
+                    <group colspan="4">
+                        <field name="note"/>
+                    </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="3">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />

From f79f94ea0058f95721aab4331b42803691042c0e Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Thu, 13 Oct 2011 16:20:50 +0530
Subject: [PATCH 15/53] [FIX] point_of_sale : Only kept tree view in view_mode
 in point_of_sale/report/pos_order_report_view.xml

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

bzr revid: bde@tinyerp.com-20111013105050-ny9xahhc0vm9q8vs
---
 addons/point_of_sale/report/pos_order_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 41fe2c3b4d6..ab6e9f73df4 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -86,7 +86,7 @@
             <field name="name">Point of Sale Analysis</field>
             <field name="res_model">report.pos.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">tree</field>
             <field name="search_view_id" ref="view_report_pos_order_search"/>
             <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>

From c5f5637e0992158734adda1782b725e24546dc6e Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Thu, 13 Oct 2011 16:30:39 +0530
Subject: [PATCH 16/53] [IMP]trying to setvalue into edit node data.

bzr revid: kch@tinyerp.com-20111013110039-i92u5ghg9kjzxwe6
---
 addons/web/static/src/js/view_editor.js | 50 ++++++++++++++++++++-----
 addons/web/static/src/js/view_form.js   | 18 ++++-----
 addons/web/static/src/xml/base.xml      |  6 +--
 3 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 4378ac4a0a9..87744825207 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,6 +1,7 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
-    'field' : ['required', 'readonly'],
+    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
+               'colspan', 'eval', 'ref', 'on_change', 'attrs'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -22,7 +23,6 @@ var _PROPERTIES = {
 };
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
-
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
         this.element_id = element_id
@@ -107,7 +107,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         render_name+= ">";
         xml_tag+= ">";
         });
-        obj.main_xml = xml_tag;
+        obj.main_xml = xml;
         obj.name = render_name;
         return obj;
     },
@@ -287,7 +287,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     this.dialog.$element.html(QWeb.render('view_editor', {
        'data': one_object['main_object'],
     }));
-
     $("tr[id^='viewedit-']").click(function() {
         $("tr[id^='viewedit-']").removeClass('ui-selected');
         $(this).addClass('ui-selected');
@@ -439,10 +438,18 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
                     // res will use for getting value of fields.
+                    var widget = ['readonly','required','nolable','completion','groups','position','icon','align'];
                     var k = {"attrs":{"modifiers":"{'readonly':true}","name":"name"},"children":[],"tag":"field"};
                     _.each(properties,function(record){
-                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
-                        $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
+                        if (_.include(widget,record)){
+                            var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
+                            $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
+                            type_widget.set_value(res[0][record]);
+                        }else{
+                            var type_widget = new openerp.web.ViewEditor.FieldChar (self.dialog, k);
+                            $("div[id='"+self.dialog.element_id+"']").append('<div id="res">'+record+''+type_widget.render()+'</div>');
+                            type_widget.set_value(res[0][record]);
+                        }
                     });
                 });
             });
@@ -450,12 +457,36 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
     init: function(view, node) {
-        //this._super(view, node);
-        this.template = "FieldBoolean";
+        this.$element = view.$element;
     },
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
+    },
+    set_value: function(value) {
+        if (value === false || value === undefined) {
+            // As in GTK client, floats default to 0
+            value = 0;
+            this.dirty = true;
+        }
+        this._super.apply(this, [value]);
+    }
+});
+openerp.web.ViewEditor.FieldChar = openerp.web.form.FieldChar.extend({
+    init: function(view, node) {
+        this.$element = view.$element;
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(value) {
+        if (value === false || value === undefined) {
+            // As in GTK client, floats default to 0
+            value = 0;
+            this.dirty = true;
+        }
+        this._super.apply(this, [value]);
     }
 });
 
@@ -464,8 +495,7 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
     'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    /*'widget' : '',
-    'groups' : '',
+    /*'groups' : 'openerp.web.ViewEditor.WidgetFrame',
     'position': '',
     'icon': '',
     'align': '' */
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 11ebad8d093..e184424fbd6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -14,7 +14,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     /**
      * @constructs openerp.web.FormView
      * @extends openerp.web.View
-     * 
+     *
      * @param {openerp.web.Session} session the current openerp session
      * @param {openerp.web.DataSet} dataset the dataset this view will work with
      * @param {String} view_id the identifier of the OpenERP view object
@@ -1042,7 +1042,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
     },
     update_dom: function() {
         this._super.apply(this, arguments);
-        if (this.field.translate) {
+       /* if (this.field.translate) {
             this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id);
         }
         if (!this.disable_utility_classes) {
@@ -1051,7 +1051,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
             if (this.view.show_invalid) {
                 this.$element.toggleClass('invalid', !this.is_valid());
             }
-        }
+        }*/
     },
     on_ui_change: function() {
         this.dirty = this.view.dirty_for_user = true;
@@ -2274,7 +2274,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             }).pipe(function() {
                 self.searchview.do_search();
             });
-            
+
         });
         this.searchview.appendTo($("#" + this.element_id + "_search"));
     },
@@ -2647,13 +2647,13 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
     start: function() {
         this._super();
         this.selected_value = null;
-        
+
         this.render_list();
     },
     set_value: function(value) {
         this._super(value);
         this.selected_value = value;
-        
+
         this.render_list();
     },
     render_list: function() {
@@ -2661,7 +2661,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
         var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
             function(x) { return x.trim(); });
         shown = _.select(shown, function(x) { return x.length > 0; });
-            
+
         if (shown.length == 0) {
             this.to_show = this.field.selection;
         } else {
@@ -2669,10 +2669,10 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
                 return _.indexOf(shown, x[0]) !== -1 || x[0] === self.selected_value;
             });
         }
-        
+
         var content = openerp.web.qweb.render("FieldStatus.content", {widget: this, _:_});
         this.$element.html(content);
-        
+
         var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
         var color = colors[this.selected_value];
         if (color) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 04bd475fd1c..b8da6dcab78 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -773,13 +773,13 @@
     <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
 </t>
 <t t-name="FieldChar">
-    <input type="text" size="1"
+    <input type="text" size="12"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type} #{widget.element_class}"
-        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
+
     />
-    <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    <!-- img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/-->
 </t>
 <t t-name="FieldChar.readonly">
     <div

From 2923c456a786c0d54588df5d8606aa08c3f18649 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 20 Oct 2011 16:21:30 +0530
Subject: [PATCH 17/53] [FIX] project_mrp : Imporved code

bzr revid: jam@tinyerp.com-20111020105130-yyn1xf1eakh5tndf
---
 addons/project_mrp/project_procurement.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 489535222f7..80d25bd15a7 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -37,15 +37,18 @@ class procurement_order(osv.osv):
         line_pool=self.pool.get('sale.order.line')
         project_pool=self.pool.get('project.project')
         for procurement in self.browse(cr, uid, ids, context=context):
-            project_id = False
-            line_ids = line_pool.search(cr, uid , [('procurement_id', '=', procurement.id)])
-            order_lines = line_pool.browse(cr, uid, line_ids)
-            for line in order_lines:
-                if line.product_id and  line.product_id.project_id:            
-                    project_id = line.product_id.project_id.id
-                if not project_id and line.order_id.project_id:
-                    project_id = project_pool.search(cr, uid , [('name', '=', line.order_id.project_id.name)])
-                    project_id = project_id and project_id[0] or False
+            # project_id = the product's associated project if it exists,
+            #              the sales order's associated project otherwise
+            if procurement.product_id.project_id:
+                project_id = procurement.product_id.project_id.id
+            else:
+                project_id = False
+                line_ids = line_pool.search(cr, uid , [('procurement_id', '=', procurement.id)])
+                for line in line_pool.browse(cr, uid, line_ids):
+                    if line.order_id.project_id:
+                        project_id = line.order_id.project_id.id
+                        break
+
             self.write(cr, uid, [procurement.id], {'state': 'running'})
             planned_hours = procurement.product_qty
             task_id = self.pool.get('project.task').create(cr, uid, {

From a4afdc2be01c190e151000612ddb88bb192d52dc Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 20 Oct 2011 16:23:37 +0530
Subject: [PATCH 18/53] [FIX] project_mrp : Removed unused Veriable and iMport

bzr revid: jam@tinyerp.com-20111020105337-3jrhebdk1lov5cb7
---
 addons/project_mrp/project_procurement.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 80d25bd15a7..6066ba1149a 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv, orm
-
-import tools
+from osv import fields, osv
 
 class procurement_order(osv.osv):
     _name = "procurement.order"
@@ -35,7 +33,6 @@ class procurement_order(osv.osv):
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
         line_pool=self.pool.get('sale.order.line')
-        project_pool=self.pool.get('project.project')
         for procurement in self.browse(cr, uid, ids, context=context):
             # project_id = the product's associated project if it exists,
             #              the sales order's associated project otherwise

From 59f3ab077f4d44b443033069932ca489777fbd13 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Mon, 24 Oct 2011 18:29:12 +0530
Subject: [PATCH 19/53] [IMP]Improved code for edit node by setting its value.

bzr revid: kch@tinyerp.com-20111024125912-m9w3v9bnikurtlxf
---
 addons/web/static/src/js/view_editor.js | 155 +++++++++++++++---------
 addons/web/static/src/xml/base.xml      |  21 +++-
 2 files changed, 117 insertions(+), 59 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 774d1872c29..b20694b7d01 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,7 +1,7 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
     'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'eval', 'ref', 'on_change', 'attrs'],
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -28,7 +28,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.element_id = element_id
         this.parent = parent
         this.dataset = dataset;
-        this.model = dataset.model;
+        this.model = this.dataset.model;
         this.xml_id = 0;
         this.property = openerp.web.ViewEditor.property_widget;
     },
@@ -331,9 +331,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         fld_name = tag_fld[2].split("=")[1].replace(/[^a-zA-Z _ 0-9]+/g,'');
                     }else{
                         tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
+                        fld_name= tag;
                     }
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties,fld_name);
+                    self.on_edit_node(properties,fld_name,id_tr);
                     break;
                 case "side-up":
                     while (1) {
@@ -398,6 +399,19 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
     },
+    get_view_object: function(view_xml_id, one_object,result){
+      var self = this;
+      if(result.length==0){
+          var check = _.detect(one_object , function(obj){
+              return view_xml_id==obj.id;
+          });
+          if(check){result.push(check);};
+          _.each(one_object, function(obj){
+             self.get_view_object(view_xml_id, obj.child_id, result);
+          });
+      }
+      return result;
+    },
     on_expand: function(expand_img){
         var level = parseInt($(expand_img).closest("tr[id^='viewedit-']").attr('level'));
         var cur_tr = $(expand_img).closest("tr[id^='viewedit-']");
@@ -421,14 +435,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties,fld_name){
+    on_edit_node:function(properties,fld_name,id_tr){
         var self = this;
         var result;
-        this.dialog = new openerp.web.Dialog(this,{
+        this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
             width: 650,
-            height: 150,
+            height: 200,
             buttons: {
                     "Update": function(){
                     },
@@ -437,72 +451,103 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     }
                 }
         });
-        this.dialog.start().open();
+        this.edit_node_dialog.start().open();
+        var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
+        var arch_val = self.get_view_object(id_tr,one_object,[]);
+        self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
         dataset = new openerp.web.DataSetSearch(this,'ir.model', null, null);
-            dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
-                db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
-                db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
-                    // res will use for getting value of fields.
-                    var widget = ['readonly','required','nolable','completion','groups','position','icon','align'];
-                    var k = {"attrs":{"modifiers":"{'readonly':true}","name":"name"},"children":[],"tag":"field"};
-                    _.each(properties,function(record){
-                        if (_.include(widget,record)){
-                            var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
-                            $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
-                            type_widget.set_value(res[0][record]);
-                        }else{
-                            var type_widget = new openerp.web.ViewEditor.FieldChar (self.dialog, k);
-                            $("div[id='"+self.dialog.element_id+"']").append('<div id="res">'+record+''+type_widget.render()+'</div>');
-                            type_widget.set_value(res[0][record]);
-                        }
-                    });
+        dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
+            db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
+            db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
+                _.each(properties,function(record){
+                    var id = record;
+                    var rs = res.length ? res[0][record] : null;
+                    if (_.include(widget,record)){
+                        var type_widget =  new (self.property.get_any(['undefined' , record, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
+                        type_widget.set_value(id,rs);
+                    }else{
+                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
+                        type_widget.set_value(id,rs);
+                    }
                 });
             });
+        });
     }
 });
-openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
+openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node) {
         this.$element = view.$element;
+        this.node = node;
+    },
+    render: function () {
+        return QWeb.render(this.template, {widget: this});
     },
     start: function() {
+        this._super();
         var self = this;
-        this._super.apply(this, arguments);
-    },
-    set_value: function(value) {
-        if (value === false || value === undefined) {
-            // As in GTK client, floats default to 0
-            value = 0;
-            this.dirty = true;
-        }
-        this._super.apply(this, [value]);
-    }
-});
-openerp.web.ViewEditor.FieldChar = openerp.web.form.FieldChar.extend({
-    init: function(view, node) {
-        this.$element = view.$element;
-    },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
-    set_value: function(value) {
-        if (value === false || value === undefined) {
-            // As in GTK client, floats default to 0
-            value = 0;
-            this.dirty = true;
-        }
-        this._super.apply(this, [value]);
     }
 });
 
+openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_boolean";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,id);
+        });
+        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', value);
+    }
+});
+openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_char";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,id);
+        });
+        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val(value);
+    }
+});
+openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.node = node;
+        this.template = "view_selection";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        //ToDo
+    }
+});
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
     'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    /*'groups' : 'openerp.web.ViewEditor.WidgetFrame',
-    'position': '',
-    'icon': '',
-    'align': '' */
+    'widget' : 'openerp.web.ViewEditor.FieldSelect',
+    'groups' : 'openerp.web.ViewEditor.FieldSelect',
+    'position': 'openerp.web.ViewEditor.FieldSelect',
+    'icon': 'openerp.web.ViewEditor.FieldSelect',
+    'align': 'openerp.web.ViewEditor.FieldSelect',
+    'special': 'openerp.web.ViewEditor.FieldSelect',
+    'type': 'openerp.web.ViewEditor.FieldSelect',
+    'target': 'openerp.web.ViewEditor.FieldSelect'
 });
 };
\ No newline at end of file
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cc3a0af8341..cf74e14ebfc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -778,13 +778,13 @@
     <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
 </t>
 <t t-name="FieldChar">
-    <input type="text" size="12"
+    <input type="text" size="1"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
-
+        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     />
-    <!-- img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/-->
+    <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldChar.readonly">
     <div
@@ -1333,7 +1333,20 @@
             <t t-set="data" t-value="rec.child_id"/>
             <t t-call="view_editor.row"/>
         </t>
-    </tr>
+</tr>
+<t t-name="view_char">
+    <input type="text" class="field_char" size="50"/>
+</t>
+<t t-name="view_selection">
+    <select>
+        <option selected="true"></option>
+        <option>ToDo</option>
+    </select>
+</t>
+<t t-name="view_boolean">
+    <input type="checkbox"/>
+</t>
+
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>

From b14b4c956cf2ac0d39a8b87f5967303251bbc5a3 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 25 Oct 2011 18:43:12 +0530
Subject: [PATCH 20/53] [IMP]Improved code for getting value of selection box x
 in edit node.

bzr revid: kch@tinyerp.com-20111025131312-jgkdm51vblkvag9s
---
 addons/web/static/src/js/view_editor.js | 177 ++++++++++++++++++++++--
 addons/web/static/src/xml/base.xml      |   1 -
 2 files changed, 168 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index b20694b7d01..89afa432c12 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,7 +1,7 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
     'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs'],
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -455,6 +455,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(id_tr,one_object,[]);
         self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
+
+        var groups_values = self.on_groups();
         dataset = new openerp.web.DataSetSearch(this,'ir.model', null, null);
         dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
             db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
@@ -465,7 +467,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     if (_.include(widget,record)){
                         var type_widget =  new (self.property.get_any(['undefined' , record, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value(id,rs);
+                        (record=='groups')?type_widget.set_value(id,groups_values):type_widget.set_value(id,rs);
                     }else{
                         var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
@@ -474,10 +476,33 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             });
         });
+    },
+     //for getting groups
+    on_groups: function(){
+        var self = this;
+        var group_ids = [];
+        var group_names = {};
+        var groups = [];
+        var resgrp_database = new openerp.web.DataSetSearch(self,'res.groups', null, null);
+        resgrp_database.read_slice([],{}, function (res_grp) {
+            _.each(res_grp,function(res){
+                var key = res.id;
+                group_names[key]=res.name;
+                group_ids.push(res.id);
+            });
+            var irmodel_database = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
+            irmodel_database.read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]},function(model_grp){
+               _.each(model_grp,function(res_group){
+                   groups.push([res_group.name,group_names[res_group.res_id]]);
+               });
+            });
+        });
+        return groups;
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node) {
+        var self = this;
         this.$element = view.$element;
         this.node = node;
     },
@@ -536,18 +561,152 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         //ToDo
     }
 });
+openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.registry = openerp.web.form.widgets;
+        this.template = "view_selection";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = _.keys(this.registry.map);
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                value: item,
+                text: item
+            }));
+        });
+    }
+});
+/*openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = ;
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                value: item,
+                text: item
+            }));
+        });
+    }
+});*/
+openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                value: 'new',
+                text: 'New Window'
+        }));
+    }
+});
+openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        var select = self.$element.find("tr[id="+id+"] select").attr('multiple', true);
+        _.each(value, function(item) {
+            select.append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
     'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    'widget' : 'openerp.web.ViewEditor.FieldSelect',
-    'groups' : 'openerp.web.ViewEditor.FieldSelect',
-    'position': 'openerp.web.ViewEditor.FieldSelect',
+    'widget' : 'openerp.web.ViewEditor.WidgetProperty',
+    'groups' : 'openerp.web.ViewEditor.GroupsProperty',
+    'position': 'openerp.web.ViewEditor.PositionProperty',
     'icon': 'openerp.web.ViewEditor.FieldSelect',
-    'align': 'openerp.web.ViewEditor.FieldSelect',
-    'special': 'openerp.web.ViewEditor.FieldSelect',
-    'type': 'openerp.web.ViewEditor.FieldSelect',
-    'target': 'openerp.web.ViewEditor.FieldSelect'
+    'align': 'openerp.web.ViewEditor.AlignProperty',
+    'special': 'openerp.web.ViewEditor.ButtonSpecialProperty',
+    'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
+    'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
 });
 };
\ No newline at end of file
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f8f316eb6a0..d6c9ac232e6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1339,7 +1339,6 @@
 <t t-name="view_selection">
     <select>
         <option selected="true"></option>
-        <option>ToDo</option>
     </select>
 </t>
 <t t-name="view_boolean">

From 6f899d86c010300295dc64977849e87f67b93731 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 27 Oct 2011 17:31:32 +0200
Subject: [PATCH 21/53] [IMP] rename Session to Connection and create one at
 initialisation

bzr revid: chs@openerp.com-20111027153132-qoj0fiwoj813gsda
---
 addons/web/static/src/js/boot.js   | 25 ++++++++++++++-
 addons/web/static/src/js/chrome.js |  8 ++---
 addons/web/static/src/js/core.js   | 50 ++++++------------------------
 addons/web/static/src/js/data.js   | 12 ++++---
 4 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index f41185be0c6..a8ecd8a0ee5 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -21,7 +21,16 @@
          *
          * @param {Array} modules list of modules to initialize
          */
-        init: function(modules) {
+        init: function(modules, connection, callback) {
+    
+            if (/^(function|undefined)$/.test(typeof connection)) {
+                callback = connection;
+                connection = {
+                    host: document.location.protocol + '//' + document.location.host,
+                };
+            }
+
+
             var new_instance = {
                 // links to the global openerp
                 _openerp: openerp,
@@ -39,6 +48,20 @@
             for(var i=0; i < modules.length; i++) {
                 openerp[modules[i]](new_instance);
             }
+
+            new_instance.connector = new new_instance.web.Connection(connection.host);
+            if (connection.login) {
+                new_instance.connector.login(connection.database, connection.login, connection.password, function() {
+                    if (callback) {
+                        callback(new_instance);
+                    }
+                });
+            } else {
+                if (callback) {
+                    callback(new_instance);
+                }
+            }
+
             return new_instance;
         }
     };
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 38923d268cf..27f0188e355 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -136,10 +136,9 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
     }
 });
 
-openerp.web.CrashManager = openerp.web.SessionAware.extend({
-    init: function(parent) {
-        this._super((parent || {}).session);
-        this.session.on_rpc_error.add(this.on_rpc_error);
+openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
+    init: function() {
+        openerp.connector.on_rpc_error.add(this.on_rpc_error);
     },
     on_rpc_error: function(error) {
         this.error = error;
@@ -951,7 +950,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.$element.html(QWeb.render("Interface", params));
 
         this.notification = new openerp.web.Notification();
-        this.session = new openerp.web.Session();
         this.loading = new openerp.web.Loading(this,"oe_loading");
         this.crashmanager =  new openerp.web.CrashManager(this);
 
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 9563abea49a..75f2bb8ef71 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -237,8 +237,8 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
      * registry was created.
      *
      * An object path is simply a dotted name from the openerp root to the
-     * object pointed to (e.g. ``"openerp.web.Session"`` for an OpenERP
-     * session object).
+     * object pointed to (e.g. ``"openerp.web.Connection"`` for an OpenERP
+     * connection object).
      *
      * @constructs openerp.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths
@@ -338,9 +338,9 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(/** @lends openerp.web.Ca
     }
 });
 
-openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Session# */{
+openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
     /**
-     * @constructs openerp.web.Session
+     * @constructs openerp.web.Connection
      * @extends openerp.web.CallbackEnabled
      *
      * @param {String} [server] JSON-RPC endpoint hostname
@@ -490,6 +490,7 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
             return true;
         }).then(success_callback);
     },
+    login: function() { this.session_login.apply(this, arguments); },
     /**
      * Reloads uid and session_id from local storage, if they exist
      */
@@ -716,36 +717,6 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
     }
 });
 
-openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.SessionAware# */{
-    /**
-     * Utility class that any class is allowed to extend to easy common manipulations.
-     *
-     * It provides rpc calls, callback on all methods preceded by "on_" or "do_" and a
-     * logging facility.
-     *
-     * @constructs openerp.web.SessionAware
-     * @extends openerp.web.CallbackEnabled
-     *
-     * @param {openerp.web.Session} session
-     */
-    init: function(session) {
-        this._super();
-        this.session = session;
-    },
-    /**
-     * Performs a JSON-RPC call
-     *
-     * @param {String} url endpoint url
-     * @param {Object} data RPC parameters
-     * @param {Function} success RPC call success callback
-     * @param {Function} error RPC call error callback
-     * @returns {jQuery.Deferred} deferred object for the RPC call
-     */
-    rpc: function(url, data, success, error) {
-        return this.session.rpc(url, data, success, error);
-    }
-});
-
 /**
  * Base class for all visual components. Provides a lot of functionalities helpful
  * for the management of a part of the DOM.
@@ -756,8 +727,6 @@ openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp
  *     destroyed too).
  * - Insertion in DOM.
  *
- * Widget also extends SessionAware for ease of use.
- *
  * Guide to create implementations of the Widget class:
  * ==============================================
  *
@@ -798,7 +767,7 @@ openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widget# */{
+openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.Widget# */{
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -817,7 +786,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
      * Construct the widget and set its parent if a parent is given.
      *
      * @constructs openerp.web.Widget
-     * @extends openerp.web.SessionAware
+     * @extends openerp.web.CallbackEnabled
      *
      * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling stop(), the current instance will be
@@ -828,7 +797,8 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
      * for new components this argument should not be provided any more.
      */
     init: function(parent, /** @deprecated */ element_id) {
-        this._super((parent || {}).session);
+        this._super();
+        this.session = openerp.connector;
         // if given an element_id, try to get the associated DOM element and save
         // a reference in this.$element. Else just generate a unique identifier.
         this.element_id = element_id;
@@ -967,7 +937,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        this._super(url, data). then(function() {
+        openerp.connector.rpc(url, data). then(function() {
             if (!self.widget_is_stopped)
                 def.resolve.apply(def, arguments);
         }, function() {
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 069506586ad..4e14b9eb6a9 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -32,7 +32,7 @@ openerp.web.DataGroup =  openerp.web.Widget.extend( /** @lends openerp.web.DataG
      * @constructs openerp.web.DataGroup
      * @extends openerp.web.Widget
      *
-     * @param {openerp.web.Session} session Current OpenERP session
+     * @param {openerp.web.Widget} parent widget
      * @param {String} model name of the model managed by this DataGroup
      * @param {Array} domain search domain for this DataGroup
      * @param {Object} context context of the DataGroup's searches
@@ -785,11 +785,15 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
     on_unlink: function(ids) {}
 });
 
-openerp.web.Model = openerp.web.SessionAware.extend({
-    init: function(session, model_name) {
-        this._super(session);
+openerp.web.Model = openerp.web.CallbackEnabled.extend({
+    init: function(_, model_name) {
+        this._super();
         this.model_name = model_name;
     },
+    rpc: function() {
+        var c = openerp.connector;
+        return c.rpc.apply(c, arguments);
+    },
     get_func: function(method_name) {
         var self = this;
         return function() {

From a2c8cf785ae40add412b8394779dbe25e7a97c6b Mon Sep 17 00:00:00 2001
From: Serpent Consulting Services <support@serpentcs.com>
Date: Fri, 28 Oct 2011 21:27:20 +0530
Subject: [PATCH 22/53] [FIX] Account_followup : Fixed the problem of user
 signature on report.

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

bzr revid: support@serpentcs.com-20111028155720-zswn19oahp33hw1w
---
 addons/account_followup/report/account_followup_print.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 9081e862cfe..557364372b0 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -86,6 +86,8 @@ class report_rappel(report_sxw.rml_parse):
 
 
     def _get_text(self, partner, followup_id, context=None):
+        if context is None:
+            context = {}
         fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup')
         fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line
         li_delay = []
@@ -96,7 +98,6 @@ class report_rappel(report_sxw.rml_parse):
         a = {}
         partner_line = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',partner.id),('reconcile_id','=',False)])
         partner_delay = []
-        context={}
         context.update({'lang': partner.lang})
         for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line, context):
             for delay in li_delay:
@@ -110,7 +111,7 @@ class report_rappel(report_sxw.rml_parse):
                 'partner_name': partner.name,
                 'date': time.strftime('%Y-%m-%d'),
                 'company_name': fp_obj.browse(self.cr, self.uid, followup_id).company_id.name,
-                'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature,
+                'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '',
             }
 
         return text

From c1956c46d41c34a0cbdd2bc09b2f0d7c522e9421 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 1 Nov 2011 18:52:57 +0530
Subject: [PATCH 23/53] [IMP]Improved code for fill selection box value in edit
 node of view editor.

bzr revid: kch@tinyerp.com-20111101132257-j222v9nfkflm2m2h
---
 addons/web/static/src/js/view_editor.js | 186 ++++++++++--------------
 addons/web/static/src/xml/base.xml      |   3 +-
 2 files changed, 77 insertions(+), 112 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 89afa432c12..bf87e473934 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -21,6 +21,33 @@ var _PROPERTIES = {
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
     'view' : [],
 };
+var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
+'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
+'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
+'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
+'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
+'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
+'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
+'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
+'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
+'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
+'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
+'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
+'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
+'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
+'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
+'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
+'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
+'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
+'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
+'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
+'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
+'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
+'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
+'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
+'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
+'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph',
+];
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
@@ -152,7 +179,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var tag = root.tagName.toLowerCase();
         var obj ={'child_id':[],'id':this.xml_id++,'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
         var root_object = this.check_attr(root,tag,0);
-        obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], [])
+        obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], []);
         return [obj];
     },
     get_data: function() {
@@ -445,6 +472,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 200,
             buttons: {
                     "Update": function(){
+                        self.on_update_node();
                     },
                     "Cancel": function(){
                         $(this).dialog('destroy');
@@ -498,6 +526,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         });
         return groups;
+    },
+    on_update_node: function(){
+        //todo
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
@@ -508,10 +539,6 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     },
     render: function () {
         return QWeb.render(this.template, {widget: this});
-    },
-    start: function() {
-        this._super();
-        var self = this;
     }
 });
 
@@ -520,10 +547,6 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_boolean";
     },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
     set_value: function(id,value) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
@@ -536,10 +559,6 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_char";
     },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
     set_value: function(id,value) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
@@ -550,149 +569,96 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.node = node;
         this.template = "view_selection";
     },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
     set_value: function(id,value) {
-        //ToDo
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,id);
+        });
+        var self = this;
+        _.each(value, function(item) {
+            var select_val = view_val?(view_val[1]==item[0]?true:false):false;
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:(typeof(item)=='string')?item:item[0],
+                    text:(typeof(item)=='string')?item:item[1],
+                    selected:select_val
+            }));
+        });
     }
 });
-openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
         this.registry = openerp.web.form.widgets;
-        this.template = "view_selection";
-    },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
     },
     set_value: function(id,value) {
-        var self = this;
         value = _.keys(this.registry.map);
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                value: item,
-                text: item
-            }));
-        });
+        value.push('');
+        value.sort();
+        this._super.apply(this,[id, value]);
     }
 });
-/*openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
-    },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
     },
     set_value: function(id,value) {
-        var self = this;
-        value = ;
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                value: item,
-                text: item
-            }));
-        });
-    }
-});*/
-openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "view_selection";
-    },
-    set_value: function(id,value) {
-        var self = this;
-        self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                value: 'new',
-                text: 'New Window'
-        }));
+        value = icons;
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['new','New Window']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        var select = self.$element.find("tr[id="+id+"] select").attr('multiple', true);
-        _.each(value, function(item) {
-            select.append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        this._super.apply(this,[id, value]);
+    }
+});
+openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
+    init: function(view, node) {
+        this._super(view, node);
+    },
+    set_value: function(id,value) {
+        this.$element.find("tr[id="+id+"] select").attr('multiple', true);
+        this._super.apply(this,[id, value]);
     }
 });
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
@@ -703,7 +669,7 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'widget' : 'openerp.web.ViewEditor.WidgetProperty',
     'groups' : 'openerp.web.ViewEditor.GroupsProperty',
     'position': 'openerp.web.ViewEditor.PositionProperty',
-    'icon': 'openerp.web.ViewEditor.FieldSelect',
+    'icon': 'openerp.web.ViewEditor.IconProperty',
     'align': 'openerp.web.ViewEditor.AlignProperty',
     'special': 'openerp.web.ViewEditor.ButtonSpecialProperty',
     'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d6c9ac232e6..41865e4f5a3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1337,8 +1337,7 @@
     <input type="text" class="field_char" size="50"/>
 </t>
 <t t-name="view_selection">
-    <select>
-        <option selected="true"></option>
+    <select style="width:366px">
     </select>
 </t>
 <t t-name="view_boolean">

From 6f91e87f8cf55a4ba79809b697dbdd575f05677a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 2 Nov 2011 11:05:11 +0100
Subject: [PATCH 24/53] [FIX] correct CrashManager

bzr revid: chs@openerp.com-20111102100511-f58vlgnv12cti8ry
---
 addons/web/static/src/js/chrome.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 27f0188e355..c8ebbb2b12a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -138,6 +138,7 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
 
 openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
     init: function() {
+        this._super();
         openerp.connector.on_rpc_error.add(this.on_rpc_error);
     },
     on_rpc_error: function(error) {
@@ -951,7 +952,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
 
         this.notification = new openerp.web.Notification();
         this.loading = new openerp.web.Loading(this,"oe_loading");
-        this.crashmanager =  new openerp.web.CrashManager(this);
+        this.crashmanager =  new openerp.web.CrashManager();
 
         this.header = new openerp.web.Header(this);
         this.login = new openerp.web.Login(this);

From ae0bf044ef1d63bc0bb19eb9dccc0218c63a9c65 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 2 Nov 2011 12:11:05 +0100
Subject: [PATCH 25/53] [IMP] qweb templates are stored in addon manifest and
 given by the server

bzr revid: chs@openerp.com-20111102111105-ibyupno1e47sv9ho
---
 addons/web/__openerp__.py                     |  3 ++
 addons/web/controllers/main.py                | 38 +++++++++++++++++++
 addons/web/static/src/js/chrome.js            |  3 +-
 addons/web/static/src/js/core.js              | 17 +++++++++
 addons/web/static/src/js/search.js            |  7 ++--
 addons/web_calendar/__openerp__.py            |  3 ++
 addons/web_calendar/static/src/js/calendar.js |  1 -
 addons/web_dashboard/__openerp__.py           |  3 ++
 .../web_dashboard/static/src/js/dashboard.js  |  1 -
 addons/web_diagram/__openerp__.py             |  3 ++
 addons/web_diagram/static/src/js/diagram.js   |  1 -
 addons/web_gantt/__openerp__.py               |  3 ++
 addons/web_gantt/static/src/js/gantt.js       |  1 -
 addons/web_graph/__openerp__.py               |  3 ++
 addons/web_graph/static/src/js/graph.js       |  1 -
 addons/web_kanban/__openerp__.py              |  3 ++
 addons/web_kanban/static/src/js/kanban.js     |  2 +-
 17 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 314d7274879..2695709c68a 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -52,4 +52,7 @@
         "static/src/css/data_export.css",
         "static/src/css/data_import.css",
     ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
 }
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 6cc46b476a9..9f894dc9673 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -24,6 +24,32 @@ openerpweb = web.common.http
 # OpenERP Web web Controllers
 #----------------------------------------------------------
 
+
+def concat_xml(file_list):
+    """Concatenate xml files
+    return (concat,timestamp)
+    concat: concatenation of file content
+    timestamp: max(os.path.getmtime of file_list)
+    """
+    root = None
+    files_timestamp = 0
+    for fname in file_list:
+        ftime = os.path.getmtime(fname)
+        if ftime > files_timestamp:
+            files_timestamp = ftime
+
+        xml = ElementTree.parse(fname).getroot()
+
+        if root is None:
+            root = ElementTree.Element(xml.tag)
+        #elif root.tag != xml.tag:
+        #    raise ValueError("Root tags missmatch: %r != %r" % (root.tag, xml.tag))
+
+        for child in xml.getchildren():
+            root.append(child)
+    return ElementTree.tostring(root, 'utf-8'), files_timestamp
+
+
 def concat_files(file_list):
     """ Concatenate file content
     return (concat,timestamp)
@@ -98,6 +124,10 @@ class WebClient(openerpweb.Controller):
     def jslist(self, req, mods=None):
         return self.manifest_list(req, mods, 'js')
 
+    @openerpweb.jsonrequest
+    def qweblist(self, req, mods=None):
+        return self.manifest_list(req, mods, 'qweb')
+
     @openerpweb.httprequest
     def css(self, req, mods=None):
         files = [f[0] for f in self.manifest_glob(req, mods, 'css')]
@@ -112,6 +142,14 @@ class WebClient(openerpweb.Controller):
         # TODO use timestamp to set Last mofified date and E-tag
         return req.make_response(content, [('Content-Type', 'application/javascript')])
 
+    @openerpweb.httprequest
+    def qweb(self, req, mods=None):
+        files = [f[0] for f in self.manifest_glob(req, mods, 'qweb')]
+        content,timestamp = concat_xml(files)
+        # TODO use timestamp to set Last mofified date and E-tag
+        return req.make_response(content, [('Content-Type', 'text/xml')])
+
+
     @openerpweb.httprequest
     def home(self, req, s_action=None, **kw):
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>'%i for i in self.manifest_list(req, None, 'js'))
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index c8ebbb2b12a..f2b90c5cf7f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -943,14 +943,13 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this._super(null, element_id);
         openerp.webclient = this;
 
-        QWeb.add_template("/web/static/src/xml/base.xml");
         var params = {};
         if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
         }
         this.$element.html(QWeb.render("Interface", params));
 
-        this.notification = new openerp.web.Notification();
+        this.notification = new openerp.web.Notification(this);
         this.loading = new openerp.web.Loading(this,"oe_loading");
         this.crashmanager =  new openerp.web.CrashManager();
 
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 75f2bb8ef71..837e9faab64 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -364,7 +364,9 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         // TODO: session should have an optional name indicating that they'll
         //       be saved to (and revived from) cookies
         this.name = 'session';
+        this.do_load_qweb(['/web/webclient/qweb']);
     },
+
     start: function() {
         this.session_restore();
     },
@@ -487,6 +489,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             self.user_context = result.context;
             self.db = result.db;
             self.session_save();
+            self.on_session_valid();
             return true;
         }).then(success_callback);
     },
@@ -578,6 +581,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                 self.rpc('/web/webclient/jslist', {"mods": modules}, function(files) {
                     self.do_load_js(file_list.concat(files));
                 });
+                self.rpc('/web/webclient/qweblist', {"mods": modules}, self.do_load_qweb);
                 openerp._modules_loaded = true;
             });
         });
@@ -611,6 +615,19 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             this.on_modules_loaded();
         }
     },
+    do_load_qweb: function(files) {
+        var self = this;
+        _.each(files, function(file) {
+            $.ajax({
+                url: file,
+                type: 'get',
+                async: false,
+                dataType: 'text',
+            }).then(function(xml) {
+                openerp.web.qweb.add_template(_(xml).trim());
+            });
+        });
+    },
     on_modules_loaded: function() {
         for(var j=0; j<this.module_list.length; j++) {
             var mod = this.module_list[j];
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index b2402cf95fa..18e035a40b8 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -433,6 +433,7 @@ openerp.web.search.Widget = openerp.web.Widget.extend( /** @lends openerp.web.se
      * @param view the ancestor view of this widget
      */
     init: function (view) {
+        this._super(view);
         this.view = view;
     },
     /**
@@ -473,10 +474,8 @@ openerp.web.search.Widget = openerp.web.Widget.extend( /** @lends openerp.web.se
         this._super();
     },
     render: function (defaults) {
-        return QWeb.render(
-            this.template, _.extend(this, {
-                defaults: defaults
-        }));
+        // FIXME
+        return this._super(_.extend(this, {defaults: defaults}));
     }
 });
 openerp.web.search.add_expand_listener = function($root) {
diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
index 1eba26065f5..5b09e70cba8 100644
--- a/addons/web_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -11,5 +11,8 @@
     "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css',
             'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_ext.css'
             ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'active': True
 }
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index a5fd8bcac9c..982fc60e1c4 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -5,7 +5,6 @@
 openerp.web_calendar = function(openerp) {
 var _t = openerp.web._t;
 var QWeb = openerp.web.qweb;
-QWeb.add_template('/web_calendar/static/src/xml/web_calendar.xml');
 openerp.web.views.add('calendar', 'openerp.web_calendar.CalendarView');
 openerp.web_calendar.CalendarView = openerp.web.View.extend({
 // Dhtmlx scheduler ?
diff --git a/addons/web_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py
index 7a527511b03..68c73731c71 100644
--- a/addons/web_dashboard/__openerp__.py
+++ b/addons/web_dashboard/__openerp__.py
@@ -7,5 +7,8 @@
         'static/src/js/dashboard.js'
     ],
     "css": ['static/src/css/dashboard.css'],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'active': True
 }
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index b5f3b606d71..e629a4a6ef5 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -1,6 +1,5 @@
 openerp.web_dashboard = function(openerp) {
 var QWeb = openerp.web.qweb;
-QWeb.add_template('/web_dashboard/static/src/xml/web_dashboard.xml');
 
 if (!openerp.web_dashboard) {
     /** @namespace */
diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py
index 584c0a16e66..cd9eb719934 100644
--- a/addons/web_diagram/__openerp__.py
+++ b/addons/web_diagram/__openerp__.py
@@ -13,5 +13,8 @@
     'css' : [
         "static/src/css/base_diagram.css",
     ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'active': True,
 }
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index ffa27734769..e4fb3ef5b75 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -4,7 +4,6 @@
 
 openerp.web_diagram = function (openerp) {
 var QWeb = openerp.web.qweb;
-QWeb.add_template('/web_diagram/static/src/xml/base_diagram.xml');
 openerp.web.views.add('diagram', 'openerp.web.DiagramView');
 openerp.web.DiagramView = openerp.web.View.extend({
     searchable: false,
diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py
index d2b24f96d08..cd24a8f7314 100644
--- a/addons/web_gantt/__openerp__.py
+++ b/addons/web_gantt/__openerp__.py
@@ -9,5 +9,8 @@
         'static/src/js/gantt.js'
     ],
     "css": ['static/lib/dhtmlxGantt/codebase/dhtmlxgantt.css'],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'active': True
 }
diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index bdd57b7bf0a..d2eb3aed899 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -3,7 +3,6 @@
  *---------------------------------------------------------*/
 openerp.web_gantt = function (openerp) {
 var QWeb = openerp.web.qweb;
-QWeb.add_template('/web_gantt/static/src/xml/web_gantt.xml');
 openerp.web.views.add('gantt', 'openerp.web_gantt.GanttView');
 openerp.web_gantt.GanttView = openerp.web.View.extend({
 
diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py
index 68775b7c0e3..d7c37acb180 100644
--- a/addons/web_graph/__openerp__.py
+++ b/addons/web_graph/__openerp__.py
@@ -7,5 +7,8 @@
            "static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js",
            "static/src/js/graph.js"],
     "css": ["static/lib/dhtmlxGraph/codebase/dhtmlxchart.css"],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     "active": True
 }
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index bac147b1a91..91aaf8bdb9c 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -13,7 +13,6 @@ var COLOR_PALETTE = [
     '#cc0000', '#d400a8'];
 
 var QWeb = openerp.web.qweb;
-QWeb.add_template('/web_graph/static/src/xml/web_graph.xml');
 openerp.web.views.add('graph', 'openerp.web_graph.GraphView');
 openerp.web_graph.GraphView = openerp.web.View.extend({
 
diff --git a/addons/web_kanban/__openerp__.py b/addons/web_kanban/__openerp__.py
index f39cd64999b..92d60b0f4ed 100644
--- a/addons/web_kanban/__openerp__.py
+++ b/addons/web_kanban/__openerp__.py
@@ -9,5 +9,8 @@
     "css": [
         "static/src/css/kanban.css"
     ],
+    'qweb' : [
+        "static/src/xml/*.xml",
+    ],
     'active': True
 }
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 8e222ebe8d9..a2a9c07f6d0 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -16,7 +16,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         this.all_display_data = false;
         this.groups = [];
         this.qweb = new QWeb2.Engine();
-        this.qweb.debug = (window.location.search.indexOf('?debug') !== -1);
+        this.qweb.debug = openerp.connector.debug;
         this.aggregates = {};
         this.NO_OF_COLUMNS = 3;
         this.form_dialog = new openerp.web.FormDialog(this, {}, this.options.action_views_ids.form, dataset).start();

From 7f6d06267a58682f43557c7bcfc857a92b1c6ff0 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Wed, 2 Nov 2011 17:38:37 +0530
Subject: [PATCH 26/53] [IMP]Improved code for only getting view's value not
 from databse.

bzr revid: kch@tinyerp.com-20111102120837-lbqu36nmf2e9anyr
---
 addons/web/static/src/js/view_editor.js | 113 ++++++++++++------------
 1 file changed, 58 insertions(+), 55 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index bf87e473934..039ac0fac3e 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -464,7 +464,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     on_edit_node:function(properties,fld_name,id_tr){
         var self = this;
-        var result;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
@@ -483,49 +482,53 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(id_tr,one_object,[]);
         self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
-
-        var groups_values = self.on_groups();
-        dataset = new openerp.web.DataSetSearch(this,'ir.model', null, null);
-        dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
-            db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
-            db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
-                _.each(properties,function(record){
-                    var id = record;
-                    var rs = res.length ? res[0][record] : null;
-                    if (_.include(widget,record)){
-                        var type_widget =  new (self.property.get_any(['undefined' , record, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
-                        (record=='groups')?type_widget.set_value(id,groups_values):type_widget.set_value(id,rs);
+        _.each(properties,function(record){
+            var id = record;
+            self.ready  = $.when(self.on_groups(id)).then(function () {
+                    if (_.include(widget,id)){
+                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                        (id=='groups')?type_widget.set_value(id,self.groups):type_widget.set_value(id);
                     }else{
                         var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value(id,rs);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                        type_widget.set_value(id);
                     }
                 });
             });
-        });
     },
      //for getting groups
-    on_groups: function(){
-        var self = this;
-        var group_ids = [];
-        var group_names = {};
-        var groups = [];
-        var resgrp_database = new openerp.web.DataSetSearch(self,'res.groups', null, null);
-        resgrp_database.read_slice([],{}, function (res_grp) {
-            _.each(res_grp,function(res){
-                var key = res.id;
-                group_names[key]=res.name;
-                group_ids.push(res.id);
-            });
-            var irmodel_database = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
-            irmodel_database.read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]},function(model_grp){
-               _.each(model_grp,function(res_group){
-                   groups.push([res_group.name,group_names[res_group.res_id]]);
-               });
-            });
-        });
-        return groups;
+    on_groups: function(id){
+        var self = this,
+        def = $.Deferred();
+        if (id !='groups') {
+            self.groups = false;
+            return false;
+        }
+        var group_ids = [],
+        group_names = {},
+        groups = [];
+        var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
+            model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
+        res_groups
+            .read_slice([],{})
+            .done(function(res_grp) {
+                _.each(res_grp,function(res){
+	                var key = res.id;
+	                group_names[key]=res.name;
+	                group_ids.push(res.id);
+                });
+            model_data
+                .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
+                .done(function(model_grp) {
+                    _.each(model_grp,function(res_group){
+	                    groups.push([res_group.name,group_names[res_group.res_id]]);
+	                });
+                    self.groups = groups;
+                    def.resolve();
+                });
+            })
+        return def.promise();
     },
     on_update_node: function(){
         //todo
@@ -547,11 +550,11 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_boolean";
     },
-    set_value: function(id,value) {
+    set_value: function(id) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', value);
+        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', false);
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -559,11 +562,11 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_char";
     },
-    set_value: function(id,value) {
+    set_value: function(id) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val(value);
+        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val();
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -591,8 +594,8 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         this._super(view, node);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function(id,value) {
-        value = _.keys(this.registry.map);
+    set_value: function(id) {
+        var value = _.keys(this.registry.map);
         value.push('');
         value.sort();
         this._super.apply(this,[id, value]);
@@ -602,8 +605,8 @@ openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend(
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = icons;
+    set_value: function(id) {
+        var value = icons;
         this._super.apply(this,[id, value]);
     }
 });
@@ -611,8 +614,8 @@ openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['new','New Window']];
+    set_value: function(id) {
+        var value = [['',''],['new','New Window']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -620,8 +623,8 @@ openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.e
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+    set_value: function(id) {
+        var value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -629,8 +632,8 @@ openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+    set_value: function(id) {
+        var value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -638,8 +641,8 @@ openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelec
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+    set_value: function(id) {
+        var value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -647,8 +650,8 @@ openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.ext
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+    set_value: function(id) {
+        var value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
         this._super.apply(this,[id, value]);
     }
 });

From 555bb5073e8e1ce1dea7310eb5ff40e4086428b2 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 3 Nov 2011 11:28:28 +0100
Subject: [PATCH 27/53] [FIX] do not add kanban qweb template explicitly

bzr revid: chs@openerp.com-20111103102828-wbx5aujiwdscb6hx
---
 addons/web_kanban/static/src/js/kanban.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index a2a9c07f6d0..1873af02984 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1,7 +1,6 @@
 openerp.web_kanban = function (openerp) {
 
 var QWeb = openerp.web.qweb;
-QWeb.add_template('/web_kanban/static/src/xml/web_kanban.xml');
 openerp.web.views.add('kanban', 'openerp.web_kanban.KanbanView');
 openerp.web_kanban.KanbanView = openerp.web.View.extend({
     init: function (parent, dataset, view_id, options) {

From 7eebc26519285ff00f891835d3ad6c43e0373354 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 3 Nov 2011 15:47:38 +0100
Subject: [PATCH 28/53] [FIX] absolutify relative uris when merging css files

bzr revid: chs@openerp.com-20111103144738-u5oewg8bo81yync5
---
 addons/web/controllers/main.py     | 46 ++++++++++++++++++++++++++----
 addons/web/static/src/css/base.css |  3 +-
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 6cc46b476a9..0413fa1f131 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -24,19 +24,25 @@ openerpweb = web.common.http
 # OpenERP Web web Controllers
 #----------------------------------------------------------
 
-def concat_files(file_list):
+def concat_files(file_list, reader=None):
     """ Concatenate file content
     return (concat,timestamp)
-    concat: concatenation of file content
+    concat: concatenation of file content, read by `reader`
     timestamp: max(os.path.getmtime of file_list)
     """
+    if reader is None:
+        def reader(f):
+            with open(f) as fp:
+                return fp.read()
+
     files_content = []
     files_timestamp = 0
     for fname in file_list:
         ftime = os.path.getmtime(fname)
         if ftime > files_timestamp:
             files_timestamp = ftime
-        files_content.append(open(fname).read())
+
+        files_content.append(reader(fname))
     files_concat = "".join(files_content)
     return files_concat,files_timestamp
 
@@ -100,8 +106,36 @@ class WebClient(openerpweb.Controller):
 
     @openerpweb.httprequest
     def css(self, req, mods=None):
-        files = [f[0] for f in self.manifest_glob(req, mods, 'css')]
-        content,timestamp = concat_files(files)
+
+        files = list(self.manifest_glob(req, mods, 'css'))
+        file_map = dict(files)
+
+        rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
+        rx_url = re.compile(r"""url\s*\(('|"|)(?!'|"|/|https?://)""", re.U)
+
+
+        def reader(f):
+            """read the a css file and absolutify all relative uris"""
+            with open(f) as fp:
+                data = fp.read()
+
+            web_path = file_map[f]
+            web_dir = os.path.dirname(web_path)
+
+            data = re.sub(
+                rx_import,
+                r"""@import \1%s/""" % (web_dir,),
+                data,
+            )
+
+            data = re.sub(
+                rx_url,
+                r"""url(\1%s/""" % (web_dir,),
+                data,
+            )
+            return data
+
+        content,timestamp = concat_files((f[0] for f in files), reader)
         # TODO use timestamp to set Last mofified date and E-tag
         return req.make_response(content, [('Content-Type', 'text/css')])
 
@@ -451,7 +485,7 @@ def clean_action(req, action, do_not_eval=False):
         # values come from the server, we can just eval them
         if isinstance(action.get('context'), basestring):
             action['context'] = eval( action['context'], eval_ctx ) or {}
-    
+
         if isinstance(action.get('domain'), basestring):
             action['domain'] = eval( action['domain'], eval_ctx ) or []
     else:
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 3430dfe196a..94e36d60419 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1088,7 +1088,7 @@ label.error {
     list-style: none;
 }
 .openerp .oe-view-manager-logs li:before {
-    content: '→ ';
+    content: '\2192 ';
 }
 .openerp .oe-view-manager-logs a {
     text-decoration: none;
@@ -1448,3 +1448,4 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
 .openerp .oe_view_editor_tree_grid a {
     display: block;
 }
+

From dd5270a00db6991c50991ef58b55daf8fb987d8d Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 10:33:38 +0530
Subject: [PATCH 29/53] [IMP]Implement code for update node in view editor.

bzr revid: kch@tinyerp.com-20111104050338-tdble3tr1v05a7cv
---
 addons/web/static/src/js/view_editor.js | 193 +++++++++++++++---------
 1 file changed, 123 insertions(+), 70 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d7f059005f7..7221a895d17 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -112,7 +112,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         obj.att_list.push(tag);
         $(xml).each(function() {
             _.each(this.attributes, function(attrs){
-                if (tag != 'button') {
+                if ((tag != 'button') && (tag != 'field')){
                     if (attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index") {
                         render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;
                     }
@@ -393,7 +393,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         fld_name= tag;
                     }
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties,fld_name,id_tr);
+                    self.on_edit_node(properties,fld_name,id_tr,one_object,view_id, view_xml_id, level);
                     break;
                 case "side-up":
                     while (1) {
@@ -465,7 +465,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
     },
-    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct){
+    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct, update_values){
         var self = this;
         var arch = _.detect(one_object['arch'],function(element){
             return element.view_id == view_id;
@@ -482,7 +482,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         }
         return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level),
-            parseInt(view_id), arch, move_direct);
+            parseInt(view_id), arch, move_direct, update_values);
     },
     get_view_object: function(view_xml_id, one_object,result){
         var self = this;
@@ -497,13 +497,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
-    get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){
+    get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
         var self = this;
         var children_list =  $(arch1).children();
         var list_obj_xml = _.zip(children_list,obj.child_id);
         if (id) {
             if (obj.id == id) {
-                var id;
                 var parent = $(arch1).parents();
                 var index = _.indexOf(child_list, obj)
                 var re_insert_obj = child_list.splice(index, 1);
@@ -511,11 +510,20 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     var next = $(arch1).next();
                     $(next).after(arch1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
-                } else {
+                }else if(move_direct == "up"){
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
+                }else if(move_direct == "update_node"){
+                    _.each(update_values, function(val){
+                        $(arch1).attr(val[0],val[1]);
+                    });
+                    var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
+                    new_obj.id = obj.id;
+                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
+                    child_list.splice(_.indexOf(child_list, obj), 0, new_obj);
                 }
+
                 parent = parent[parent.length-1];
                 var convert_to_utf = self.xml2Str(parent);
                 if (convert_to_utf) {
@@ -529,7 +537,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
-                    self.get_node(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct);
+                    self.get_node(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
                 });
             }
         }
@@ -570,7 +578,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties,fld_name,id_tr){
+    on_edit_node:function(properties,fld_name,id_tr,obj,view_id, view_xml_id, level){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -579,7 +587,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 200,
             buttons: {
                     "Update": function(){
-                        self.on_update_node();
+                        //self.on_update_node();
+                        var update_values = [];
+                        _.each(self.edit_widget,function(widget){
+                            update_values.push(widget.get_value());
+                        });
+                        update_values = _.without(update_values,undefined);
+                        self.save_move_arch(obj, view_id, view_xml_id, id_tr, level, "update_node", update_values);
                     },
                     "Cancel": function(){
                         $(this).dialog('destroy');
@@ -589,18 +603,21 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.start().open();
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(id_tr,one_object,[]);
-        self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
+        self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
+        self.edit_widget = [];
         _.each(properties,function(record){
             var id = record;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                     if (_.include(widget,id)){
-                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
+                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                        self.edit_widget.push(type_widget);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        (id=='groups')?type_widget.set_value(id,self.groups):type_widget.set_value(id);
+                        (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
                     }else{
-                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
+                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                        self.edit_widget.push(type_widget);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value(id);
+                        type_widget.set_value();
                     }
                 });
             });
@@ -618,7 +635,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         groups = [];
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
-        res_groups
+            res_groups
             .read_slice([],{})
             .done(function(res_grp) {
                 _.each(res_grp,function(res){
@@ -638,137 +655,173 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             })
         return def.promise();
     },
-    on_update_node: function(){
-        //todo
-    }
+    /*on_update_node: function(){
+        var self = this;
+        var values = [];
+        _.each(self.edit_widget,function(widget){
+            values.push(widget.get_value());
+        });
+        values = _.without(values,undefined);
+    }*/
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
-    init: function(view, node) {
+    init: function(view, node, id) {
         var self = this;
         this.$element = view.$element;
         this.node = node;
+        this.dirty = false;
+        this.name = id;
     },
     render: function () {
         return QWeb.render(this.template, {widget: this});
     }
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.template = "view_boolean";
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,id);
+            return _.include(res,self.name);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', false);
+        view_val ? this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+self.name+"] input").attr('checked', false);
+    },
+    get_value: function(){
+        var val = this.$element.find("tr[id="+this.name+"] input").attr('checked');
+        if (val){
+            return [this.name,val];
+        }
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.template = "view_char";
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,id);
+            return _.include(res, self.name);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val();
+        view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
+    },
+    get_value: function(){
+        var val= this.$element.find("tr[id="+this.name+"] input").val();
+        if (val){
+            return [this.name,val];
+        }
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.template = "view_selection";
     },
-    set_value: function(id,value) {
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,id);
-        });
+    set_value: function(value) {
         var self = this;
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,self.name);
+        });
         _.each(value, function(item) {
             var select_val = view_val?(view_val[1]==item[0]?true:false):false;
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+            self.$element.find("tr[id="+self.name+"] select").append($("<option/>", {
                     value:(typeof(item)=='string')?item:item[0],
                     text:(typeof(item)=='string')?item:item[1],
                     selected:select_val
             }));
         });
+    },
+    get_value: function(){
+        var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
+        if (val){
+            return [this.name,val];
+        }
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self= this;
         var value = _.keys(this.registry.map);
         value.push('');
         value.sort();
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = icons;
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['new','New Window']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id,value) {
-        this.$element.find("tr[id="+id+"] select").attr('multiple', true);
-        this._super.apply(this,[id, value]);
+    set_value: function(value) {
+        var self = this;
+        this.$element.find("tr[id="+ this.name +"] select").attr('multiple', true);
+        this.$element.find("tr[id="+ this.name +"] select").css('height','100px');
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({

From 0955cc4eeafcf34a8964d31600f7b207c0d8b127 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 15:22:06 +0530
Subject: [PATCH 30/53] [FIX]Fixed code for getting updated value in boolean
 field.

bzr revid: kch@tinyerp.com-20111104095206-yy9yv1kmeupgg76d
---
 addons/web/static/src/js/view_editor.js | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 7221a895d17..6f31aa75031 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -9,7 +9,7 @@ var _PROPERTIES = {
     'image' : ['filename', 'width', 'height', 'groups'],
     'separator' : ['string', 'colspan', 'groups'],
     'label': ['string', 'align', 'colspan', 'groups'],
-    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups'],
+    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
     'newline' : [],
     'hpaned': ['position', 'groups'],
     'vpaned': ['position', 'groups'],
@@ -587,12 +587,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 200,
             buttons: {
                     "Update": function(){
-                        //self.on_update_node();
                         var update_values = [];
                         _.each(self.edit_widget,function(widget){
                             update_values.push(widget.get_value());
                         });
-                        update_values = _.without(update_values,undefined);
                         self.save_move_arch(obj, view_id, view_xml_id, id_tr, level, "update_node", update_values);
                     },
                     "Cancel": function(){
@@ -654,15 +652,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             })
         return def.promise();
-    },
-    /*on_update_node: function(){
-        var self = this;
-        var values = [];
-        _.each(self.edit_widget,function(widget){
-            values.push(widget.get_value());
-        });
-        values = _.without(values,undefined);
-    }*/
+    }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node, id) {
@@ -686,12 +676,16 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,self.name);
         });
-        view_val ? this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+self.name+"] input").attr('checked', false);
+        if(view_val){
+            this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]);
+        }
     },
     get_value: function(){
-        var val = this.$element.find("tr[id="+this.name+"] input").attr('checked');
+        var val = this.$element.find("tr[id="+this.name+"] input").is(':checked');
         if (val){
             return [this.name,val];
+        }else{
+            return [this.name,null];
         }
     }
 });
@@ -708,9 +702,12 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
     },
     get_value: function(){
+        var self = this;
         var val= this.$element.find("tr[id="+this.name+"] input").val();
         if (val){
             return [this.name,val];
+        }else{
+            return [this.name,""];
         }
     }
 });
@@ -725,7 +722,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
             return _.include(res,self.name);
         });
         _.each(value, function(item) {
-            var select_val = view_val?(view_val[1]==item[0]?true:false):false;
+            var select_val = view_val?(view_val[1]==((typeof(item)=='string')?item:item[0])?true:false):false;
             self.$element.find("tr[id="+self.name+"] select").append($("<option/>", {
                     value:(typeof(item)=='string')?item:item[0],
                     text:(typeof(item)=='string')?item:item[1],
@@ -734,9 +731,12 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         });
     },
     get_value: function(){
+        var self = this;
         var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
         if (val){
             return [this.name,val];
+        }else{
+            return [this.name,""];
         }
     }
 });

From 2de28bf033c556b0cf40e22fddeba5ed5e0d8d72 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 4 Nov 2011 16:58:48 +0530
Subject: [PATCH 31/53] [FIX]save and move functionality after update node.

bzr revid: vme@tinyerp.com-20111104112848-gdfj275kyrj2g2qq
---
 addons/web/static/src/js/view_editor.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 6f31aa75031..f44b063561b 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -503,27 +503,29 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var list_obj_xml = _.zip(children_list,obj.child_id);
         if (id) {
             if (obj.id == id) {
-                var parent = $(arch1).parents();
                 var index = _.indexOf(child_list, obj)
-                var re_insert_obj = child_list.splice(index, 1);
                 if (move_direct == "down") {
                     var next = $(arch1).next();
                     $(next).after(arch1);
+                    var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
                 }else if(move_direct == "up"){
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
+                    var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 }else if(move_direct == "update_node"){
                     _.each(update_values, function(val){
+                        if(val[1]){
                         $(arch1).attr(val[0],val[1]);
+                        }
                     });
                     var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
                     new_obj.id = obj.id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
-                    child_list.splice(_.indexOf(child_list, obj), 0, new_obj);
+                    child_list.splice(index, 1, new_obj);
                 }
-
+                var parent = $(arch1).parents();
                 parent = parent[parent.length-1];
                 var convert_to_utf = self.xml2Str(parent);
                 if (convert_to_utf) {
@@ -838,4 +840,4 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
     'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
 });
-};
\ No newline at end of file
+};

From d67d093495e24b785e48f3baa43fc4cb2c7eed96 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 4 Nov 2011 17:33:44 +0530
Subject: [PATCH 32/53] [FIX]fix wrong level and child_id issue after update
 node.

bzr revid: vme@tinyerp.com-20111104120344-nckdtrak38l9px8r
---
 addons/web/static/src/js/view_editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f44b063561b..5676a4be5c4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -520,8 +520,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         $(arch1).attr(val[0],val[1]);
                         }
                     });
-                    var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
+                    var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level - 1);
                     new_obj.id = obj.id;
+                    new_obj.child_id = obj.child_id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
                 }

From 766be33a937ac6e6d19b86ceb0fa7de72a2576ae Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 17:45:25 +0530
Subject: [PATCH 33/53] [FIX]Fixed code by using change method so now only
 update attr goes to save.

bzr revid: kch@tinyerp.com-20111104121525-m5lff48g2a87hreh
---
 addons/web/static/src/js/view_editor.js | 92 +++++++++++++++++--------
 1 file changed, 63 insertions(+), 29 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 5676a4be5c4..ae3995ff436 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -356,8 +356,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() {
             var side = $(this).closest("tr[id^='viewedit-']")
-            var id_tr = (side.attr('id')).split('-')[1];
-            var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); ;
+            var tr_id = (side.attr('id')).split('-')[1];
+            var img = side.find("img[id='parentimg-"+tr_id+"']").attr('src'); ;
             var level = parseInt(side.attr('level'));
             var list_shift =[];
             var last_tr;
@@ -393,7 +393,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         fld_name= tag;
                     }
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties,fld_name,id_tr,one_object,view_id, view_xml_id, level);
+                    self.on_edit_node(properties, fld_name, tr_id, one_object, view_id, view_xml_id, level);
                     break;
                 case "side-up":
                     while (1) {
@@ -420,7 +420,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         _.each(list_shift, function(rec) {
                              $(last_tr).before(rec);
                         });
-                        self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "up");
+                        self.save_move_arch(one_object, view_id, view_xml_id, tr_id, level, "up");
                     }
                 break;
             case "side-down":
@@ -459,13 +459,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     _.each(list_shift, function(rec) {
                        $(last_tr).after(rec);
                     });
-                    self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down");
+                    self.save_move_arch(one_object, view_id, view_xml_id, tr_id, level, "down");
                 }
                 break;
             }
         });
     },
-    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct, update_values){
+    save_move_arch: function(one_object, view_id, view_xml_id, tr_id, level, move_direct, update_values){
         var self = this;
         var arch = _.detect(one_object['arch'],function(element){
             return element.view_id == view_id;
@@ -481,7 +481,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 if(insert.length == check_list.length ){return xml_child;}
             });
         }
-        return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level),
+        return self.get_node(arch.arch, obj[0].child_id[0], parseInt(tr_id), [], parseInt(level),
             parseInt(view_id), arch, move_direct, update_values);
     },
     get_view_object: function(view_xml_id, one_object,result){
@@ -516,9 +516,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 }else if(move_direct == "update_node"){
                     _.each(update_values, function(val){
-                        if(val[1]){
                         $(arch1).attr(val[0],val[1]);
-                        }
                     });
                     var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level - 1);
                     new_obj.id = obj.id;
@@ -581,7 +579,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties,fld_name,id_tr,obj,view_id, view_xml_id, level){
+    on_edit_node:function(properties, fld_name, tr_id, obj, view_id, view_xml_id, level){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -592,36 +590,43 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     "Update": function(){
                         var update_values = [];
                         _.each(self.edit_widget,function(widget){
-                            update_values.push(widget.get_value());
+                            var value = widget.get_value();
+                            if (value) {
+                                update_values.push(value);
+                            }
                         });
-                        self.save_move_arch(obj, view_id, view_xml_id, id_tr, level, "update_node", update_values);
+                        self.save_move_arch(obj, view_id, view_xml_id, tr_id, level, "update_node", update_values);
+                        self.edit_node_dialog.close();
                     },
                     "Cancel": function(){
-                        $(this).dialog('destroy');
+                        self.edit_node_dialog.close();
                     }
                 }
         });
         this.edit_node_dialog.start().open();
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
-        var arch_val = self.get_view_object(id_tr,one_object,[]);
+        var arch_val = self.get_view_object(tr_id,one_object,[]);
         self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
         self.edit_widget = [];
         _.each(properties,function(record){
             var id = record;
             self.ready  = $.when(self.on_groups(id)).then(function () {
-                    if (_.include(widget,id)){
-                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
-                        self.edit_widget.push(type_widget);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
-                    }else{
-                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
-                        self.edit_widget.push(type_widget);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value();
-                    }
-                });
+                if (_.include(widget,id)){
+                    var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                    self.edit_widget.push(type_widget);
+                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                    (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
+                    type_widget.start();
+                }else{
+                    var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                    self.edit_widget.push(type_widget);
+                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                    type_widget.set_value();
+                    type_widget.start();
+                }
+
             });
+        });
     },
      //for getting groups
     on_groups: function(id){
@@ -659,21 +664,29 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node, id) {
-        var self = this;
         this.$element = view.$element;
         this.node = node;
         this.dirty = false;
         this.name = id;
     },
+    on_ui_change: function() {
+        this.dirty = true;
+    },
     render: function () {
         return QWeb.render(this.template, {widget: this});
-    }
+    },
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     init: function(view, node, id) {
         this._super(view, node, id);
         this.template = "view_boolean";
     },
+    start: function () {
+        var self = this;
+        this.$element.find("tr[id="+ self.name+"] input").change(function() {
+            self.on_ui_change();
+        });
+    },
     set_value: function() {
         var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
@@ -684,6 +697,9 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         }
     },
     get_value: function(){
+        if (!this.dirty) {
+            return false;
+        }
         var val = this.$element.find("tr[id="+this.name+"] input").is(':checked');
         if (val){
             return [this.name,val];
@@ -697,6 +713,12 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super(view, node, id);
         this.template = "view_char";
     },
+    start: function () {
+        var self = this;
+        this.$element.find("tr[id="+ this.name+"] input").change(function() {
+            self.on_ui_change();
+        });
+    },
     set_value: function() {
         var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
@@ -705,6 +727,9 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
     },
     get_value: function(){
+        if (!this.dirty) {
+            return false;
+        }
         var self = this;
         var val= this.$element.find("tr[id="+this.name+"] input").val();
         if (val){
@@ -719,6 +744,12 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this._super(view, node, id);
         this.template = "view_selection";
     },
+    start: function () {
+        var self = this;
+        this.$element.find("tr[id="+ this.name+"] select").change(function() {
+            self.on_ui_change();
+        });
+    },
     set_value: function(value) {
         var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
@@ -734,6 +765,9 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         });
     },
     get_value: function(){
+        if (!this.dirty) {
+            return false;
+        }
         var self = this;
         var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
         if (val){
@@ -841,4 +875,4 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
     'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
 });
-};
+};
\ No newline at end of file

From f657312f4d61fd4c628cee6fc1d49717931808de Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 18:05:32 +0530
Subject: [PATCH 34/53] [IMP]Improved code by removing unnecessary code.

bzr revid: kch@tinyerp.com-20111104123532-dbwgkrqsid0aowlm
---
 addons/web/static/src/js/view_editor.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ae3995ff436..382a9342d64 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -609,22 +609,19 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
         self.edit_widget = [];
         _.each(properties,function(record){
-            var id = record;
+            var id = record,
+            type_widget;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                 if (_.include(widget,id)){
-                    var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                    type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
                     self.edit_widget.push(type_widget);
-                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                    (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
-                    type_widget.start();
                 }else{
-                    var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
                     self.edit_widget.push(type_widget);
-                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                    type_widget.set_value();
-                    type_widget.start();
                 }
-
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
+                type_widget.start();
             });
         });
     },

From 085f90d989d587c0260780e7cc69ee84ccc5f495 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 4 Nov 2011 16:43:12 +0100
Subject: [PATCH 35/53] [imp] added back button + removed backbone history

bzr revid: nicolas.vanhoren@openerp.com-20111104154312-uolo3j36lg1zwfxh
---
 addons/point_of_sale/static/src/js/pos.js   | 22 +++++++++------------
 addons/point_of_sale/static/src/xml/pos.xml |  3 +++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 086bc38cf65..2964ad75991 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -1131,22 +1131,20 @@ openerp.point_of_sale = function(db) {
         return ShopView;
     })();
     App = (function() {
-        __extends(App, Backbone.Router);
-        function App() {
-            App.__super__.constructor.apply(this, arguments);
+        function App($element) {
+            this.initialize($element);
         }
 
-        App.prototype.routes = {
-            '': 'category',
-            'category/:id': 'category'
-        };
         App.prototype.initialize = function($element) {
             this.shop = new Shop;
             this.shopView = new ShopView({
                 shop: this.shop,
                 el: $element
             });
-            return this.categoryView = new CategoryView;
+            this.categoryView = new CategoryView;
+            this.categoryView.bind("changeCategory", this.category, this);
+            this.category();
+            return this.categoryView;
         };
         App.prototype.category = function(id) {
             var c, products;
@@ -1188,11 +1186,10 @@ openerp.point_of_sale = function(db) {
     db.point_of_sale.PointOfSale = db.web.Widget.extend({
         template: "PointOfSale",
         start: function() {
-            // FIXME: absolutely horrible hack to avoid conflict
-            //        between backbone's history and al's action
-            //        thingie
-            window.location.hash = '';
             var self = this;
+            this.$element.find("#loggedas button").click(function() {
+                self.stop();
+            });
 
             if (pos)
                 throw "It is not possible to instantiate multiple instances"+
@@ -1203,7 +1200,6 @@ openerp.point_of_sale = function(db) {
 
             return pos.ready.then( function() {
                 pos.app = new App(self.$element);
-                return Backbone.history.start();
             });
         },
         stop: function() {
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 32994b01c98..d4962a62084 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -24,6 +24,9 @@
                     <ol id="orders"></ol>
                 </div>
             </div>
+            <div id="loggedas">
+                <button>Back</button>
+            </div>
         </div>
         <div id="content">
 

From db36bc97b4d6e12478830d47c820b183e697687b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 7 Nov 2011 15:13:23 +0100
Subject: [PATCH 36/53] [fix] categories were broken

bzr revid: nicolas.vanhoren@openerp.com-20111107141323-zmariwqu0qns3bcm
---
 addons/point_of_sale/static/src/js/pos.js   |  9 +++++++++
 addons/point_of_sale/static/src/xml/pos.xml | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 2964ad75991..5835f1e35e1 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -751,6 +751,10 @@ openerp.point_of_sale = function(db) {
         function CategoryView() {
             CategoryView.__super__.constructor.apply(this, arguments);
         }
+        
+        CategoryView.prototype.events = {
+            'click .oe-pos-categories-list a': 'changeCategory'
+        };
 
         CategoryView.prototype.template = qweb_template('pos-category-template');
         CategoryView.prototype.render = function(ancestors, children) {
@@ -776,6 +780,10 @@ openerp.point_of_sale = function(db) {
                 })()
             }));
         };
+        CategoryView.prototype.changeCategory = function(a) {
+            var id = $(a.target).data("category-id");
+            this.trigger("changeCategory", id);
+        };
         return CategoryView;
     })();
     ProductView = (function() {
@@ -1153,6 +1161,7 @@ openerp.point_of_sale = function(db) {
             }
             c = pos.categories[id];
             $('#products-screen').html(this.categoryView.render(c.ancestors, c.children));
+            this.categoryView.delegateEvents();
             products = pos.store.get('product.product').filter( function(p) {
                 var _ref;
                 return _ref = p.pos_categ_id[0], __indexOf.call(c.subtree, _ref) >= 0;
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index d4962a62084..b9148395cbe 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -143,15 +143,15 @@
     <t t-name="pos-category-template">
         <header>
             <ol class="breadcrumb">
-                <li>
-                    <a href="#">
+                <li class="oe-pos-categories-list">
+                    <a href="javascript:void(0)">
                         <img src="/point_of_sale/static/src/img/home.png" class="homeimg" />
                     </a>
                 </li>
                 <t t-foreach="breadcrumb" t-as="category">
-                    <li>
+                    <li class="oe-pos-categories-list">
                         <img src="/point_of_sale/static/src/img/bc-arrow.png" class="bc-arrow" />
-                        <a t-att-href="'#category/' + category.id">
+                        <a href="javascript:void(0)" t-att-data-category-id="category.id">
                             <t t-esc="category.name"/>
                         </a>
                     </li>
@@ -166,8 +166,8 @@
             <h4>Categories:</h4>
             <ol>
                 <t t-foreach="categories" t-as="category">
-                    <li>
-                        <a t-att-href="'#category/' + category.id" class="button">
+                    <li class="oe-pos-categories-list">
+                        <a href="javascript:void(0)" t-att-data-category-id="category.id" class="button">
                             <t t-esc="category.name"/>
                         </a>
                     </li>

From 2e0bb35d3e50d8401c2c8c8b408747d9ea00f747 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 7 Nov 2011 18:34:17 +0100
Subject: [PATCH 37/53] [fix] problem with "orders", showed multiple ones when
 closing and reopening pos

bzr revid: nicolas.vanhoren@openerp.com-20111107173417-6fqs4ddsnp1wn0gp
---
 addons/point_of_sale/static/src/js/pos.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 5835f1e35e1..59c13e0553c 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -421,11 +421,11 @@ openerp.point_of_sale = function(db) {
             Shop.__super__.constructor.apply(this, arguments);
         }
 
-        Shop.prototype.defaults = {
-            orders: new OrderCollection,
-            products: new ProductCollection
-        };
         Shop.prototype.initialize = function() {
+            this.set({
+                orders: new OrderCollection(),
+                products: new ProductCollection()
+            });
             this.set({
                 cashRegisters: new CashRegisterCollection(pos.store.get('account.bank.statement')),
             });
@@ -1201,7 +1201,7 @@ openerp.point_of_sale = function(db) {
             });
 
             if (pos)
-                throw "It is not possible to instantiate multiple instances"+
+                throw "It is not possible to instantiate multiple instances "+
                     "of the point of sale at the same time.";
             pos = new Pos(this.session);
 

From 2393cbcaab9d6eda2d349ec76db3cd4d546e731f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 8 Nov 2011 06:12:20 +0000
Subject: [PATCH 38/53] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111108054936-o85vdc79709844pf
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108061220-ayp19sctv6uvxl1u
---
 addons/account/i18n/ar.po            |   8 +-
 addons/account/i18n/bg.po            |   2 +-
 addons/account/i18n/br.po            |   2 +-
 addons/account/i18n/bs.po            |   2 +-
 addons/account/i18n/ca.po            |   9 +-
 addons/account/i18n/cs.po            |   7 +-
 addons/account/i18n/da.po            |   2 +-
 addons/account/i18n/de.po            |   9 +-
 addons/account/i18n/el.po            |   2 +-
 addons/account/i18n/en_GB.po         |   4 +-
 addons/account/i18n/en_US.po         |   2 +-
 addons/account/i18n/es.po            |   9 +-
 addons/account/i18n/es_AR.po         |   2 +-
 addons/account/i18n/es_CL.po         |   4 +-
 addons/account/i18n/es_EC.po         |   7 +-
 addons/account/i18n/es_PY.po         |   9 +-
 addons/account/i18n/et.po            |   2 +-
 addons/account/i18n/eu.po            |   2 +-
 addons/account/i18n/fa.po            |   2 +-
 addons/account/i18n/fa_AF.po         |   4 +-
 addons/account/i18n/fi.po            |   9 +-
 addons/account/i18n/fr.po            |   9 +-
 addons/account/i18n/fr_BE.po         |   2 +-
 addons/account/i18n/gl.po            |   9 +-
 addons/account/i18n/gu.po            |   2 +-
 addons/account/i18n/he.po            |   2 +-
 addons/account/i18n/hi.po            |   2 +-
 addons/account/i18n/hr.po            |   7 +-
 addons/account/i18n/hu.po            |   7 +-
 addons/account/i18n/id.po            |   2 +-
 addons/account/i18n/it.po            |   9 +-
 addons/account/i18n/kab.po           |   2 +-
 addons/account/i18n/kk.po            |   4 +-
 addons/account/i18n/ko.po            |   2 +-
 addons/account/i18n/lo.po            |   2 +-
 addons/account/i18n/lt.po            |   2 +-
 addons/account/i18n/lv.po            |   2 +-
 addons/account/i18n/mk.po            |   4 +-
 addons/account/i18n/mn.po            |   7 +-
 addons/account/i18n/nb.po            |   9 +-
 addons/account/i18n/nl.po            |   9 +-
 addons/account/i18n/nl_BE.po         |   2 +-
 addons/account/i18n/oc.po            |   2 +-
 addons/account/i18n/pl.po            |   7 +-
 addons/account/i18n/pt.po            |   9 +-
 addons/account/i18n/pt_BR.po         |   9 +-
 addons/account/i18n/ro.po            |   2 +-
 addons/account/i18n/ru.po            |   9 +-
 addons/account/i18n/si.po            |   2 +-
 addons/account/i18n/sk.po            |   2 +-
 addons/account/i18n/sl.po            |   2 +-
 addons/account/i18n/sq.po            |   2 +-
 addons/account/i18n/sr.po            |   2 +-
 addons/account/i18n/sr@latin.po      |   2 +-
 addons/account/i18n/sv.po            |   9 +-
 addons/account/i18n/ta.po            |   2 +-
 addons/account/i18n/te.po            |   2 +-
 addons/account/i18n/th.po            |   2 +-
 addons/account/i18n/tlh.po           |   2 +-
 addons/account/i18n/tr.po            |   9 +-
 addons/account/i18n/ug.po            |   2 +-
 addons/account/i18n/uk.po            |   2 +-
 addons/account/i18n/ur.po            |   2 +-
 addons/account/i18n/vi.po            |   9 +-
 addons/account/i18n/zh_CN.po         |   7 +-
 addons/account/i18n/zh_HK.po         |   2 +-
 addons/account/i18n/zh_TW.po         |   2 +-
 addons/base_setup/i18n/ar.po         |  11 +-
 addons/base_setup/i18n/bg.po         |   9 +-
 addons/base_setup/i18n/bs.po         |   4 +-
 addons/base_setup/i18n/ca.po         |   9 +-
 addons/base_setup/i18n/cs.po         |  11 +-
 addons/base_setup/i18n/da.po         |  11 +-
 addons/base_setup/i18n/de.po         |  11 +-
 addons/base_setup/i18n/el.po         |   9 +-
 addons/base_setup/i18n/es.po         |   9 +-
 addons/base_setup/i18n/es_AR.po      |   4 +-
 addons/base_setup/i18n/es_CL.po      |   9 +-
 addons/base_setup/i18n/es_EC.po      |   9 +-
 addons/base_setup/i18n/es_PY.po      |  11 +-
 addons/base_setup/i18n/et.po         |   4 +-
 addons/base_setup/i18n/fa.po         |   4 +-
 addons/base_setup/i18n/fi.po         |  11 +-
 addons/base_setup/i18n/fr.po         |  11 +-
 addons/base_setup/i18n/gl.po         |   4 +-
 addons/base_setup/i18n/hr.po         |   4 +-
 addons/base_setup/i18n/hu.po         |   9 +-
 addons/base_setup/i18n/id.po         |   4 +-
 addons/base_setup/i18n/it.po         |  11 +-
 addons/base_setup/i18n/ko.po         |   4 +-
 addons/base_setup/i18n/lt.po         |   4 +-
 addons/base_setup/i18n/lv.po         |   4 +-
 addons/base_setup/i18n/mn.po         |  11 +-
 addons/base_setup/i18n/nb.po         |  11 +-
 addons/base_setup/i18n/nl.po         |  11 +-
 addons/base_setup/i18n/nl_BE.po      |   4 +-
 addons/base_setup/i18n/pl.po         |   9 +-
 addons/base_setup/i18n/pt.po         |  11 +-
 addons/base_setup/i18n/pt_BR.po      |  11 +-
 addons/base_setup/i18n/ro.po         |   9 +-
 addons/base_setup/i18n/ru.po         |  11 +-
 addons/base_setup/i18n/sk.po         |   4 +-
 addons/base_setup/i18n/sl.po         |   4 +-
 addons/base_setup/i18n/sq.po         |   4 +-
 addons/base_setup/i18n/sr.po         |   9 +-
 addons/base_setup/i18n/sr@latin.po   |  11 +-
 addons/base_setup/i18n/sv.po         |   9 +-
 addons/base_setup/i18n/th.po         |   4 +-
 addons/base_setup/i18n/tlh.po        |   4 +-
 addons/base_setup/i18n/tr.po         |  11 +-
 addons/base_setup/i18n/uk.po         |   4 +-
 addons/base_setup/i18n/vi.po         |  11 +-
 addons/base_setup/i18n/zh_CN.po      |   9 +-
 addons/base_setup/i18n/zh_TW.po      |   9 +-
 addons/event/i18n/ru.po              |   9 +-
 addons/marketing_campaign/i18n/ru.po |  10 +-
 addons/project_issue/i18n/ru.po      | 967 +++++++++++++++++++++++++++
 addons/purchase/i18n/bg.po           |   6 +-
 addons/purchase/i18n/ca.po           |   8 +-
 addons/purchase/i18n/cs.po           |   6 +-
 addons/purchase/i18n/de.po           |   6 +-
 addons/purchase/i18n/es.po           |   8 +-
 addons/purchase/i18n/fi.po           |   6 +-
 addons/purchase/i18n/fr.po           |   8 +-
 addons/purchase/i18n/hu.po           |   6 +-
 addons/purchase/i18n/id.po           |   8 +-
 addons/purchase/i18n/it.po           |   6 +-
 addons/purchase/i18n/nl.po           |   8 +-
 addons/purchase/i18n/pl.po           |   6 +-
 addons/purchase/i18n/pt_BR.po        |   8 +-
 addons/purchase/i18n/ro.po           |   8 +-
 addons/purchase/i18n/ru.po           |   6 +-
 addons/purchase/i18n/tr.po           |   6 +-
 addons/purchase/i18n/zh_CN.po        |   6 +-
 addons/stock/i18n/ar.po              |   2 +-
 addons/stock/i18n/bg.po              |   7 +-
 addons/stock/i18n/bs.po              |   2 +-
 addons/stock/i18n/ca.po              |   9 +-
 addons/stock/i18n/cs.po              |   7 +-
 addons/stock/i18n/da.po              |   4 +-
 addons/stock/i18n/de.po              |   9 +-
 addons/stock/i18n/el.po              |   7 +-
 addons/stock/i18n/es.po              |   7 +-
 addons/stock/i18n/es_AR.po           |   2 +-
 addons/stock/i18n/es_CL.po           |   7 +-
 addons/stock/i18n/es_EC.po           |   2 +-
 addons/stock/i18n/et.po              |   2 +-
 addons/stock/i18n/fi.po              |   9 +-
 addons/stock/i18n/fr.po              |   7 +-
 addons/stock/i18n/gl.po              |   2 +-
 addons/stock/i18n/hr.po              |   2 +-
 addons/stock/i18n/hu.po              |   7 +-
 addons/stock/i18n/id.po              |   2 +-
 addons/stock/i18n/it.po              |   7 +-
 addons/stock/i18n/ko.po              |   2 +-
 addons/stock/i18n/lt.po              |   2 +-
 addons/stock/i18n/lv.po              |   2 +-
 addons/stock/i18n/mn.po              |   2 +-
 addons/stock/i18n/nb.po              |   4 +-
 addons/stock/i18n/nl.po              |   2 +-
 addons/stock/i18n/nl_BE.po           |   2 +-
 addons/stock/i18n/pl.po              |   7 +-
 addons/stock/i18n/pt.po              |   2 +-
 addons/stock/i18n/pt_BR.po           |   9 +-
 addons/stock/i18n/ro.po              |   7 +-
 addons/stock/i18n/ru.po              |   7 +-
 addons/stock/i18n/sl.po              |   2 +-
 addons/stock/i18n/sq.po              |   2 +-
 addons/stock/i18n/sr.po              |   2 +-
 addons/stock/i18n/sr@latin.po        |   2 +-
 addons/stock/i18n/sv.po              |   2 +-
 addons/stock/i18n/th.po              |   2 +-
 addons/stock/i18n/tlh.po             |   2 +-
 addons/stock/i18n/tr.po              |   9 +-
 addons/stock/i18n/uk.po              |   2 +-
 addons/stock/i18n/vi.po              |   2 +-
 addons/stock/i18n/zh_CN.po           |   7 +-
 addons/stock/i18n/zh_TW.po           |   7 +-
 addons/web/po/ar.po                  |  11 +-
 addons/web_default_home/po/ar.po     |  10 +-
 180 files changed, 1583 insertions(+), 401 deletions(-)
 create mode 100644 addons/project_issue/i18n/ru.po

diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index baac2ec03d0..54a4ed3c9e8 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -266,7 +266,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1210
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s of %s%s (%s%s المتبقي)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -664,7 +664,7 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "فترة قيود إفتتاحية"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -1325,7 +1325,7 @@ msgstr "لا يمكنك إستخدام هذا الحساب العام في هذ
 #: report:pl.account:0
 #: report:pl.account.horizontal:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "برصيد لا يساوي صفر"
 
 #. module: account
 #: view:account.tax:0
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 02a76796cdc..b6f703a02cb 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 7a4a57ec008..b6732915bcf 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 1f170b6df90..31f8d5e5ff7 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 2b465073f48..989d6033466 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,13 +7,13 @@ 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-08-17 22:28+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 13:03+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11762,6 +11762,9 @@ msgstr "Passiu"
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balanç de situació (comptes d'actiu)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "està validada."
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 5f780150272..240bbf5c248 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-09-16 08:47+0000\n"
+"PO-Revision-Date: 2011-11-07 12:46+0000\n"
 "Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
@@ -10150,5 +10150,8 @@ msgstr ""
 #~ msgid "The statement balance is incorrect !\n"
 #~ msgstr "Nesprávný zůstatek výpisu!\n"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Rozvaha (Majetkové účty)"
+
 #~ msgid "Chart of Account"
 #~ msgstr "Účtový rozvrh"
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 61e2b5d9e6b..448a89899b9 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 7337ae8a538..d1939efaf5f 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ 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-02 08:42+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 13:03+0000\n"
+"Last-Translator: Ferdinand-camptocamp <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-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11735,6 +11735,9 @@ msgstr "Verbindlichkeiten"
 #~ msgid "Invoice "
 #~ msgstr "Rechnung "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilanz (Vermögen)"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 5f7a3b0f11f..db972ab2e5f 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
index 0cff5a4a0ff..16761252d6c 100644
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4398,7 +4398,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index cc6f498b293..5b1abbe4cd1 100644
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 9fdf65ca0e4..3d9d0cb6d31 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,13 +7,13 @@ 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-08-17 23:12+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11766,6 +11766,9 @@ msgstr "Pasivos"
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance de situación (cuentas de activos)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validada."
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index e9c2d3c08c4..0c50fa3431b 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index db81b258070..4d8ae4b0df0 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4364,7 +4364,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index b33d191c2bc..ea7fead4f0e 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4580,7 +4580,7 @@ msgstr "Detalle de asientos Contables"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Asset Accounts)"
-msgstr "Hoja de Balance (Cuentas de Activo)"
+msgstr ""
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -11610,6 +11610,9 @@ msgstr "Pasivos"
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Hoja de Balance (Cuentas de Activo)"
+
 #~ msgid "Chart of Account"
 #~ msgstr "Plan de Cuentas"
 
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index cf9e549f8ce..7e625ea038b 100644
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4598,8 +4598,8 @@ msgstr "Registros del diario"
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance de situación (cuentas de activos)"
+msgid "Balance Sheet (Asset Accounts)"
+msgstr ""
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -10401,6 +10401,9 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance de situación (cuentas de activos)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validada."
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index aad25b9de20..31516e79afc 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 17e1b5e2478..e8a27c45eb2 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 7c45244c7fa..fe4ea4f52f7 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index a9f720c8193..204473e7f50 100644
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4361,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index b596cc24779..1d425787f6d 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 09:18+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11159,6 +11159,9 @@ msgstr "Vastuut"
 #~ msgid "Balance:"
 #~ msgstr "Saldo:"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Tase (omaisuustilit)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "on tarkistettu."
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index d24f145b9e7..4129c9cd735 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,13 @@ 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-09-16 09:10+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11744,6 +11744,9 @@ msgstr "Passif"
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilan (comptes d'actif)"
+
 #~ msgid "Chart of Account"
 #~ msgstr "Plan comptable"
 
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index 143db252a23..f902b492437 100644
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index e10d48dd10f..adba5d19687 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-27 15:37+0000\n"
-"Last-Translator: Xosé <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -10079,6 +10079,9 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Factura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance de situación (contas de activos)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "está validada."
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index b03bfe6b7ee..2110a95d7f9 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 8caabde1673..2ff59ed17c6 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index b1c439ef657..db02dad0ab5 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index ee4842b188f..034e5e7de0f 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ 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-01-17 06:59+0000\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\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-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -10902,5 +10902,8 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Račun "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilanca (konta imovine)"
+
 #~ msgid "Chart of Account"
 #~ msgstr "Kontni plan"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index fff0f9d55c0..0583e83ba5e 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-18 11:11+0000\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\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-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -10615,6 +10615,9 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Számla "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Mérleg (eszköz számlák)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "jóváhagyásra került."
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index bdd2ea1a65b..59de935b5c3 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index c98787c8263..95b9d8641e9 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ 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-04-05 12:13+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11041,6 +11041,9 @@ msgstr ""
 #~ msgid "Chart of Account"
 #~ msgstr "Piano dei conti"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilancio (Attività)"
+
 #~ msgid "Header"
 #~ msgstr "Intestazione"
 
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 6a165c1e3f4..930391188d4 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
index f0784fb2e36..a2ea28fb56d 100644
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4361,7 +4361,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 338eef94b7e..5a2f2856ab9 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index 804da13fe16..96bea222d44 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 36e506d3d79..8851d332f62 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index b4847723f90..c802a70768e 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index 1db0ff18a67..a36c2505229 100644
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -4363,7 +4363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
+msgid "Balance Sheet (Asset Accounts)"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index a86e327aee1..e79fe091e1b 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-19 10:00+0000\n"
+"PO-Revision-Date: 2011-11-07 13:02+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11151,6 +11151,9 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Нэхэмжлэл "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Баланс тайлан (Хөрөнгө)"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index e02e573a7eb..c3c90c9dcbe 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-10-13 07:32+0000\n"
-"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -9843,6 +9843,9 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Faktura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balanse (Aktivakonti)"
+
 #~ msgid "Chart of Account"
 #~ msgstr "Kontoplan"
 
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 404f5a8ea77..0cbf9687cb7 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,13 +7,13 @@ 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-01-18 22:08+0000\n"
-"Last-Translator: debaetsr <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:54+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11406,3 +11406,6 @@ msgstr ""
 #, python-format
 #~ msgid "Invoice "
 #~ msgstr "Factuur "
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balans (Actiefrekeningen)"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index d62a1d0c4fd..6e7b65bbbda 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index e1d3903bcee..442f4af30ef 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 64ec87643de..b890024372b 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ 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-01-13 06:21+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11355,6 +11355,9 @@ msgstr ""
 #~ msgid "Invoice "
 #~ msgstr "Faktura "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bilans (konta aktywów)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "zostało zatwierdzone."
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index e84bf767dc6..5a995f8211b 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,13 +7,13 @@ 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-01-22 00:46+0000\n"
-"Last-Translator: Tiago Baptista <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:42+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11715,3 +11715,6 @@ msgstr ""
 #~ msgid ""
 #~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
 #~ msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)"
+
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balancete (Contas de Activo)"
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index d8c83002464..36d85714b06 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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-02 18:53+0000\n"
-"Last-Translator: Nédio Batista Marques <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11659,6 +11659,9 @@ msgstr ""
 #~ msgid "is validated."
 #~ msgstr "está validada."
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Planilha de Balanço (Ativos)"
+
 #, python-format
 #~ msgid "Date not in a defined fiscal year"
 #~ msgstr "A data não está em um ano fiscal definido"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 007c0889e36..6d90115440d 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 755868c518b..935177ef07b 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ 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-06-27 05:16+0000\n"
-"Last-Translator: Andrew Yashchuk <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:58+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -10956,6 +10956,9 @@ msgstr "Обязательства"
 #~ msgid "is validated."
 #~ msgstr "проверен."
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Баланс (счета активов)"
+
 #~ msgid "Accounting Statement"
 #~ msgstr "Бухгалтерская ведомость"
 
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 17c5062b20c..ba8ecf327e8 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 3ce7a5a7398..8d08e6776b5 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 15e5ea3f93e..282b716dc63 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index fe9ef79f9fb..8176d6350c4 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index b0d786a9c48..8545e0c8e3f 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index fbba4120bf6..5f65b7f4ce1 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 03f5d86c97a..95adfaa6b15 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-24 13:10+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11240,6 +11240,9 @@ msgstr ""
 #~ "The optional quantity expressed by this line, eg: number of product sold. "
 #~ "The quantity is not a legal requirement but is very usefull for some reports."
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balansräkning (Tillgångskonton)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "har validerats."
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 3365d043af3..058d1d661c3 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 79f7e5457b8..29a1c2c2d92 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 356c9798096..d074ef0aca9 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 7cd12ad9b5b..ee21cddc1d0 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 34b2334ba00..60d193ccb9a 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ 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-05-20 15:30+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11020,6 +11020,9 @@ msgstr ""
 #~ msgid "Message"
 #~ msgstr "İleti"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Balance Sheet (Assets Accounts)"
+
 #, python-format
 #~ msgid "The opening journal must not have any entry in the new fiscal year !"
 #~ msgstr "The opening journal must not have any entry in the new fiscal year !"
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 4b06d6db4cf..e7011eaa6fb 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 5a52354a1f9..18548cd6803 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index 092372add3d..a855a9b7a26 100644
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index e7ea2108f3d..9d5ddd58e92 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-07-20 09:45+0000\n"
-"Last-Translator: lam nhut tien <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -10565,6 +10565,9 @@ msgstr "Tài sản nợ"
 #~ msgid "Entry encoding"
 #~ msgstr "Mã hóa bút toán"
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "Bảng cân đối Kế toán (Các Tài khoản Tài sản)"
+
 #, python-format
 #~ msgid "is validated."
 #~ msgstr "đã được kiểm tra."
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 1794c70616d..aa7282fe1ac 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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-02 15:26+0000\n"
+"PO-Revision-Date: 2011-11-07 12:54+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
@@ -11130,6 +11130,9 @@ msgstr "负债"
 #~ msgid "Invoice "
 #~ msgstr "发票 "
 
+#~ msgid "Balance Sheet (Assets Accounts)"
+#~ msgstr "资产负债表（资产科目）"
+
 #~ msgid "Chart of Account"
 #~ msgstr "科目一览表"
 
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index 59976feba32..7546f4df059 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index 67776bf13df..d23bd13822b 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: account
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index 0eba5a122fe..0e658ca1d41 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-11-07 12:48+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "تمت إضافة المستخدمين التالين: \n"
@@ -488,3 +488,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr ""
+
+#~ msgid "Point of Sales"
+#~ msgstr "نقاط البيع"
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index d343f9a51f9..e00d8c838da 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -7,13 +7,13 @@ 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: 2009-09-08 14:09+0000\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "препоръчваме да инсталирате само фактуриране "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Следните потребители са инсталирани: \n"
@@ -601,3 +601,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Предишен"
+
+#~ msgid "Point of Sales"
+#~ msgstr "POS продажби"
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 956b67a8130..d16261f722b 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 546dba26848..fec53e21170 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.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: 2009-09-30 08:29+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
 "<resteve@zikzakmedia.com>\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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -96,7 +96,7 @@ msgstr ""
 "suggerim instal·lar només la facturació. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Els següents usuaris han estat instal·lats : \n"
@@ -627,3 +627,6 @@ msgstr "base.setup.config"
 #~ msgstr ""
 #~ "Podeu iniciar la configuració del sistema o connectar-vos directament a la "
 #~ "base de dades utilitzant la instal·lació per defecte."
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punt de venda"
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 02700ef5ef0..595a3cd5c33 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -7,13 +7,13 @@ 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: 2009-11-17 08:51+0000\n"
-"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
@@ -96,7 +96,7 @@ msgstr ""
 "vám instalovat pouze Fakturaci. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Byli instalováni následující uživatelů : \n"
@@ -577,3 +577,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Installation Done"
 #~ msgstr "Instalace dokončena"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Prodejní místo"
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index 38b28307c96..ff3ff65cf8c 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -76,8 +76,8 @@ msgstr "Din database er ny oprettet"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr "Point of sales"
+msgid "Point of Sale"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Følgende brugere er installeret \n"
@@ -520,3 +520,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr ""
+
+#~ msgid "Point of Sales"
+#~ msgstr "Point of sales"
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index d5f99a0260a..942bc9a5dd6 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -7,13 +7,13 @@ 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-01-13 12:54+0000\n"
-"Last-Translator: silas <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:46+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "Buchhaltung. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Folgende Benutzer wurden installiert : \n"
@@ -623,5 +623,8 @@ msgstr "base.setup.config"
 #~ msgid "Previous"
 #~ msgstr "Vorherig"
 
+#~ msgid "Point of Sales"
+#~ msgstr "POS & Kasse"
+
 #~ msgid "Use Directly"
 #~ msgstr "Sofort beginnen"
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 4430616a917..8837d6d223e 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-15 03:01+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -96,7 +96,7 @@ msgstr ""
 "λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Οι ακόλουθοι χρήστες έχουν εγκατασταθεί: \n"
@@ -626,3 +626,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Cancel"
 #~ msgstr "Άκυρο"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Σημείο πώλησης"
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index a44fb2f89a5..a71e2900e12 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.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: 2010-12-27 08:23+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
@@ -627,3 +627,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Define Main Company"
 #~ msgstr "Defina la compañia principal"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 4213f2dac5d..c646a7145ac 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index eb6e9daf76f..011ed071d89 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -79,7 +79,7 @@ msgstr "Su base de datos ya está creada."
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sale"
-msgstr "Terminal punto de venta"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
@@ -558,6 +558,9 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
+
 #~ msgid "Select a Profile"
 #~ msgstr "Seleccione un perfil"
 
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 7ac9c8363f2..9c4a446168b 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -79,7 +79,7 @@ msgstr "Su base de datos ya está creada."
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sale"
-msgstr "Terminal punto de venta"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
@@ -627,3 +627,6 @@ msgstr "Configuración"
 
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Su nueva base de datos ha sido instalada completamente."
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index 91ffeb25705..2db06e83fb4 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada."
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
-msgid "Point of Sales"
-msgstr "Terminal punto de venta"
+msgid "Point of Sale"
+msgstr ""
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
@@ -96,7 +96,7 @@ msgstr ""
 "sugerimos instalar sólo la facturación. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Los siguientes usuarios han sido instalados : \n"
@@ -557,3 +557,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.setup.config"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Terminal punto de venta"
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index 40937db63e6..178eceacde7 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 3396dc6c1f8..9f902b1a90e 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index 09308932262..967797046a5 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-03 03:47+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -96,7 +96,7 @@ msgstr ""
 "suosittelemme että asennat vain laskutuksen "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Seuraavat käyttäjät on asennettu: \n"
@@ -605,3 +605,6 @@ msgstr ""
 
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "Uusi tietokanta on nyt kokonaan asennettu."
+
+#~ msgid "Point of Sales"
+#~ msgstr "Myyntipiste"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index accf5d834a0..92e683590f3 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -7,13 +7,13 @@ 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-01-18 16:45+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "vous suggérons d'installer uniquement la facturation. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Les utilisateurs suivants ont été installés : \n"
@@ -625,3 +625,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Précédent"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Point de vente"
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 8cc928564b8..a92e4b42916 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index 922d9e65c60..e65d8d9141c 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "Language: hr\n"
 
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index 55ffd133497..de41cc5a5b4 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-02 16:23+0000\n"
+"PO-Revision-Date: 2011-11-07 12:54+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -96,7 +96,7 @@ msgstr ""
 "a Számlázást telepítse. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "A következő felhasználók lettek létrehozva : \n"
@@ -555,3 +555,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.setup.config"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Pénztárgép működés"
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 9100d8d7321..660100f151c 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 997f80e6e42..61b01d6a487 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -7,13 +7,13 @@ 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-01-16 09:42+0000\n"
-"Last-Translator: Loris Turchetti <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:49+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "di installare solo la fatturazione "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "I seguenti utenti sono stati installati: \n"
@@ -626,3 +626,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Indietro"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Punto vendita"
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index f3a0151f944..f708a4785e8 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index fe6c72e94be..73e3011abea 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index deecb270088..003c661d82a 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 4727caa5055..3c15f553bf2 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-20 16:18+0000\n"
-"Last-Translator: badralb <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -94,7 +94,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n"
@@ -571,5 +571,8 @@ msgstr "base.setup.config"
 #~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж "
 #~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий."
 
+#~ msgid "Point of Sales"
+#~ msgstr "Борлуулалтын цэг"
+
 #~ msgid "Use Directly"
 #~ msgstr "Хэрэглэх заавар"
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index 3b48933b4e3..550fb9d10c3 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-30 19:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-11-07 12:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -97,7 +97,7 @@ msgstr ""
 "regnskapsfører, anbefaler vi at du kun installerer Fakturering "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Følgende brukere er blitt installert: \n"
@@ -552,3 +552,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.oppsett.konfig"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Utsalgssted"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 2a8473b23e9..3fefd2f2fb5 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -7,13 +7,13 @@ 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-01-16 17:03+0000\n"
-"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:48+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "om alleen de facturatie te installeren "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
@@ -620,3 +620,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Previous"
 #~ msgstr "Vorige"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Kassa's"
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index cc859010b14..301a65a5673 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -93,7 +93,7 @@ msgstr ""
 "aan om enkel Facturatie te installeren. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 033b114cf29..18c0f19159f 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -7,13 +7,13 @@ 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-01-14 13:45+0000\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -93,7 +93,7 @@ msgstr ""
 "instalowanie tylko fakturowania. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Następujący użytkownicy zostali utworzeni : \n"
@@ -608,3 +608,6 @@ msgstr ""
 
 #~ msgid "Use Directly"
 #~ msgstr "Użyj bezpośrednio"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Punkt sprzedaży"
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index da612b6b5aa..0f7395bc92b 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 10:06+0000\n"
-"Last-Translator: Tiago Baptista <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:42+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "instale apenas o módulo Facturação "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Foram instalados os seguintes utilizadores: \n"
@@ -600,3 +600,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Use Directly"
 #~ msgstr "Usar Directamente"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Ponto de Venda"
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 69f952a76a7..0c0e036c6f5 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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-01-13 09:49+0000\n"
-"Last-Translator: Guilherme Santos <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "instalação apenas do Faturamento "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Os seguintes usuário foram instalados: \n"
@@ -621,3 +621,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Summary"
 #~ msgstr "Resumo"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Ponto de Vendas"
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index 542cbcee618..015eb620e8e 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -7,13 +7,13 @@ 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: 2010-12-12 01:45+0000\n"
+"PO-Revision-Date: 2011-11-07 12:48+0000\n"
 "Last-Translator: OpenERP Administrators <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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "doar modulul de Facturare. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Utilizatorii din lista de mai jos nu au fost instalați : \n"
@@ -599,3 +599,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Use Directly"
 #~ msgstr "Folosire directă"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Punct de vînzare"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index d61f8e1707d..0080ba636f1 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,13 +7,13 @@ 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-01-25 11:19+0000\n"
-"Last-Translator: Treefeed Xavier <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -96,7 +96,7 @@ msgstr ""
 "— советуем установить только модуль выставления счетов. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Были введены следующие пользователи: \n"
@@ -624,3 +624,6 @@ msgstr "base.setup.config"
 
 #~ msgid "State"
 #~ msgstr "Область/штат"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Кассовый терминал"
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index 0619a4d354d..cd4ffd266ae 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 00214917314..42c245534a7 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -93,7 +93,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Naslednji uporabniki so bili nameščeni: \n"
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index 560edfd4218..9e3df647985 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index bc08110fca2..a95a53dfc00 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-10-30 12:59+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -97,7 +97,7 @@ msgstr ""
 "knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Sledeci korisnici su instalirani: \n"
@@ -602,3 +602,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Cancel"
 #~ msgstr "Otkaži"
+
+#~ msgid "Point of Sales"
+#~ msgstr "POS"
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 11432a11e0f..25fa7984891 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-23 15:28+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -97,7 +97,7 @@ msgstr ""
 "knjigovodja, predlazemo ti da instaliras samo Fakturisanje "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Sledeci korisnici su instalirani: \n"
@@ -535,6 +535,9 @@ msgstr ""
 msgid "base.setup.config"
 msgstr "base.setup.config"
 
+#~ msgid "Point of Sales"
+#~ msgstr "POS"
+
 #~ msgid "Use Directly"
 #~ msgstr "Koristi Direktno"
 
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 43a7eb3f26a..0dfabca49da 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-13 07:19+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -95,7 +95,7 @@ msgstr ""
 "redovisning rekommenderar vi dig att enbart installera faktureringsmodulen "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Följande användere har nu blivit installerade \n"
@@ -598,5 +598,8 @@ msgstr "base.setup.config"
 #~ msgid "General Information"
 #~ msgstr "Allmän information"
 
+#~ msgid "Point of Sales"
+#~ msgstr "Kassa"
+
 #~ msgid "State"
 #~ msgstr "Län"
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index 3048827b0f8..eacc77db53d 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index 90ba96adacc..6f8b89d6cd8 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 4312065994f..0f279bc80c0 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ 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-05-10 18:46+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -94,7 +94,7 @@ msgstr ""
 "sadece Faturalama modülünü kurmanızı tavsiye ederiz. "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Aşağıdaki kullanıcılar kuruldu: \n"
@@ -571,3 +571,6 @@ msgstr "temel.kurulum.ayar"
 
 #~ msgid "Previous"
 #~ msgstr "Önceki"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Hızlı Satış Noktası"
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index dec96cbb84b..ae7cb912e4e 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr ""
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 24d263a4693..2d63ca2d0fc 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-05-04 16:45+0000\n"
-"Last-Translator: OpenBMS JSC <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -92,7 +92,7 @@ msgid ""
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "Những người sử dụng sau đã được cài đặt: \n"
@@ -489,3 +489,6 @@ msgstr ""
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
 msgstr "base.setup.config"
+
+#~ msgid "Point of Sales"
+#~ msgstr "Điểm bán hàng"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index a42ebb47270..670a9f6ed58 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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: 2010-12-31 10:59+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr "帮助您掌控您的会计需求，如果您不是一个会计人员，我们建议您仅仅安装发票模块。 "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "下列用户已经安装 \n"
@@ -566,3 +566,6 @@ msgstr "base.setup.config"
 
 #~ msgid "Your new database is now fully installed."
 #~ msgstr "新帐套已安装完毕."
+
+#~ msgid "Point of Sales"
+#~ msgstr "销售点"
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index f96c9ef7a89..e56ace16d84 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -7,13 +7,13 @@ 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-01-26 04:32+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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-11-05 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: base_setup
@@ -91,7 +91,7 @@ msgid ""
 msgstr "助您處理會計事情；如閣下非會計師，建議只安裝發票 "
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:56
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 msgstr "已安裝以下用戶： \n"
@@ -566,3 +566,6 @@ msgstr "基礎.設置.配置"
 
 #~ msgid "Previous"
 #~ msgstr "上一個"
+
+#~ msgid "Point of Sales"
+#~ msgstr "鎖售點 (POS)"
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index 04789b02e47..77f37159701 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/i18n/ru.po
@@ -7,13 +7,13 @@ 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: 2011-08-02 10:44+0000\n"
+"PO-Revision-Date: 2011-11-07 22:33+0000\n"
 "Last-Translator: Stanislav Hanzhin <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-11-05 04:58+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: event
@@ -689,8 +689,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
-"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей "
-"почты для этой записи. Разделяйте эл. адреса запятыми."
+"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и "
+"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса "
+"запятыми."
 
 #. module: event
 #: constraint:res.partner:0
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
index a51b8994cee..f4c85881403 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-10 07:30+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 22:35+0000\n"
+"Last-Translator: Stanislav Hanzhin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: marketing_campaign
@@ -809,7 +809,7 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr "Сделано"
+msgstr "Выполнено"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:209
@@ -861,7 +861,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr "Задача"
+msgstr "Сделать"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po
new file mode 100644
index 00000000000..5c1528e4c92
--- /dev/null
+++ b/addons/project_issue/i18n/ru.po
@@ -0,0 +1,967 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-07 22:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Средняя задержка при Открытии"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "Группировать по ..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"Ошибка! Дата начала проекта должна быть раньше даты окончания проекта."
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "Открыто"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "Дата открытия"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "Выполнение (%)"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "Организация"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "Адреса наблюдателей"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "Дней до открытия"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"Не возможна эскалация этой проблемы.\n"
+"Связанный с проблемой проект ещё не настроил процедуры эскалации!"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Ошибка! Вы не можете назначить эскалацию на тот же проект!"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "Дата закрытия"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "День"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "Добавить внутреннюю заметку"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "Задача"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "Проблемы по стадии"
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "Мобильный"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "Мои открытые проблемы по проекту"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "Отменен"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid "Warning !"
+msgstr "Warning !"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "Дата закрытия"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "Поиск по проблемам"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "Ср. кол-во часов до открытия"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "Следующее действие"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "Доп. инфо."
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:473
+#, python-format
+msgid " (copy)"
+msgstr " (копия)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "Предыдущий"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "Статистика"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "Преобразовать в задачу"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "Анализ проблемы"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "Номер версии"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "Следующий"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "Приоритет"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "Отправить новое эл. письмо"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "Версия"
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr "Управление инцидентами в управлении проектами"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr "Ожидающие инциденты"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr "Открыто рабочих часов"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "Категории инцидентов"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "Электронная почта"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "Канал"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "Низший"
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "Дата создания"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "Версии"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "Телефон"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "Вернуть в черновики"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "Сегодня"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "Инфо-панель \"Инциденты проекта\""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "Выполнено"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "Июль"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "Категории"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "Этап"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "История"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "Инциденты проекта"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "Общение & история"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "Мой открытый инцидент"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "Мои инциденты"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "Контакт"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr "Моя панель"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "Мои инциденты"
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:283
+#, python-format
+msgid "Tasks"
+msgstr "Задачи"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "Кол-во инцидентов"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "Сентябрь"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "Декабрь"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "Дерево инцидентов"
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "Эскалировать"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "Запросы на доработку"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "Дата изменения"
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "Категория"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "Кол-во инцидентов на проекте"
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и "
+"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса "
+"запятыми."
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "Низкий"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "Закрыт"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "Ср. задержка перед закрытием"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "В ожидании"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "Состояние"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "Кол-во инцидентов на проекте"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "Текущие индиденты"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "Обычный"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "Глобальная копия"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr "Сделать"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "Июнь"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "Дней до закрытия"
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr "Активный"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "Ноябрь"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "Поиск"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "Октябрь"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "Январь"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "Дерево запросов функциональности"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "Инциденты по состоянию"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Контакт контрагента"
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr "Решение"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "История"
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr "Назначено"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "Обратный адрес электронной почты"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "Наивысший"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "Прикрепленные файлы"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "Форма для отслеживания инцидентов"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr "Состояние"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "Эти люди получат эл. письма."
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:61
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:76
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:377
+#, python-format
+msgid "No Title"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr ""
+
+#~ msgid "Maintenance"
+#~ msgstr "Обслуживание"
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index a883340b195..619436f2e86 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -7,13 +7,13 @@ 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 10:12+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1570,7 +1570,7 @@ msgstr "Февруари"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Категории продукти"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 48ea16b8b5e..24429012b29 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -7,13 +7,13 @@ 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: 2011-08-17 21:54+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1648,7 +1648,7 @@ msgstr "Febrer"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categories de productes"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index 01c61e5a13e..a3a9b09968b 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -7,13 +7,13 @@ 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: 2011-07-15 02:37+0000\n"
+"PO-Revision-Date: 2011-11-07 12:54+0000\n"
 "Last-Translator: Jiří Hajda <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
@@ -1579,7 +1579,7 @@ msgstr "Únor"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Kategorie výrobků"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index dbdae8eedb1..6aa22d7b2d1 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.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:15+0000\n"
-"PO-Revision-Date: 2011-01-18 11:29+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1669,7 +1669,7 @@ msgstr "Februar"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Produkte Kategorien"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 88d87ed04fe..755695102f8 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -7,13 +7,13 @@ 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: 2011-10-16 23:04+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1642,7 +1642,7 @@ msgstr "Febrero"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categorías de productos"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index 0e964f82410..361ed5c8603 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-16 05:43+0000\n"
+"PO-Revision-Date: 2011-11-07 12:55+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1619,7 +1619,7 @@ msgstr "Helmikuu"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Tuotteiden Kategoriat"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index d6e3b44caa9..89bdac8d444 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,13 +7,13 @@ 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: 2011-01-19 08:42+0000\n"
-"Last-Translator: Xavier Verbeke <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:55+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1656,7 +1656,7 @@ msgstr "Février"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Catégories de produits"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index ace4a1ce344..27aa4fa3bd4 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-09 18:38+0000\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1640,7 +1640,7 @@ msgstr "Február"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Termék kategóriák"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index 46d8ee4df5e..c10f1c6e9db 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -7,13 +7,13 @@ 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: 2011-01-25 06:44+0000\n"
-"Last-Translator: moelyana <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1621,7 +1621,7 @@ msgstr "Februari"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Kategori Produk"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 0f37f3ff217..ca9077d432c 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -7,13 +7,13 @@ 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: 2011-01-12 04:56+0000\n"
+"PO-Revision-Date: 2011-11-07 12:52+0000\n"
 "Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1635,7 +1635,7 @@ msgstr "Febbraio"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categorie Prodotti"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index d0b4029ee3d..381c796a1c7 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -7,13 +7,13 @@ 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: 2011-01-16 17:01+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1638,7 +1638,7 @@ msgstr "Februari"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Productcategoriën"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 4d877f2b186..4f5b8ee53c6 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -7,13 +7,13 @@ 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: 2011-01-22 13:10+0000\n"
+"PO-Revision-Date: 2011-11-07 12:53+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1629,7 +1629,7 @@ msgstr "Luty"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Kategorie produktów"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index fab2d0d3b02..a8e82a4db94 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-28 21:53+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1647,7 +1647,7 @@ msgstr "Fevereiro"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categorias de produtos"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index e8211fdec42..1b90abfe14a 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -7,13 +7,13 @@ 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: 2011-04-04 15:03+0000\n"
-"Last-Translator: Mihai Satmarean <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1606,7 +1606,7 @@ msgstr "Februarie"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Categorii Produse"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 58663d74579..48335dbbf50 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ 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: 2011-03-24 14:57+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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-11-05 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1590,7 +1590,7 @@ msgstr "Февраль"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Категории ТМЦ"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 9b1d93b5996..52ba5cd56b9 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ 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-12-16 04:39+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-11-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1638,7 +1638,7 @@ msgstr "Şubat"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "Ürün Kategorileri"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index bc43915ecf4..9e67dc54b69 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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: 2011-01-28 02:07+0000\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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-11-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: purchase
@@ -1569,7 +1569,7 @@ msgstr "2月"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
-msgid "Product Categories"
+msgid "Products Categories"
 msgstr "产品分类"
 
 #. module: purchase
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index 300072882ff..6fa528ba0cb 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index c58a8e3a173..39436a1bb7c 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-02 09:07+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4720,6 +4720,9 @@ msgstr ""
 #~ "Планирана дата за придвижване на продукти, или реална дата, ако "
 #~ "придвижването е извършено."
 
+#~ msgid "Products Categories"
+#~ msgstr "Категории продукти"
+
 #, python-format
 #~ msgid "Product "
 #~ msgstr "Продукт "
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 9120fda1c3f..4f69f603ecd 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index 1a2a878d742..38e25bfa269 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-10-16 23:07+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:57+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -5041,6 +5041,9 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació."
 #~ msgid "Stock Variation Account"
 #~ msgstr "Compte variació d'estoc"
 
+#~ msgid "Products Categories"
+#~ msgstr "Categories de productes"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 7fccaebfd6c..582cb4504e5 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-07-15 19:02+0000\n"
+"PO-Revision-Date: 2011-11-07 12:57+0000\n"
 "Last-Translator: Jiří Hajda <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-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Language: Czech\n"
 
@@ -3972,6 +3972,9 @@ msgstr "Volitelné podrobnosti umístění, pouze pro informační účely"
 #~ msgid "Stock Variation Account"
 #~ msgstr "Účet výměny zásob"
 
+#~ msgid "Products Categories"
+#~ msgstr "Kategorie výrobků"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
index b0573df0618..b5addddbb17 100644
--- a/addons/stock/i18n/da.po
+++ b/addons/stock/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -2861,7 +2861,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 6d5c8a8f0e0..4933700c1ec 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-03 09:07+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
+"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -5064,6 +5064,9 @@ msgstr "Optionale Lagerort Details, nur als Information"
 #~ msgid "quantity."
 #~ msgstr "Anzahl"
 
+#~ msgid "Products Categories"
+#~ msgstr "Produkte Kategorien"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index f6fbbfc46ac..3c9960f64c4 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-01 18:43+0000\n"
+"PO-Revision-Date: 2011-11-07 12:46+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -4754,6 +4754,9 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Προϊόν "
 
+#~ msgid "Products Categories"
+#~ msgstr "Κατηγορίες Προϊόντων"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "είναι προγραμματιζμένο"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index d7b2e2a518e..5fa85ed5c32 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 09:19+0000\n"
+"PO-Revision-Date: 2011-11-07 12:46+0000\n"
 "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #~ msgid "Stock Management"
@@ -5065,3 +5065,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
+
+#~ msgid "Products Categories"
+#~ msgstr "Categorías de productos"
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index dcfe33d7fe6..aad9b7746cc 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index 937c41d36c6..c50359ed1c9 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -3103,7 +3103,7 @@ msgstr "Productos por categoría"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr "Categorías de productos"
+msgstr ""
 
 #. module: stock
 #: field:stock.move.memory.in,wizard_id:0
@@ -4226,6 +4226,9 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 #~ msgid "Stock Variation Account"
 #~ msgstr "Cuenta variación stock"
 
+#~ msgid "Products Categories"
+#~ msgstr "Categorías de productos"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index 322f2f9628c..9e9fc419b21 100644
--- a/addons/stock/i18n/es_EC.po
+++ b/addons/stock/i18n/es_EC.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index a8379e0dbaf..e208d3ae0db 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index 53c5d452f30..1cead46804f 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-22 08:17+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4818,6 +4818,9 @@ msgstr ""
 #~ msgid "Stock Variation Account"
 #~ msgstr "Varastomuutoksen tili"
 
+#~ msgid "Products Categories"
+#~ msgstr "Tuotteiden Kategoriat"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "on aikataulutettu"
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 57c108cbdcd..dd80481cfd3 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-21 12:15+0000\n"
+"PO-Revision-Date: 2011-11-07 12:56+0000\n"
 "Last-Translator: hedererjs <hedererjs@asperience.fr>\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-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -5077,3 +5077,6 @@ msgstr ""
 #, python-format
 #~ msgid "quantity."
 #~ msgstr "quantité."
+
+#~ msgid "Products Categories"
+#~ msgstr "Catégories de produits"
diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po
index 6d6e5e77a08..2f5894f7e3d 100644
--- a/addons/stock/i18n/gl.po
+++ b/addons/stock/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 3e62d435c4e..6cf7fb8e71c 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 75532227d6f..6a1692196c1 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-06 14:33+0000\n"
+"PO-Revision-Date: 2011-11-07 12:46+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\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-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4754,6 +4754,9 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Termék "
 
+#~ msgid "Products Categories"
+#~ msgstr "Termék kategóriák"
+
 #~ msgid "Stock Variation Account"
 #~ msgstr "Készlet főkönyvi számla"
 
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 604e3656b8b..e7d2d146f56 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 6d8b3a27b9e..8fa44cb6a2a 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.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:16+0000\n"
-"PO-Revision-Date: 2011-03-30 15:03+0000\n"
+"PO-Revision-Date: 2011-11-07 12:57+0000\n"
 "Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
 "<lorenzo.battistini@agilebg.com>\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-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4771,6 +4771,9 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "Prodotto "
 
+#~ msgid "Products Categories"
+#~ msgstr "Categorie Prodotti"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "è pianificato"
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 89d2b3a023b..4c1dea3ef7c 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index 14903405d92..d571ac1f273 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 "Language: lt\n"
 
diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po
index 09a61e6d3c2..cd2b657e92f 100644
--- a/addons/stock/i18n/lv.po
+++ b/addons/stock/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index f07c4311d14..13b22a96f6d 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po
index b03d6968be5..f6e0dde0448 100644
--- a/addons/stock/i18n/nb.po
+++ b/addons/stock/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -2867,7 +2867,7 @@ msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
+msgid "Product Categories"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index f42337bfa06..cb8f4e760c5 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index 69f2d8dedd7..690324736bf 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 555969b8ce5..81a0764a9ee 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-22 16:16+0000\n"
+"PO-Revision-Date: 2011-11-07 13:05+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4684,3 +4684,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "FAK: "
+
+#~ msgid "Products Categories"
+#~ msgstr "Kategorie produktów"
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 14fbe57783b..9c6d46ea564 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 9f75329d1ba..aa4d80d9d8e 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-09 00:58+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:44+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4498,6 +4498,9 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo"
 #~ msgid "Stock Variation Account"
 #~ msgstr "Conta para Variação de Estoque"
 
+#~ msgid "Products Categories"
+#~ msgstr "Categorias de Produtos"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 9b76d651ba6..67ee97cb26c 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-24 20:19+0000\n"
+"PO-Revision-Date: 2011-11-07 12:45+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -3961,6 +3961,9 @@ msgstr ""
 #~ msgid "Stock Variation Account"
 #~ msgstr "Cont variații de stoc"
 
+#~ msgid "Products Categories"
+#~ msgstr "Categorii Produse"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "INV: "
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index c9d81a0aceb..6dc91454726 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-20 08:06+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4710,6 +4710,9 @@ msgstr "Дополнительные подробности локализаци
 #~ msgid "STOCK_HOME"
 #~ msgstr "STOCK_HOME"
 
+#~ msgid "Products Categories"
+#~ msgstr "Категории ТМЦ"
+
 #~ msgid "Stock Variation Account"
 #~ msgstr "Счет изменения стоимости ТМЦ"
 
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 2ea1731a526..13c2a31dd9d 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index 92166252764..f65f7de2c87 100644
--- a/addons/stock/i18n/sq.po
+++ b/addons/stock/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 8d1dfe6c255..299ec325da4 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po
index a7ae6bc4d96..df049b3cf76 100644
--- a/addons/stock/i18n/sr@latin.po
+++ b/addons/stock/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 2a18e8d7cf8..8b9f5ee0b69 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index dbcaa4d0ac2..4b572ac43e8 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index bdbf29eaab4..659cb6c4a3c 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 851431f2837..da73cda050e 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-06-25 18:52+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2011-11-07 12:47+0000\n"
+"Last-Translator: OpenERP Administrators <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-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4786,6 +4786,9 @@ msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı"
 #~ msgid "Stock Variation Account"
 #~ msgstr "Stok Varyasyon Hesabı"
 
+#~ msgid "Products Categories"
+#~ msgstr "Ürün Kategorileri"
+
 #, python-format
 #~ msgid "INV: "
 #~ msgstr "FAT: "
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index a41e377200c..8ae9d9f6020 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index 573f4ebed32..b41880afcb7 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 3912a013ddf..dcaa205db9c 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-04 10:26+0000\n"
+"PO-Revision-Date: 2011-11-07 12:51+0000\n"
 "Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\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-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -4785,6 +4785,9 @@ msgstr "可选库位，仅供参考"
 #~ msgid "Stock Variation Account"
 #~ msgstr "库存变动科目"
 
+#~ msgid "Products Categories"
+#~ msgstr "产品分类"
+
 #, python-format
 #~ msgid "is consumed with"
 #~ msgstr "是消耗品"
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 67d3f46c859..193b8a57482 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-09-27 10:25+0000\n"
+"PO-Revision-Date: 2011-11-07 13:04+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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-11-05 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #. module: stock
@@ -3933,6 +3933,9 @@ msgstr ""
 #~ msgid "Product "
 #~ msgstr "產品 "
 
+#~ msgid "Products Categories"
+#~ msgstr "產品分類"
+
 #, python-format
 #~ msgid "is scheduled"
 #~ msgstr "已安排"
diff --git a/addons/web/po/ar.po b/addons/web/po/ar.po
index 0802e990ae5..0aac2c8aed2 100644
--- a/addons/web/po/ar.po
+++ b/addons/web/po/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-10-07 10:38+0200\n"
-"PO-Revision-Date: 2011-11-04 16:13+0000\n"
-"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n"
+"PO-Revision-Date: 2011-11-08 05:44+0000\n"
+"Last-Translator: Ahmad Khayyat <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 06:04+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 06:12+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #: addons/web/static/src/js/view_form.js:355
@@ -210,7 +210,8 @@ msgid ""
 "Today's enterprise challenges are multiple. We provide one module for each "
 "need."
 msgstr ""
-"تتعدد تحديات المنشآت اليوم، و لذلك نوفر العديد من وحدات الأكواد لكل إحتياج."
+"تتعدد تحديات المنشآت اليوم، و لذلك نوفر العديد من الوحدات البرمجية لكل "
+"احتياج."
 
 #: addons/web/static/src/xml/base.xml:0
 msgid "Open Source"
@@ -265,7 +266,7 @@ msgstr "إخفاء هذه الملحوظة"
 
 #: addons/web/static/src/xml/base.xml:0
 msgid "Disable all tips"
-msgstr "تعطيل جميع النصائح"
+msgstr "تعطيل جميع الإرشادات"
 
 #: addons/web/static/src/xml/base.xml:0
 msgid "View#"
diff --git a/addons/web_default_home/po/ar.po b/addons/web_default_home/po/ar.po
index 19363090f3b..48260328d70 100644
--- a/addons/web_default_home/po/ar.po
+++ b/addons/web_default_home/po/ar.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-10-07 10:39+0200\n"
-"PO-Revision-Date: 2011-11-03 15:06+0000\n"
-"Last-Translator: kifcaliph <kifcaliph@hotmail.com>\n"
+"PO-Revision-Date: 2011-11-08 05:50+0000\n"
+"Last-Translator: Ahmad Khayyat <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-04 05:32+0000\n"
+"X-Launchpad-Export-Date: 2011-11-08 06:12+0000\n"
 "X-Generator: Launchpad (build 14231)\n"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
@@ -23,7 +23,7 @@ msgstr "أهلاً و مرحباً بك في OpenERP"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Remember to bookmark this page."
-msgstr "لا تنسي إدراج هذه الصفحة ضمن المفضلات"
+msgstr "لا تنس إدراج هذه الصفحة ضمن المفضلات"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Remember your login:"
@@ -31,7 +31,7 @@ msgstr "تذكر كلمة المرور"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Choose the first OpenERP Application you want to install.."
-msgstr "اختر أول برنامج OpenERP للتثبيت"
+msgstr "اختر أول تطبيق OpenERP تود تثبيته"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Install"

From d8a2f16c434d1ebaf76d17187d1ca541b4b4b217 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 8 Nov 2011 12:14:01 +0530
Subject: [PATCH 39/53] [FIX]Fixed code for finding tag name from selecting tr
 in edit node.

bzr revid: kch@tinyerp.com-20111108064401-lfjvhm1ejbga2ch3
---
 addons/web/static/src/js/view_editor.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 382a9342d64..881dc5cfce9 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -382,18 +382,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-remove":
                     break;
                 case "side-edit":
-                    var tag, fld_name;
                     var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
-                    var tag_fld = tr.split(" ");
-                    if (tag_fld.length > 3){
-                        tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
-                        fld_name = tag_fld[2].split("=")[1].replace(/[^a-zA-Z _ 0-9]+/g,'');
-                    }else{
-                        tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
-                        fld_name= tag;
-                    }
+                    var tag = _.detect(_.keys(_PROPERTIES),function(res){
+                        return _.includes(tr, res);
+                    });
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties, fld_name, tr_id, one_object, view_id, view_xml_id, level);
+                    self.on_edit_node(properties, tr_id, one_object, view_id, view_xml_id, level);
                     break;
                 case "side-up":
                     while (1) {
@@ -579,7 +573,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties, fld_name, tr_id, obj, view_id, view_xml_id, level){
+    on_edit_node:function(properties, tr_id, obj, view_id, view_xml_id, level){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -606,8 +600,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.start().open();
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(tr_id,one_object,[]);
-        self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
-        self.edit_widget = [];
+        this.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
+        this.edit_widget = [];
         _.each(properties,function(record){
             var id = record,
             type_widget;

From 4c9aade99ebbafb9a231ac8b1c403a4b5648d8e0 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 8 Nov 2011 14:49:12 +0530
Subject: [PATCH 40/53] [FIX]Remove unnecessary changes in view_form.js.

bzr revid: kch@tinyerp.com-20111108091912-4j1uog22h7p7p20m
---
 addons/web/static/src/js/view_form.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a2f7a89ff80..ac96ea27f1f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1169,7 +1169,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
     },
     update_dom: function() {
         this._super.apply(this, arguments);
-       /* if (this.field.translate) {
+        if (this.field.translate) {
             this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id);
         }
         if (!this.disable_utility_classes) {
@@ -1178,7 +1178,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
             if (this.view.show_invalid) {
                 this.$element.toggleClass('invalid', !this.is_valid());
             }
-        }*/
+        }
     },
     on_ui_change: function() {
         this.dirty = this.view.dirty_for_user = true;
@@ -1979,7 +1979,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
     },
     load_views: function() {
         var self = this;
-        
+
         var modes = this.node.attrs.mode;
         modes = !!modes ? modes.split(",") : ["tree"];
         var views = [];
@@ -2004,7 +2004,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
             views.push(view);
         });
         this.views = views;
-        
+
         this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views);
         this.viewmanager.registry = openerp.web.views.clone({
             list: 'openerp.web.form.One2ManyListView',
@@ -2281,7 +2281,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
         this.dataset.on_unlink.add_last(function(ids) {
             self.on_ui_change();
         });
-        
+
         this.is_setted.then(function() {
             self.load_view();
         });

From 434b796e0414332b26cd97424a94d3cfaa1a7808 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 8 Nov 2011 11:15:45 +0100
Subject: [PATCH 41/53] [IMP] Improved __openerp__ for project_gtd

bzr revid: fp@tinyerp.com-20111108101545-7o5nkn0x69oap9bz
---
 addons/project_gtd/__openerp__.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 8d03112ed04..a9a1aecd0c5 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Methodology: Getting Things Done',
+    'name': 'Todo List based on the Getting Things Done methodology',
     'version': '1.0',
     'category': 'Project Management',
     'complexity': "easy",
@@ -29,8 +29,12 @@
 This module implements all concepts defined by the Getting Things Done methodology.
 ===================================================================================
 
-This world-wide used methodology is used for personal
-time management improvement.
+This module implements a simple personnal Todo list based on tasks. It adds in
+the project application an editable list of tasks simplified to the minimum
+required fields.
+
+The todo list is based on the GTD methodology. This world-wide used methodology
+is used for personal time management improvement.
 
 Getting Things Done (commonly abbreviated as GTD) is an action management
 method created by David Allen, and described in a book of the same name.

From 4f4bbab98fd423f8f5f759263281ef42ab48bdbf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 8 Nov 2011 11:19:11 +0100
Subject: [PATCH 42/53] [IMP] better data for project_long_term

bzr revid: fp@tinyerp.com-20111108101911-l7jiql4nbomy9535
---
 addons/project_gtd/project_gtd_data.xml | 26 ++++++++++++++++++++
 addons/project_gtd/project_gtd_demo.xml | 32 ++++---------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index 2780cd0f8d0..659b0fe9cb2 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -1,5 +1,31 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+        <record model="project.gtd.context" id="context_office">
+            <field name="name">Office</field>
+            <field name="sequence">0</field>
+        </record>
+        <record model="project.gtd.context" id="context_travel">
+            <field name="name">Travel</field>
+            <field name="sequence">2</field>
+        </record>
+
+        <record model="project.gtd.timebox" id="timebox_daily">
+            <field name="name">Today</field>
+            <field name="icon">terp-go-today</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_weekly">
+            <field name="name">This Week</field>
+            <field name="icon">terp-go-week</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_monthly">
+            <field name="name">This Month</field>
+            <field name="icon">terp-go-month</field>
+        </record>
+        <record model="project.gtd.timebox" id="timebox_lt">
+            <field name="name">Long Term</field>
+            <field name="icon">terp-project</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index a2d3cf65923..5ae12dff7bf 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -2,38 +2,14 @@
 <openerp>
     <data>
 
-    <record model="project.gtd.context" id="context_office">
-        <field name="name">Office</field>
-        <field name="sequence">0</field>
-    </record>
-    <record model="project.gtd.context" id="context_travel">
-        <field name="name">Travel</field>
-        <field name="sequence">2</field>
-    </record>
-    <record model="project.gtd.context" id="context_car">
-        <field name="name">Car</field>
-        <field name="sequence">1</field>
-    </record>
+
     <record model="project.gtd.context" id="context_home">
         <field name="name">Home</field>
         <field name="sequence">3</field>
     </record>
-
-    <record model="project.gtd.timebox" id="timebox_daily">
-        <field name="name">Today</field>
-        <field name="icon">terp-go-today</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_weekly">
-        <field name="name">This Week</field>
-        <field name="icon">terp-go-week</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_monthly">
-        <field name="name">This Month</field>
-        <field name="icon">terp-go-month</field>
-    </record>
-    <record model="project.gtd.timebox" id="timebox_lt">
-        <field name="name">Long Term</field>
-        <field name="icon">terp-project</field>
+    <record model="project.gtd.context" id="context_car">
+        <field name="name">Car</field>
+        <field name="sequence">1</field>
     </record>
 
     <record id="project.project_task_116" model="project.task">

From c3cc9bdf5dffd47439ef28338d12c1c9d3d6c942 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 8 Nov 2011 12:11:02 +0100
Subject: [PATCH 43/53] [IMP] Improved design for sale and sale_layout

bzr revid: fp@tinyerp.com-20111108111102-u49mm19xv16ze39r
---
 addons/sale/sale_view.xml               | 41 +++++++-----
 addons/sale_layout/sale_layout.py       |  4 +-
 addons/sale_layout/sale_layout_view.xml | 83 ++++++++++++++++---------
 addons/sale_margin/sale_margin_view.xml |  4 +-
 4 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e49e22c71c7..85ae2c7cb5c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -119,40 +119,51 @@
                                 <form string="Sales Order Lines">
                                     <notebook>
                                         <page string="Order Line">
-                                            <field colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                        <group colspan="4" col="5">
+                                            <field colspan="3"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                name="product_id"
+                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                            <field name="name"/>
+
                                             <field
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                                            <field name="product_uom"
+                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"
+                                                nolabel="1"/>
+                                            <field name="price_unit"/>
+
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field groups="product.group_uos" name="product_uos"/>
-                                            <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
-                                            <field colspan="4" name="name"/>
-                                            <field name="price_unit"/>
-                                            <field name="discount"/>
-                                            <field name="type" groups="base.group_extended"/>
-                                            <field name="delay" groups="base.group_extended"/>
                                             <newline/>
+                                            <field name="product_packaging"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
+                                                domain="[('product_id','=',product_id)]" groups="base.group_extended"
+                                                colspan="3"/>
+                                            <field name="discount"/>
+                                            <separator colspan="5" string="Notes"/>
+                                            <field colspan="5" name="notes" nolabel="1"/>
                                             <separator colspan="5" string="Taxes"/>
-                                            <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <group colspan="4" col="5" groups="base.group_extended">
+                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                                            <group colspan="5" col="5" groups="base.group_extended">
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state"/>
                                                 <field name="invoiced"/>
                                                 <group attrs="{'invisible':[('invoiced','=',True)]}">
-                                                <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
-                                                 </group>
+                                                    <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/>
+                                                </group>
                                             </group>
+                                        </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
+                                            <field name="type"/>
+                                            <field name="delay"/>
                                             <field name="th_weight"/>
                                             <field name="address_allotment_id"/>
                                             <field name="property_ids" colspan="4"/>
                                         </page>
-                                        <page string="Notes">
-                                            <field colspan="4" name="notes" nolabel="1"/>
-                                        </page>
                                         <page string="History" groups="base.group_extended">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index 0c81586c08c..7c15713d3b3 100644
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -117,8 +117,8 @@ class sale_order_line(osv.osv):
                 ('subtotal', 'Sub Total'),
                 ('line', 'Separator Line'),
                 ('break', 'Page Break'),]
-            ,'Layout Type', select=True, required=True),
-        'sequence': fields.integer('Layout Sequence'),
+            ,'Line Type', select=True, required=True),
+        'sequence': fields.integer('Line Sequence'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
         'product_uom': fields.many2one('product.uom', 'Product UoM'),
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 3b0600f9d8b..79adefa32f3 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -14,60 +14,83 @@
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
                     <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
-                            <form string="Sale Order Lines">
+                            <form string="Order Line">
                                 <notebook>
                                     <page string="Order Line">
-                                        <separator colspan="4" string="Automatic Declaration"/>
-                                        <field colspan="4"
+                                    <group colspan="4" col="5">
+                                        <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                    </group>
+                                    <group colspan="4" col="5">
+                                        <field colspan="3"
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             name="product_id"
-                                            attrs="{'readonly':[('layout_type','!=','article')]}"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"
                                             on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"
                                             select="1"/>
+                                        <field
+                                            name="name" required="0"
+                                            attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/>
+
                                         <field
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             name="product_uom_qty"
-                                            attrs="{'readonly':[('layout_type','!=','article')]}"
-                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"
-                                            select="1"/>
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"
+                                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
                                         <field name="product_uom"
-                                               required="0"
-                                            attrs="{'readonly':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
+                                            nolabel="1"
+                                            required="0"
+                                            attrs="{'invisible':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
                                             on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
+                                        <field name="price_unit"
+                                            attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
+
+                                        <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+                                        <field groups="product.group_uos" name="product_uos"/>
+                                        <newline/>
+
                                         <field
                                             name="product_packaging"
-                                            attrs="{'readonly':[('layout_type','!=','article')]}"
+                                            colspan="3"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"
                                             context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}"
                                             on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
                                             domain="[('product_id','=',product_id)]"
                                             groups="base.group_extended"/>
-                                        <separator colspan="4" string="Manual Description" />
-                                        <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/>
-                                        <field name="sequence" string="Seq."/>
-                                        <field colspan="4" name="name" required="0" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))], 'required':[('layout_type','not in',['line','break'])]}"/>
-                                        <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/>
-                                        <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/>
-                                        <separator colspan="4" string="States"/>
-                                        <field name="state" select="2"/>
-                                        <group col="3" colspan="2">
-                                            <field name="invoiced" select="2"/>
+                                        <field
+                                            name="discount"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}"/>
+
+                                        <group colspan="5"
+                                            attrs="{'invisible':[('layout_type','not in', ['article','text'])]}">
+                                            <separator colspan="4" string="Notes"/>
+                                            <field colspan="4" name="notes" nolabel="1"/>
+                                        </group>
+
+                                        <group colspan="5"
+                                            attrs="{'invisible':[('layout_type','!=','article')]}">
+                                            <separator colspan="4" string="Taxes"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/>
+                                        </group>
+
+                                        <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}">
+                                            <separator colspan="5" string="States"/>
+                                            <field name="state"/>
+                                            <field name="invoiced"/>
                                             <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/>
                                         </group>
+                                    </group>
                                     </page>
-                                    <page groups="base.group_extended" string="Extra Info">
-                                        <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
-                                        <field groups="product.group_uos" name="product_uos"/>
+                                    <page groups="base.group_extended" string="Extra Info"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}">
+                                        <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/>
+                                        <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/>
                                         <field name="address_allotment_id" select="2"/>
                                         <separator colspan="4" string="Properties"/>
                                         <field colspan="4" name="property_ids" nolabel="1"/>
                                     </page>
-                                    <page string="Notes">
-                                        <field colspan="4" name="notes" nolabel="1"/>
-                                    </page>
-                                    <page string="History" groups="base.group_extended">
+                                    <page string="History" groups="base.group_extended"
+                                        attrs="{'invisible':[('layout_type','!=','article')]}">
                                         <separator colspan="4" string="Invoice Lines"/>
                                         <field colspan="4" name="invoice_lines" nolabel="1"/>
                                         <separator colspan="4" string="Stock Moves"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 201dd12d7a0..c424bf33785 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -20,7 +20,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after">
+            <xpath expr="//field[@name='order_line']/form//field[@name='price_unit']" position="after">
                 <field name="purchase_price"/>
             </xpath>
         </field>
@@ -32,7 +32,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after">
+           <xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after">
                 <field name="purchase_price"/>
             </xpath>
         </field>

From 0658a41309d713a91e91db5c4360762efe838e84 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 8 Nov 2011 16:59:10 +0530
Subject: [PATCH 44/53] [IMP]Improved code as par review.

bzr revid: kch@tinyerp.com-20111108112910-p177yz5g4lfcorg1
---
 addons/web/static/src/js/view_editor.js | 218 ++++++++++--------------
 addons/web/static/src/xml/base.xml      |   6 +-
 2 files changed, 92 insertions(+), 132 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9814bb81e0f..edadbe005b0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -22,31 +22,31 @@ var _PROPERTIES = {
     'view' : [],
 };
 var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
-'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
-'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
-'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
-'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
-'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
-'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
-'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
-'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
-'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
-'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
-'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
-'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
-'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
-'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
-'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
-'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
-'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
-'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
-'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
-'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
-'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
-'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
-'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
-'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
-'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph',
+            'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
+            'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
+            'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
+            'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
+            'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
+            'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
+            'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
+            'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
+            'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
+            'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
+            'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
+            'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
+            'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
+            'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
+            'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
+            'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
+            'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
+            'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
+            'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
+            'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
+            'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
+            'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
+            'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
+            'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
+            'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
 ];
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
@@ -162,7 +162,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             child_obj_list.push(self.convert_tag_to_obj(child_node, parents.length));
         });
         if (children_list.length != 0) {
-            if(parents.length <= parent_list.length) { parent_list.splice(parents.length - 1);}
+            if (parents.length <= parent_list.length) { parent_list.splice(parents.length - 1);}
             parent_list.push(parent_id);
             self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list);
         }
@@ -284,8 +284,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     obj.child_id.push(xpath_arch_object[0]);
                     xpath_arch_object.pop();
                 }
-            }
-            else {
+            } else {
                 _.each(arch_object, function(element) {
                     self.inherit_apply(expr_list, element.child_id, xpath_arch_object);
                 });
@@ -363,7 +362,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             var view_find = side;
             while (1) {
                 view_find = view_find.prev();
-                if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
+                if ((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
                         && parseInt(view_find.attr('level')) < clicked_tr_level) {
                     view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
                     view_xml_id = (view_find.attr('id')).split('-')[1];
@@ -426,10 +425,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             cur_tr = next_tr;
                         }
                    }
-                }
-                else {
+                } else {
                     last_tr = cur_tr.next();
                 }
+
                 if ((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1) {
                     return;
                 }
@@ -470,7 +469,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 if (insert.length == check_list.length ) {return xml_child;}
             });
         }
-        return self.save_arch(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(clicked_tr_level),
+        return self.do_save_xml(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(clicked_tr_level),
                         parseInt(view_id), arch, move_direct, update_values);
     },
     get_object_by_id: function(view_xml_id, one_object, result) {
@@ -486,7 +485,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
-    save_arch: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
+    do_save_xml: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
         var self = this;
         var children_list =  $(arch1).children();
         var list_obj_xml = _.zip(children_list,obj.child_id);
@@ -500,12 +499,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     $(next).after(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
-                }else if(move_direct == "up"){
+                } else if (move_direct == "up") {
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
-                }else if(move_direct == "update_node"){
+                } else if (move_direct == "update_node") {
                     _.each(update_values, function(val){
                         $(arch1).attr(val[0],val[1]);
                     });
@@ -528,7 +527,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
-                    self.save_arch(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
+                    self.do_save_xml(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
                 });
             }
         }
@@ -575,7 +574,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             modal: true,
             title: 'Properties',
             width: 650,
-            height: 200,
+            height: 400,
             buttons: {
                     "Update": function(){
                         var update_values = [];
@@ -594,7 +593,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
         });
         this.edit_node_dialog.start().open();
-        var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
+        var widget = _.keys(self.property.map);
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'],[]);
         this.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
         this.edit_widget = [];
@@ -605,12 +604,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 if (_.include(widget,id)){
                     type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
                     self.edit_widget.push(type_widget);
-                }else{
+                } else {
                     type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
                     self.edit_widget.push(type_widget);
                 }
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                var view_val = _.detect(arch_val[0]['att_list'],function(res) {
+                    return _.include(res, id);
+                });
+                var value = null;
+                (id=='groups')?type_widget.set_value(self.groups,view_val):type_widget.set_value(value,view_val);
                 type_widget.start();
             });
         });
@@ -659,7 +662,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     on_ui_change: function() {
         this.dirty = true;
     },
-    render: function () {
+    render: function() {
         return QWeb.render(this.template, {widget: this});
     },
 });
@@ -668,31 +671,24 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this._super(view, node, id);
         this.template = "view_boolean";
     },
-    start: function () {
+    start: function() {
         var self = this;
-        this.$element.find("tr[id="+ self.name+"] input").change(function() {
+        this.$element.find("input[id="+ self.name+"]").change(function() {
             self.on_ui_change();
         });
     },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,self.name);
-        });
-        if(view_val){
-            this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]);
+        if (view_val) {
+            this.$element.find("input[id="+ self.name+"]").attr('checked', view_val[1]);
         }
     },
-    get_value: function(){
+    get_value: function() {
         if (!this.dirty) {
             return false;
         }
-        var val = this.$element.find("tr[id="+this.name+"] input").is(':checked');
-        if (val){
-            return [this.name,val];
-        }else{
-            return [this.name,null];
-        }
+        var val = this.$element.find("input[id="+this.name+"]").is(':checked');
+        return val ? [this.name,val] : [this.name,null];
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -702,28 +698,21 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
     },
     start: function () {
         var self = this;
-        this.$element.find("tr[id="+ this.name+"] input").change(function() {
+        this.$element.find("input[id="+ this.name+"]").change(function() {
             self.on_ui_change();
         });
     },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res, self.name);
-        });
-        view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
+        view_val ? this.$element.find("input[id="+self.name+"]").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
     },
-    get_value: function(){
+    get_value: function() {
         if (!this.dirty) {
             return false;
         }
         var self = this;
-        var val= this.$element.find("tr[id="+this.name+"] input").val();
-        if (val){
-            return [this.name,val];
-        }else{
-            return [this.name,""];
-        }
+        var val= this.$element.find("input[id="+this.name+"]").val();
+        return val ? [this.name,val] : [this.name,""];
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -733,35 +722,28 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     },
     start: function () {
         var self = this;
-        this.$element.find("tr[id="+ this.name+"] select").change(function() {
+        this.$element.find("select[id="+this.name+"]").change(function() {
             self.on_ui_change();
         });
     },
-    set_value: function(value) {
+    set_value: function(value, view_val) {
         var self = this;
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,self.name);
-        });
         _.each(value, function(item) {
             var select_val = view_val?(view_val[1]==((typeof(item)=='string')?item:item[0])?true:false):false;
-            self.$element.find("tr[id="+self.name+"] select").append($("<option/>", {
+            self.$element.find("select[id="+self.name+"]").append($("<option/>", {
                     value:(typeof(item)=='string')?item:item[0],
                     text:(typeof(item)=='string')?item:item[1],
                     selected:select_val
             }));
         });
     },
-    get_value: function(){
+    get_value: function() {
         if (!this.dirty) {
             return false;
         }
         var self = this;
-        var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
-        if (val){
-            return [this.name,val];
-        }else{
-            return [this.name,""];
-        }
+        var val = this.$element.find("select[id="+this.name+"]").find("option:selected").val();
+        return  val ? [this.name,val] : [this.name,""];
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -769,83 +751,61 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self= this;
-        var value = _.keys(this.registry.map);
+        value = _.keys(this.registry.map);
         value.push('');
         value.sort();
-        this._super.apply(this,[value]);
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = icons;
-        this._super.apply(this,[value]);
+        value = icons;
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['new','New Window']];
-        this._super.apply(this,[value]);
+        value = [['',''],['new','New Window']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[value]);
+        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        this._super.apply(this,[value]);
+        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        this._super.apply(this,[value]);
+        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[value]);
+        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function(value) {
+    set_value: function(value,view_val) {
         var self = this;
-        this.$element.find("tr[id="+ this.name +"] select").attr('multiple', true);
-        this.$element.find("tr[id="+ this.name +"] select").css('height','100px');
-        this._super.apply(this,[value]);
+        this.$element.find("select[id="+ this.name +"]").attr('multiple', true).css('height','100px');
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 648dc3a9f1d..cac02286fca 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1331,14 +1331,14 @@
     </t>
 </tr>
 <t t-name="view_char">
-    <input type="text" class="field_char" size="50"/>
+    <input type="text" t-att-id="widget.name" class="field_char" size="50"/>
 </t>
 <t t-name="view_selection">
-    <select style="width:366px">
+    <select style="width:366px" t-att-id="widget.name">
     </select>
 </t>
 <t t-name="view_boolean">
-    <input type="checkbox"/>
+    <input type="checkbox" t-att-id="widget.name"/>
 </t>
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>

From d7213de31586286c445221fb613f7cde7fb456e5 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Nov 2011 18:33:27 +0530
Subject: [PATCH 45/53] [IMP] Vieweditor:- improve xml of edit node view editor
 and init method of widget class

bzr revid: ysa@tinyerp.com-20111108130327-iozuye9ll7tgb2pq
---
 addons/web/static/src/js/view_editor.js | 23 +++++++----------------
 addons/web/static/src/xml/base.xml      |  9 ++++-----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index edadbe005b0..ba9f8be56bb 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -573,7 +573,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
-            width: 650,
+            width: 500,
             height: 400,
             buttons: {
                     "Update": function(){
@@ -595,7 +595,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.start().open();
         var widget = _.keys(self.property.map);
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'],[]);
-        this.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
+        this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
         _.each(properties,function(record){
             var id = record,
@@ -667,10 +667,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     },
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-        this.template = "view_boolean";
-    },
+    template : "vieweditor_boolean",
     start: function() {
         var self = this;
         this.$element.find("input[id="+ self.name+"]").change(function() {
@@ -692,13 +689,10 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-        this.template = "view_char";
-    },
+    template : "vieweditor_char",
     start: function () {
         var self = this;
-        this.$element.find("input[id="+ this.name+"]").change(function() {
+        this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() {
             self.on_ui_change();
         });
     },
@@ -716,13 +710,10 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-        this.template = "view_selection";
-    },
+    template : "vieweditor_selection",
     start: function () {
         var self = this;
-        this.$element.find("select[id="+this.name+"]").change(function() {
+        this.$element.find("select[id="+ this.name +"]").css('width','100%').change(function() {
             self.on_ui_change();
         });
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cac02286fca..a0d8921d1b7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1330,14 +1330,13 @@
         <t t-call="view_editor.row"/>
     </t>
 </tr>
-<t t-name="view_char">
+<t t-name="vieweditor_char">
     <input type="text" t-att-id="widget.name" class="field_char" size="50"/>
 </t>
-<t t-name="view_selection">
-    <select style="width:366px" t-att-id="widget.name">
-    </select>
+<t t-name="vieweditor_selection">
+    <select t-att-id="widget.name"/>
 </t>
-<t t-name="view_boolean">
+<t t-name="vieweditor_boolean">
     <input type="checkbox" t-att-id="widget.name"/>
 </t>
 <t t-name="ExportView">

From 88513942dff5293631e80e801e0b7b16c9b0868c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 8 Nov 2011 14:12:08 +0100
Subject: [PATCH 46/53] [REM] Removed 'ready' state from project.task

bzr revid: fme@openerp.com-20111108131208-uoteau267plyum9m
---
 addons/project/project.py       |  6 +-----
 addons/project/project_view.xml | 19 +++++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 2c647825408..bc0c03ebde1 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -431,7 +431,7 @@ class task(osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('ready', 'Ready'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
+        'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'create_date': fields.datetime('Create Date', readonly=True,select=True),
@@ -706,10 +706,6 @@ class task(osv.osv):
             self.log(cr, uid, t.id, message)
         return True
 
-    def do_ready(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state': 'ready'}, context=context)
-        return True
-
     def do_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index da35d9ae52d..8f21cee1a4a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -244,7 +244,7 @@
                             </group>
                             <group col="3" colspan="2">
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,ready,pending" icon="gtk-edit"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
@@ -259,13 +259,13 @@
                             <newline/>
                             <group col="11" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                                <button name="do_cancel" states="draft,open,ready,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="do_draft" states="open,ready" string="Draft" type="object" icon="gtk-indent"/>
+                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                                <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
-                                <button name="do_pending" states="open,ready" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,ready,draft" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="action_close" states="pending,open,ready" string="Done" type="object" icon="terp-dialog-close"/>
+                                <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
+                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/>
+                                <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations History">
@@ -334,7 +334,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t>
-                            <div t-att-class="kanban_color(record.color.raw_value) + (record.state.raw_value === 'pending' ? ' oe_kanban_color_alert' : '') + (record.state.raw_value === 'ready' ? ' oe_kanban_color_green' : '')">
+                            <div t-att-class="kanban_color(record.color.raw_value) + (record.state.raw_value === 'pending' ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_kanban_box oe_kanban_color_border">
                                     <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
                                         <tr>
@@ -371,9 +371,8 @@
                                         </div>
                                         <div class="oe_kanban_right">
                                             <a name="do_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                                            <a name="do_open" string="Start Task" states="pending,ready" type="object" icon="gtk-media-play"/>
-                                            <a name="do_ready" string="Ready" states="draft,open" type="object" icon="gtk-go-forward"/>
-                                            <a name="action_close" string="Done" states="draft,open,ready" type="object" icon="gtk-apply"/>
+                                            <a name="do_open" string="Start Task" states="pending" type="object" icon="gtk-media-play"/>
+                                            <a name="action_close" string="Done" states="draft,open" type="object" icon="gtk-apply"/>
                                         </div>
                                         <br class="oe_kanban_clear"/>
                                     </div>

From bd210bf9d0aa1ddacb3cdf008e4467dc6f282787 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Nov 2011 18:59:43 +0530
Subject: [PATCH 47/53] [IMP] vieweditor:- code refactor.

bzr revid: ysa@tinyerp.com-20111108132943-0wcjjnjfrsx5l0of
---
 addons/web/static/src/js/view_editor.js | 191 +++++++++++-------------
 1 file changed, 89 insertions(+), 102 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ba9f8be56bb..57b0daffec7 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,53 +1,4 @@
 openerp.web.view_editor = function(openerp) {
-var _PROPERTIES = {
-    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
-    'form' : ['string', 'col', 'link'],
-    'notebook' : ['colspan', 'position', 'groups'],
-    'page' : ['string', 'states', 'attrs', 'groups'],
-    'group' : ['string', 'col', 'colspan', 'states', 'attrs', 'groups'],
-    'image' : ['filename', 'width', 'height', 'groups'],
-    'separator' : ['string', 'colspan', 'groups'],
-    'label': ['string', 'align', 'colspan', 'groups'],
-    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
-    'newline' : [],
-    'hpaned': ['position', 'groups'],
-    'vpaned': ['position', 'groups'],
-    'child1' : ['groups'],
-    'child2' : ['groups'],
-    'action' : ['name', 'string', 'colspan', 'groups'],
-    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
-    'graph' : ['string', 'type'],
-    'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
-    'view' : [],
-};
-var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
-            'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
-            'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
-            'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
-            'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
-            'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
-            'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
-            'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
-            'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
-            'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
-            'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
-            'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
-            'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
-            'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
-            'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
-            'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
-            'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
-            'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
-            'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
-            'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
-            'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
-            'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
-            'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
-            'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
-            'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
-            'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
-];
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
@@ -578,7 +529,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             buttons: {
                     "Update": function(){
                         var update_values = [];
-                        _.each(self.edit_widget,function(widget){
+                        _.each(self.edit_widget, function(widget) {
                             var value = widget.get_value();
                             if (value) {
                                 update_values.push(value);
@@ -594,26 +545,25 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_node_dialog.start().open();
         var widget = _.keys(self.property.map);
-        var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'],[]);
+        var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
-        _.each(properties,function(record){
+        _.each(properties, function(record) {
             var id = record,
             type_widget;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                 if (_.include(widget,id)){
                     type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
-                    self.edit_widget.push(type_widget);
                 } else {
                     type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
-                    self.edit_widget.push(type_widget);
                 }
+                self.edit_widget.push(type_widget);
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 var view_val = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
                 });
                 var value = null;
-                (id=='groups')?type_widget.set_value(self.groups,view_val):type_widget.set_value(value,view_val);
+                id == 'groups'? type_widget.set_value(self.groups, view_val): type_widget.set_value(value, view_val);
                 type_widget.start();
             });
         });
@@ -622,7 +572,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     on_groups: function(id){
         var self = this,
         def = $.Deferred();
-        if (id !='groups') {
+        if (id != 'groups') {
             self.groups = false;
             return false;
         }
@@ -632,7 +582,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
             res_groups
-            .read_slice([],{})
+            .read_slice([], {})
             .done(function(res_grp) {
                 _.each(res_grp,function(res){
                     var key = res.id;
@@ -675,17 +625,17 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value,view_val) {
-        var self = this;
+        console.log("self.edit_widget.push(type_widget);:::::::",view_val, view);
         if (view_val) {
-            this.$element.find("input[id="+ self.name+"]").attr('checked', view_val[1]);
+            this.$element.find("input[id=" + self.name+ "]").attr('checked', view_val[1]);
         }
     },
     get_value: function() {
         if (!this.dirty) {
             return false;
         }
-        var val = this.$element.find("input[id="+this.name+"]").is(':checked');
-        return val ? [this.name,val] : [this.name,null];
+        var value = this.$element.find("input[id=" + this.name + "]").is(':checked');
+        return value ? [this.name, value] : [this.name, null];
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -697,33 +647,31 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value,view_val) {
-        var self = this;
-        view_val ? this.$element.find("input[id="+self.name+"]").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
+        view_val ? this.$element.find("input[id=" + this.name + "]").val(view_val[1]): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
         if (!this.dirty) {
             return false;
         }
-        var self = this;
-        var val= this.$element.find("input[id="+this.name+"]").val();
-        return val ? [this.name,val] : [this.name,""];
+        var value= this.$element.find("input[id=" + this.name + "]").val();
+        return value ? [this.name, value] : [this.name, ""];
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
     start: function () {
         var self = this;
-        this.$element.find("select[id="+ this.name +"]").css('width','100%').change(function() {
+        this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
         });
     },
     set_value: function(value, view_val) {
         var self = this;
         _.each(value, function(item) {
-            var select_val = view_val?(view_val[1]==((typeof(item)=='string')?item:item[0])?true:false):false;
-            self.$element.find("select[id="+self.name+"]").append($("<option/>", {
-                    value:(typeof(item)=='string')?item:item[0],
-                    text:(typeof(item)=='string')?item:item[1],
+            var select_val = view_val? (view_val[1] == ((typeof(item) == 'string')? item:item[0])?true: false): false;
+            self.$element.find("select[id=" + self.name + "]").append($("<option/>", {
+                    value: (typeof(item) == 'string') ? item: item[0],
+                    text: (typeof(item) == 'string')? item: item[1],
                     selected:select_val
             }));
         });
@@ -732,9 +680,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         if (!this.dirty) {
             return false;
         }
-        var self = this;
-        var val = this.$element.find("select[id="+this.name+"]").find("option:selected").val();
-        return  val ? [this.name,val] : [this.name,""];
+        var value = this.$element.find("select[id=" + this.name + "]").find("option:selected").val();
+        return  value ? [this.name, value] : [this.name, ""];
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -742,63 +689,103 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function(value,view_val) {
-        var self= this;
+    set_value: function(value, view_val) {
         value = _.keys(this.registry.map);
         value.push('');
         value.sort();
-        this._super.apply(this,[value,view_val]);
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = icons;
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        this._super.apply(this,[icons, view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['new','New Window']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['', ''], ['new', 'New Window']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
+    set_value: function(value, view_val) {
         value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[value,view_val]);
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
+    set_value: function(value, view_val) {
         this.$element.find("select[id="+ this.name +"]").attr('multiple', true).css('height','100px');
         this._super.apply(this,[value, view_val]);
     }
 });
+var _PROPERTIES = {
+    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
+    'form' : ['string', 'col', 'link'],
+    'notebook' : ['colspan', 'position', 'groups'],
+    'page' : ['string', 'states', 'attrs', 'groups'],
+    'group' : ['string', 'col', 'colspan', 'states', 'attrs', 'groups'],
+    'image' : ['filename', 'width', 'height', 'groups'],
+    'separator' : ['string', 'colspan', 'groups'],
+    'label': ['string', 'align', 'colspan', 'groups'],
+    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
+    'newline' : [],
+    'hpaned': ['position', 'groups'],
+    'vpaned': ['position', 'groups'],
+    'child1' : ['groups'],
+    'child2' : ['groups'],
+    'action' : ['name', 'string', 'colspan', 'groups'],
+    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
+    'graph' : ['string', 'type'],
+    'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
+    'view' : [],
+};
+var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
+            'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
+            'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
+            'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
+            'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
+            'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
+            'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
+            'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
+            'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
+            'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
+            'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
+            'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
+            'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
+            'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
+            'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
+            'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
+            'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
+            'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
+            'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
+            'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
+            'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
+            'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
+            'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
+            'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
+            'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
+            'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
+];
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',

From 30359afc90f3e1e8cf156fa66921a40c436d0348 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 8 Nov 2011 15:37:14 +0100
Subject: [PATCH 48/53] [ADD] Added kanban_state for project.task

bzr revid: fme@openerp.com-20111108143714-z6w1ptcsdrzo9vf0
---
 addons/project/project.py       | 11 +++++++++++
 addons/project/project_view.xml | 14 ++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index bc0c03ebde1..54afe10155f 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -434,6 +434,7 @@ class task(osv.osv):
         'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True,
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
+        'kanban_state': fields.selection([('blocked', 'Blocked'),('normal', 'Normal'),('done', 'Done')], 'Kanban State', readonly=True, required=False),
         'create_date': fields.datetime('Create Date', readonly=True,select=True),
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
@@ -477,6 +478,7 @@ class task(osv.osv):
 
     _defaults = {
         'state': 'draft',
+        'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
         'sequence': 10,
@@ -765,6 +767,15 @@ class task(osv.osv):
         self.write(cr, uid, ids, {'remaining_hours': 10 * 8.0}, context=context)
         return True
 
+    def set_kanban_state_blocked(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
+
+    def set_kanban_state_normal(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context)
+
+    def set_kanban_state_done(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context)
+
     def _change_type(self, cr, uid, ids, next, *args):
         """
             go to the next stage
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8f21cee1a4a..7179a00248a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -329,12 +329,14 @@
                     <field name="description"/>
                     <field name="sequence"/>
                     <field name="state"/>
+                    <field name="kanban_state"/>
                     <field name="project_id"/>
-                    <field name="remaining_hours" sum="Remaining Time"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t>
-                            <div t-att-class="kanban_color(record.color.raw_value) + (record.state.raw_value === 'pending' ? ' oe_kanban_color_alert' : '')">
+                            <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t>
+                            <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
+                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
                                 <div class="oe_kanban_box oe_kanban_color_border">
                                     <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
                                         <tr>
@@ -354,7 +356,7 @@
                                         </div>
                                         <div>
                                             <i t-if="record.date_deadline.raw_value"><field name="date_deadline"/> ,</i>
-                                            <field name="remaining_hours"/>
+                                            <field name="remaining_hours" sum="Remaining Time"/>
                                             <b>
                                                 <a name="set_remaining_hours_1" string="Set 1 day" type="object"> [1d]</a>
                                                 <a name="set_remaining_hours_2" string="Set 2 day" type="object"> [2d]</a>
@@ -370,9 +372,9 @@
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         </div>
                                         <div class="oe_kanban_right">
-                                            <a name="do_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                                            <a name="do_open" string="Start Task" states="pending" type="object" icon="gtk-media-play"/>
-                                            <a name="action_close" string="Done" states="draft,open" type="object" icon="gtk-apply"/>
+                                            <a name="set_kanban_state_blocked" string="Block" kanban_states="normal,done" type="object" icon="gtk-media-pause"/>
+                                            <a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/>
+                                            <a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="gtk-apply"/>
                                         </div>
                                         <br class="oe_kanban_clear"/>
                                     </div>

From 2ae078e58cec253c36828abd10460c528f36b948 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 8 Nov 2011 15:52:14 +0100
Subject: [PATCH 49/53] [FIX] mergecss: allow spaces after (

bzr revid: chs@openerp.com-20111108145214-ahdaiyk0f616zq74
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 0413fa1f131..a218962f84c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -111,7 +111,7 @@ class WebClient(openerpweb.Controller):
         file_map = dict(files)
 
         rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
-        rx_url = re.compile(r"""url\s*\(('|"|)(?!'|"|/|https?://)""", re.U)
+        rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://)""", re.U)
 
 
         def reader(f):

From 9e70e67ae52bca3b5593c814aa5fa3f99f50cd96 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 8 Nov 2011 16:21:42 +0100
Subject: [PATCH 50/53] [IMP] feedback from PS

bzr revid: fp@tinyerp.com-20111108152142-6b0dqdnk6ntxm8ja
---
 addons/product/product.py                   | 1 +
 addons/project/project_view.xml             | 7 +++++--
 addons/project_issue/project_issue.py       | 2 +-
 addons/project_issue/project_issue_view.xml | 6 +++---
 addons/sale/sale.py                         | 1 +
 addons/stock/stock_view.xml                 | 8 ++++----
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 7e7f7375e87..0e1b2048ea7 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -93,6 +93,7 @@ class product_uom(osv.osv):
             del(data['factor_inv'])
         return super(product_uom, self).create(cr, uid, data, context)
 
+    _order = "name"
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7179a00248a..df20e280d3b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -175,7 +175,6 @@
             <field name="context">{'search_default_Current':1}</field>
             <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
         </record>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_definitions" sequence="1"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
@@ -604,7 +603,11 @@
         </record>
 
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
-        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
+
+        <menuitem id="menu_project_config_project" parent="menu_definitions" sequence="1"/>
+
+        <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 228a899a640..a67d60b5890 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -196,7 +196,7 @@ class project_issue(crm.crm_case, osv.osv):
                                  domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'New'), ('open', 'To Solve'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c6d852cfde0..e064f0c8c8f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem  id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
+        <menuitem  id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/>
 
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
@@ -85,8 +85,8 @@
                             <group col="8" colspan="4">
                             <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                            <button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
+                            <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                            <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                             <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                             <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 294a1c29c00..aea79abfa37 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1315,6 +1315,7 @@ class sale_config_picking_policy(osv.osv_memory):
 
         if wizard.task_work:
             module_name.append('project_timesheet')
+            module_name.append('project_mrp')
             module_name.append('account_analytic_analysis')
 
         if wizard.timesheet:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6452960c2cd..aa1b8b7210f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -6,9 +6,9 @@
                   groups="group_stock_manager,group_stock_user" sequence="5"
                   web_icon="images/warehouse.png"
                   web_icon_hover="images/warehouse-hover.png"/>
-        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
-        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
-        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
+        <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
+        <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/>
+        <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/>
         <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
            parent="stock.menu_stock_product" sequence="0"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
@@ -16,7 +16,7 @@
         <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
         <menuitem
-            id="menu_product_in_config_stock" name="Product"
+            id="menu_product_in_config_stock" name="Products"
             parent="stock.menu_stock_configuration" sequence="2"/>
         <menuitem
             action="product.product_category_action_form" id="menu_product_category_config_stock"

From 5290ada81f998e29da7777116e317478c69d05e6 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 8 Nov 2011 16:56:33 +0100
Subject: [PATCH 51/53] [FIX] correct criss-cross merge

bzr revid: chs@openerp.com-20111108155633-8lymglmg46sfv0ko
---
 addons/web/static/src/js/boot.js | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index fef9b5168a8..5fba5f4d8d4 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -21,16 +21,7 @@
          *
          * @param {Array} modules list of modules to initialize
          */
-        init: function(modules, connection, callback) {
-    
-            if (/^(function|undefined)$/.test(typeof connection)) {
-                callback = connection;
-                connection = {
-                    host: document.location.protocol + '//' + document.location.host,
-                };
-            }
-
-
+        init: function(modules) {
             var new_instance = {
                 // links to the global openerp
                 _openerp: openerp,
@@ -48,20 +39,6 @@
             for(var i=0; i < modules.length; i++) {
                 openerp[modules[i]](new_instance);
             }
-
-            new_instance.connector = new new_instance.web.Connection(connection.host);
-            if (connection.login) {
-                new_instance.connector.login(connection.database, connection.login, connection.password, function() {
-                    if (callback) {
-                        callback(new_instance);
-                    }
-                });
-            } else {
-                if (callback) {
-                    callback(new_instance);
-                }
-            }
-
             return new_instance;
         }
     };

From 66f71407f2c838dd2d88c90ebd0b8d5fe16f7c5d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 8 Nov 2011 17:58:17 +0100
Subject: [PATCH 52/53] [FIX] Fixed kanban aggregates. Added kanban_states
 support. Added colors

bzr revid: fme@openerp.com-20111108165817-0ae7bp7ulfv3pn3d
---
 addons/web_kanban/static/src/css/kanban.css | 12 ++++++--
 addons/web_kanban/static/src/js/kanban.js   | 32 ++++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6c6ddd57dec..86818f6541c 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -278,12 +278,18 @@
     border-color: #D979C1;
 }
 
-/* Alert color */
-.openerp .oe_kanban_color_alert .oe_kanban_color_border {
+/* Red border */
+.openerp .oe_kanban_color_alert .oe_kanban_color_border,
+.openerp .oe_kanban_color_red .oe_kanban_color_border {
     border-color: #c00 !important;
 }
 
-/* Green color */
+/* Green border */
 .openerp .oe_kanban_color_green .oe_kanban_color_border {
     border-color: #0c0 !important;
 }
+
+/* Blue border */
+.openerp .oe_kanban_color_blue .oe_kanban_color_border {
+    border-color: #00c !important;
+}
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index c43ea503841..b2d5dcadc25 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -52,17 +52,8 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         this.has_been_loaded.resolve();
     },
     add_qweb_template: function() {
-        var group_operator = ['avg', 'max', 'min', 'sum', 'count']
         for (var i=0, ii=this.fields_view.arch.children.length; i < ii; i++) {
             var child = this.fields_view.arch.children[i];
-            if (child.tag === "field") {
-                for(j=0, jj=group_operator.length; j < jj;  j++) {
-                    if (child.attrs[group_operator[j]]) {
-                        this.aggregates[child.attrs.name] = child.attrs[group_operator[j]];
-                        break;
-                    }
-                }
-            }
             if (child.tag === "templates") {
                 this.transform_qweb_template(child);
                 this.qweb.add_template(openerp.web.json_node_to_xml(child));
@@ -71,18 +62,25 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         }
     },
     transform_qweb_template: function(node) {
-        var qweb_prefix = QWeb.prefix;
+        var qweb_prefix = QWeb.prefix,
+            group_operator = ['avg', 'max', 'min', 'sum', 'count'];
         switch (node.tag) {
             case 'field':
-                node.tag = 't';
-                node.attrs['t-esc'] = 'record.' + node.attrs['name'] + '.value';
+                node.tag = qweb_prefix;
+                node.attrs[qweb_prefix + '-esc'] = 'record.' + node.attrs['name'] + '.value';
+                for (var j = 0, jj = group_operator.length; j < jj;  j++) {
+                    if (node.attrs[group_operator[j]]) {
+                        this.aggregates[node.attrs.name] = node.attrs[group_operator[j]];
+                        break;
+                    }
+                }
                 break
             case 'button':
             case 'a':
                 var type = node.attrs.type || '';
                 if (_.indexOf('action,object,edit,delete,color'.split(','), type) !== -1) {
                     _.each(node.attrs, function(v, k) {
-                        if (_.indexOf('icon,type,name,string,context,states'.split(','), k) != -1) {
+                        if (_.indexOf('icon,type,name,string,context,states,kanban_states'.split(','), k) != -1) {
                             node.attrs['data-' + k] = v;
                             delete(node.attrs[k]);
                         }
@@ -91,7 +89,13 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
                         var states = _.map(node.attrs['data-states'].split(','), function(state) {
                             return "record.state.raw_value == '" + _.trim(state) + "'";
                         });
-                        node.attrs['t-if'] = states.join(' or ');
+                        node.attrs[qweb_prefix + '-if'] = states.join(' or ');
+                    }
+                    if (node.attrs['data-kanban_states']) {
+                        var states = _.map(node.attrs['data-kanban_states'].split(','), function(state) {
+                            return "record.kanban_state.raw_value == '" + _.trim(state) + "'";
+                        });
+                        node.attrs[qweb_prefix + '-if'] = states.join(' or ');
                     }
                     if (node.attrs['data-string']) {
                         node.attrs.title = node.attrs['data-string'];

From 5c073850ee307fbbaa2645ba974626280ff1a5a6 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 9 Nov 2011 10:24:22 +0530
Subject: [PATCH 53/53] [FIX] vieweditor :- fix problem in boolean widget.

bzr revid: ysa@tinyerp.com-20111109045422-8940v0i4pap8runc
---
 addons/web/static/src/js/view_editor.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 57b0daffec7..d690057db91 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -625,9 +625,8 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value,view_val) {
-        console.log("self.edit_widget.push(type_widget);:::::::",view_val, view);
         if (view_val) {
-            this.$element.find("input[id=" + self.name+ "]").attr('checked', view_val[1]);
+            this.$element.find("input[id=" + this.name+ "]").attr('checked', view_val[1]);
         }
     },
     get_value: function() {