From 45ddb1f0b747dde81553f75000feee75b13f8005 Mon Sep 17 00:00:00 2001
From: "Hardik Ansodariy (OpenERP)" <han@tinyerp.com>
Date: Thu, 18 Aug 2011 17:25:20 +0530
Subject: [PATCH 01/51] [IMP]: improved view and provide access right
 accordingly

bzr revid: han@tinyerp.com-20110818115520-5hp5zoydw467jrwj
---
 addons/delivery/delivery.py       | 2 +-
 addons/delivery/delivery_demo.xml | 1 +
 addons/delivery/delivery_view.xml | 8 +++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index d70af4b4d1e..55199a9aa19 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -71,7 +71,7 @@ class delivery_carrier(osv.osv):
         'free_if_more_than': fields.boolean('Free If More Than'),
         'amount': fields.float('Amount'),
         'use_detailed_pricelist': fields.boolean('Use Detailed Pricelist'),
-        'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Price List'),
+        'pricelist_ids': fields.one2many('delivery.grid', 'carrier_id', 'Advanced Pricing'),
     }
 
     _defaults = {
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 4dfef0c105b..94666efb26c 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -17,6 +17,7 @@
 
         <record id="delivery_product" model="product.product">
             <field name="name">Delivery by Poste</field>
+            <field name="default_code">Delivery</field>
             <field name="type">service</field>
             <field model="product.category" name="categ_id" search="[]"/>
         </record>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 72f811632ce..4ade9b321a7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -9,7 +9,6 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Carrier">
-                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="price" invisible="'order_id' not in context"/>
                 </tree>
@@ -22,10 +21,9 @@
             <field name="arch" type="xml">
                 <form string="Carrier">
                     <group colspan="4" col="4" name="general">
-                        <field name="name" select="1"/>
-                        <field name="active" select="1"/>
                         <field name="partner_id" select="1"/>
                         <field name="product_id" select="1"/>
+                        <field name="active" select="1"/>
                         <separator string="Pricing Information" colspan="6"/>
                         <group colspan="2" col="4">
                             <field name="normal_price" select="1" colspan="4"/>
@@ -82,7 +80,7 @@
             <field name="help">Define the delivery methods you are using and their pricing in order to reinvoice the delivery costs when you are doing invoicing based on delivery orders</field>
         </record>
 
-        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_extended"/>
+        <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery"/>
 
         <!-- Delivery Grids -->
         <record id="view_delivery_grid_tree" model="ir.ui.view">
@@ -132,7 +130,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help">The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range.</field>
         </record>
-        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
+        <menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery" groups="base.group_extended"/>
 
         <record id="view_delivery_grid_line_form" model="ir.ui.view">
             <field name="name">delivery.grid.line.form</field>

From cfffadc509baa237a913f92b35500979026f3391 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Tue, 30 Aug 2011 14:15:10 +0530
Subject: [PATCH 02/51] [Usability project_isses, renamed the field and changed
 the core relavend to it,  assigned_to  to user_id]

bzr revid: tta@openerp.com-20110830084510-0zqh6akkptue5zet
---
 .../board_project_issue_view.xml              |  4 ++--
 addons/project_issue/project_issue.py         | 22 +++++--------------
 addons/project_issue/project_issue_view.xml   | 19 ++++++++--------
 .../report/project_issue_report.py            |  6 ++---
 .../report/project_issue_report_view.xml      | 11 ++++------
 .../project_issue_sheet.py                    |  4 ++--
 .../project_issue_sheet_view.xml              |  2 +-
 7 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b6a6bcd0a3..6563e4a33b9 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -123,7 +123,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','not in',('cancel','done')),'|',('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
          <record id="view_my_open_project_issue_graph" model="ir.ui.view">
@@ -142,7 +142,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','=','open'),'|',('user_id','=',uid)]</field>
            <field name="view_id" ref="view_my_open_project_issue_graph"/>
         </record>
        <record id="board_my_project_issue_form" model="ir.ui.view">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b6032241a8e..733e2035f19 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -56,7 +56,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid})
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : uid})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
@@ -174,8 +174,7 @@ class project_issue(crm.crm_case, osv.osv):
         'date_deadline': fields.date('Deadline'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'),
-        'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'),
+                             Define Responsible user and Email account for mail gateway.'),        
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
@@ -208,7 +207,7 @@ class project_issue(crm.crm_case, osv.osv):
                                 multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='compute_day', type="float", store=True),
-        'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
+        'user_id': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
@@ -230,17 +229,6 @@ class project_issue(crm.crm_case, osv.osv):
             return user.context_project_id.id
         return False
 
-    def on_change_project(self, cr, uid, ids, project_id, context=None):
-        result = {}
-
-        if project_id:
-            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
-            if project.user_id:
-                result['value'] = {'user_id' : project.user_id.id}
-
-        return result
-
-
     _defaults = {
         'active': 1,
         #'user_id': crm.crm_case._get_default_user,
@@ -282,7 +270,7 @@ class project_issue(crm.crm_case, osv.osv):
                 'date': bug.date,
                 'project_id': bug.project_id.id,
                 'priority': bug.priority,
-                'user_id': bug.assigned_to.id,
+                'user_id': bug.user_id.id,
                 'planned_hours': 0.0,
             })
 
@@ -350,7 +338,7 @@ class project_issue(crm.crm_case, osv.osv):
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
-        return {'value':{'assigned_to': task.user_id.id,}}
+        return {'value':{'user_id': task.user_id.id,}}
 
     def case_escalate(self, cr, uid, ids, *args):
         """Escalates case to top level
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fcea96d6770..e486b850c47 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -53,10 +53,9 @@
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
                         <field name="name"/>
-                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
+                        <field name="project_id" required="True" />
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="user_id" invisible="1" />
-                        <field name="assigned_to"/>
+                        <field name="user_id"/>                        
                         <field name="version_id" colspan="2" widget="selection"/>
                         <group colspan="2" col="4">
                             <field name="type_id" string="Resolution" />
@@ -188,7 +187,7 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -217,8 +216,8 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" groups="base.group_extended"/>
-                        <field name="assigned_to">
-                            <filter domain="[('assigned_to','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                        <field name="user_id">
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
                         </field>
                         <field name="project_id"/>
                         <field name="version_id" widget="selection"/>
@@ -227,7 +226,7 @@
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'assigned_to'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -258,7 +257,7 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
                     <field name="name"/>
                     <field name="partner_id"/>
                 </calendar>
@@ -283,7 +282,7 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -306,7 +305,7 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="assigned_to" select="1"/>
+                        <field name="user_id" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 29542f32912..434f7941b03 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -36,8 +36,7 @@ class project_issue_report(osv.osv):
     _auto = False
 
     _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+        'name': fields.char('Year', size=64, required=False, readonly=True),        
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
@@ -64,7 +63,7 @@ class project_issue_report(osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
+        'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
         'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ),
@@ -95,7 +94,6 @@ class project_issue_report(osv.osv):
                     c.project_id as project_id,
                     c.version_id as version_id,
                     1 as nbr,
-                    c.assigned_to,
                     c.partner_id,
                     c.canal_id,
                     c.task_id,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 95c20653769..7cec03e172b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -20,8 +20,7 @@
                     <field name="categ_id" invisible="1"/>
                     <field name="canal_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="task_id" invisible="1"/>
-                    <field name="assigned_to" invisible="1"/>
+                    <field name="task_id" invisible="1"/>                    
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -89,16 +88,14 @@
 
                            </field>
                               <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="['|',('user_id','ilike',self),('assigned_to','ilike',self)]"/>
+                          <field name="user_id"  select="1" widget="selection" filter_domain="['|',('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                           <filter name="User" string="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'user_id'}" />
+                   <group  expand="1" string="Group By..." colspan="4" col="8">                        
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'assigned_to'}" />
+                        domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Sale Team" icon="terp-personal+"
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index e9396f9d030..60d2fd0a734 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -33,8 +33,8 @@ class project_issue(osv.osv):
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         if not project_id:
             return {}
-
-        result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
+        result={}        
+        #result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
         
         project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
         if 'value' not in result:
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 058fd67a946..1e9b139aed1 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -18,7 +18,7 @@
                 </xpath>
                 <notebook colspan="4">
                     <page string="Worklogs">
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : assigned_to, 'default_account_id' : analytic_account_id}">
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>

From 8a584fe84eafdbfa79589e490d3890204b994dbe Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Tue, 30 Aug 2011 14:19:54 +0530
Subject: [PATCH 03/51] [Usability] project_isses, renamed the field and
 changed the core relavend to it,  assigned_to  to user_id

bzr revid: tta@openerp.com-20110830084954-y6huwmelax7xgfxw
---
 .../board_project_issue_view.xml              |  4 ++--
 addons/project_issue/project_issue.py         | 22 +++++--------------
 addons/project_issue/project_issue_view.xml   | 19 ++++++++--------
 .../report/project_issue_report.py            |  6 ++---
 .../report/project_issue_report_view.xml      | 11 ++++------
 .../project_issue_sheet.py                    |  4 ++--
 .../project_issue_sheet_view.xml              |  2 +-
 7 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b6a6bcd0a3..6563e4a33b9 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -123,7 +123,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','not in',('cancel','done')),'|',('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
          <record id="view_my_open_project_issue_graph" model="ir.ui.view">
@@ -142,7 +142,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+            <field name="domain">[('state','=','open'),'|',('user_id','=',uid)]</field>
            <field name="view_id" ref="view_my_open_project_issue_graph"/>
         </record>
        <record id="board_my_project_issue_form" model="ir.ui.view">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b6032241a8e..733e2035f19 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -56,7 +56,7 @@ class project_issue(crm.crm_case, osv.osv):
         """
 
         res = super(project_issue, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'assigned_to' : uid})
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'user_id' : uid})
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("Issue '%s' has been opened.") % name
             self.log(cr, uid, id, message)
@@ -174,8 +174,7 @@ class project_issue(crm.crm_case, osv.osv):
         'date_deadline': fields.date('Deadline'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'),
-        'user_id': fields.related('project_id', 'user_id', type='many2one', relation='res.users', store=True, select=1, string='Responsible'),
+                             Define Responsible user and Email account for mail gateway.'),        
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
@@ -208,7 +207,7 @@ class project_issue(crm.crm_case, osv.osv):
                                 multi='compute_day', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='compute_day', type="float", store=True),
-        'assigned_to': fields.many2one('res.users', 'Assigned to', required=False, select=1),
+        'user_id': fields.many2one('res.users', 'Assigned to', required=False, select=1),
         'working_hours_open': fields.function(_compute_day, string='Working Hours to Open the Issue', \
                                 multi='compute_day', type="float", store=True),
         'working_hours_close': fields.function(_compute_day, string='Working Hours to Close the Issue', \
@@ -230,17 +229,6 @@ class project_issue(crm.crm_case, osv.osv):
             return user.context_project_id.id
         return False
 
-    def on_change_project(self, cr, uid, ids, project_id, context=None):
-        result = {}
-
-        if project_id:
-            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
-            if project.user_id:
-                result['value'] = {'user_id' : project.user_id.id}
-
-        return result
-
-
     _defaults = {
         'active': 1,
         #'user_id': crm.crm_case._get_default_user,
@@ -282,7 +270,7 @@ class project_issue(crm.crm_case, osv.osv):
                 'date': bug.date,
                 'project_id': bug.project_id.id,
                 'priority': bug.priority,
-                'user_id': bug.assigned_to.id,
+                'user_id': bug.user_id.id,
                 'planned_hours': 0.0,
             })
 
@@ -350,7 +338,7 @@ class project_issue(crm.crm_case, osv.osv):
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
-        return {'value':{'assigned_to': task.user_id.id,}}
+        return {'value':{'user_id': task.user_id.id,}}
 
     def case_escalate(self, cr, uid, ids, *args):
         """Escalates case to top level
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index fcea96d6770..e486b850c47 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -53,10 +53,9 @@
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
                         <field name="name"/>
-                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
+                        <field name="project_id" required="True" />
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="user_id" invisible="1" />
-                        <field name="assigned_to"/>
+                        <field name="user_id"/>                        
                         <field name="version_id" colspan="2" widget="selection"/>
                         <group colspan="2" col="4">
                             <field name="type_id" string="Resolution" />
@@ -188,7 +187,7 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id" widget="selection"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
@@ -217,8 +216,8 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" groups="base.group_extended"/>
-                        <field name="assigned_to">
-                            <filter domain="[('assigned_to','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
+                        <field name="user_id">
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" separator="1"/>
                         </field>
                         <field name="project_id"/>
                         <field name="version_id" widget="selection"/>
@@ -227,7 +226,7 @@
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
                         <filter string="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'assigned_to'}" />
+                            domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" domain="[]"
                             context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical"/>
@@ -258,7 +257,7 @@
             <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
-                <calendar string="Issues" date_start="date" color="assigned_to" date_delay="duration">
+                <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
                     <field name="name"/>
                     <field name="partner_id"/>
                 </calendar>
@@ -283,7 +282,7 @@
                     <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                     <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                     <field name="version_id"/>
-                    <field name="assigned_to"/>
+                    <field name="user_id"/>
                     <field name="state"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -306,7 +305,7 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="assigned_to" select="1"/>
+                        <field name="user_id" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 29542f32912..434f7941b03 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -36,8 +36,7 @@ class project_issue_report(osv.osv):
     _auto = False
 
     _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
+        'name': fields.char('Year', size=64, required=False, readonly=True),        
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
@@ -64,7 +63,7 @@ class project_issue_report(osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
-        'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
+        'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
         'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ),
@@ -95,7 +94,6 @@ class project_issue_report(osv.osv):
                     c.project_id as project_id,
                     c.version_id as version_id,
                     1 as nbr,
-                    c.assigned_to,
                     c.partner_id,
                     c.canal_id,
                     c.task_id,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 95c20653769..7cec03e172b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -20,8 +20,7 @@
                     <field name="categ_id" invisible="1"/>
                     <field name="canal_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="task_id" invisible="1"/>
-                    <field name="assigned_to" invisible="1"/>
+                    <field name="task_id" invisible="1"/>                    
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -89,16 +88,14 @@
 
                            </field>
                               <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="['|',('user_id','ilike',self),('assigned_to','ilike',self)]"/>
+                          <field name="user_id"  select="1" widget="selection" filter_domain="['|',('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>
                    <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                           <filter name="User" string="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'user_id'}" />
+                   <group  expand="1" string="Group By..." colspan="4" col="8">                        
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                        domain="[]" context="{'group_by':'assigned_to'}" />
+                        domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Sale Team" icon="terp-personal+"
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index e9396f9d030..60d2fd0a734 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -33,8 +33,8 @@ class project_issue(osv.osv):
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         if not project_id:
             return {}
-
-        result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
+        result={}        
+        #result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
         
         project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
         if 'value' not in result:
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 058fd67a946..1e9b139aed1 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -18,7 +18,7 @@
                 </xpath>
                 <notebook colspan="4">
                     <page string="Worklogs">
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : assigned_to, 'default_account_id' : analytic_account_id}">
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
                             <tree editable="top" string="Timesheet">
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>

From 1d031884f57156d10b42fc472ef378042f8858f3 Mon Sep 17 00:00:00 2001
From: "Tejas (OpenERP)" <tta@openerp.com>
Date: Tue, 30 Aug 2011 14:38:50 +0530
Subject: [PATCH 04/51] [Usability] remove the comment line

bzr revid: tta@openerp.com-20110830090850-ez3anuh4z7or001l
---
 addons/project_issue_sheet/project_issue_sheet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 60d2fd0a734..fa5b843d7f1 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -34,7 +34,6 @@ class project_issue(osv.osv):
         if not project_id:
             return {}
         result={}        
-        #result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
         
         project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
         if 'value' not in result:

From ee7e30dc19c2f53effb7a7eef07f35073eed9d24 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Sep 2011 14:20:31 +0200
Subject: [PATCH 05/51] [FIX] incorrect domain syntax

bzr revid: rco@openerp.com-20110902122031-1ca4qzsimhgl0mzm
---
 addons/project_issue/board_project_issue_view.xml         | 4 ++--
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 6563e4a33b9..cfe285134a7 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -123,7 +123,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),'|',('user_id','=',uid)]</field>
+            <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
          <record id="view_my_open_project_issue_graph" model="ir.ui.view">
@@ -142,7 +142,7 @@
             <field name="res_model">project.issue.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form,</field>
-            <field name="domain">[('state','=','open'),'|',('user_id','=',uid)]</field>
+            <field name="domain">[('state','=','open'),('user_id','=',uid)]</field>
            <field name="view_id" ref="view_my_open_project_issue_graph"/>
         </record>
        <record id="board_my_project_issue_form" model="ir.ui.view">
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 7cec03e172b..c92e8e8d503 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -88,7 +88,7 @@
 
                            </field>
                               <field name="project_id"/>
-                          <field name="user_id"  select="1" widget="selection" filter_domain="['|',('user_id','ilike',self)]"/>
+                          <field name="user_id"  select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/>
                           <field name="partner_id"/>
                           <field name="version_id" widget="selection" />
                    </group>

From b12caae3a086bed30ad2691a1a6b38d7f6685d4a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Sep 2011 14:29:24 +0200
Subject: [PATCH 06/51] [FIX] restore on_change_project on project_issue, to
 make it work in project_issue_sheet

bzr revid: rco@openerp.com-20110902122924-nm75xvs60o1m3i4k
---
 addons/project_issue/project_issue.py             | 6 +++++-
 addons/project_issue/project_issue_view.xml       | 2 +-
 addons/project_issue_sheet/project_issue_sheet.py | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 733e2035f19..f008e383462 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -174,7 +174,7 @@ class project_issue(crm.crm_case, osv.osv):
         'date_deadline': fields.date('Deadline'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'),        
+                             Define Responsible user and Email account for mail gateway.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"),
@@ -229,6 +229,10 @@ class project_issue(crm.crm_case, osv.osv):
             return user.context_project_id.id
         return False
 
+    def on_change_project(self, cr, uid, ids, project_id, context=None):
+        return {}
+
+
     _defaults = {
         'active': 1,
         #'user_id': crm.crm_case._get_default_user,
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e486b850c47..87046087ca6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -53,7 +53,7 @@
                 <form string="Issue Tracker Form">
                     <group colspan="4" col="6">
                         <field name="name"/>
-                        <field name="project_id" required="True" />
+                        <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                         <field name="user_id"/>                        
                         <field name="version_id" colspan="2" widget="selection"/>
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index fa5b843d7f1..e9396f9d030 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -33,7 +33,8 @@ class project_issue(osv.osv):
     def on_change_project(self, cr, uid, ids, project_id, context=None):
         if not project_id:
             return {}
-        result={}        
+
+        result = super(project_issue, self).on_change_project(cr, uid, ids, project_id, context=context)
         
         project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
         if 'value' not in result:

From 78725f65fe317533c26c74848004964fe43e77f7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Sep 2011 14:43:32 +0200
Subject: [PATCH 07/51] [IMP] spacing

bzr revid: rco@openerp.com-20110902124332-ogl8zq9372840v3g
---
 addons/project_issue/report/project_issue_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 434f7941b03..129745ee450 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -36,7 +36,7 @@ class project_issue_report(osv.osv):
     _auto = False
 
     _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),        
+        'name': fields.char('Year', size=64, required=False, readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \

From 958002eadb22f385762a6a67337e349bb9849b14 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 2 Sep 2011 15:09:08 +0200
Subject: [PATCH 08/51] [IMP] remove obsolete commented code

bzr revid: rco@openerp.com-20110902130908-ep9chm1uvaeg7itc
---
 addons/project_issue/project_issue.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f008e383462..edef832a0c3 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -235,7 +235,6 @@ class project_issue(crm.crm_case, osv.osv):
 
     _defaults = {
         'active': 1,
-        #'user_id': crm.crm_case._get_default_user,
         'partner_id': crm.crm_case._get_default_partner,
         'partner_address_id': crm.crm_case._get_default_partner_address,
         'email_from': crm.crm_case._get_default_email,
@@ -245,7 +244,6 @@ class project_issue(crm.crm_case, osv.osv):
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'project_id':_get_project,
         'categ_id' : lambda *a: False,
-        #'assigned_to' : lambda obj, cr, uid, context: uid,
     }
 
     def convert_issue_task(self, cr, uid, ids, context=None):

From ee8fb1c6f7949716b4e50084f5f9ec63ddf99425 Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Tue, 6 Sep 2011 12:32:58 +0530
Subject: [PATCH 09/51] [IMP] solve bug when merge opportunities

bzr revid: aar@tinyerp.com-20110906070258-hcyvgcmvy9bkiuaz
---
 addons/crm/wizard/crm_merge_opportunities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 57620f8c016..6d2c5a2abe1 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -136,7 +136,7 @@ class crm_merge_opportunity(osv.osv_memory):
         data = self._update_data(op_ids, oldest_opp)
         #copy message into the first opportunity + merge attachement
         
-        for opp in tail_opportunities + [first_opportunity]:
+        for opp in tail_opportunities:
             attach_ids = self.get_attachments(cr, uid, opp, context=context)
             self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
             for history in opp.message_ids:

From 28986d87fbd14f2b7eb5f560a668f738322cf74d Mon Sep 17 00:00:00 2001
From: "Amit Parmar (OpenERP)" <aar@tinyerp.com>
Date: Mon, 12 Sep 2011 18:21:06 +0530
Subject: [PATCH 10/51] [IMP] improve the opportunity merging and its
 attachments

bzr revid: aar@tinyerp.com-20110912125106-xmh53poxaytd4frt
---
 addons/crm/wizard/crm_merge_opportunities.py | 34 ++++++++++++++------
 addons/document/document.py                  |  2 +-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 6d2c5a2abe1..b6aeacf9810 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -51,12 +51,18 @@ class crm_merge_opportunity(osv.osv_memory):
     def get_attachments(self, cr, uid, id, context=None):
         attach_obj = self.pool.get('ir.attachment')
         attach_ids = attach_obj.search(cr, uid, [('res_model' , '=', 'crm.lead'), ('res_id', '=', id)])
-        return attach_ids
+        if attach_ids:
+            return attach_obj.browse(cr, uid, attach_ids)
+        else:
+            return False
 
-    def set_attachements_res_id(self, cr, uid, op_id, attach_ids, context=None):
+    def set_attachements_res_id(self, cr, uid, op_id, attachments, context=None):
         attach_obj = self.pool.get('ir.attachment')
-        attach_obj.write(cr, uid, attach_ids, {'res_id' : op_id})
-
+        for attachment in attachments:
+            attachment.update({'res_id' : op_id})
+            id = attachment['id']
+            del attachment['id']
+            attach_obj.write(cr, uid, id, attachment)
 
     def find_oldest(self, cr, uid, op_ids, context=None):
         if not context:
@@ -131,14 +137,24 @@ class crm_merge_opportunity(osv.osv_memory):
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
             
-
-        
         data = self._update_data(op_ids, oldest_opp)
         #copy message into the first opportunity + merge attachement
-        
+        attach = []
+        count = 1
+        first_attachments = self.get_attachments(cr, uid, first_opportunity, context=context)
         for opp in tail_opportunities:
-            attach_ids = self.get_attachments(cr, uid, opp, context=context)
-            self.set_attachements_res_id(cr, uid, first_opportunity.id, attach_ids)
+            attachments = self.get_attachments(cr, uid, opp, context=context)
+            if attachments:
+                for first in first_attachments:
+                    res = {}
+                    for attachment in attachments:
+                        if attachment.name == first.name:
+                            res.update({'name':attachment.name+'('+`count`+')'})
+                            res.update({'id':[attachment.id]})
+                            attach.append(res)
+                            count+=1
+                    
+            self.set_attachements_res_id(cr, uid, first_opportunity.id, attach)
             for history in opp.message_ids:
                 message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
 
diff --git a/addons/document/document.py b/addons/document/document.py
index 69e123b87eb..ef9ca01bd1e 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -252,7 +252,7 @@ class document_file(osv.osv):
             ids = ids2
         if 'file_size' in vals: # only write that field using direct SQL calls
             del vals['file_size']
-        if len(ids) and len(vals):
+        if ids and vals:
             result = super(document_file,self).write(cr, uid, ids, vals, context=context)
         cr.commit() # ?
         return result

From 834e14255959138f1e93f89fe6d8f2add00866fa Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 13 Sep 2011 18:09:47 +0200
Subject: [PATCH 11/51] [imp] switched client library to openerp-client-lib

bzr revid: nicolas.vanhoren@openerp.com-20110913160947-wtg3beczdtf3gr1t
---
 addons/web/common/backendlocal.py | 10 +---------
 addons/web/common/backendrpc.py   | 27 ++++++++++++---------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/addons/web/common/backendlocal.py b/addons/web/common/backendlocal.py
index dac33991c4d..a477be25575 100644
--- a/addons/web/common/backendlocal.py
+++ b/addons/web/common/backendlocal.py
@@ -10,14 +10,6 @@ class OpenERPConnector(object):
 class OpenERPAuth(object):
     pass
 
-class OpenERPModel(object):
-    def __init__(self, session, model):
-        self._session = session
-        self._model = model
-
-    def __getattr__(self, name):
-        return lambda *l:self._session.execute(self._model, name, *l)
-
 class OpenERPSession(object):
-        def __init__(self, model_factory=OpenERPModel):
+        def __init__(self):
             pass
diff --git a/addons/web/common/backendrpc.py b/addons/web/common/backendrpc.py
index e6c59000caf..e2fafb4ca0a 100644
--- a/addons/web/common/backendrpc.py
+++ b/addons/web/common/backendrpc.py
@@ -2,7 +2,7 @@
 import datetime
 import dateutil.relativedelta
 import time
-import xmlrpclib
+import openerplib
 
 import nonliterals
 #----------------------------------------------------------
@@ -17,14 +17,6 @@ class OpenERPConnector(object):
 class OpenERPAuth(object):
     pass
 
-class OpenERPModel(object):
-    def __init__(self, session, model):
-        self._session = session
-        self._model = model
-
-    def __getattr__(self, name):
-        return lambda *l:self._session.execute(self._model, name, *l)
-
 class OpenERPSession(object):
     """
     An OpenERP RPC session, a given user can own multiple such sessions
@@ -42,7 +34,7 @@ class OpenERPSession(object):
         Used to store references to non-literal domains which need to be
         round-tripped to the client browser.
     """
-    def __init__(self, server='127.0.0.1', port=8069, model_factory=OpenERPModel):
+    def __init__(self, server='127.0.0.1', port=8069):
         self._server = server
         self._port = port
         self._db = False
@@ -57,10 +49,14 @@ class OpenERPSession(object):
         self._lang = {}
         self.remote_timezone = 'utc'
         self.client_timezone = False
+        
+    def build_connection(self):
+        return openerplib.get_connection(hostname=self._server, port=self._port,
+                                         database=self._db,
+                                         user_id=self._uid, password=self._password)
 
     def proxy(self, service):
-        s = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/%s' % (self._server, self._port, service))
-        return s
+        return self.build_connection().get_service(service)
 
     def bind(self, db, uid, password):
         self._db = db
@@ -84,7 +80,8 @@ class OpenERPSession(object):
 
     def execute(self, model, func, *l, **d):
         self.assert_valid()
-        r = self.proxy('object').execute(self._db, self._uid, self._password, model, func, *l, **d)
+        model = self.build_connection().get_model(model)
+        r = getattr(model, func)(*l, **d)
         return r
 
     def exec_workflow(self, model, id, signal):
@@ -97,9 +94,9 @@ class OpenERPSession(object):
 
         :param model: an OpenERP model name
         :type model: str
-        :rtype: :class:`openerpweb.openerpweb.OpenERPModel`
+        :rtype: a model object
         """
-        return self.model_factory(self, model)
+        return self.build_connection().get_model(model)
 
     def get_context(self):
         """ Re-initializes the current user's session context (based on

From e242cb4ab6d15113de0ec6fff545d6d4d5674080 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 10:51:27 +0200
Subject: [PATCH 12/51] [IMP] options backend local or rpc

bzr revid: al@openerp.com-20110914085127-16ovkmi77fimsmoh
---
 addons/web/__init__.py        | 4 ++--
 addons/web/common/__init__.py | 1 +
 openerp-web.py                | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index ec702292ce8..bcb8f6db28c 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -5,6 +5,7 @@ import logging
 
 _logger = logging.getLogger(__name__)
 
+
 try:
     import openerp.wsgi
     import os
@@ -17,8 +18,7 @@ try:
     o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions")
     o.addons_path = os.path.dirname(os.path.dirname(__file__))
     o.serve_static = True
-    o.server_host = '127.0.0.1'
-    o.server_port = 8069
+    o.backend = 'local'
 
     app = common.dispatch.Root(o)
     #import openerp.wsgi
diff --git a/addons/web/common/__init__.py b/addons/web/common/__init__.py
index 0628a7fa609..7bbbe609d32 100644
--- a/addons/web/common/__init__.py
+++ b/addons/web/common/__init__.py
@@ -2,3 +2,4 @@
 # TODO if from openerpserver use backendlocal
 # from backendlocal import *
 from dispatch import *
+mode_remote = 1
diff --git a/openerp-web.py b/openerp-web.py
index 5617a0b8bdd..f822a389642 100755
--- a/openerp-web.py
+++ b/openerp-web.py
@@ -42,6 +42,7 @@ import web.common.dispatch
 
 if __name__ == "__main__":
     (options, args) = optparser.parse_args(sys.argv[1:])
+    options.backend =  'rpc'
 
     os.environ["TZ"] = "UTC"
 

From 514dfa074820b78cdb76fb6f57159de21719cff1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 10:53:11 +0200
Subject: [PATCH 13/51] [IMP] hr_payroll: added tree view on payroll structures
 and rule categories. + few renaming of stupid copied/pasted xml_id
 meaningless

bzr revid: qdp-launchpad@openerp.com-20110914085311-nfg3sg0cdi5jv9y6
---
 addons/hr_payroll/hr_payroll.py       |  2 +
 addons/hr_payroll/hr_payroll_view.xml | 63 ++++++++++++++++++++++++---
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index cdf6549fedd..9578f322217 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -50,6 +50,7 @@ class hr_payroll_structure(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=True),
         'note': fields.text('Description'),
         'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
+        'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
     }
 
     def _get_parent(self, cr, uid, context=None):
@@ -175,6 +176,7 @@ class hr_salary_rule_category(osv.osv):
         'name':fields.char('Name', size=64, required=True, readonly=False),
         'code':fields.char('Code', size=64, required=True, readonly=False),
         'parent_id':fields.many2one('hr.salary.rule.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."),
+        'children_ids': fields.one2many('hr.salary.rule.category', 'parent_id', 'Children'),
         'note': fields.text('Description'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
     }
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8bb56bb1200..dd750e57282 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -58,7 +58,7 @@
         <!-- End Contract View-->
 
         <!-- Salary structure -->
-        <record id="view_hr_employee_grade_tree" model="ir.ui.view">
+        <record id="view_hr_payroll_structure_list_view" model="ir.ui.view">
             <field name="name">hr.payroll.structure.tree</field>
             <field name="model">hr.payroll.structure</field>
             <field name="type">tree</field>
@@ -71,6 +71,19 @@
                 </tree>
             </field>
         </record>
+        <record id="view_hr_payroll_structure_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.structure.tree</field>
+            <field name="model">hr.payroll.structure</field>
+            <field name="type">tree</field>
+            <field name="field_parent">children_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Employee Function">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_hr_payroll_structure_filter" model="ir.ui.view">
             <field name="name">hr.payroll.structure.select</field>
@@ -116,18 +129,32 @@
             </field>
         </record>
 
-        <record id="action_view_hr_employee_grade_form" model="ir.actions.act_window">
+        <record id="action_view_hr_payroll_structure_list_form" model="ir.actions.act_window">
             <field name="name">Salary Structures</field>
             <field name="res_model">hr.payroll.structure</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_hr_employee_grade_tree"/>
+            <field name="view_id" ref="view_hr_payroll_structure_list_view"/>
         </record>
         <menuitem
-            id="menu_hr_employee_function"
-            action="action_view_hr_employee_grade_form"
+            id="menu_hr_payroll_structure_view"
+            action="action_view_hr_payroll_structure_list_form"
             parent="payroll_configure"
             sequence="1"
         />
+        <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
+            <field name="name">Salary Structures</field>
+            <field name="res_model">hr.payroll.structure</field>
+            <field name="view_type">tree</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_id" ref="view_hr_payroll_structure_tree"/>
+        </record>
+        <menuitem
+            id="menu_hr_payroll_structure_tree"
+            action="action_view_hr_payroll_structure_tree"
+            parent="payroll_configure"
+            sequence="2"
+            icon="STOCK_INDENT"
+        />
         <!-- End Salary structure -->
 
         <!-- Payslip Line -->
@@ -415,6 +442,19 @@
                 </tree>
             </field>
         </record>
+        <record id="hr_salary_rule_category_tree_view" model="ir.ui.view">
+            <field name="name">hr.salary.rule.category.tree.view</field>
+            <field name="model">hr.salary.rule.category</field>
+            <field name="type">tree</field>
+            <field name="field_parent">children_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Salary Rule Categories">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="parent_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
 
         <record id="view_hr_salary_rule_category_filter" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.select</field>
@@ -441,6 +481,19 @@
             parent="payroll_configure"
             sequence="11"
         />
+        <record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
+            <field name="name">Salary Rule Categories</field>
+            <field name="res_model">hr.salary.rule.category</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="hr_salary_rule_category_tree_view"/>
+        </record>
+        <menuitem
+            id="menu_hr_salary_rule_category_tree_view"
+            action="action_hr_salary_rule_category_tree_view"
+            parent="payroll_configure"
+            sequence="12"
+            icon="STOCK_INDENT"
+        />
 
         <!--
         Contribution Register

From e40057cc89e16653573a56582d73ef0432bb204e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 10:55:45 +0200
Subject: [PATCH 14/51] [IMP] remove backendrpc and backendlocal for session

bzr revid: al@openerp.com-20110914085545-n9dxxlfysxa66sen
---
 addons/web/common/__init__.py                   |  3 ---
 addons/web/common/backendlocal.py               | 15 ---------------
 addons/web/common/dispatch.py                   |  2 +-
 addons/web/common/{backendrpc.py => session.py} |  6 ------
 4 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 addons/web/common/backendlocal.py
 rename addons/web/common/{backendrpc.py => session.py} (98%)

diff --git a/addons/web/common/__init__.py b/addons/web/common/__init__.py
index 7bbbe609d32..9257f51d037 100644
--- a/addons/web/common/__init__.py
+++ b/addons/web/common/__init__.py
@@ -1,5 +1,2 @@
 #!/usr/bin/python
-# TODO if from openerpserver use backendlocal
-# from backendlocal import *
 from dispatch import *
-mode_remote = 1
diff --git a/addons/web/common/backendlocal.py b/addons/web/common/backendlocal.py
deleted file mode 100644
index a477be25575..00000000000
--- a/addons/web/common/backendlocal.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#----------------------------------------------------------
-# OpenERPSession local openerp backend access
-#----------------------------------------------------------
-class OpenERPUnboundException(Exception):
-    pass
-
-class OpenERPConnector(object):
-    pass
-
-class OpenERPAuth(object):
-    pass
-
-class OpenERPSession(object):
-        def __init__(self):
-            pass
diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
index 2336ca2d426..dbd9e3ac71f 100644
--- a/addons/web/common/dispatch.py
+++ b/addons/web/common/dispatch.py
@@ -22,7 +22,7 @@ import ast
 import nonliterals
 import http
 # import backendlocal as backend
-import backendrpc as backend
+import session as backend
 
 __all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
            'WebRequest', 'JsonRequest', 'HttpRequest']
diff --git a/addons/web/common/backendrpc.py b/addons/web/common/session.py
similarity index 98%
rename from addons/web/common/backendrpc.py
rename to addons/web/common/session.py
index e2fafb4ca0a..091f20aaf6a 100644
--- a/addons/web/common/backendrpc.py
+++ b/addons/web/common/session.py
@@ -11,12 +11,6 @@ import nonliterals
 class OpenERPUnboundException(Exception):
     pass
 
-class OpenERPConnector(object):
-    pass
-
-class OpenERPAuth(object):
-    pass
-
 class OpenERPSession(object):
     """
     An OpenERP RPC session, a given user can own multiple such sessions

From 21d093528a272ce82b9c4c9149fa45cd4821069e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Sep 2011 10:57:57 +0200
Subject: [PATCH 15/51] [fix] typo

bzr revid: nicolas.vanhoren@openerp.com-20110914085757-6t9b0ytyql4fzziz
---
 addons/web/common/session.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index 091f20aaf6a..cdedf7962da 100644
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -35,7 +35,6 @@ class OpenERPSession(object):
         self._uid = False
         self._login = False
         self._password = False
-        self.model_factory = model_factory
         self._locale = 'en_US'
         self.context = {}
         self.contexts_store = {}

From 8160a833dab8e0808a4b2ea673e31925529f0133 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Sep 2011 10:59:05 +0200
Subject: [PATCH 16/51] [imp] directly included openerplib

bzr revid: nicolas.vanhoren@openerp.com-20110914085905-39jfpckr8m0l2ub1
---
 addons/web/common/openerplib/__init__.py | 397 +++++++++++++++++++++++
 1 file changed, 397 insertions(+)
 create mode 100644 addons/web/common/openerplib/__init__.py

diff --git a/addons/web/common/openerplib/__init__.py b/addons/web/common/openerplib/__init__.py
new file mode 100644
index 00000000000..2fee67b7daa
--- /dev/null
+++ b/addons/web/common/openerplib/__init__.py
@@ -0,0 +1,397 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) Stephane Wirtel
+# Copyright (C) 2011 Nicolas Vanhoren
+# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+"""
+OpenERP Client Library
+"""
+
+import xmlrpclib
+import logging 
+import socket
+
+try:
+    import cPickle as pickle
+    pickle.__name__
+except:
+    import pickle
+
+try:
+    import cStringIO as StringIO
+    StringIO.__name__
+except:
+    import StringIO
+
+_logger = logging.getLogger(__name__)
+
+def _getChildLogger(logger, subname):
+    return logging.getLogger(logger.name + "." + subname)
+
+class Connector(object):
+    """
+    The base abstract class representing a connection to an OpenERP Server.
+    """
+
+    __logger = _getChildLogger(_logger, 'connector')
+
+    def __init__(self, hostname, port):
+        """
+        Initilize by specifying an hostname and a port.
+        :param hostname: Host name of the server.
+        :param port: Port for the connection to the server.
+        """
+        self.hostname = hostname
+        self.port = port
+
+class XmlRPCConnector(Connector):
+    """
+    A type of connector that uses the XMLRPC protocol.
+    """
+    PROTOCOL = 'xmlrpc'
+    
+    __logger = _getChildLogger(_logger, 'connector.xmlrpc')
+
+    def __init__(self, hostname, port=8069):
+        """
+        Initialize by specifying the hostname and the port.
+        :param hostname: The hostname of the computer holding the instance of OpenERP.
+        :param port: The port used by the OpenERP instance for XMLRPC (default to 8069).
+        """
+        Connector.__init__(self, hostname, port)
+        self.url = 'http://%s:%d/xmlrpc' % (self.hostname, self.port)
+
+    def send(self, service_name, method, *args):
+        url = '%s/%s' % (self.url, service_name)
+        service = xmlrpclib.ServerProxy(url)
+        return getattr(service, method)(*args)
+
+class NetRPC_Exception(Exception):
+    """
+    Exception for NetRPC errors.
+    """
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class NetRPC:
+    """
+    Low level class for NetRPC protocol.
+    """
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            buf = host.split('//')[1]
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+
+    def mysend(self, msg, exception=False, traceback=None):
+        msg = pickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = StringIO.StringIO(msg)
+        unpickler = pickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise NetRPC_Exception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+class NetRPCConnector(Connector):
+    """
+    A type of connector that uses the NetRPC protocol.
+    """
+
+    PROTOCOL = 'netrpc'
+    
+    __logger = _getChildLogger(_logger, 'connector.netrpc')
+
+    def __init__(self, hostname, port=8070):
+        """
+        Initialize by specifying the hostname and the port.
+        :param hostname: The hostname of the computer holding the instance of OpenERP.
+        :param port: The port used by the OpenERP instance for NetRPC (default to 8070).
+        """
+        Connector.__init__(self, hostname, port)
+
+    def send(self, service_name, method, *args):
+        socket = NetRPC()
+        socket.connect(self.hostname, self.port)
+        socket.mysend((service_name, method, )+args)
+        result = socket.myreceive()
+        socket.disconnect()
+        return result
+
+class Service:
+    """
+    A class to execute RPC calls on a specific service of the remote server.
+    """
+    def __init__(self, connector, service_name):
+        """
+        :param connector: A valid Connector instance.
+        :param service_name: The name of the service on the remote server.
+        """
+        self.connector = connector
+        self.service_name = service_name
+        self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name)
+        
+    def __getattr__(self, method):
+        """
+        :param method: The name of the method to execute on the service.
+        """
+        self.__logger.debug('method: %r', method)
+        def proxy(*args):
+            """
+            :param args: A list of values for the method
+            """
+            self.__logger.debug('args: %r', args)
+            result = self.connector.send(self.service_name, method, *args)
+            self.__logger.debug('result: %r' % result)
+            return result
+        return proxy
+
+class Connection(object):
+    """
+    A class to represent a connection with authentification to an OpenERP Server.
+    It also provides utility methods to interact with the server more easily.
+    """
+    __logger = _getChildLogger(_logger, 'connection')
+
+    def __init__(self, connector,
+                 database=None,
+                 login=None,
+                 password=None,
+                 user_id=None):
+        """
+        Initialize with login information. The login information is facultative to allow specifying
+        it after the initialization of this object.
+
+        :param connector: A valid Connector instance to send messages to the remote server.
+        :param database: The name of the database to work on.
+        :param login: The login of the user.
+        :param password: The password of the user.
+        :param user_id: The user id is a number identifying the user. This is only useful if you
+        already know it, in most cases you don't need to specify it.
+        """
+        self.connector = connector
+
+        self.set_login_info(database, login, password, user_id)
+
+    def set_login_info(self, database, login, password, user_id=None):
+        """
+        Set login information after the initialisation of this object.
+
+        :param connector: A valid Connector instance to send messages to the remote server.
+        :param database: The name of the database to work on.
+        :param login: The login of the user.
+        :param password: The password of the user.
+        :param user_id: The user id is a number identifying the user. This is only useful if you
+        already know it, in most cases you don't need to specify it.
+        """
+        self.database, self.login, self.password = database, login, password
+
+        self.user_id = user_id
+        
+    def check_login(self, force=True):
+        """
+        Checks that the login information is valid. Throws an AuthentificationError if the
+        authentification fails.
+
+        :param force: Force to re-check even if this Connection was already validated previously.
+        Default to True.
+        """
+        if self.user_id and not force:
+            return
+        
+        self.user_id = self.get_service("common").login(self.database, self.login, self.password)
+        if not self.user_id:
+            raise AuthentificationError("Authentification failure")
+        self.__logger.debug("Authentified with user id %s" % self.user_id)
+    
+    """
+    Returns a Model instance to allow easy remote manipulation of an OpenERP model.
+    
+    :param model_name: The name of the model.
+    """
+    def get_model(self, model_name):
+        return Model(self, model_name)
+
+    """
+    Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
+    Please note this Connection instance does not need to have valid authenfication information since authentification
+    is only necessary for the "object" service that handles models.
+
+    :param service_name: The name of the service.
+    """
+    def get_service(self, service_name):
+        return Service(self.connector, service_name)
+
+class AuthentificationError(Exception):
+    """
+    An error thrown when an authentification to an OpenERP server failed.
+    """
+    pass
+
+class Model(object):
+    """
+    Useful class to dialog with one of the models provided by an OpenERP server.
+    An instance of this class depends on a Connection instance with valid authenfication information.
+    """
+
+    def __init__(self, connection, model_name):
+        """
+        :param connection: A valid Connection instance with correct authentification information.
+        :param model_name: The name of the model.
+        """
+        self.connection = connection
+        self.model_name = model_name
+        self.__logger = _getChildLogger(_getChildLogger(_logger, 'object'), model_name)
+
+    def __getattr__(self, method):
+        """
+        Provides proxy methods that will forward calls to the model on the remote OpenERP server.
+
+        :param method: The method for the linked model (search, read, write, unlink, create, ...)
+        """
+        def proxy(*args):
+            """
+            :param args: A list of values for the method
+            """
+            self.connection.check_login(False)
+            self.__logger.debug(args)
+            result = self.connection.get_service('object').execute(
+                                                    self.connection.database,
+                                                    self.connection.user_id,
+                                                    self.connection.password,
+                                                    self.model_name,
+                                                    method,
+                                                    *args)
+            if method == "read":
+                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
+                    index = {}
+                    for i in xrange(len(result)):
+                        index[result[i]["id"]] = result[i]
+                    result = [index[x] for x in args[0]]
+            self.__logger.debug('result: %r' % result)
+            return result
+        return proxy
+
+    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
+        """
+        A shortcut method to combine a search() and a read().
+
+        :param domain: The domain for the search.
+        :param fields: The fields to extract (can be None or [] to extract all fields).
+        :param offset: The offset for the rows to read.
+        :param limit: The maximum number of rows to read.
+        :param order: The order to class the rows.
+        :param context: The context.
+        :return: A list of dictionaries containing all the specified fields.
+        """
+        record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
+        records = self.read(record_ids, fields or [], context or {})
+        return records
+
+def get_connector(hostname, protocol="xmlrpc", port="auto"):
+    """
+    A shortcut method to easily create a connector to a remote server using XMLRPC or NetRPC.
+
+    :param hostname: The hostname to the remote server.
+    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
+    :param port: The number of the port. Defaults to auto.
+    """
+    if port == 'auto':
+        port = 8069 if protocol=="xmlrpc" else 8070
+    if protocol == "xmlrpc":
+        return XmlRPCConnector(hostname, port)
+    elif protocol == "netrpc":
+        return NetRPCConnector(hostname, port)
+    else:
+        raise ValueError("You must choose xmlrpc or netrpc")
+
+def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
+                 login=None, password=None, user_id=None):
+    """
+    A shortcut method to easily create a connection to a remote OpenERP server.
+
+    :param hostname: The hostname to the remote server.
+    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
+    :param port: The number of the port. Defaults to auto.
+    :param connector: A valid Connector instance to send messages to the remote server.
+    :param database: The name of the database to work on.
+    :param login: The login of the user.
+    :param password: The password of the user.
+    :param user_id: The user id is a number identifying the user. This is only useful if you
+    already know it, in most cases you don't need to specify it.
+    """
+    return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
+        

From a84f8fac3e42794ab62088eaa07b4d4af388fb43 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 11:13:19 +0200
Subject: [PATCH 17/51] [IMP] move action name display to ViewManagerAction,
 move form's debug (display view code button) to viewmanageraction as well

bzr revid: xmo@openerp.com-20110914091319-o1941w689183wivt
---
 addons/web/static/src/js/form.js              |  6 ------
 addons/web/static/src/js/views.js             | 19 +++++++++++++++++--
 addons/web/static/src/xml/base.xml            | 11 +++++++----
 .../static/src/xml/web_dashboard.xml          |  2 --
 .../static/src/xml/base_diagram.xml           |  3 +--
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/js/form.js b/addons/web/static/src/js/form.js
index c4540d591a2..7bb4c7aa392 100644
--- a/addons/web/static/src/js/form.js
+++ b/addons/web/static/src/js/form.js
@@ -90,12 +90,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.$form_header.find('button.oe_form_button_cancel').click(this.do_cancel);
         this.$form_header.find('button.oe_form_button_new').click(this.on_button_new);
 
-        if (this.session.debug) {
-            this.$form_header.find('button.oe_get_xml_view').click(function() {
-                $('<xmp>' + openerp.web.json_node_to_xml(self.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
-            });
-        }
-
         if (this.options.sidebar && this.options.sidebar_id) {
             this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id);
             this.sidebar.start();
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 3edd07e924f..c8b7b69a577 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -158,7 +158,10 @@ openerp.web.ViewManager =  openerp.web.Widget.extend(/** @lends openerp.web.View
         this.registry = openerp.web.views;
     },
     render: function() {
-        return QWeb.render(this.template, {"prefix": this.element_id, views: this.views_src})
+        return QWeb.render(this.template, {
+            self: this,
+            prefix: this.element_id,
+            views: this.views_src});
     },
     /**
      * @returns {jQuery.Deferred} initial view loading promise
@@ -332,6 +335,14 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
      * launches an initial search after both views are done rendering.
      */
     start: function() {
+        var self = this;
+        this.$element.find('.oe_get_xml_view').click(function () {
+            // TODO: add search view?
+            $('<pre>').text(openerp.web.json_node_to_xml(
+                self.views[self.active_view].controller.fields_view.arch, true))
+                    .dialog({ width: '95%'});
+        });
+
         var searchview_loaded;
         if (this.flags.search_view !== false) {
             var search_defaults = {};
@@ -358,9 +369,13 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
         return manager_ready;
     },
     on_mode_switch: function (view_type) {
+        var self = this;
         return $.when(
             this._super(view_type),
-            this.shortcut_check(this.views[view_type]));
+            this.shortcut_check(this.views[view_type])).then(function () {
+                var view_id = self.views[self.active_view].controller.fields_view.view_id;
+                self.$element.find('.oe_get_xml_view span').text(view_id);
+        });
     },
     shortcut_check : function(view) {
         var self = this;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 1b1745036c4..fcd7f9a96b8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -444,7 +444,13 @@
 <t t-extend="ViewManager" t-name="ViewManagerAction">
     <t t-jquery=".view-manager-main-content" t-operation="prepend">
     	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
-    	href="javascript: void(0)"> </a>
+    	   href="javascript: void(0)"> </a>
+        <h2 class="oe_view_title">
+            <t t-esc="self.action.name"/>
+            <button t-if="self.session.debug" class="oe_get_xml_view">
+                View#<span></span>
+            </button>
+        </h2>
     </t>
 </t>
 
@@ -502,7 +508,6 @@
     </div>
 </t>
 <t t-name="TreeView">
-    <h2 class="oe_view_title"><t t-esc="title"/></h2>
     <select t-if="toolbar" style="width: 30%">
     </select>
     <table class="oe-treeview-table">
@@ -632,7 +637,6 @@
 </t>
 <t t-name="FormView">
     <div class="oe_form_header" t-att-id="view.element_id + '_header'">
-        <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/> <button t-if="view.session.debug" class="oe_get_xml_view">View#<t t-esc="view.fields_view.view_id"/></button></h2>
         <div class="oe_form_buttons" t-if="view.options.action_buttons !== false">
             <!--<button type="button" class="oe_form_button_save">
                 <span class="oe_form_on_update">Save</span>
@@ -974,7 +978,6 @@
     </button>
 </t>
 <t t-name="SearchView">
-    <h2 class="oe_view_title"><t t-esc="view.attrs['string']"/></h2>
     <form class="oe_forms">
         <t t-call="SearchView.render_lines"/>
         <div class="oe_search-view-buttons" style="text-align: right;">
diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index e03e21b6487..ec89cf9f647 100644
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -31,8 +31,6 @@
 <t t-name="DashBoard.action">
     <div t-att-data-id="action.attrs.name" class="oe-dashboard-action">
         <h2 class="oe-dashboard-action-header oe_view_title">
-            <t t-esc="action.attrs.string"/>
-            <!--<a href="#" class="oe-dashboard-action-rename"><img src="/web/static/src/img/icons/gtk-edit.png" width="16" height="16"/></a>-->
             <input class="oe-dashboard-action-input" type="text" name="title" value="" style="display: none"/>
             <span class='ui-icon ui-icon-closethick'></span>
             <span class='ui-icon ui-icon-minusthick oe-dashboard-fold' t-if="!action.attrs.fold"></span>
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index f57505d81ac..7867befa957 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -1,7 +1,6 @@
 <template>
     <t t-name="DiagramView">
         <div class="oe_diagram_header" t-att-id="element_id + '_header'">
-        	<h2 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h2>
             <div class="oe_diagram_buttons">
                 <button type="button" id="new_node" class="oe_diagram_button_new">New Node</button>
                 <button type="button" id="new_edge" class="oe_diagram_button_new">New Edge</button>
@@ -19,4 +18,4 @@
         </div>
         <div id="dia-canvas" class="diagram show_grid" style="overflow: auto;"></div>
     </t>
-</template>
\ No newline at end of file
+</template>

From 81041302bb4c17797373119f1e491e977b57c9f2 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Sep 2011 11:28:34 +0200
Subject: [PATCH 18/51] [imp] new version of the openerplib

bzr revid: nicolas.vanhoren@openerp.com-20110914092834-nq0cdpda99zefev5
---
 addons/web/common/openerplib/__init__.py      | 364 +---------------
 addons/web/common/openerplib/dates.py         |  99 +++++
 addons/web/common/openerplib/main.py          | 397 ++++++++++++++++++
 .../common/openerplib/openerplib/__init__.py  |  35 ++
 .../web/common/openerplib/openerplib/dates.py |  99 +++++
 .../web/common/openerplib/openerplib/main.py  | 397 ++++++++++++++++++
 6 files changed, 1028 insertions(+), 363 deletions(-)
 create mode 100644 addons/web/common/openerplib/dates.py
 create mode 100644 addons/web/common/openerplib/main.py
 create mode 100644 addons/web/common/openerplib/openerplib/__init__.py
 create mode 100644 addons/web/common/openerplib/openerplib/dates.py
 create mode 100644 addons/web/common/openerplib/openerplib/main.py

diff --git a/addons/web/common/openerplib/__init__.py b/addons/web/common/openerplib/__init__.py
index 2fee67b7daa..23fc257e4d1 100644
--- a/addons/web/common/openerplib/__init__.py
+++ b/addons/web/common/openerplib/__init__.py
@@ -30,368 +30,6 @@
 #
 ##############################################################################
 
-"""
-OpenERP Client Library
-"""
 
-import xmlrpclib
-import logging 
-import socket
+from main import *
 
-try:
-    import cPickle as pickle
-    pickle.__name__
-except:
-    import pickle
-
-try:
-    import cStringIO as StringIO
-    StringIO.__name__
-except:
-    import StringIO
-
-_logger = logging.getLogger(__name__)
-
-def _getChildLogger(logger, subname):
-    return logging.getLogger(logger.name + "." + subname)
-
-class Connector(object):
-    """
-    The base abstract class representing a connection to an OpenERP Server.
-    """
-
-    __logger = _getChildLogger(_logger, 'connector')
-
-    def __init__(self, hostname, port):
-        """
-        Initilize by specifying an hostname and a port.
-        :param hostname: Host name of the server.
-        :param port: Port for the connection to the server.
-        """
-        self.hostname = hostname
-        self.port = port
-
-class XmlRPCConnector(Connector):
-    """
-    A type of connector that uses the XMLRPC protocol.
-    """
-    PROTOCOL = 'xmlrpc'
-    
-    __logger = _getChildLogger(_logger, 'connector.xmlrpc')
-
-    def __init__(self, hostname, port=8069):
-        """
-        Initialize by specifying the hostname and the port.
-        :param hostname: The hostname of the computer holding the instance of OpenERP.
-        :param port: The port used by the OpenERP instance for XMLRPC (default to 8069).
-        """
-        Connector.__init__(self, hostname, port)
-        self.url = 'http://%s:%d/xmlrpc' % (self.hostname, self.port)
-
-    def send(self, service_name, method, *args):
-        url = '%s/%s' % (self.url, service_name)
-        service = xmlrpclib.ServerProxy(url)
-        return getattr(service, method)(*args)
-
-class NetRPC_Exception(Exception):
-    """
-    Exception for NetRPC errors.
-    """
-    def __init__(self, faultCode, faultString):
-        self.faultCode = faultCode
-        self.faultString = faultString
-        self.args = (faultCode, faultString)
-
-class NetRPC:
-    """
-    Low level class for NetRPC protocol.
-    """
-    def __init__(self, sock=None):
-        if sock is None:
-            self.sock = socket.socket(
-            socket.AF_INET, socket.SOCK_STREAM)
-        else:
-            self.sock = sock
-        self.sock.settimeout(120)
-    def connect(self, host, port=False):
-        if not port:
-            buf = host.split('//')[1]
-            host, port = buf.split(':')
-        self.sock.connect((host, int(port)))
-
-    def disconnect(self):
-        self.sock.shutdown(socket.SHUT_RDWR)
-        self.sock.close()
-
-    def mysend(self, msg, exception=False, traceback=None):
-        msg = pickle.dumps([msg,traceback])
-        size = len(msg)
-        self.sock.send('%8d' % size)
-        self.sock.send(exception and "1" or "0")
-        totalsent = 0
-        while totalsent < size:
-            sent = self.sock.send(msg[totalsent:])
-            if sent == 0:
-                raise RuntimeError, "socket connection broken"
-            totalsent = totalsent + sent
-
-    def myreceive(self):
-        buf=''
-        while len(buf) < 8:
-            chunk = self.sock.recv(8 - len(buf))
-            if chunk == '':
-                raise RuntimeError, "socket connection broken"
-            buf += chunk
-        size = int(buf)
-        buf = self.sock.recv(1)
-        if buf != "0":
-            exception = buf
-        else:
-            exception = False
-        msg = ''
-        while len(msg) < size:
-            chunk = self.sock.recv(size-len(msg))
-            if chunk == '':
-                raise RuntimeError, "socket connection broken"
-            msg = msg + chunk
-        msgio = StringIO.StringIO(msg)
-        unpickler = pickle.Unpickler(msgio)
-        unpickler.find_global = None
-        res = unpickler.load()
-
-        if isinstance(res[0],Exception):
-            if exception:
-                raise NetRPC_Exception(str(res[0]), str(res[1]))
-            raise res[0]
-        else:
-            return res[0]
-
-class NetRPCConnector(Connector):
-    """
-    A type of connector that uses the NetRPC protocol.
-    """
-
-    PROTOCOL = 'netrpc'
-    
-    __logger = _getChildLogger(_logger, 'connector.netrpc')
-
-    def __init__(self, hostname, port=8070):
-        """
-        Initialize by specifying the hostname and the port.
-        :param hostname: The hostname of the computer holding the instance of OpenERP.
-        :param port: The port used by the OpenERP instance for NetRPC (default to 8070).
-        """
-        Connector.__init__(self, hostname, port)
-
-    def send(self, service_name, method, *args):
-        socket = NetRPC()
-        socket.connect(self.hostname, self.port)
-        socket.mysend((service_name, method, )+args)
-        result = socket.myreceive()
-        socket.disconnect()
-        return result
-
-class Service:
-    """
-    A class to execute RPC calls on a specific service of the remote server.
-    """
-    def __init__(self, connector, service_name):
-        """
-        :param connector: A valid Connector instance.
-        :param service_name: The name of the service on the remote server.
-        """
-        self.connector = connector
-        self.service_name = service_name
-        self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name)
-        
-    def __getattr__(self, method):
-        """
-        :param method: The name of the method to execute on the service.
-        """
-        self.__logger.debug('method: %r', method)
-        def proxy(*args):
-            """
-            :param args: A list of values for the method
-            """
-            self.__logger.debug('args: %r', args)
-            result = self.connector.send(self.service_name, method, *args)
-            self.__logger.debug('result: %r' % result)
-            return result
-        return proxy
-
-class Connection(object):
-    """
-    A class to represent a connection with authentification to an OpenERP Server.
-    It also provides utility methods to interact with the server more easily.
-    """
-    __logger = _getChildLogger(_logger, 'connection')
-
-    def __init__(self, connector,
-                 database=None,
-                 login=None,
-                 password=None,
-                 user_id=None):
-        """
-        Initialize with login information. The login information is facultative to allow specifying
-        it after the initialization of this object.
-
-        :param connector: A valid Connector instance to send messages to the remote server.
-        :param database: The name of the database to work on.
-        :param login: The login of the user.
-        :param password: The password of the user.
-        :param user_id: The user id is a number identifying the user. This is only useful if you
-        already know it, in most cases you don't need to specify it.
-        """
-        self.connector = connector
-
-        self.set_login_info(database, login, password, user_id)
-
-    def set_login_info(self, database, login, password, user_id=None):
-        """
-        Set login information after the initialisation of this object.
-
-        :param connector: A valid Connector instance to send messages to the remote server.
-        :param database: The name of the database to work on.
-        :param login: The login of the user.
-        :param password: The password of the user.
-        :param user_id: The user id is a number identifying the user. This is only useful if you
-        already know it, in most cases you don't need to specify it.
-        """
-        self.database, self.login, self.password = database, login, password
-
-        self.user_id = user_id
-        
-    def check_login(self, force=True):
-        """
-        Checks that the login information is valid. Throws an AuthentificationError if the
-        authentification fails.
-
-        :param force: Force to re-check even if this Connection was already validated previously.
-        Default to True.
-        """
-        if self.user_id and not force:
-            return
-        
-        self.user_id = self.get_service("common").login(self.database, self.login, self.password)
-        if not self.user_id:
-            raise AuthentificationError("Authentification failure")
-        self.__logger.debug("Authentified with user id %s" % self.user_id)
-    
-    """
-    Returns a Model instance to allow easy remote manipulation of an OpenERP model.
-    
-    :param model_name: The name of the model.
-    """
-    def get_model(self, model_name):
-        return Model(self, model_name)
-
-    """
-    Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
-    Please note this Connection instance does not need to have valid authenfication information since authentification
-    is only necessary for the "object" service that handles models.
-
-    :param service_name: The name of the service.
-    """
-    def get_service(self, service_name):
-        return Service(self.connector, service_name)
-
-class AuthentificationError(Exception):
-    """
-    An error thrown when an authentification to an OpenERP server failed.
-    """
-    pass
-
-class Model(object):
-    """
-    Useful class to dialog with one of the models provided by an OpenERP server.
-    An instance of this class depends on a Connection instance with valid authenfication information.
-    """
-
-    def __init__(self, connection, model_name):
-        """
-        :param connection: A valid Connection instance with correct authentification information.
-        :param model_name: The name of the model.
-        """
-        self.connection = connection
-        self.model_name = model_name
-        self.__logger = _getChildLogger(_getChildLogger(_logger, 'object'), model_name)
-
-    def __getattr__(self, method):
-        """
-        Provides proxy methods that will forward calls to the model on the remote OpenERP server.
-
-        :param method: The method for the linked model (search, read, write, unlink, create, ...)
-        """
-        def proxy(*args):
-            """
-            :param args: A list of values for the method
-            """
-            self.connection.check_login(False)
-            self.__logger.debug(args)
-            result = self.connection.get_service('object').execute(
-                                                    self.connection.database,
-                                                    self.connection.user_id,
-                                                    self.connection.password,
-                                                    self.model_name,
-                                                    method,
-                                                    *args)
-            if method == "read":
-                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
-                    index = {}
-                    for i in xrange(len(result)):
-                        index[result[i]["id"]] = result[i]
-                    result = [index[x] for x in args[0]]
-            self.__logger.debug('result: %r' % result)
-            return result
-        return proxy
-
-    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
-        """
-        A shortcut method to combine a search() and a read().
-
-        :param domain: The domain for the search.
-        :param fields: The fields to extract (can be None or [] to extract all fields).
-        :param offset: The offset for the rows to read.
-        :param limit: The maximum number of rows to read.
-        :param order: The order to class the rows.
-        :param context: The context.
-        :return: A list of dictionaries containing all the specified fields.
-        """
-        record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
-        records = self.read(record_ids, fields or [], context or {})
-        return records
-
-def get_connector(hostname, protocol="xmlrpc", port="auto"):
-    """
-    A shortcut method to easily create a connector to a remote server using XMLRPC or NetRPC.
-
-    :param hostname: The hostname to the remote server.
-    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
-    :param port: The number of the port. Defaults to auto.
-    """
-    if port == 'auto':
-        port = 8069 if protocol=="xmlrpc" else 8070
-    if protocol == "xmlrpc":
-        return XmlRPCConnector(hostname, port)
-    elif protocol == "netrpc":
-        return NetRPCConnector(hostname, port)
-    else:
-        raise ValueError("You must choose xmlrpc or netrpc")
-
-def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
-                 login=None, password=None, user_id=None):
-    """
-    A shortcut method to easily create a connection to a remote OpenERP server.
-
-    :param hostname: The hostname to the remote server.
-    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
-    :param port: The number of the port. Defaults to auto.
-    :param connector: A valid Connector instance to send messages to the remote server.
-    :param database: The name of the database to work on.
-    :param login: The login of the user.
-    :param password: The password of the user.
-    :param user_id: The user id is a number identifying the user. This is only useful if you
-    already know it, in most cases you don't need to specify it.
-    """
-    return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
-        
diff --git a/addons/web/common/openerplib/dates.py b/addons/web/common/openerplib/dates.py
new file mode 100644
index 00000000000..6d6c3808c27
--- /dev/null
+++ b/addons/web/common/openerplib/dates.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) Stephane Wirtel
+# Copyright (C) 2011 Nicolas Vanhoren
+# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+import datetime
+
+DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
+DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
+DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
+    DEFAULT_SERVER_DATE_FORMAT,
+    DEFAULT_SERVER_TIME_FORMAT)
+
+def str_to_datetime(str):
+    """
+    Converts a string to a datetime object using OpenERP's
+    datetime string format (exemple: '2011-12-01 15:12:35').
+    
+    No timezone information is added, the datetime is a naive instance, but
+    according to OpenERP 6.1 specification the timezone is always UTC.
+    """
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATETIME_FORMAT)
+
+def str_to_date(str):
+    """
+    Converts a string to a date object using OpenERP's
+    date string format (exemple: '2011-12-01').
+    """
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATE_FORMAT).date()
+
+def str_to_time(str):
+    """
+    Converts a string to a time object using OpenERP's
+    time string format (exemple: '15:12:35').
+    """
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_TIME_FORMAT).time()
+
+def datetime_to_str(obj):
+    """
+    Converts a datetime object to a string using OpenERP's
+    datetime string format (exemple: '2011-12-01 15:12:35').
+    
+    The datetime instance should not have an attached timezone and be in UTC.
+    """
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+def date_to_str(obj):
+    """
+    Converts a date object to a string using OpenERP's
+    date string format (exemple: '2011-12-01').
+    """
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+def time_to_str(obj):
+    """
+    Converts a time object to a string using OpenERP's
+    time string format (exemple: '15:12:35').
+    """
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_TIME_FORMAT)
+
diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
new file mode 100644
index 00000000000..2fee67b7daa
--- /dev/null
+++ b/addons/web/common/openerplib/main.py
@@ -0,0 +1,397 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) Stephane Wirtel
+# Copyright (C) 2011 Nicolas Vanhoren
+# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+"""
+OpenERP Client Library
+"""
+
+import xmlrpclib
+import logging 
+import socket
+
+try:
+    import cPickle as pickle
+    pickle.__name__
+except:
+    import pickle
+
+try:
+    import cStringIO as StringIO
+    StringIO.__name__
+except:
+    import StringIO
+
+_logger = logging.getLogger(__name__)
+
+def _getChildLogger(logger, subname):
+    return logging.getLogger(logger.name + "." + subname)
+
+class Connector(object):
+    """
+    The base abstract class representing a connection to an OpenERP Server.
+    """
+
+    __logger = _getChildLogger(_logger, 'connector')
+
+    def __init__(self, hostname, port):
+        """
+        Initilize by specifying an hostname and a port.
+        :param hostname: Host name of the server.
+        :param port: Port for the connection to the server.
+        """
+        self.hostname = hostname
+        self.port = port
+
+class XmlRPCConnector(Connector):
+    """
+    A type of connector that uses the XMLRPC protocol.
+    """
+    PROTOCOL = 'xmlrpc'
+    
+    __logger = _getChildLogger(_logger, 'connector.xmlrpc')
+
+    def __init__(self, hostname, port=8069):
+        """
+        Initialize by specifying the hostname and the port.
+        :param hostname: The hostname of the computer holding the instance of OpenERP.
+        :param port: The port used by the OpenERP instance for XMLRPC (default to 8069).
+        """
+        Connector.__init__(self, hostname, port)
+        self.url = 'http://%s:%d/xmlrpc' % (self.hostname, self.port)
+
+    def send(self, service_name, method, *args):
+        url = '%s/%s' % (self.url, service_name)
+        service = xmlrpclib.ServerProxy(url)
+        return getattr(service, method)(*args)
+
+class NetRPC_Exception(Exception):
+    """
+    Exception for NetRPC errors.
+    """
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class NetRPC:
+    """
+    Low level class for NetRPC protocol.
+    """
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            buf = host.split('//')[1]
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+
+    def mysend(self, msg, exception=False, traceback=None):
+        msg = pickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = StringIO.StringIO(msg)
+        unpickler = pickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise NetRPC_Exception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+class NetRPCConnector(Connector):
+    """
+    A type of connector that uses the NetRPC protocol.
+    """
+
+    PROTOCOL = 'netrpc'
+    
+    __logger = _getChildLogger(_logger, 'connector.netrpc')
+
+    def __init__(self, hostname, port=8070):
+        """
+        Initialize by specifying the hostname and the port.
+        :param hostname: The hostname of the computer holding the instance of OpenERP.
+        :param port: The port used by the OpenERP instance for NetRPC (default to 8070).
+        """
+        Connector.__init__(self, hostname, port)
+
+    def send(self, service_name, method, *args):
+        socket = NetRPC()
+        socket.connect(self.hostname, self.port)
+        socket.mysend((service_name, method, )+args)
+        result = socket.myreceive()
+        socket.disconnect()
+        return result
+
+class Service:
+    """
+    A class to execute RPC calls on a specific service of the remote server.
+    """
+    def __init__(self, connector, service_name):
+        """
+        :param connector: A valid Connector instance.
+        :param service_name: The name of the service on the remote server.
+        """
+        self.connector = connector
+        self.service_name = service_name
+        self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name)
+        
+    def __getattr__(self, method):
+        """
+        :param method: The name of the method to execute on the service.
+        """
+        self.__logger.debug('method: %r', method)
+        def proxy(*args):
+            """
+            :param args: A list of values for the method
+            """
+            self.__logger.debug('args: %r', args)
+            result = self.connector.send(self.service_name, method, *args)
+            self.__logger.debug('result: %r' % result)
+            return result
+        return proxy
+
+class Connection(object):
+    """
+    A class to represent a connection with authentification to an OpenERP Server.
+    It also provides utility methods to interact with the server more easily.
+    """
+    __logger = _getChildLogger(_logger, 'connection')
+
+    def __init__(self, connector,
+                 database=None,
+                 login=None,
+                 password=None,
+                 user_id=None):
+        """
+        Initialize with login information. The login information is facultative to allow specifying
+        it after the initialization of this object.
+
+        :param connector: A valid Connector instance to send messages to the remote server.
+        :param database: The name of the database to work on.
+        :param login: The login of the user.
+        :param password: The password of the user.
+        :param user_id: The user id is a number identifying the user. This is only useful if you
+        already know it, in most cases you don't need to specify it.
+        """
+        self.connector = connector
+
+        self.set_login_info(database, login, password, user_id)
+
+    def set_login_info(self, database, login, password, user_id=None):
+        """
+        Set login information after the initialisation of this object.
+
+        :param connector: A valid Connector instance to send messages to the remote server.
+        :param database: The name of the database to work on.
+        :param login: The login of the user.
+        :param password: The password of the user.
+        :param user_id: The user id is a number identifying the user. This is only useful if you
+        already know it, in most cases you don't need to specify it.
+        """
+        self.database, self.login, self.password = database, login, password
+
+        self.user_id = user_id
+        
+    def check_login(self, force=True):
+        """
+        Checks that the login information is valid. Throws an AuthentificationError if the
+        authentification fails.
+
+        :param force: Force to re-check even if this Connection was already validated previously.
+        Default to True.
+        """
+        if self.user_id and not force:
+            return
+        
+        self.user_id = self.get_service("common").login(self.database, self.login, self.password)
+        if not self.user_id:
+            raise AuthentificationError("Authentification failure")
+        self.__logger.debug("Authentified with user id %s" % self.user_id)
+    
+    """
+    Returns a Model instance to allow easy remote manipulation of an OpenERP model.
+    
+    :param model_name: The name of the model.
+    """
+    def get_model(self, model_name):
+        return Model(self, model_name)
+
+    """
+    Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
+    Please note this Connection instance does not need to have valid authenfication information since authentification
+    is only necessary for the "object" service that handles models.
+
+    :param service_name: The name of the service.
+    """
+    def get_service(self, service_name):
+        return Service(self.connector, service_name)
+
+class AuthentificationError(Exception):
+    """
+    An error thrown when an authentification to an OpenERP server failed.
+    """
+    pass
+
+class Model(object):
+    """
+    Useful class to dialog with one of the models provided by an OpenERP server.
+    An instance of this class depends on a Connection instance with valid authenfication information.
+    """
+
+    def __init__(self, connection, model_name):
+        """
+        :param connection: A valid Connection instance with correct authentification information.
+        :param model_name: The name of the model.
+        """
+        self.connection = connection
+        self.model_name = model_name
+        self.__logger = _getChildLogger(_getChildLogger(_logger, 'object'), model_name)
+
+    def __getattr__(self, method):
+        """
+        Provides proxy methods that will forward calls to the model on the remote OpenERP server.
+
+        :param method: The method for the linked model (search, read, write, unlink, create, ...)
+        """
+        def proxy(*args):
+            """
+            :param args: A list of values for the method
+            """
+            self.connection.check_login(False)
+            self.__logger.debug(args)
+            result = self.connection.get_service('object').execute(
+                                                    self.connection.database,
+                                                    self.connection.user_id,
+                                                    self.connection.password,
+                                                    self.model_name,
+                                                    method,
+                                                    *args)
+            if method == "read":
+                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
+                    index = {}
+                    for i in xrange(len(result)):
+                        index[result[i]["id"]] = result[i]
+                    result = [index[x] for x in args[0]]
+            self.__logger.debug('result: %r' % result)
+            return result
+        return proxy
+
+    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
+        """
+        A shortcut method to combine a search() and a read().
+
+        :param domain: The domain for the search.
+        :param fields: The fields to extract (can be None or [] to extract all fields).
+        :param offset: The offset for the rows to read.
+        :param limit: The maximum number of rows to read.
+        :param order: The order to class the rows.
+        :param context: The context.
+        :return: A list of dictionaries containing all the specified fields.
+        """
+        record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
+        records = self.read(record_ids, fields or [], context or {})
+        return records
+
+def get_connector(hostname, protocol="xmlrpc", port="auto"):
+    """
+    A shortcut method to easily create a connector to a remote server using XMLRPC or NetRPC.
+
+    :param hostname: The hostname to the remote server.
+    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
+    :param port: The number of the port. Defaults to auto.
+    """
+    if port == 'auto':
+        port = 8069 if protocol=="xmlrpc" else 8070
+    if protocol == "xmlrpc":
+        return XmlRPCConnector(hostname, port)
+    elif protocol == "netrpc":
+        return NetRPCConnector(hostname, port)
+    else:
+        raise ValueError("You must choose xmlrpc or netrpc")
+
+def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
+                 login=None, password=None, user_id=None):
+    """
+    A shortcut method to easily create a connection to a remote OpenERP server.
+
+    :param hostname: The hostname to the remote server.
+    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
+    :param port: The number of the port. Defaults to auto.
+    :param connector: A valid Connector instance to send messages to the remote server.
+    :param database: The name of the database to work on.
+    :param login: The login of the user.
+    :param password: The password of the user.
+    :param user_id: The user id is a number identifying the user. This is only useful if you
+    already know it, in most cases you don't need to specify it.
+    """
+    return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
+        
diff --git a/addons/web/common/openerplib/openerplib/__init__.py b/addons/web/common/openerplib/openerplib/__init__.py
new file mode 100644
index 00000000000..23fc257e4d1
--- /dev/null
+++ b/addons/web/common/openerplib/openerplib/__init__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) Stephane Wirtel
+# Copyright (C) 2011 Nicolas Vanhoren
+# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+
+from main import *
+
diff --git a/addons/web/common/openerplib/openerplib/dates.py b/addons/web/common/openerplib/openerplib/dates.py
new file mode 100644
index 00000000000..6d6c3808c27
--- /dev/null
+++ b/addons/web/common/openerplib/openerplib/dates.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) Stephane Wirtel
+# Copyright (C) 2011 Nicolas Vanhoren
+# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+import datetime
+
+DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
+DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
+DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
+    DEFAULT_SERVER_DATE_FORMAT,
+    DEFAULT_SERVER_TIME_FORMAT)
+
+def str_to_datetime(str):
+    """
+    Converts a string to a datetime object using OpenERP's
+    datetime string format (exemple: '2011-12-01 15:12:35').
+    
+    No timezone information is added, the datetime is a naive instance, but
+    according to OpenERP 6.1 specification the timezone is always UTC.
+    """
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATETIME_FORMAT)
+
+def str_to_date(str):
+    """
+    Converts a string to a date object using OpenERP's
+    date string format (exemple: '2011-12-01').
+    """
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATE_FORMAT).date()
+
+def str_to_time(str):
+    """
+    Converts a string to a time object using OpenERP's
+    time string format (exemple: '15:12:35').
+    """
+    if not str:
+        return str
+    return datetime.datetime.strptime(str, DEFAULT_SERVER_TIME_FORMAT).time()
+
+def datetime_to_str(obj):
+    """
+    Converts a datetime object to a string using OpenERP's
+    datetime string format (exemple: '2011-12-01 15:12:35').
+    
+    The datetime instance should not have an attached timezone and be in UTC.
+    """
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+def date_to_str(obj):
+    """
+    Converts a date object to a string using OpenERP's
+    date string format (exemple: '2011-12-01').
+    """
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+def time_to_str(obj):
+    """
+    Converts a time object to a string using OpenERP's
+    time string format (exemple: '15:12:35').
+    """
+    if not obj:
+        return False
+    return obj.strftime(DEFAULT_SERVER_TIME_FORMAT)
+
diff --git a/addons/web/common/openerplib/openerplib/main.py b/addons/web/common/openerplib/openerplib/main.py
new file mode 100644
index 00000000000..2fee67b7daa
--- /dev/null
+++ b/addons/web/common/openerplib/openerplib/main.py
@@ -0,0 +1,397 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (C) Stephane Wirtel
+# Copyright (C) 2011 Nicolas Vanhoren
+# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+##############################################################################
+
+"""
+OpenERP Client Library
+"""
+
+import xmlrpclib
+import logging 
+import socket
+
+try:
+    import cPickle as pickle
+    pickle.__name__
+except:
+    import pickle
+
+try:
+    import cStringIO as StringIO
+    StringIO.__name__
+except:
+    import StringIO
+
+_logger = logging.getLogger(__name__)
+
+def _getChildLogger(logger, subname):
+    return logging.getLogger(logger.name + "." + subname)
+
+class Connector(object):
+    """
+    The base abstract class representing a connection to an OpenERP Server.
+    """
+
+    __logger = _getChildLogger(_logger, 'connector')
+
+    def __init__(self, hostname, port):
+        """
+        Initilize by specifying an hostname and a port.
+        :param hostname: Host name of the server.
+        :param port: Port for the connection to the server.
+        """
+        self.hostname = hostname
+        self.port = port
+
+class XmlRPCConnector(Connector):
+    """
+    A type of connector that uses the XMLRPC protocol.
+    """
+    PROTOCOL = 'xmlrpc'
+    
+    __logger = _getChildLogger(_logger, 'connector.xmlrpc')
+
+    def __init__(self, hostname, port=8069):
+        """
+        Initialize by specifying the hostname and the port.
+        :param hostname: The hostname of the computer holding the instance of OpenERP.
+        :param port: The port used by the OpenERP instance for XMLRPC (default to 8069).
+        """
+        Connector.__init__(self, hostname, port)
+        self.url = 'http://%s:%d/xmlrpc' % (self.hostname, self.port)
+
+    def send(self, service_name, method, *args):
+        url = '%s/%s' % (self.url, service_name)
+        service = xmlrpclib.ServerProxy(url)
+        return getattr(service, method)(*args)
+
+class NetRPC_Exception(Exception):
+    """
+    Exception for NetRPC errors.
+    """
+    def __init__(self, faultCode, faultString):
+        self.faultCode = faultCode
+        self.faultString = faultString
+        self.args = (faultCode, faultString)
+
+class NetRPC:
+    """
+    Low level class for NetRPC protocol.
+    """
+    def __init__(self, sock=None):
+        if sock is None:
+            self.sock = socket.socket(
+            socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.sock = sock
+        self.sock.settimeout(120)
+    def connect(self, host, port=False):
+        if not port:
+            buf = host.split('//')[1]
+            host, port = buf.split(':')
+        self.sock.connect((host, int(port)))
+
+    def disconnect(self):
+        self.sock.shutdown(socket.SHUT_RDWR)
+        self.sock.close()
+
+    def mysend(self, msg, exception=False, traceback=None):
+        msg = pickle.dumps([msg,traceback])
+        size = len(msg)
+        self.sock.send('%8d' % size)
+        self.sock.send(exception and "1" or "0")
+        totalsent = 0
+        while totalsent < size:
+            sent = self.sock.send(msg[totalsent:])
+            if sent == 0:
+                raise RuntimeError, "socket connection broken"
+            totalsent = totalsent + sent
+
+    def myreceive(self):
+        buf=''
+        while len(buf) < 8:
+            chunk = self.sock.recv(8 - len(buf))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            buf += chunk
+        size = int(buf)
+        buf = self.sock.recv(1)
+        if buf != "0":
+            exception = buf
+        else:
+            exception = False
+        msg = ''
+        while len(msg) < size:
+            chunk = self.sock.recv(size-len(msg))
+            if chunk == '':
+                raise RuntimeError, "socket connection broken"
+            msg = msg + chunk
+        msgio = StringIO.StringIO(msg)
+        unpickler = pickle.Unpickler(msgio)
+        unpickler.find_global = None
+        res = unpickler.load()
+
+        if isinstance(res[0],Exception):
+            if exception:
+                raise NetRPC_Exception(str(res[0]), str(res[1]))
+            raise res[0]
+        else:
+            return res[0]
+
+class NetRPCConnector(Connector):
+    """
+    A type of connector that uses the NetRPC protocol.
+    """
+
+    PROTOCOL = 'netrpc'
+    
+    __logger = _getChildLogger(_logger, 'connector.netrpc')
+
+    def __init__(self, hostname, port=8070):
+        """
+        Initialize by specifying the hostname and the port.
+        :param hostname: The hostname of the computer holding the instance of OpenERP.
+        :param port: The port used by the OpenERP instance for NetRPC (default to 8070).
+        """
+        Connector.__init__(self, hostname, port)
+
+    def send(self, service_name, method, *args):
+        socket = NetRPC()
+        socket.connect(self.hostname, self.port)
+        socket.mysend((service_name, method, )+args)
+        result = socket.myreceive()
+        socket.disconnect()
+        return result
+
+class Service:
+    """
+    A class to execute RPC calls on a specific service of the remote server.
+    """
+    def __init__(self, connector, service_name):
+        """
+        :param connector: A valid Connector instance.
+        :param service_name: The name of the service on the remote server.
+        """
+        self.connector = connector
+        self.service_name = service_name
+        self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name)
+        
+    def __getattr__(self, method):
+        """
+        :param method: The name of the method to execute on the service.
+        """
+        self.__logger.debug('method: %r', method)
+        def proxy(*args):
+            """
+            :param args: A list of values for the method
+            """
+            self.__logger.debug('args: %r', args)
+            result = self.connector.send(self.service_name, method, *args)
+            self.__logger.debug('result: %r' % result)
+            return result
+        return proxy
+
+class Connection(object):
+    """
+    A class to represent a connection with authentification to an OpenERP Server.
+    It also provides utility methods to interact with the server more easily.
+    """
+    __logger = _getChildLogger(_logger, 'connection')
+
+    def __init__(self, connector,
+                 database=None,
+                 login=None,
+                 password=None,
+                 user_id=None):
+        """
+        Initialize with login information. The login information is facultative to allow specifying
+        it after the initialization of this object.
+
+        :param connector: A valid Connector instance to send messages to the remote server.
+        :param database: The name of the database to work on.
+        :param login: The login of the user.
+        :param password: The password of the user.
+        :param user_id: The user id is a number identifying the user. This is only useful if you
+        already know it, in most cases you don't need to specify it.
+        """
+        self.connector = connector
+
+        self.set_login_info(database, login, password, user_id)
+
+    def set_login_info(self, database, login, password, user_id=None):
+        """
+        Set login information after the initialisation of this object.
+
+        :param connector: A valid Connector instance to send messages to the remote server.
+        :param database: The name of the database to work on.
+        :param login: The login of the user.
+        :param password: The password of the user.
+        :param user_id: The user id is a number identifying the user. This is only useful if you
+        already know it, in most cases you don't need to specify it.
+        """
+        self.database, self.login, self.password = database, login, password
+
+        self.user_id = user_id
+        
+    def check_login(self, force=True):
+        """
+        Checks that the login information is valid. Throws an AuthentificationError if the
+        authentification fails.
+
+        :param force: Force to re-check even if this Connection was already validated previously.
+        Default to True.
+        """
+        if self.user_id and not force:
+            return
+        
+        self.user_id = self.get_service("common").login(self.database, self.login, self.password)
+        if not self.user_id:
+            raise AuthentificationError("Authentification failure")
+        self.__logger.debug("Authentified with user id %s" % self.user_id)
+    
+    """
+    Returns a Model instance to allow easy remote manipulation of an OpenERP model.
+    
+    :param model_name: The name of the model.
+    """
+    def get_model(self, model_name):
+        return Model(self, model_name)
+
+    """
+    Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
+    Please note this Connection instance does not need to have valid authenfication information since authentification
+    is only necessary for the "object" service that handles models.
+
+    :param service_name: The name of the service.
+    """
+    def get_service(self, service_name):
+        return Service(self.connector, service_name)
+
+class AuthentificationError(Exception):
+    """
+    An error thrown when an authentification to an OpenERP server failed.
+    """
+    pass
+
+class Model(object):
+    """
+    Useful class to dialog with one of the models provided by an OpenERP server.
+    An instance of this class depends on a Connection instance with valid authenfication information.
+    """
+
+    def __init__(self, connection, model_name):
+        """
+        :param connection: A valid Connection instance with correct authentification information.
+        :param model_name: The name of the model.
+        """
+        self.connection = connection
+        self.model_name = model_name
+        self.__logger = _getChildLogger(_getChildLogger(_logger, 'object'), model_name)
+
+    def __getattr__(self, method):
+        """
+        Provides proxy methods that will forward calls to the model on the remote OpenERP server.
+
+        :param method: The method for the linked model (search, read, write, unlink, create, ...)
+        """
+        def proxy(*args):
+            """
+            :param args: A list of values for the method
+            """
+            self.connection.check_login(False)
+            self.__logger.debug(args)
+            result = self.connection.get_service('object').execute(
+                                                    self.connection.database,
+                                                    self.connection.user_id,
+                                                    self.connection.password,
+                                                    self.model_name,
+                                                    method,
+                                                    *args)
+            if method == "read":
+                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
+                    index = {}
+                    for i in xrange(len(result)):
+                        index[result[i]["id"]] = result[i]
+                    result = [index[x] for x in args[0]]
+            self.__logger.debug('result: %r' % result)
+            return result
+        return proxy
+
+    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
+        """
+        A shortcut method to combine a search() and a read().
+
+        :param domain: The domain for the search.
+        :param fields: The fields to extract (can be None or [] to extract all fields).
+        :param offset: The offset for the rows to read.
+        :param limit: The maximum number of rows to read.
+        :param order: The order to class the rows.
+        :param context: The context.
+        :return: A list of dictionaries containing all the specified fields.
+        """
+        record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
+        records = self.read(record_ids, fields or [], context or {})
+        return records
+
+def get_connector(hostname, protocol="xmlrpc", port="auto"):
+    """
+    A shortcut method to easily create a connector to a remote server using XMLRPC or NetRPC.
+
+    :param hostname: The hostname to the remote server.
+    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
+    :param port: The number of the port. Defaults to auto.
+    """
+    if port == 'auto':
+        port = 8069 if protocol=="xmlrpc" else 8070
+    if protocol == "xmlrpc":
+        return XmlRPCConnector(hostname, port)
+    elif protocol == "netrpc":
+        return NetRPCConnector(hostname, port)
+    else:
+        raise ValueError("You must choose xmlrpc or netrpc")
+
+def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
+                 login=None, password=None, user_id=None):
+    """
+    A shortcut method to easily create a connection to a remote OpenERP server.
+
+    :param hostname: The hostname to the remote server.
+    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
+    :param port: The number of the port. Defaults to auto.
+    :param connector: A valid Connector instance to send messages to the remote server.
+    :param database: The name of the database to work on.
+    :param login: The login of the user.
+    :param password: The password of the user.
+    :param user_id: The user id is a number identifying the user. This is only useful if you
+    already know it, in most cases you don't need to specify it.
+    """
+    return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
+        

From 45d13bbe1d5793ed86ce52132d7b9b754f70fd49 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 11:34:09 +0200
Subject: [PATCH 19/51] [ADD] menu tips on ViewManagerAction

bzr revid: xmo@openerp.com-20110914093409-1hc5skp9mn17ieir
---
 addons/web/static/src/css/base.css | 14 ++++++++++++--
 addons/web/static/src/xml/base.xml | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index cc8b596e6f5..dc599874909 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -987,9 +987,19 @@ label.error {
 
 .openerp .view-manager-main-content {
     width: 100%;
-    padding: 6px;
 }
-
+.openerp .oe-view-manager-header blockquote {
+    font-size: 85%;
+    margin: 0;
+    background: #fff;
+    border-bottom: 1px solid #CECBCB;
+    padding: 1px 10px;
+    color: #4C4C4C;
+}
+.openerp .oe-view-manager-header blockquote p {
+    margin: 0;
+    padding: 6px 1px 4px;
+}
 .openerp .view-manager-main-sidebar {
     width: 180px;
     padding: 0;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fcd7f9a96b8..750a42451a8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -420,12 +420,14 @@
     <table class="view-manager-main-table">
     <tr>
         <td class="view-manager-main-content">
-            <div class="oe_vm_switch">
-                <t t-if="views.length != 1" t-foreach="views" t-as="view">
-                    <button type="button" t-att-data-view-type="view.view_type">
-                        <t t-esc="view.view_type"/>
-                    </button>
-                </t>
+            <div class="oe-view-manager-header">
+                <div class="oe_vm_switch">
+                    <t t-if="views.length != 1" t-foreach="views" t-as="view">
+                        <button type="button" t-att-data-view-type="view.view_type">
+                            <t t-esc="view.view_type"/>
+                        </button>
+                    </t>
+                </div>
             </div>
             <div t-attf-id="#{prefix}_search" t-opentag="true"/>
             <t t-foreach="views" t-as="view">
@@ -442,7 +444,10 @@
 </t>
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
-    <t t-jquery=".view-manager-main-content" t-operation="prepend">
+    <t t-jquery=".oe-view-manager-header" t-operation="prepend">
+        <blockquote t-if="self.action.help"><p>
+            <t t-esc="self.action.help"/>
+        </p></blockquote>
     	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
     	   href="javascript: void(0)"> </a>
         <h2 class="oe_view_title">

From 655ed47c06454baf0cd0ce2fcbceec7b73706d5d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Sep 2011 11:51:39 +0200
Subject: [PATCH 20/51] [fix] problem with authentification detection

bzr revid: nicolas.vanhoren@openerp.com-20110914095139-ya200r6rc7qkxn33
---
 addons/web/common/dispatch.py | 3 ++-
 addons/web/common/session.py  | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
index dbd9e3ac71f..afcde2edfad 100644
--- a/addons/web/common/dispatch.py
+++ b/addons/web/common/dispatch.py
@@ -23,6 +23,7 @@ import nonliterals
 import http
 # import backendlocal as backend
 import session as backend
+import openerplib
 
 __all__ = ['Root', 'jsonrequest', 'httprequest', 'Controller',
            'WebRequest', 'JsonRequest', 'HttpRequest']
@@ -166,7 +167,7 @@ class JsonRequest(WebRequest):
                 _logger.debug("--> %s.%s\n%s", controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
             response["result"] = method(controller, self, **self.params)
-        except backend.OpenERPUnboundException:
+        except openerplib.AuthentificationError:
             error = {
                 'code': 100,
                 'message': "OpenERP Session Invalid",
diff --git a/addons/web/common/session.py b/addons/web/common/session.py
index cdedf7962da..3691f88e3f5 100644
--- a/addons/web/common/session.py
+++ b/addons/web/common/session.py
@@ -8,8 +8,6 @@ import nonliterals
 #----------------------------------------------------------
 # OpenERPSession RPC openerp backend access
 #----------------------------------------------------------
-class OpenERPUnboundException(Exception):
-    pass
 
 class OpenERPSession(object):
     """
@@ -68,8 +66,7 @@ class OpenERPSession(object):
         """
         Ensures this session is valid (logged into the openerp server)
         """
-        if not (self._db and self._uid and self._password):
-            raise OpenERPUnboundException()
+        self.build_connection().check_login(False)
 
     def execute(self, model, func, *l, **d):
         self.assert_valid()

From 8c17d421556dd12846a7d41c648eed5fad8d8759 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Sep 2011 11:54:44 +0200
Subject: [PATCH 21/51] [fix] new version of the client lib

bzr revid: nicolas.vanhoren@openerp.com-20110914095444-n10qiswdb9apg1du
---
 addons/web/common/openerplib/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
index 2fee67b7daa..36b15e09c68 100644
--- a/addons/web/common/openerplib/main.py
+++ b/addons/web/common/openerplib/main.py
@@ -272,6 +272,9 @@ class Connection(object):
         if self.user_id and not force:
             return
         
+        if not self.database or not self.login or self.password is None:
+            raise AuthentificationError("Creditentials not provided")
+        
         self.user_id = self.get_service("common").login(self.database, self.login, self.password)
         if not self.user_id:
             raise AuthentificationError("Authentification failure")

From e70ebcab8de4a0502433db7cd0c3d73712545392 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 12:08:33 +0200
Subject: [PATCH 22/51] [ADD] ability to hide menu help, only this or all help
 sections

bzr revid: xmo@openerp.com-20110914100833-fo4arcaa92zu1361
---
 addons/web/static/src/css/base.css | 14 ++++++++++++
 addons/web/static/src/js/data.js   |  2 +-
 addons/web/static/src/js/views.js  | 35 +++++++++++++++++++++++++-----
 addons/web/static/src/xml/base.xml | 10 ++++++---
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dc599874909..433cdd2e638 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -989,6 +989,7 @@ label.error {
     width: 100%;
 }
 .openerp .oe-view-manager-header blockquote {
+    display: none;
     font-size: 85%;
     margin: 0;
     background: #fff;
@@ -1000,6 +1001,19 @@ label.error {
     margin: 0;
     padding: 6px 1px 4px;
 }
+.openerp .oe-view-manager-header blockquote div {
+    text-align: right;
+}
+.openerp .oe-view-manager-header blockquote div button {
+    border: none;
+    background: none;
+    padding: 0 4px;
+    margin: 0;
+    display: inline;
+    text-decoration: underline;
+    color: inherit;
+}
+
 .openerp .view-manager-main-sidebar {
     width: 180px;
     padding: 0;
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 1eb57241fa6..e5d323c8a96 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -356,7 +356,7 @@ openerp.web.DataSet =  openerp.web.Widget.extend( /** @lends openerp.web.DataSet
      * @returns {$.Deferred}
      */
     write: function (id, data, options, callback, error_callback) {
-        var options = options || {};
+        options = options || {};
         return this.rpc('/web/dataset/save', {
             model: this.model,
             id: id,
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index c8b7b69a577..5ecf462870b 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -336,12 +336,6 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
      */
     start: function() {
         var self = this;
-        this.$element.find('.oe_get_xml_view').click(function () {
-            // TODO: add search view?
-            $('<pre>').text(openerp.web.json_node_to_xml(
-                self.views[self.active_view].controller.fields_view.arch, true))
-                    .dialog({ width: '95%'});
-        });
 
         var searchview_loaded;
         if (this.flags.search_view !== false) {
@@ -366,6 +360,35 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
             // schedule auto_search
             manager_ready.then(this.searchview.do_search);
         }
+
+        this.$element.find('.oe_get_xml_view').click(function () {
+            // TODO: add search view?
+            $('<pre>').text(openerp.web.json_node_to_xml(
+                self.views[self.active_view].controller.fields_view.arch, true))
+                    .dialog({ width: '95%'});
+        });
+        if (this.action.help) {
+            var Users = new openerp.web.DataSet(self, 'res.users'),
+                header = this.$element.find('.oe-view-manager-header');
+            header.delegate(' blockquote button', 'click', function () {
+                var $this = $(this);
+                //noinspection FallthroughInSwitchStatementJS
+                switch($this.attr('name')) {
+                case 'disable':
+                    Users.write(self.session.uid, {menu_tips: false});
+                case 'hide':
+                    $this.closest('blockquote').hide();
+                }
+            });
+            Users.read_ids([this.session.uid], ['menu_tips'], function (users) {
+                var user = users[0];
+                if (!(user && user.id === self.session.uid)) {
+                    return;
+                }
+                header.find('blockquote').toggle(user.menu_tips);
+            });
+        }
+
         return manager_ready;
     },
     on_mode_switch: function (view_type) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 750a42451a8..9007955b056 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -445,9 +445,13 @@
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
     <t t-jquery=".oe-view-manager-header" t-operation="prepend">
-        <blockquote t-if="self.action.help"><p>
-            <t t-esc="self.action.help"/>
-        </p></blockquote>
+        <blockquote t-if="self.action.help">
+            <p><t t-esc="self.action.help"/></p>
+            <div>
+                <button type="button" name="hide">Hide this tip</button>
+                <button type="button" name="disable">Disable all tips</button>
+            </div>
+        </blockquote>
     	<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
     	   href="javascript: void(0)"> </a>
         <h2 class="oe_view_title">

From c5c689a21c3ddeb200aeb6087e244ebcbbb0ae35 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 12:15:31 +0200
Subject: [PATCH 23/51] [IMP] when hiding a given menu tip, hide for the length
 of the web client session

bzr revid: xmo@openerp.com-20110914101531-ci5c8z7rearvycyh
---
 addons/web/static/src/js/views.js  | 25 +++++++++++++++++--------
 addons/web/static/src/xml/base.xml |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5ecf462870b..5048f18d4c2 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -327,6 +327,12 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
             // buttons, sidebar, ...) displaying
             this.flags.search_view = this.flags.pager = this.flags.sidebar = this.flags.action_buttons = false;
         }
+
+        // setup storage for session-wise menu hiding
+        if (this.session.hidden_menutips) {
+            return;
+        }
+        this.session.hidden_menutips = {}
     },
     /**
      * Initializes the ViewManagerAction: sets up the searchview (if the
@@ -370,7 +376,7 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
         if (this.action.help) {
             var Users = new openerp.web.DataSet(self, 'res.users'),
                 header = this.$element.find('.oe-view-manager-header');
-            header.delegate(' blockquote button', 'click', function () {
+            header.delegate('blockquote button', 'click', function () {
                 var $this = $(this);
                 //noinspection FallthroughInSwitchStatementJS
                 switch($this.attr('name')) {
@@ -378,15 +384,18 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
                     Users.write(self.session.uid, {menu_tips: false});
                 case 'hide':
                     $this.closest('blockquote').hide();
+                    self.session.hidden_menutips[self.action.id] = true;
                 }
             });
-            Users.read_ids([this.session.uid], ['menu_tips'], function (users) {
-                var user = users[0];
-                if (!(user && user.id === self.session.uid)) {
-                    return;
-                }
-                header.find('blockquote').toggle(user.menu_tips);
-            });
+            if (!(self.action.id in self.session.hidden_menutips)) {
+                Users.read_ids([this.session.uid], ['menu_tips'], function (users) {
+                    var user = users[0];
+                    if (!(user && user.id === self.session.uid)) {
+                        return;
+                    }
+                    header.find('blockquote').toggle(user.menu_tips);
+                });
+            }
         }
 
         return manager_ready;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9007955b056..69ead1d2c32 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -445,7 +445,7 @@
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
     <t t-jquery=".oe-view-manager-header" t-operation="prepend">
-        <blockquote t-if="self.action.help">
+        <blockquote t-if="self.action.help and !(self.action.id in self.session.hidden_menutips)">
             <p><t t-esc="self.action.help"/></p>
             <div>
                 <button type="button" name="hide">Hide this tip</button>

From 4b9d94d3b909bae1f37da4853b1282f823b24eb7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 14 Sep 2011 12:39:59 +0200
Subject: [PATCH 24/51] [FIX] Clean and Rewrite the code of the previous commit

bzr revid: stw@openerp.com-20110914103959-c2kbbmosrkv3w6ge
---
 addons/crm/wizard/crm_merge_opportunities.py | 40 +++++++-------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index b6aeacf9810..464fc0d070f 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -49,20 +49,9 @@ class crm_merge_opportunity(osv.osv_memory):
 
 
     def get_attachments(self, cr, uid, id, context=None):
-        attach_obj = self.pool.get('ir.attachment')
-        attach_ids = attach_obj.search(cr, uid, [('res_model' , '=', 'crm.lead'), ('res_id', '=', id)])
-        if attach_ids:
-            return attach_obj.browse(cr, uid, attach_ids)
-        else:
-            return False
-
-    def set_attachements_res_id(self, cr, uid, op_id, attachments, context=None):
-        attach_obj = self.pool.get('ir.attachment')
-        for attachment in attachments:
-            attachment.update({'res_id' : op_id})
-            id = attachment['id']
-            del attachment['id']
-            attach_obj.write(cr, uid, id, attachment)
+        proxy = self.pool.get('ir.attachment')
+        ids = proxy.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', id)], context=context)
+        return proxy.browse(cr, uid, ids, context=context)
 
     def find_oldest(self, cr, uid, op_ids, context=None):
         if not context:
@@ -138,23 +127,22 @@ class crm_merge_opportunity(osv.osv_memory):
             tail_opportunities = opportunities_list[1:]
             
         data = self._update_data(op_ids, oldest_opp)
+
         #copy message into the first opportunity + merge attachement
-        attach = []
         count = 1
         first_attachments = self.get_attachments(cr, uid, first_opportunity, context=context)
         for opp in tail_opportunities:
             attachments = self.get_attachments(cr, uid, opp, context=context)
-            if attachments:
-                for first in first_attachments:
-                    res = {}
-                    for attachment in attachments:
-                        if attachment.name == first.name:
-                            res.update({'name':attachment.name+'('+`count`+')'})
-                            res.update({'id':[attachment.id]})
-                            attach.append(res)
-                            count+=1
+            for first in first_attachments:
+                for attachment in attachments:
+                    if attachment.name == first.name:
+                        values = dict(
+                            name = "%s (%s)" % (attachment.name, count,),
+                            res_id = first_opportunity.id,
+                        )
+                        attachment.write(values)
+                        count+=1
                     
-            self.set_attachements_res_id(cr, uid, first_opportunity.id, attach)
             for history in opp.message_ids:
                 message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'name' : _("From %s : %s") % (opp.name, history.name) }, context=context)
 
@@ -190,7 +178,7 @@ class crm_merge_opportunity(osv.osv_memory):
 
         opp_obj._history(cr, uid, [first_opportunity], subject, details=details)
         #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
-        opp_obj.write(cr, uid, [first_opportunity.id], data)
+        opp_obj.write(cr, uid, [first_opportunity.id], data, context=context)
         unlink_ids = map(lambda x: x.id, tail_opportunities)
         opp_obj.unlink(cr, uid, unlink_ids, context=context)
 

From 623bdb2c9f2c66c905dcb91ff99bc3d89453f491 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 Sep 2011 14:06:44 +0200
Subject: [PATCH 25/51] [FIX] ir.mail_server: care for non-ascii connection
 error message

bzr revid: odo@openerp.com-20110914120644-u0e2dmo2n146nl97
---
 openerp/addons/base/ir/ir_mail_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py
index 0701412043c..96fa9f52a88 100644
--- a/openerp/addons/base/ir/ir_mail_server.py
+++ b/openerp/addons/base/ir/ir_mail_server.py
@@ -189,7 +189,7 @@ class ir_mail_server(osv.osv):
                                     password=smtp_server.smtp_pass, encryption=smtp_server.smtp_encryption,
                                     smtp_debug=smtp_server.smtp_debug)
             except Exception, e:
-                raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % e)
+                raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
             finally:
                 try:
                     if smtp: smtp.quit()

From 6289ce38f9a4e1c7d0aee7a3d565f883f8e0e27c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 14 Sep 2011 14:07:53 +0200
Subject: [PATCH 26/51] [FIX] fetchmail.server: care for non-ascii connection
 error message

bzr revid: odo@openerp.com-20110914120753-tt1x0kr8b1noj84j
---
 addons/fetchmail/fetchmail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 8aaff197d47..b7460965c3b 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -120,7 +120,7 @@ class fetchmail_server(osv.osv):
                 server.write({'state':'done'})
             except Exception, e:
                 logger.exception("Failed to connect to %s server %s", server.type, server.name)
-                raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % e)
+                raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e))
             finally:
                 try:
                     if connection:

From 74d0339fb0138485d5f3ca21ca91abfa480a31dd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 14:13:05 +0200
Subject: [PATCH 27/51] [ADD] base res_log display

bzr revid: xmo@openerp.com-20110914121305-mcey8e3t36omkr2k
---
 addons/web/static/src/css/base.css            | 15 ++++++++
 addons/web/static/src/js/core.js              |  1 +
 addons/web/static/src/js/form.js              |  2 +-
 addons/web/static/src/js/list.js              |  4 +--
 addons/web/static/src/js/views.js             | 35 ++++++++++++++++---
 addons/web/static/src/xml/base.xml            |  3 ++
 .../web_dashboard/static/src/js/dashboard.js  |  2 +-
 addons/web_kanban/static/src/js/kanban.js     |  2 +-
 8 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 433cdd2e638..7c6e8432950 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1013,6 +1013,21 @@ label.error {
     text-decoration: underline;
     color: inherit;
 }
+.openerp .oe-view-manager-logs {
+    font-size: 85%;
+    margin: 0.5em 0;
+    background: #fff;
+    padding: 0 10px;
+    color: #4C4C4C;
+    list-style: none;
+}
+.openerp .oe-view-manager-logs li:before {
+    content: '→';
+}
+.openerp .oe-view-manager-logs a {
+    text-decoration: none;
+    color: inherit;
+}
 
 .openerp .view-manager-main-sidebar {
     width: 180px;
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index f279a7d23d7..6462529d0c9 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -888,6 +888,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
      * If that's not the case this method will simply return `false`.
      */
     do_action: function(action, on_finished) {
+        console.log('Widget.do_action', action, on_finished);
         if (this.widget_parent) {
             return this.widget_parent.do_action(action, on_finished);
         }
diff --git a/addons/web/static/src/js/form.js b/addons/web/static/src/js/form.js
index 7bb4c7aa392..ff8e695278e 100644
--- a/addons/web/static/src/js/form.js
+++ b/addons/web/static/src/js/form.js
@@ -836,7 +836,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
     on_confirmed: function() {
         var self = this;
 
-        this.view.execute_action(
+        this.view.do_execute_action(
             this.node.attrs, this.view.dataset, this.view.datarecord.id, function () {
                 self.view.reload();
             });
diff --git a/addons/web/static/src/js/list.js b/addons/web/static/src/js/list.js
index 95a8207144b..60ba22dc68c 100644
--- a/addons/web/static/src/js/list.js
+++ b/addons/web/static/src/js/list.js
@@ -41,8 +41,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {void|String} [options.addable="New"] should the new-record button be displayed, and what should its label be. Use ``null`` to hide the button.
      * @param {Boolean} [options.sortable=true] is it possible to sort the table by clicking on column headers
      * @param {Boolean} [options.reorderable=true] is it possible to reorder list rows
-     *
-     * @borrows openerp.web.ActionExecutor#execute_action as #execute_action
      */
     init: function(parent, element_id, dataset, view_id, options) {
         var self = this;
@@ -490,7 +488,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             return field.name === name;
         });
         if (!action) { return; }
-        this.execute_action(action, this.dataset, id, callback);
+        this.do_execute_action(action, this.dataset, id, callback);
     },
     /**
      * Handles the activation of a record (clicking on it)
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5048f18d4c2..b113c60afd3 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -297,7 +297,11 @@ openerp.web.ViewManager =  openerp.web.Widget.extend(/** @lends openerp.web.View
     on_remove: function() {
     },
     on_edit: function() {
-    }
+    },
+    /**
+     * Called by children view after executing an action
+     */
+    on_action_executed: function () {}
 });
 
 openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
@@ -446,6 +450,23 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
                     $shortcut_toggle.addClass("oe-shortcut-remove");
                 }
             });
+    },
+    /**
+     * Intercept do_action resolution from children views
+     */
+    on_action_executed: function () {
+        new openerp.web.DataSet(this, 'res.log')
+                .call('get', [], this.do_display_log);
+    },
+    /**
+     * @param {Array<Object>} log_records
+     */
+    do_display_log: function (log_records) {
+        var logs = this.$element.find('ul.oe-view-manager-logs:first').empty();
+        _(log_records).each(function (record) {
+            // TODO: fix link: bind action?
+            logs.append(_.sprintf('<li><a href="#">%s</a></li>', record.name));
+        });
     }
 });
 
@@ -721,8 +742,12 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
-    execute_action: function (action_data, dataset, record_id, on_closed) {
+    do_execute_action: function (action_data, dataset, record_id, on_closed) {
         var self = this;
+        var result_handler = function () {
+            if (on_closed) { on_closed.apply(null, arguments); }
+            self.widget_parent.on_action_executed.apply(null, arguments);
+        };
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
@@ -733,9 +758,9 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
                     active_model: dataset.model
                 });
                 action.context = new openerp.web.CompoundContext(dataset.get_context(), action.context);
-                self.do_action(action, on_closed);
-            } else if (on_closed) {
-                on_closed(action);
+                self.do_action(action, result_handler);
+            } else {
+                result_handler();
             }
         };
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 69ead1d2c32..bf91e2d65e4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -461,6 +461,9 @@
             </button>
         </h2>
     </t>
+    <t t-jquery=".oe-view-manager-header" t-operation="after">
+        <ul class="oe-view-manager-logs"></ul>
+    </t>
 </t>
 
 <t t-name="Sidebar">
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 9fe904319f9..b2d1eab5377 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -333,7 +333,7 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
                 });
             })
             .delegate('li:not(.oe-done)', 'click', function () {
-                self.widget_parent.widget_parent.widget_parent.execute_action({
+                self.widget_parent.widget_parent.widget_parent.do_execute_action({
                         type: 'object',
                         name: 'action_launch'
                     }, self.dataset,
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index dfaf7769df5..d90f4bc5ed8 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -224,7 +224,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
     },
     on_execute_button_click: function (dataset, button_attrs, record_id) {
         var self = this;
-        this.execute_action(
+        this.do_execute_action(
             button_attrs, dataset,
             record_id, function () {
                 var count = 1;

From 980898da89bd08768dadd4671c4095df316beb2d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 14:25:25 +0200
Subject: [PATCH 28/51] [ADD] correctly link log entries to the corresponding
 form view object

bzr revid: xmo@openerp.com-20110914122525-mo3oirufdgks83ug
---
 addons/web/static/src/js/views.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b113c60afd3..0e4016f4250 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -462,10 +462,22 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
      * @param {Array<Object>} log_records
      */
     do_display_log: function (log_records) {
-        var logs = this.$element.find('ul.oe-view-manager-logs:first').empty();
+        var self = this,
+            $logs = this.$element.find('ul.oe-view-manager-logs:first').empty();
         _(log_records).each(function (record) {
-            // TODO: fix link: bind action?
-            logs.append(_.sprintf('<li><a href="#">%s</a></li>', record.name));
+            $(_.sprintf('<li><a href="#">%s</a></li>', record.name))
+                .appendTo($logs)
+                .delegate('a', 'click', function (e) {
+                    self.do_action({
+                        type: 'ir.actions.act_window',
+                        res_model: record.res_model,
+                        res_id: record.res_id,
+                        // TODO: need to have an evaluated context here somehow
+                        //context: record.context,
+                        views: [[false, 'form']]
+                    });
+                    return false;
+                });
         });
     }
 });

From 3b8ebe06159f9c7e41c813cc3b1421c29c2121c8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 14:31:08 +0200
Subject: [PATCH 29/51] [IMP] hr_payroll: usability improvements

bzr revid: qdp-launchpad@openerp.com-20110914123108-k5xtjxau4zc50sv8
---
 addons/hr_payroll/hr_payroll_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index dd750e57282..a2523fcb7ba 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -77,7 +77,7 @@
             <field name="type">tree</field>
             <field name="field_parent">children_ids</field>
             <field name="arch" type="xml">
-                <tree string="Employee Function">
+                <tree string="Salary Structure">
                     <field name="name"/>
                     <field name="code"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -142,7 +142,7 @@
             sequence="1"
         />
         <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
-            <field name="name">Salary Structures</field>
+            <field name="name">Salary Structures Hierarchy</field>
             <field name="res_model">hr.payroll.structure</field>
             <field name="view_type">tree</field>
             <field name="domain">[('parent_id','=',False)]</field>
@@ -482,7 +482,7 @@
             sequence="11"
         />
         <record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
-            <field name="name">Salary Rule Categories</field>
+            <field name="name">Salary Rule Categories Hierarchy</field>
             <field name="res_model">hr.salary.rule.category</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="hr_salary_rule_category_tree_view"/>

From c14d2b82cc03d9608cf91122bab37a602521ce0a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 14:58:14 +0200
Subject: [PATCH 30/51] [IMP] look of ViewManagerAction header

bzr revid: xmo@openerp.com-20110914125814-r068qnuruiw2j5nf
---
 addons/web/static/src/css/base.css | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7c6e8432950..6012bec1f29 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -988,6 +988,12 @@ label.error {
 .openerp .view-manager-main-content {
     width: 100%;
 }
+.openerp .oe-view-manager-header {
+    overflow: auto;
+}
+.openerp .oe-view-manager-header h2 {
+    float: left;
+}
 .openerp .oe-view-manager-header blockquote {
     display: none;
     font-size: 85%;
@@ -1014,15 +1020,16 @@ label.error {
     color: inherit;
 }
 .openerp .oe-view-manager-logs {
+    clear: both;
     font-size: 85%;
-    margin: 0.5em 0;
+    margin: 0.25em 0;
     background: #fff;
     padding: 0 10px;
     color: #4C4C4C;
     list-style: none;
 }
 .openerp .oe-view-manager-logs li:before {
-    content: '→';
+    content: '→ ';
 }
 .openerp .oe-view-manager-logs a {
     text-decoration: none;

From 4ac9cc76f05202adcdaead15d700f981567324ea Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 15:03:08 +0200
Subject: [PATCH 31/51] [IMP] very basic url support

bzr revid: al@openerp.com-20110914130308-catb05wb0t376lmi
---
 addons/web/static/src/js/chrome.js | 104 ++++++++++++++++++-----------
 addons/web/static/src/js/views.js  |  19 +++---
 2 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index a04456cfaa5..3cfbb5c8464 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -839,7 +839,11 @@ openerp.web.Menu =  openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
         $menu.addClass('active');
         $menu.parent('h4').addClass('active');
 
-        return !$menu.is(".leaf");
+        if (this.$secondary_menu.has($menu).length) {
+            return !$menu.is(".leaf");
+        } else {
+            return false;
+        }
     },
     on_menu_action_loaded: function(data) {
         var self = this;
@@ -878,7 +882,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         // Do you autorize this ? will be replaced by notify() in controller
         openerp.web.Widget.prototype.notification = new openerp.web.Notification(this, "oe_notification");
 
-        
         this.header = new openerp.web.Header(this);
         this.login = new openerp.web.Login(this, "oe_login");
         this.header.on_logout.add(this.login.on_logout);
@@ -891,6 +894,11 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
 
         this.menu = new openerp.web.Menu(this, "oe_menu", "oe_secondary_menu");
         this.menu.on_action.add(this.on_menu_action);
+
+        this.url_internal_hashchange = false;
+        this.url_external_hashchange = false;
+        jQuery(window).bind('hashchange', this.on_url_hashchange);
+
     },
     start: function() {
         this.header.appendTo($("#oe_header"));
@@ -904,44 +912,45 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             this.action_manager.stop();
         this.action_manager = new openerp.web.ActionManager(this);
         this.action_manager.appendTo($("#oe_app"));
+        this.action_manager.do_url_set_hash.add_last(this.do_url_set_hash);
 
-        // if using saved actions, load the action and give it to action manager
-        var parameters = jQuery.deparam(jQuery.param.querystring());
-        if (parameters["s_action"] != undefined) {
-            var key = parseInt(parameters["s_action"], 10);
-            var self = this;
-            this.rpc("/web/session/get_session_action", {key:key}, function(action) {
-                self.action_manager.do_action(action);
-            });
-        } else if (openerp._modules_loaded) { // TODO: find better option than this
-            this.load_url_state()
-        } else {
-            this.session.on_modules_loaded.add({
-                callback: $.proxy(this, 'load_url_state'),
-                unique: true,
-                position: 'last'
-            })
-        }
-    },
-    /**
-     * Loads state from URL if any, or checks if there is a home action and
-     * loads that, assuming we're at the index
-     */
-    load_url_state: function () {
-        var self = this;
-        // TODO: add actual loading if there is url state to unpack, test on window.location.hash
+        // // if using saved actions, load the action and give it to action manager
+        // var parameters = jQuery.deparam(jQuery.param.querystring());
+        // if (parameters["s_action"] != undefined) {
+        //     var key = parseInt(parameters["s_action"], 10);
+        //     var self = this;
+        //     this.rpc("/web/session/get_session_action", {key:key}, function(action) {
+        //         self.action_manager.do_action(action);
+        //     });
+        // } else if (openerp._modules_loaded) { // TODO: find better option than this
+        //     this.load_url_state()
+        // } else {
+        //     this.session.on_modules_loaded.add({
+        //         callback: $.proxy(this, 'load_url_state'),
+        //         unique: true,
+        //         position: 'last'
+        //     })
+        // }
 
-        // not logged in
-        if (!this.session.uid) { return; }
-        var ds = new openerp.web.DataSetSearch(this, 'res.users');
-        ds.read_ids([this.session.uid], ['action_id'], function (users) {
-            var home_action = users[0].action_id;
-            if (!home_action) {
-                self.default_home();
-                return;
-            }
-            self.execute_home_action(home_action[0], ds);
-        })
+    // /**
+    //  * Loads state from URL if any, or checks if there is a home action and
+    //  * loads that, assuming we're at the index
+    //  */
+    // load_url_state: function () {
+    //     var self = this;
+    //     // TODO: add actual loading if there is url state to unpack, test on window.location.hash
+    //     // not logged in
+    //     if (!this.session.uid) { return; }
+    //     var ds = new openerp.web.DataSetSearch(this, 'res.users');
+    //     ds.read_ids([this.session.uid], ['action_id'], function (users) {
+    //         var home_action = users[0].action_id;
+    //         if (!home_action) {
+    //             self.default_home();
+    //             return;
+    //         }
+    //         self.execute_home_action(home_action[0], ds);
+    //     })
+    // },
     },
     default_home: function () { 
     },
@@ -966,6 +975,25 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
             self.action_manager.do_action(action);
         });
     },
+    do_url_set_hash: function(url) {
+        if(!this.url_external_hashchange) {
+            console.log("url set #hash to",url);
+            this.url_internal_hashchange = true;
+            jQuery.bbq.pushState(url);
+        }
+    },
+    on_url_hashchange: function() {
+        if(this.url_internal_hashchange) {
+            this.url_internal_hashchange = false;
+            console.log("url jump to FLAG OFF");
+        } else {
+            var url = jQuery.deparam.fragment();
+            console.log("url jump to",url);
+            this.url_external_hashchange = true;
+            this.action_manager.on_url_hashchange(url);
+            this.url_external_hashchange = false;
+        }
+    },
     on_menu_action: function(action) {
         this.action_manager.do_action(action);
     },
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 5048f18d4c2..b5a4cefce74 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -20,7 +20,6 @@ openerp.web.ActionManager = openerp.web.Widget.extend({
         this.dialog = null;
         this.dialog_viewmanager = null;
         this.client_widget = null;
-        this.url = {}
     },
     render: function() {
         return "<div id='"+this.element_id+"'></div>";
@@ -44,8 +43,11 @@ openerp.web.ActionManager = openerp.web.Widget.extend({
         }
     },
     url_update: function(action) {
+        var url = {};
+        if(action.id)
+            url.action_id = action.id;
         // this.url = {
-        //     "model": action.model,
+        //     "model": action.res_model,
         //     "domain": action.domain,
         // };
         // action.res_model
@@ -56,14 +58,15 @@ openerp.web.ActionManager = openerp.web.Widget.extend({
         // action.res_id
         // mode
         // menu
+        this.do_url_set_hash(url);
     },
-    url_stringify: function(action) {
+    do_url_set_hash: function(url) {
     },
-    url_parse: function(action) {
-    },
-    on_url_update: function(url) {
-    },
-    do_url_action: function(url) {
+    on_url_hashchange: function(url) {
+        var self = this;
+        self.rpc("/web/action/load", { action_id: url.action_id }, function(result) {
+                self.do_action(result.result);
+            });
     },
     do_action: function(action, on_close) {
         var type = action.type.replace(/\./g,'_');

From 7a84f7a872a2491ffd80b0e93d5fa604a8ddad22 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 15:14:54 +0200
Subject: [PATCH 32/51] [FIX] temporarly restore WebClient.load_url_state

bzr revid: al@openerp.com-20110914131454-sbamws59qu84i5gh
---
 addons/web/static/src/js/chrome.js | 73 +++++++++++++++---------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3cfbb5c8464..d114f485c62 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -914,43 +914,42 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.action_manager.appendTo($("#oe_app"));
         this.action_manager.do_url_set_hash.add_last(this.do_url_set_hash);
 
-        // // if using saved actions, load the action and give it to action manager
-        // var parameters = jQuery.deparam(jQuery.param.querystring());
-        // if (parameters["s_action"] != undefined) {
-        //     var key = parseInt(parameters["s_action"], 10);
-        //     var self = this;
-        //     this.rpc("/web/session/get_session_action", {key:key}, function(action) {
-        //         self.action_manager.do_action(action);
-        //     });
-        // } else if (openerp._modules_loaded) { // TODO: find better option than this
-        //     this.load_url_state()
-        // } else {
-        //     this.session.on_modules_loaded.add({
-        //         callback: $.proxy(this, 'load_url_state'),
-        //         unique: true,
-        //         position: 'last'
-        //     })
-        // }
-
-    // /**
-    //  * Loads state from URL if any, or checks if there is a home action and
-    //  * loads that, assuming we're at the index
-    //  */
-    // load_url_state: function () {
-    //     var self = this;
-    //     // TODO: add actual loading if there is url state to unpack, test on window.location.hash
-    //     // not logged in
-    //     if (!this.session.uid) { return; }
-    //     var ds = new openerp.web.DataSetSearch(this, 'res.users');
-    //     ds.read_ids([this.session.uid], ['action_id'], function (users) {
-    //         var home_action = users[0].action_id;
-    //         if (!home_action) {
-    //             self.default_home();
-    //             return;
-    //         }
-    //         self.execute_home_action(home_action[0], ds);
-    //     })
-    // },
+        // if using saved actions, load the action and give it to action manager
+        var parameters = jQuery.deparam(jQuery.param.querystring());
+        if (parameters["s_action"] != undefined) {
+            var key = parseInt(parameters["s_action"], 10);
+            var self = this;
+            this.rpc("/web/session/get_session_action", {key:key}, function(action) {
+                self.action_manager.do_action(action);
+            });
+        } else if (openerp._modules_loaded) { // TODO: find better option than this
+            this.load_url_state()
+        } else {
+            this.session.on_modules_loaded.add({
+                callback: $.proxy(this, 'load_url_state'),
+                unique: true,
+                position: 'last'
+            })
+        }
+    },
+    /**
+     * Loads state from URL if any, or checks if there is a home action and
+     * loads that, assuming we're at the index
+     */
+    load_url_state: function () {
+        var self = this;
+        // TODO: add actual loading if there is url state to unpack, test on window.location.hash
+        // not logged in
+        if (!this.session.uid) { return; }
+        var ds = new openerp.web.DataSetSearch(this, 'res.users');
+        ds.read_ids([this.session.uid], ['action_id'], function (users) {
+            var home_action = users[0].action_id;
+            if (!home_action) {
+                self.default_home();
+                return;
+            }
+            self.execute_home_action(home_action[0], ds);
+        })
     },
     default_home: function () { 
     },

From 284f7467faa79d08778d5afb33de052ab1a850d4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 15:16:35 +0200
Subject: [PATCH 33/51] [ADD] low_profile action flag used by viewmanager to
 know if it needs to render the help menu (used by e.g. dashboards)

bzr revid: xmo@openerp.com-20110914131635-qyvwgvw2y67h9pu0
---
 addons/web/static/src/js/views.js               | 10 +++++-----
 addons/web/static/src/xml/base.xml              |  3 ++-
 addons/web_dashboard/static/src/js/dashboard.js |  3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0e4016f4250..006a58b231d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -377,22 +377,22 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
                 self.views[self.active_view].controller.fields_view.arch, true))
                     .dialog({ width: '95%'});
         });
-        if (this.action.help) {
+        if (this.action.help && !this.flags.low_profile) {
             var Users = new openerp.web.DataSet(self, 'res.users'),
                 header = this.$element.find('.oe-view-manager-header');
-            header.delegate('blockquote button', 'click', function () {
+            header.delegate('blockquote button', 'click', function() {
                 var $this = $(this);
                 //noinspection FallthroughInSwitchStatementJS
-                switch($this.attr('name')) {
+                switch ($this.attr('name')) {
                 case 'disable':
-                    Users.write(self.session.uid, {menu_tips: false});
+                    Users.write(self.session.uid, {menu_tips:false});
                 case 'hide':
                     $this.closest('blockquote').hide();
                     self.session.hidden_menutips[self.action.id] = true;
                 }
             });
             if (!(self.action.id in self.session.hidden_menutips)) {
-                Users.read_ids([this.session.uid], ['menu_tips'], function (users) {
+                Users.read_ids([this.session.uid], ['menu_tips'], function(users) {
                     var user = users[0];
                     if (!(user && user.id === self.session.uid)) {
                         return;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index bf91e2d65e4..041e2ced2e9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -445,7 +445,8 @@
 
 <t t-extend="ViewManager" t-name="ViewManagerAction">
     <t t-jquery=".oe-view-manager-header" t-operation="prepend">
-        <blockquote t-if="self.action.help and !(self.action.id in self.session.hidden_menutips)">
+        <blockquote t-if="self.action.help and !self.flags.low_profile
+                         and !(self.action.id in self.session.hidden_menutips)">
             <p><t t-esc="self.action.help"/></p>
             <div>
                 <button type="button" name="hide">Hide this tip</button>
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index b2d1eab5377..a6855894a99 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -223,7 +223,8 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
             sidebar : false,
             views_switcher : false,
             action_buttons : false,
-            pager: false
+            pager: false,
+            low_profile: true
         };
         var am = new openerp.web.ActionManager(this);
         this.action_managers.push(am);

From d515a2cbe7a55b5a7c932828c14134357e1add58 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 14 Sep 2011 15:18:11 +0200
Subject: [PATCH 34/51] [imp] new version of the client lib, with xmo
 improvements

bzr revid: nicolas.vanhoren@openerp.com-20110914131811-qurqqux4p4wtfx72
---
 addons/web/common/dispatch.py            |  2 +-
 addons/web/common/openerplib/__init__.py | 23 +++----
 addons/web/common/openerplib/dates.py    | 22 +++---
 addons/web/common/openerplib/main.py     | 87 ++++++++++++------------
 4 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py
index afcde2edfad..98b948704fa 100644
--- a/addons/web/common/dispatch.py
+++ b/addons/web/common/dispatch.py
@@ -167,7 +167,7 @@ class JsonRequest(WebRequest):
                 _logger.debug("--> %s.%s\n%s", controller.__class__.__name__, method.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
             response["result"] = method(controller, self, **self.params)
-        except openerplib.AuthentificationError:
+        except openerplib.AuthenticationError:
             error = {
                 'code': 100,
                 'message': "OpenERP Session Invalid",
diff --git a/addons/web/common/openerplib/__init__.py b/addons/web/common/openerplib/__init__.py
index 23fc257e4d1..5c0bd8ec655 100644
--- a/addons/web/common/openerplib/__init__.py
+++ b/addons/web/common/openerplib/__init__.py
@@ -7,29 +7,26 @@
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
+# modification, are permitted provided that the following conditions are met: 
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution. 
 # 
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+# 
 ##############################################################################
 
-
 from main import *
 
diff --git a/addons/web/common/openerplib/dates.py b/addons/web/common/openerplib/dates.py
index 6d6c3808c27..6d4fa9e2f63 100644
--- a/addons/web/common/openerplib/dates.py
+++ b/addons/web/common/openerplib/dates.py
@@ -7,27 +7,25 @@
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
+# modification, are permitted provided that the following conditions are met: 
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution. 
 # 
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+# 
 ##############################################################################
 
 import datetime
diff --git a/addons/web/common/openerplib/main.py b/addons/web/common/openerplib/main.py
index 36b15e09c68..21f8d48ff63 100644
--- a/addons/web/common/openerplib/main.py
+++ b/addons/web/common/openerplib/main.py
@@ -7,31 +7,32 @@
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
+# modification, are permitted provided that the following conditions are met: 
+# 
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer. 
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution. 
 # 
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+# 
 ##############################################################################
 
 """
 OpenERP Client Library
+
+Home page: http://pypi.python.org/pypi/openerp-client-lib
+Code repository: https://code.launchpad.net/~niv-openerp/openerp-client-lib/trunk
 """
 
 import xmlrpclib
@@ -40,14 +41,12 @@ import socket
 
 try:
     import cPickle as pickle
-    pickle.__name__
-except:
+except ImportError:
     import pickle
 
 try:
     import cStringIO as StringIO
-    StringIO.__name__
-except:
+except ImportError:
     import StringIO
 
 _logger = logging.getLogger(__name__)
@@ -102,7 +101,7 @@ class NetRPC_Exception(Exception):
         self.faultString = faultString
         self.args = (faultCode, faultString)
 
-class NetRPC:
+class NetRPC(object):
     """
     Low level class for NetRPC protocol.
     """
@@ -191,7 +190,7 @@ class NetRPCConnector(Connector):
         socket.disconnect()
         return result
 
-class Service:
+class Service(object):
     """
     A class to execute RPC calls on a specific service of the remote server.
     """
@@ -215,13 +214,13 @@ class Service:
             """
             self.__logger.debug('args: %r', args)
             result = self.connector.send(self.service_name, method, *args)
-            self.__logger.debug('result: %r' % result)
+            self.__logger.debug('result: %r', result)
             return result
         return proxy
 
 class Connection(object):
     """
-    A class to represent a connection with authentification to an OpenERP Server.
+    A class to represent a connection with authentication to an OpenERP Server.
     It also provides utility methods to interact with the server more easily.
     """
     __logger = _getChildLogger(_logger, 'connection')
@@ -263,8 +262,8 @@ class Connection(object):
         
     def check_login(self, force=True):
         """
-        Checks that the login information is valid. Throws an AuthentificationError if the
-        authentification fails.
+        Checks that the login information is valid. Throws an AuthenticationError if the
+        authentication fails.
 
         :param force: Force to re-check even if this Connection was already validated previously.
         Default to True.
@@ -273,46 +272,46 @@ class Connection(object):
             return
         
         if not self.database or not self.login or self.password is None:
-            raise AuthentificationError("Creditentials not provided")
+            raise AuthenticationError("Creditentials not provided")
         
         self.user_id = self.get_service("common").login(self.database, self.login, self.password)
         if not self.user_id:
-            raise AuthentificationError("Authentification failure")
-        self.__logger.debug("Authentified with user id %s" % self.user_id)
+            raise AuthenticationError("Authentication failure")
+        self.__logger.debug("Authenticated with user id %s", self.user_id)
     
-    """
-    Returns a Model instance to allow easy remote manipulation of an OpenERP model.
-    
-    :param model_name: The name of the model.
-    """
     def get_model(self, model_name):
+        """
+        Returns a Model instance to allow easy remote manipulation of an OpenERP model.
+
+        :param model_name: The name of the model.
+        """
         return Model(self, model_name)
 
-    """
-    Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
-    Please note this Connection instance does not need to have valid authenfication information since authentification
-    is only necessary for the "object" service that handles models.
-
-    :param service_name: The name of the service.
-    """
     def get_service(self, service_name):
+        """
+        Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
+        Please note this Connection instance does not need to have valid authentication information since authentication
+        is only necessary for the "object" service that handles models.
+
+        :param service_name: The name of the service.
+        """
         return Service(self.connector, service_name)
 
-class AuthentificationError(Exception):
+class AuthenticationError(Exception):
     """
-    An error thrown when an authentification to an OpenERP server failed.
+    An error thrown when an authentication to an OpenERP server failed.
     """
     pass
 
 class Model(object):
     """
     Useful class to dialog with one of the models provided by an OpenERP server.
-    An instance of this class depends on a Connection instance with valid authenfication information.
+    An instance of this class depends on a Connection instance with valid authentication information.
     """
 
     def __init__(self, connection, model_name):
         """
-        :param connection: A valid Connection instance with correct authentification information.
+        :param connection: A valid Connection instance with correct authentication information.
         :param model_name: The name of the model.
         """
         self.connection = connection
@@ -341,10 +340,10 @@ class Model(object):
             if method == "read":
                 if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
                     index = {}
-                    for i in xrange(len(result)):
-                        index[result[i]["id"]] = result[i]
+                    for r in result:
+                        index[r['id']] = r
                     result = [index[x] for x in args[0]]
-            self.__logger.debug('result: %r' % result)
+            self.__logger.debug('result: %r', result)
             return result
         return proxy
 

From 0dff60cf2684bcf5dc6c4f89ddf0cdd3661ce116 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 16:05:57 +0200
Subject: [PATCH 35/51] [FIX] hr_payroll: fixed rule in demo data

bzr revid: qdp-launchpad@openerp.com-20110914140557-nkm6j1fjpo34nfd2
---
 addons/hr_payroll/hr_payroll_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 8af4785dde7..87deaef2f51 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -89,7 +89,7 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Get 1% of sales</field>
             <field name="sequence" eval="17"/>
-            <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * contract.wage * 0.01</field>
+            <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
          </record>
 
         <!-- Rule Inputs -->

From 7a154e5689887dd3c4ed3d6244ae1b5711cc98f7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 16:06:30 +0200
Subject: [PATCH 36/51] [IMP] hr_payroll_l10n_be: demo data enhancement

bzr revid: qdp-launchpad@openerp.com-20110914140630-89b8rcilb0si9pyf
---
 addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml
index f40e4c4dc84..c9e284f8e9b 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml
+++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_demo.xml
@@ -4,7 +4,7 @@
 
         <!-- Employee Contract -->
         <record id="hr_payroll.hr_contract_firstcontract1" model="hr.contract">
-            <field name="name">Bonamy's Contract (C.P.218)</field>
+            <field name="name">Bonamy's Contract (Belgium payroll C.P. 218)</field>
             <field name="struct_id" ref="hr_payroll_salary_structure_employee"/>
             <field eval="2500.0" name="wage"/>
             <field eval="6.0" name="ch_value"/>

From bedd3306c103fd907154a2db546c2eb45f545a1b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 16:06:59 +0200
Subject: [PATCH 37/51] [IMP] hr_payroll_l10n_be: better view for contracts

bzr revid: qdp-launchpad@openerp.com-20110914140659-mmwzoojdiksibzqm
---
 addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
index 2b5264dbc96..213e2a8aa47 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
+++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="/form/notebook/page/group/field[@name='advantages']" position="after">
+                 <xpath expr="/form/notebook/page/group/field[@name='struct_id']" position="after">
                     <field name="reim_travel"/>
                     <field name="company_car_emp"/>
                     <field name="mis_ex_onss"/>
@@ -29,9 +29,6 @@
                         <field name="company_car_wkr"/>
                     </group>
                  </xpath>
-                 <xpath expr="/form//group/field[@name='type_id']" position="after">
-                    <field name="struct_id" select="1"/>
-                 </xpath>
             </data>
             </field>
         </record>

From 9ab8acb85886a78d2a1c0676d921eb654c34c4a6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 16:23:43 +0200
Subject: [PATCH 38/51] [IMP] hr_contract: added names on page and group of
 contract view, for xpath

bzr revid: qdp-launchpad@openerp.com-20110914142343-3y2fkxlz1de6iwqj
---
 addons/hr_contract/hr_contract_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 2d2bdc5a178..cfccd8912dc 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -75,8 +75,8 @@
                         <field name="type_id" widget="selection"/>
                     </group>
                     <notebook>
-                    <page string="Information">
-                        <group col="2" colspan="2">
+                    <page string="Information" name="information">
+                        <group col="2" colspan="2" name="left_column">
                             <separator colspan="2" string="Duration"/>
                             <field name="date_start" />
                             <field name="date_end" />
@@ -85,7 +85,7 @@
                             <field name="trial_date_start" />
                             <field name="trial_date_end" />
                         </group>
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" name="right_column">
                             <separator name="advantages" colspan="2" string="Advantages"/>
                             <field name="advantages" nolabel="1" colspan="2"/>
                         </group>

From 7dfc61350c653ea0eb0dcc659e8c41c3014e0e9c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 16:24:50 +0200
Subject: [PATCH 39/51] [IMP] hr_payroll: default value for scheduled pay field

bzr revid: qdp-launchpad@openerp.com-20110914142450-au5t6fkg6h420qwg
---
 addons/hr_payroll/hr_payroll.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 9578f322217..464c3d295a4 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -132,6 +132,10 @@ class hr_contract(osv.osv):
             ], 'Scheduled Pay', select=True),
     }
 
+    _defaults = {
+        'schedule_pay': 'monthly',
+    }
+
     def get_all_structures(self, cr, uid, contract_ids, context=None):
         """
         @param contract_ids: list of contracts

From d12fca41f8f8a5f50916ebd306bebb5a227f2b10 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 14 Sep 2011 16:30:34 +0200
Subject: [PATCH 40/51] [IMP] hr_payroll_l10n_be: better view for contracts

bzr revid: qdp-launchpad@openerp.com-20110914143034-0xn6gvzr7rms21he
---
 .../hr_payroll_l10n_be_view.xml               | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
index 213e2a8aa47..c4dca86166d 100644
--- a/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
+++ b/addons/hr_payroll_l10n_be/hr_payroll_l10n_be_view.xml
@@ -9,17 +9,15 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="/form/notebook/page/group/field[@name='struct_id']" position="after">
+                 <xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
                     <field name="reim_travel"/>
                     <field name="company_car_emp"/>
                     <field name="mis_ex_onss"/>
                     <field name="ch_value"/>
                     <field name="advantage"/>
-                    <group colspan="2" col="2">
-                        <separator string="Miscellaneous" colspan="2"/>
-                        <field name="suppl_net"/>
-                        <field name="retained_net"/>
-                    </group>    
+                    <separator string="Miscellaneous" colspan="2"/>
+                    <field name="suppl_net"/>
+                    <field name="retained_net"/>
                  </xpath>
                  <xpath expr="/form/notebook/page/group/field[@name='trial_date_end']" position="after">
                     <group colspan="2" col="2">
@@ -45,17 +43,6 @@
             </field>
         </record>
 
-        <record id="view_contract_salary_structure" model="ir.ui.view">
-            <field name="name">hr.contract.struc</field>
-            <field name="model">hr.contract</field>
-            <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                 <field name="struct_id" position="replace">
-                 </field>
-            </field>
-        </record>
-
         <record id="hr_contract_hr_hr_employee_view_for" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.for</field>
             <field name="model">hr.employee</field>

From c57bb71be15524e6a7f2719826bb9c279602b1c7 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 17:03:52 +0200
Subject: [PATCH 41/51] [ADD] listview padding to 5 visible rows at all time

bzr revid: xmo@openerp.com-20110914150352-jxnom223gdmtys2n
---
 addons/web/static/src/js/list.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/addons/web/static/src/js/list.js b/addons/web/static/src/js/list.js
index 60ba22dc68c..e0c6405db2f 100644
--- a/addons/web/static/src/js/list.js
+++ b/addons/web/static/src/js/list.js
@@ -775,6 +775,31 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
         this.$current.empty().append(
             QWeb.render('ListView.rows', _.extend({
                 render_cell: openerp.web.format_cell}, this)));
+        this.pad_table_to(5);
+    },
+    pad_table_to: function (count) {
+        if (this.records.length >= count ||
+                _(this.columns).any(function(column) { return column.meta; })) {
+            return;
+        }
+        var cells = [];
+        if (this.options.selectable) {
+            cells.push('<td title="selection"></td>');
+        }
+        _(this.columns).each(function(column) {
+            if (column.invisible !== '1') {
+                cells.push('<td title="' + column.string + '">&nbsp;</td>');
+            }
+        });
+        if (this.options.deletable) {
+            cells.push('<td><button type="button" style="visibility: hidden"> </button></td>');
+        }
+        cells.unshift('<tr>');
+        cells.push('</tr>');
+
+        var row = cells.join('');
+        this.$current.append(new Array(count - this.records.length + 1).join(row));
+        this.refresh_zebra(this.records.length);
     },
     /**
      * Gets the ids of all currently selected records, if any

From e05e41ccf8d75a664aefdc5182237f60a034f277 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 17:37:07 +0200
Subject: [PATCH 42/51] [IMP] restrict droppable targets

bzr revid: xmo@openerp.com-20110914153707-i4xycxgo1qdl5vtl
---
 addons/web/static/src/js/list.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/list.js b/addons/web/static/src/js/list.js
index e0c6405db2f..ad0a9f849b6 100644
--- a/addons/web/static/src/js/list.js
+++ b/addons/web/static/src/js/list.js
@@ -1162,6 +1162,8 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
         }
         // ondrop, move relevant record & fix sequences
         list.$current.sortable({
+            axis: 'y',
+            items: '> tr[data-id]',
             stop: function (event, ui) {
                 var to_move = list.records.get(ui.item.data('id')),
                     target_id = ui.item.prev().data('id');

From 2b72220d8449f7bd68c4d11d9c51bb00c1c693f0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Sep 2011 17:46:08 +0200
Subject: [PATCH 43/51] [FIX] weird offset bug I completely missed in listview
 d&d

bzr revid: xmo@openerp.com-20110914154608-gkyh0n74xejryxmr
---
 addons/web/static/src/js/list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/list.js b/addons/web/static/src/js/list.js
index ad0a9f849b6..883fae81bbf 100644
--- a/addons/web/static/src/js/list.js
+++ b/addons/web/static/src/js/list.js
@@ -1169,7 +1169,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                     target_id = ui.item.prev().data('id');
 
                 list.records.remove(to_move);
-                var to = target_id ? list.records.indexOf(list.records.get(target_id)) : 0;
+                var to = target_id ? list.records.indexOf(list.records.get(target_id)) + 1 : 0;
                 list.records.add(to_move, { at: to });
 
                 // resequencing time!

From b17ae5506b25fa4acd91f61e73704acc1f0f30a4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Sep 2011 17:46:10 +0200
Subject: [PATCH 44/51] [IMP] Form: date and datetime widgets are correctly
 formatted/parsed

bzr revid: fme@openerp.com-20110914154610-hlha0bp28197xg1m
---
 addons/web/static/src/css/base.css | 18 ++++++--
 addons/web/static/src/js/form.js   | 73 +++++++++++++++++++++---------
 addons/web/static/src/xml/base.xml | 12 +++--
 3 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6012bec1f29..02ea33e4ec3 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -821,6 +821,7 @@ label.error {
 }
 .openerp td.oe_form_frame_cell {
     padding: 2px;
+    position: relative;
 }
 .openerp td.oe_form_frame_cell.oe_form_group {
     padding: 0;
@@ -887,12 +888,19 @@ label.error {
     position: relative;
     vertical-align: top;
 }
-.openerp img.ui-datepicker-trigger {
-    margin-left: -20px;
-    vertical-align: middle;
+.openerp .oe_input_icon {
+    position: absolute;
     cursor: pointer;
-    position: relative;
-    top: -1px;
+    right: 5px;
+    top: 5px;
+}
+.openerp .oe_input_icon_disabled {
+    position: absolute;
+    cursor: default;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
+    right: 5px;
+    top: 5px;
 }
 .openerp img.oe_field_translate {
     margin-left: -21px;
diff --git a/addons/web/static/src/js/form.js b/addons/web/static/src/js/form.js
index ff8e695278e..aecc52c5eef 100644
--- a/addons/web/static/src/js/form.js
+++ b/addons/web/static/src/js/form.js
@@ -1105,37 +1105,51 @@ openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({
         this.jqueryui_object = 'datetimepicker';
     },
     start: function() {
+        var self = this;
         this._super.apply(this, arguments);
-        this.$element.find('input').change(this.on_ui_change)[this.jqueryui_object]({
-            dateFormat: 'yy-mm-dd',
-            timeFormat: 'hh:mm:ss',
-            showOn: 'button',
-            buttonImage: '/web/static/src/img/ui/field_calendar.png',
-            buttonImageOnly: true,
-            constrainInput: false
+        this.$element.find('input').change(this.on_ui_change);
+        this.picker({
+            onSelect: this.on_picker_select,
+            changeMonth: true,
+            changeYear: true,
+            showWeek: true,
+            showButtonPanel: false
+        });
+        this.$element.find('img.oe_datepicker_trigger').click(function() {
+            if (!self.readonly) {
+                self.picker('setDate', self.value || new Date());
+                self.$element.find('.oe_datepicker').toggle();
+            }
+        });
+        this.$element.find('.ui-datepicker-inline').removeClass('ui-widget-content ui-corner-all');
+        this.$element.find('button.oe_datepicker_close').click(function() {
+            self.$element.find('.oe_datepicker').hide();
         });
     },
+    picker: function() {
+        return $.fn[this.jqueryui_object].apply(this.$element.find('.oe_datepicker_container'), arguments);
+    },
+    on_picker_select: function(text, instance) {
+        var date = this.picker('getDate');
+        this.$element.find('input').val(date ? this.format_client(date) : '').change();
+    },
     set_value: function(value) {
-        this._super.apply(this, arguments);
-        if (!value) {
-            this.$element.find('input').val('');
-        } else {
-            this.$element.find('input').unbind('change');
-            // jQuery UI date picker wrongly call on_change event herebelow
-            this.$element.find('input')[this.jqueryui_object]('setDate', this.parse(value));
-            this.$element.find('input').change(this.on_ui_change);
-        }
+        value = this.parse(value);
+        this._super(value);
+        this.$element.find('input').val(value ? this.format_client(value) : '');
+    },
+    get_value: function() {
+        return this.format(this.value);
     },
     set_value_from_ui: function() {
-        this.value = this.$element.find('input')[this.jqueryui_object]('getDate') || false;
-        if (this.value) {
-            this.value = this.format(this.value);
-        }
+        var value = this.$element.find('input').val() || false;
+        this.value = this.parse_client(value);
         this._super();
     },
     update_dom: function() {
         this._super.apply(this, arguments);
-        this.$element.find('input').datepicker(this.readonly ? 'disable' : 'enable');
+        this.$element.find('input').attr('disabled', this.readonly);
+        this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', this.readonly);
     },
     validate: function() {
         this.invalid = false;
@@ -1143,15 +1157,26 @@ openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({
         if (value === "") {
             this.invalid = this.required;
         } else {
-            this.invalid = !this.$element.find('input')[this.jqueryui_object]('getDate');
+            try {
+                this.parse_client(value);
+                this.invalid = false;
+            } catch(e) {
+                this.invalid = true;
+            }
         }
     },
     focus: function() {
         this.$element.find('input').focus();
     },
     parse: openerp.web.auto_str_to_date,
+    parse_client: function(v) {
+        return openerp.web.parse_value(v, this.field);
+    },
     format: function(val) {
         return openerp.web.auto_date_to_str(val, this.field.type);
+    },
+    format_client: function(v) {
+        return openerp.web.format_value(v, this.field);
     }
 });
 
@@ -1159,6 +1184,10 @@ openerp.web.form.FieldDate = openerp.web.form.FieldDatetime.extend({
     init: function(view, node) {
         this._super(view, node);
         this.jqueryui_object = 'datepicker';
+    },
+    on_picker_select: function(text, instance) {
+        this._super(text, instance);
+        this.$element.find('.oe_datepicker').hide();
     }
 });
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 041e2ced2e9..422ecca5760 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -810,11 +810,13 @@
     <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="FieldDate">
-    <input type="text" size="1" style="width: 100%"
-        t-att-name="widget.name"
-        t-att-id="widget.element_id + '_field'"
-        t-att-class="'field_' + widget.type"
-    />
+    <t t-call="FieldChar"/>
+    <img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
+         title="Select date" width="16" height="16" border="0"/>
+    <div class="oe_datepicker ui-widget-content ui-corner-all" style="display: none; position: absolute; z-index: 1;">
+        <div class="oe_datepicker_container"/>
+        <button type="button" class="oe_datepicker_close ui-state-default ui-priority-primary ui-corner-all" style="float: right;">Done</button>
+    </div>
 </t>
 <t t-name="FieldSelection">
     <select

From 87b23c05d24b5d7891e60672720f6a8e0b60450d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Sep 2011 18:00:40 +0200
Subject: [PATCH 45/51] [REVERT] Revert
 revid:fme@openerp.com-20110907074810-17ssgepzpc11u7bd causing problems in
 search view

bzr revid: fme@openerp.com-20110914160040-1bvgewarlh5x3tsq
---
 addons/web/static/src/css/base.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 02ea33e4ec3..4645c55f692 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -842,8 +842,8 @@ label.error {
 .openerp label.oe_label_help {
     cursor: help;
 }
-.openerp label.oe_label,
-.openerp label.oe_label_help {
+
+.openerp .oe_form_field label.oe_label, .openerp .oe_form_field label.oe_label_help {
     text-align: right;
     margin: 3px 0 0 10px;
 }

From 17f64b27e32a452eb286551830cb325f4cda7c16 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 19:57:11 +0200
Subject: [PATCH 46/51] [FIX] remove openerplib.openerplib

bzr revid: al@openerp.com-20110914175711-9e5x85f4r9wd4q6w
---
 .../common/openerplib/openerplib/__init__.py  |  35 --
 .../web/common/openerplib/openerplib/dates.py |  99 -----
 .../web/common/openerplib/openerplib/main.py  | 397 ------------------
 3 files changed, 531 deletions(-)
 delete mode 100644 addons/web/common/openerplib/openerplib/__init__.py
 delete mode 100644 addons/web/common/openerplib/openerplib/dates.py
 delete mode 100644 addons/web/common/openerplib/openerplib/main.py

diff --git a/addons/web/common/openerplib/openerplib/__init__.py b/addons/web/common/openerplib/openerplib/__init__.py
deleted file mode 100644
index 23fc257e4d1..00000000000
--- a/addons/web/common/openerplib/openerplib/__init__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) Stephane Wirtel
-# Copyright (C) 2011 Nicolas Vanhoren
-# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-##############################################################################
-
-
-from main import *
-
diff --git a/addons/web/common/openerplib/openerplib/dates.py b/addons/web/common/openerplib/openerplib/dates.py
deleted file mode 100644
index 6d6c3808c27..00000000000
--- a/addons/web/common/openerplib/openerplib/dates.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) Stephane Wirtel
-# Copyright (C) 2011 Nicolas Vanhoren
-# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-##############################################################################
-
-import datetime
-
-DEFAULT_SERVER_DATE_FORMAT = "%Y-%m-%d"
-DEFAULT_SERVER_TIME_FORMAT = "%H:%M:%S"
-DEFAULT_SERVER_DATETIME_FORMAT = "%s %s" % (
-    DEFAULT_SERVER_DATE_FORMAT,
-    DEFAULT_SERVER_TIME_FORMAT)
-
-def str_to_datetime(str):
-    """
-    Converts a string to a datetime object using OpenERP's
-    datetime string format (exemple: '2011-12-01 15:12:35').
-    
-    No timezone information is added, the datetime is a naive instance, but
-    according to OpenERP 6.1 specification the timezone is always UTC.
-    """
-    if not str:
-        return str
-    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATETIME_FORMAT)
-
-def str_to_date(str):
-    """
-    Converts a string to a date object using OpenERP's
-    date string format (exemple: '2011-12-01').
-    """
-    if not str:
-        return str
-    return datetime.datetime.strptime(str, DEFAULT_SERVER_DATE_FORMAT).date()
-
-def str_to_time(str):
-    """
-    Converts a string to a time object using OpenERP's
-    time string format (exemple: '15:12:35').
-    """
-    if not str:
-        return str
-    return datetime.datetime.strptime(str, DEFAULT_SERVER_TIME_FORMAT).time()
-
-def datetime_to_str(obj):
-    """
-    Converts a datetime object to a string using OpenERP's
-    datetime string format (exemple: '2011-12-01 15:12:35').
-    
-    The datetime instance should not have an attached timezone and be in UTC.
-    """
-    if not obj:
-        return False
-    return obj.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-
-def date_to_str(obj):
-    """
-    Converts a date object to a string using OpenERP's
-    date string format (exemple: '2011-12-01').
-    """
-    if not obj:
-        return False
-    return obj.strftime(DEFAULT_SERVER_DATE_FORMAT)
-
-def time_to_str(obj):
-    """
-    Converts a time object to a string using OpenERP's
-    time string format (exemple: '15:12:35').
-    """
-    if not obj:
-        return False
-    return obj.strftime(DEFAULT_SERVER_TIME_FORMAT)
-
diff --git a/addons/web/common/openerplib/openerplib/main.py b/addons/web/common/openerplib/openerplib/main.py
deleted file mode 100644
index 2fee67b7daa..00000000000
--- a/addons/web/common/openerplib/openerplib/main.py
+++ /dev/null
@@ -1,397 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) Stephane Wirtel
-# Copyright (C) 2011 Nicolas Vanhoren
-# Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-##############################################################################
-
-"""
-OpenERP Client Library
-"""
-
-import xmlrpclib
-import logging 
-import socket
-
-try:
-    import cPickle as pickle
-    pickle.__name__
-except:
-    import pickle
-
-try:
-    import cStringIO as StringIO
-    StringIO.__name__
-except:
-    import StringIO
-
-_logger = logging.getLogger(__name__)
-
-def _getChildLogger(logger, subname):
-    return logging.getLogger(logger.name + "." + subname)
-
-class Connector(object):
-    """
-    The base abstract class representing a connection to an OpenERP Server.
-    """
-
-    __logger = _getChildLogger(_logger, 'connector')
-
-    def __init__(self, hostname, port):
-        """
-        Initilize by specifying an hostname and a port.
-        :param hostname: Host name of the server.
-        :param port: Port for the connection to the server.
-        """
-        self.hostname = hostname
-        self.port = port
-
-class XmlRPCConnector(Connector):
-    """
-    A type of connector that uses the XMLRPC protocol.
-    """
-    PROTOCOL = 'xmlrpc'
-    
-    __logger = _getChildLogger(_logger, 'connector.xmlrpc')
-
-    def __init__(self, hostname, port=8069):
-        """
-        Initialize by specifying the hostname and the port.
-        :param hostname: The hostname of the computer holding the instance of OpenERP.
-        :param port: The port used by the OpenERP instance for XMLRPC (default to 8069).
-        """
-        Connector.__init__(self, hostname, port)
-        self.url = 'http://%s:%d/xmlrpc' % (self.hostname, self.port)
-
-    def send(self, service_name, method, *args):
-        url = '%s/%s' % (self.url, service_name)
-        service = xmlrpclib.ServerProxy(url)
-        return getattr(service, method)(*args)
-
-class NetRPC_Exception(Exception):
-    """
-    Exception for NetRPC errors.
-    """
-    def __init__(self, faultCode, faultString):
-        self.faultCode = faultCode
-        self.faultString = faultString
-        self.args = (faultCode, faultString)
-
-class NetRPC:
-    """
-    Low level class for NetRPC protocol.
-    """
-    def __init__(self, sock=None):
-        if sock is None:
-            self.sock = socket.socket(
-            socket.AF_INET, socket.SOCK_STREAM)
-        else:
-            self.sock = sock
-        self.sock.settimeout(120)
-    def connect(self, host, port=False):
-        if not port:
-            buf = host.split('//')[1]
-            host, port = buf.split(':')
-        self.sock.connect((host, int(port)))
-
-    def disconnect(self):
-        self.sock.shutdown(socket.SHUT_RDWR)
-        self.sock.close()
-
-    def mysend(self, msg, exception=False, traceback=None):
-        msg = pickle.dumps([msg,traceback])
-        size = len(msg)
-        self.sock.send('%8d' % size)
-        self.sock.send(exception and "1" or "0")
-        totalsent = 0
-        while totalsent < size:
-            sent = self.sock.send(msg[totalsent:])
-            if sent == 0:
-                raise RuntimeError, "socket connection broken"
-            totalsent = totalsent + sent
-
-    def myreceive(self):
-        buf=''
-        while len(buf) < 8:
-            chunk = self.sock.recv(8 - len(buf))
-            if chunk == '':
-                raise RuntimeError, "socket connection broken"
-            buf += chunk
-        size = int(buf)
-        buf = self.sock.recv(1)
-        if buf != "0":
-            exception = buf
-        else:
-            exception = False
-        msg = ''
-        while len(msg) < size:
-            chunk = self.sock.recv(size-len(msg))
-            if chunk == '':
-                raise RuntimeError, "socket connection broken"
-            msg = msg + chunk
-        msgio = StringIO.StringIO(msg)
-        unpickler = pickle.Unpickler(msgio)
-        unpickler.find_global = None
-        res = unpickler.load()
-
-        if isinstance(res[0],Exception):
-            if exception:
-                raise NetRPC_Exception(str(res[0]), str(res[1]))
-            raise res[0]
-        else:
-            return res[0]
-
-class NetRPCConnector(Connector):
-    """
-    A type of connector that uses the NetRPC protocol.
-    """
-
-    PROTOCOL = 'netrpc'
-    
-    __logger = _getChildLogger(_logger, 'connector.netrpc')
-
-    def __init__(self, hostname, port=8070):
-        """
-        Initialize by specifying the hostname and the port.
-        :param hostname: The hostname of the computer holding the instance of OpenERP.
-        :param port: The port used by the OpenERP instance for NetRPC (default to 8070).
-        """
-        Connector.__init__(self, hostname, port)
-
-    def send(self, service_name, method, *args):
-        socket = NetRPC()
-        socket.connect(self.hostname, self.port)
-        socket.mysend((service_name, method, )+args)
-        result = socket.myreceive()
-        socket.disconnect()
-        return result
-
-class Service:
-    """
-    A class to execute RPC calls on a specific service of the remote server.
-    """
-    def __init__(self, connector, service_name):
-        """
-        :param connector: A valid Connector instance.
-        :param service_name: The name of the service on the remote server.
-        """
-        self.connector = connector
-        self.service_name = service_name
-        self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name)
-        
-    def __getattr__(self, method):
-        """
-        :param method: The name of the method to execute on the service.
-        """
-        self.__logger.debug('method: %r', method)
-        def proxy(*args):
-            """
-            :param args: A list of values for the method
-            """
-            self.__logger.debug('args: %r', args)
-            result = self.connector.send(self.service_name, method, *args)
-            self.__logger.debug('result: %r' % result)
-            return result
-        return proxy
-
-class Connection(object):
-    """
-    A class to represent a connection with authentification to an OpenERP Server.
-    It also provides utility methods to interact with the server more easily.
-    """
-    __logger = _getChildLogger(_logger, 'connection')
-
-    def __init__(self, connector,
-                 database=None,
-                 login=None,
-                 password=None,
-                 user_id=None):
-        """
-        Initialize with login information. The login information is facultative to allow specifying
-        it after the initialization of this object.
-
-        :param connector: A valid Connector instance to send messages to the remote server.
-        :param database: The name of the database to work on.
-        :param login: The login of the user.
-        :param password: The password of the user.
-        :param user_id: The user id is a number identifying the user. This is only useful if you
-        already know it, in most cases you don't need to specify it.
-        """
-        self.connector = connector
-
-        self.set_login_info(database, login, password, user_id)
-
-    def set_login_info(self, database, login, password, user_id=None):
-        """
-        Set login information after the initialisation of this object.
-
-        :param connector: A valid Connector instance to send messages to the remote server.
-        :param database: The name of the database to work on.
-        :param login: The login of the user.
-        :param password: The password of the user.
-        :param user_id: The user id is a number identifying the user. This is only useful if you
-        already know it, in most cases you don't need to specify it.
-        """
-        self.database, self.login, self.password = database, login, password
-
-        self.user_id = user_id
-        
-    def check_login(self, force=True):
-        """
-        Checks that the login information is valid. Throws an AuthentificationError if the
-        authentification fails.
-
-        :param force: Force to re-check even if this Connection was already validated previously.
-        Default to True.
-        """
-        if self.user_id and not force:
-            return
-        
-        self.user_id = self.get_service("common").login(self.database, self.login, self.password)
-        if not self.user_id:
-            raise AuthentificationError("Authentification failure")
-        self.__logger.debug("Authentified with user id %s" % self.user_id)
-    
-    """
-    Returns a Model instance to allow easy remote manipulation of an OpenERP model.
-    
-    :param model_name: The name of the model.
-    """
-    def get_model(self, model_name):
-        return Model(self, model_name)
-
-    """
-    Returns a Service instance to allow easy manipulation of one of the services offered by the remote server.
-    Please note this Connection instance does not need to have valid authenfication information since authentification
-    is only necessary for the "object" service that handles models.
-
-    :param service_name: The name of the service.
-    """
-    def get_service(self, service_name):
-        return Service(self.connector, service_name)
-
-class AuthentificationError(Exception):
-    """
-    An error thrown when an authentification to an OpenERP server failed.
-    """
-    pass
-
-class Model(object):
-    """
-    Useful class to dialog with one of the models provided by an OpenERP server.
-    An instance of this class depends on a Connection instance with valid authenfication information.
-    """
-
-    def __init__(self, connection, model_name):
-        """
-        :param connection: A valid Connection instance with correct authentification information.
-        :param model_name: The name of the model.
-        """
-        self.connection = connection
-        self.model_name = model_name
-        self.__logger = _getChildLogger(_getChildLogger(_logger, 'object'), model_name)
-
-    def __getattr__(self, method):
-        """
-        Provides proxy methods that will forward calls to the model on the remote OpenERP server.
-
-        :param method: The method for the linked model (search, read, write, unlink, create, ...)
-        """
-        def proxy(*args):
-            """
-            :param args: A list of values for the method
-            """
-            self.connection.check_login(False)
-            self.__logger.debug(args)
-            result = self.connection.get_service('object').execute(
-                                                    self.connection.database,
-                                                    self.connection.user_id,
-                                                    self.connection.password,
-                                                    self.model_name,
-                                                    method,
-                                                    *args)
-            if method == "read":
-                if isinstance(result, list) and len(result) > 0 and "id" in result[0]:
-                    index = {}
-                    for i in xrange(len(result)):
-                        index[result[i]["id"]] = result[i]
-                    result = [index[x] for x in args[0]]
-            self.__logger.debug('result: %r' % result)
-            return result
-        return proxy
-
-    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, context=None):
-        """
-        A shortcut method to combine a search() and a read().
-
-        :param domain: The domain for the search.
-        :param fields: The fields to extract (can be None or [] to extract all fields).
-        :param offset: The offset for the rows to read.
-        :param limit: The maximum number of rows to read.
-        :param order: The order to class the rows.
-        :param context: The context.
-        :return: A list of dictionaries containing all the specified fields.
-        """
-        record_ids = self.search(domain or [], offset, limit or False, order or False, context or {})
-        records = self.read(record_ids, fields or [], context or {})
-        return records
-
-def get_connector(hostname, protocol="xmlrpc", port="auto"):
-    """
-    A shortcut method to easily create a connector to a remote server using XMLRPC or NetRPC.
-
-    :param hostname: The hostname to the remote server.
-    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
-    :param port: The number of the port. Defaults to auto.
-    """
-    if port == 'auto':
-        port = 8069 if protocol=="xmlrpc" else 8070
-    if protocol == "xmlrpc":
-        return XmlRPCConnector(hostname, port)
-    elif protocol == "netrpc":
-        return NetRPCConnector(hostname, port)
-    else:
-        raise ValueError("You must choose xmlrpc or netrpc")
-
-def get_connection(hostname, protocol="xmlrpc", port='auto', database=None,
-                 login=None, password=None, user_id=None):
-    """
-    A shortcut method to easily create a connection to a remote OpenERP server.
-
-    :param hostname: The hostname to the remote server.
-    :param protocol: The name of the protocol, must be "xmlrpc" or "netrpc".
-    :param port: The number of the port. Defaults to auto.
-    :param connector: A valid Connector instance to send messages to the remote server.
-    :param database: The name of the database to work on.
-    :param login: The login of the user.
-    :param password: The password of the user.
-    :param user_id: The user id is a number identifying the user. This is only useful if you
-    already know it, in most cases you don't need to specify it.
-    """
-    return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
-        

From 3ef575744d0b83fbdaa09334d0f217b2ad5065b9 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 22:40:57 +0200
Subject: [PATCH 47/51] =?UTF-8?q?[IMP]=20prefix=20view=20(obsessive?=
 =?UTF-8?q?=E2=80=93compulsive=20rename=20disorder)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: al@openerp.com-20110914204057-cg8y5yy3py70ge62
---
 addons/web/__openerp__.py                                   | 6 +++---
 addons/web/static/src/js/{form.js => view_form.js}          | 0
 addons/web/static/src/js/{list.js => view_list.js}          | 0
 .../src/js/{list-editable.js => view_list_editable.js}      | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename addons/web/static/src/js/{form.js => view_form.js} (100%)
 rename addons/web/static/src/js/{list.js => view_list.js} (100%)
 rename addons/web/static/src/js/{list-editable.js => view_list_editable.js} (100%)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index dd4d2071f00..9a1fd119fb9 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -32,10 +32,10 @@
         "static/src/js/views.js",
         "static/src/js/data.js",
         "static/src/js/data_export.js",
-        "static/src/js/form.js",
-        "static/src/js/list.js",
-        "static/src/js/list-editable.js",
         "static/src/js/search.js",
+        "static/src/js/view_form.js",
+        "static/src/js/view_list.js",
+        "static/src/js/view_list_editable.js",
         "static/src/js/view_tree.js",
     ],
     'css' : [
diff --git a/addons/web/static/src/js/form.js b/addons/web/static/src/js/view_form.js
similarity index 100%
rename from addons/web/static/src/js/form.js
rename to addons/web/static/src/js/view_form.js
diff --git a/addons/web/static/src/js/list.js b/addons/web/static/src/js/view_list.js
similarity index 100%
rename from addons/web/static/src/js/list.js
rename to addons/web/static/src/js/view_list.js
diff --git a/addons/web/static/src/js/list-editable.js b/addons/web/static/src/js/view_list_editable.js
similarity index 100%
rename from addons/web/static/src/js/list-editable.js
rename to addons/web/static/src/js/view_list_editable.js

From eadb161a38cb9d1bd6065bf2e01f103b8e96017d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Sep 2011 23:04:45 +0200
Subject: [PATCH 48/51] [IMP] Improved dirty state in form view

bzr revid: fme@openerp.com-20110914210445-ul8aax7g1q5b47c6
---
 addons/web/static/src/js/view_form.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index aecc52c5eef..583f8f38b67 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -35,7 +35,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.datarecord = {};
         this.ready = false;
         this.show_invalid = true;
-        this.dirty = false;
+        this.dirty_for_user = false;
         this.default_focus_field = null;
         this.default_focus_button = null;
         this.registry = openerp.web.form.widgets;
@@ -135,7 +135,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             this.$form_header.find('.oe_form_on_update').show();
             this.$form_header.find('button.oe_form_button_new').show();
         }
-        this.dirty = false;
+        this.dirty_for_user = false;
         this.datarecord = record;
         for (var f in this.fields) {
             var field = this.fields[f];
@@ -145,7 +145,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         }
         if (!record.id) {
             // New record: Second pass in order to trigger the onchanges
-            this.dirty = true;
             this.show_invalid = false;
             for (var f in record) {
                 var field = this.fields[f];
@@ -270,7 +269,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                     processed.push(field.name);
                     if (field.get_value() != value) {
                         field.set_value(value);
-                        field.dirty = true;
+                        field.dirty = this.dirty_for_user = true;
                         if (_.indexOf(processed, field.name) < 0) {
                             this.do_onchange(field, processed);
                         }
@@ -298,10 +297,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         var self = this;
         var def = $.Deferred();
         $.when(this.has_been_loaded).then(function() {
-            self.dataset.default_get(
-                _.keys(self.fields_view.fields)).then(self.on_record_loaded).then(function() {
-                    def.resolve();
-                    });
+            self.dataset.default_get(_.keys(self.fields_view.fields)).then(self.on_record_loaded).then(function() {
+                def.resolve();
+            });
         });
         return def.promise();
     },
@@ -809,7 +807,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
     },
     on_click: function(saved) {
         var self = this;
-        if (!this.node.attrs.special && this.view.dirty && saved !== true) {
+        if ((!this.node.attrs.special && this.view.dirty_for_user && saved !== true) || !this.view.recordcount.id) {
             this.view.do_save(function() {
                 self.on_click(true);
             });
@@ -957,7 +955,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
         }
     },
     on_ui_change: function() {
-        this.dirty = this.view.dirty = true;
+        this.dirty = this.view.dirty_for_user = true;
         this.validate();
         if (this.is_valid()) {
             this.set_value_from_ui();

From 5189b91d8e81642ea65baac3d25403a29967b79b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Sep 2011 23:09:02 +0200
Subject: [PATCH 49/51] [ADD] Add form dirty confirmation dialog

bzr revid: fme@openerp.com-20110914210902-z08taar5woqmxnts
---
 addons/web/static/src/js/view_form.js | 41 ++++++++++++++++-----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 583f8f38b67..b097fc6abf0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -173,21 +173,23 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         }
     },
     on_pager_action: function(action) {
-        switch (action) {
-            case 'first':
-                this.dataset.index = 0;
-                break;
-            case 'previous':
-                this.dataset.previous();
-                break;
-            case 'next':
-                this.dataset.next();
-                break;
-            case 'last':
-                this.dataset.index = this.dataset.ids.length - 1;
-                break;
+        if (this.can_be_discarded()) {
+            switch (action) {
+                case 'first':
+                    this.dataset.index = 0;
+                    break;
+                case 'previous':
+                    this.dataset.previous();
+                    break;
+                case 'next':
+                    this.dataset.next();
+                    break;
+                case 'last':
+                    this.dataset.index = this.dataset.ids.length - 1;
+                    break;
+            }
+            this.reload();
         }
-        this.reload();
     },
     do_update_pager: function(hide_index) {
         var $pager = this.$element.find('#' + this.element_id + '_header div.oe_form_pager');
@@ -297,12 +299,17 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         var self = this;
         var def = $.Deferred();
         $.when(this.has_been_loaded).then(function() {
-            self.dataset.default_get(_.keys(self.fields_view.fields)).then(self.on_record_loaded).then(function() {
-                def.resolve();
-            });
+            if (self.can_be_discarded()) {
+                self.dataset.default_get(_.keys(self.fields_view.fields)).then(self.on_record_loaded).then(function() {
+                    def.resolve();
+                });
+            }
         });
         return def.promise();
     },
+    can_be_discarded: function() {
+        return !this.dirty_for_user || confirm(_t("Warning, the record has been modified, your changes will be discarded."));
+    },
     /**
      * Triggers saving the form's record. Chooses between creating a new
      * record or saving an existing one depending on whether the record

From 79440f2b7bbd9ff8aa5610bb29761779fdb7fd87 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 14 Sep 2011 23:54:03 +0200
Subject: [PATCH 50/51] =?UTF-8?q?[IMP]=20rename=20openerp=20into=20db=20in?=
 =?UTF-8?q?=20views.js=20(obsessive=E2=80=93compulsive=20rename=20disorder?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: al@openerp.com-20110914215403-vu110701a9701nip
---
 addons/web/static/src/js/views.js | 93 +++++++++++++++----------------
 1 file changed, 44 insertions(+), 49 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 0c3ef6c65d6..46c3f7e6b30 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -2,17 +2,21 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.views = function(openerp) {
+openerp.web.views = function(db) {
 
-var _t = openerp.web._t;
-var QWeb = openerp.web.qweb;
+var _t = db.web._t;
 
 /**
  * Registry for all the client actions key: tag value: widget
  */
-openerp.web.client_actions = new openerp.web.Registry();
+db.web.client_actions = new db.web.Registry();
 
-openerp.web.ActionManager = openerp.web.Widget.extend({
+/**
+ * Registry for all the main views
+ */
+db.web.views = new db.web.Registry();
+
+db.web.ActionManager = db.web.Widget.extend({
     identifier_prefix: "actionmanager",
     init: function(parent) {
         this._super(parent);
@@ -87,20 +91,20 @@ openerp.web.ActionManager = openerp.web.Widget.extend({
     ir_actions_act_window: function (action, on_close) {
         if (action.target === 'new') {
             if (this.dialog == null) {
-                this.dialog = new openerp.web.Dialog(this, { title: action.name, width: '80%' });
+                this.dialog = new db.web.Dialog(this, { title: action.name, width: '80%' });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
                 this.dialog.start();
             } else {
                 this.dialog_viewmanager.stop();
             }
-            this.dialog_viewmanager = new openerp.web.ViewManagerAction(this, action);
+            this.dialog_viewmanager = new db.web.ViewManagerAction(this, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
             this.dialog.open();
         } else  {
             this.dialog_stop();
             this.content_stop();
-            this.inner_viewmanager = new openerp.web.ViewManagerAction(this, action);
+            this.inner_viewmanager = new db.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
             this.url_update(action);
         }
@@ -125,7 +129,7 @@ openerp.web.ActionManager = openerp.web.Widget.extend({
     },
     ir_actions_client: function (action) {
         this.content_stop();
-        var ClientWidget = openerp.web.client_actions.get_object(action.tag);
+        var ClientWidget = db.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
     },
     ir_actions_report_xml: function(action) {
@@ -138,12 +142,12 @@ openerp.web.ActionManager = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.ViewManager =  openerp.web.Widget.extend(/** @lends openerp.web.ViewManager# */{
+db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
     identifier_prefix: "viewmanager",
     template: "ViewManager",
     /**
-     * @constructs openerp.web.ViewManager
-     * @extends openerp.web.Widget
+     * @constructs db.web.ViewManager
+     * @extends db.web.Widget
      *
      * @param parent
      * @param dataset
@@ -158,10 +162,10 @@ openerp.web.ViewManager =  openerp.web.Widget.extend(/** @lends openerp.web.View
         this.views_src = _.map(views, function(x) {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;});
         this.views = {};
         this.flags = this.flags || {};
-        this.registry = openerp.web.views;
+        this.registry = db.web.views;
     },
     render: function() {
-        return QWeb.render(this.template, {
+        return db.web.qweb.render(this.template, {
             self: this,
             prefix: this.element_id,
             views: this.views_src});
@@ -280,7 +284,7 @@ openerp.web.ViewManager =  openerp.web.Widget.extend(/** @lends openerp.web.View
         if (this.searchview) {
             this.searchview.stop();
         }
-        this.searchview = new openerp.web.SearchView(
+        this.searchview = new db.web.SearchView(
                 this, this.element_id + "_search", this.dataset,
                 view_id, search_defaults);
 
@@ -307,13 +311,13 @@ openerp.web.ViewManager =  openerp.web.Widget.extend(/** @lends openerp.web.View
     on_action_executed: function () {}
 });
 
-openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
+db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
     template:"ViewManagerAction",
     /**
-     * @constructs openerp.web.ViewManagerAction
-     * @extends openerp.web.ViewManager
+     * @constructs db.web.ViewManagerAction
+     * @extends db.web.ViewManager
      *
-     * @param {openerp.web.ActionManager} parent parent object/widget
+     * @param {db.web.ActionManager} parent parent object/widget
      * @param {Object} action descriptor for the action this viewmanager needs to manage its views.
      */
     init: function(parent, action) {
@@ -322,7 +326,7 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
         // ``_super()``) rpc requests will blow up.
         this.session = parent.session;
         this.action = action;
-        var dataset = new openerp.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+        var dataset = new db.web.DataSetSearch(this, action.res_model, action.context, action.domain);
         if (action.res_id) {
             dataset.ids.push(action.res_id);
             dataset.index = 0;
@@ -376,12 +380,12 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
 
         this.$element.find('.oe_get_xml_view').click(function () {
             // TODO: add search view?
-            $('<pre>').text(openerp.web.json_node_to_xml(
+            $('<pre>').text(db.web.json_node_to_xml(
                 self.views[self.active_view].controller.fields_view.arch, true))
                     .dialog({ width: '95%'});
         });
         if (this.action.help && !this.flags.low_profile) {
-            var Users = new openerp.web.DataSet(self, 'res.users'),
+            var Users = new db.web.DataSet(self, 'res.users'),
                 header = this.$element.find('.oe-view-manager-header');
             header.delegate('blockquote button', 'click', function() {
                 var $this = $(this);
@@ -421,7 +425,7 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
         var grandparent = this.widget_parent && this.widget_parent.widget_parent;
         // display shortcuts if on the first view for the action
         var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
-        if (!(grandparent instanceof openerp.web.WebClient) ||
+        if (!(grandparent instanceof db.web.WebClient) ||
             !(view.view_type === this.views_src[0].view_type
                 && view.view_id === this.views_src[0].view_id)) {
             $shortcut_toggle.hide();
@@ -458,7 +462,7 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
      * Intercept do_action resolution from children views
      */
     on_action_executed: function () {
-        new openerp.web.DataSet(this, 'res.log')
+        new db.web.DataSet(this, 'res.log')
                 .call('get', [], this.do_display_log);
     },
     /**
@@ -485,7 +489,7 @@ openerp.web.ViewManagerAction = openerp.web.ViewManager.extend(/** @lends oepner
     }
 });
 
-openerp.web.Sidebar = openerp.web.Widget.extend({
+db.web.Sidebar = db.web.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.items = {};
@@ -494,7 +498,7 @@ openerp.web.Sidebar = openerp.web.Widget.extend({
     start: function() {
         this._super(this);
         var self = this;
-        this.$element.html(QWeb.render('Sidebar'));
+        this.$element.html(db.web.qweb.render('Sidebar'));
         this.$element.find(".toggle-sidebar").click(function(e) {
             self.do_toggle();
         });
@@ -536,7 +540,7 @@ openerp.web.Sidebar = openerp.web.Widget.extend({
                 this.items[items[i].element_id] = items[i];
             }
         }
-        var $section = $(QWeb.render("Sidebar.section", {
+        var $section = $(db.web.qweb.render("Sidebar.section", {
             section_id: section_id,
             name: name,
             classname: 'oe_sidebar_' + code,
@@ -592,7 +596,7 @@ openerp.web.Sidebar = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.TranslateDialog = openerp.web.Dialog.extend({
+db.web.TranslateDialog = db.web.Dialog.extend({
     dialog_title: _t("Translations"),
     init: function(view) {
         // TODO fme: should add the language to fields_view_get because between the fields view get
@@ -612,14 +616,14 @@ openerp.web.TranslateDialog = openerp.web.Dialog.extend({
         this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name });
         this.languages = null;
         this.languages_loaded = $.Deferred();
-        (new openerp.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
+        (new db.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
             [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }, this.on_languages_loaded);
     },
     start: function() {
         var self = this;
         this._super();
         $.when(this.languages_loaded).then(function() {
-            self.$element.html(QWeb.render('TranslateDialog', { widget: self }));
+            self.$element.html(db.web.qweb.render('TranslateDialog', { widget: self }));
             self.$element.tabs();
             if (!(self.view.translatable_fields && self.view.translatable_fields.length)) {
                 self.hide_tabs('fields');
@@ -724,11 +728,7 @@ openerp.web.TranslateDialog = openerp.web.Dialog.extend({
     }
 });
 
-/**
- * @class
- * @extends openerp.web.Widget
- */
-openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
+db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     set_default_options: function(options) {
         this.options = options || {};
         _.defaults(this.options, {
@@ -741,7 +741,7 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
     },
     open_translate_dialog: function(field) {
         if (!this.translate_dialog) {
-            this.translate_dialog = new openerp.web.TranslateDialog(this).start();
+            this.translate_dialog = new db.web.TranslateDialog(this).start();
         }
         this.translate_dialog.open(field);
     },
@@ -753,7 +753,7 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
      * @param {String} [action_data.special=null] special action handlers (currently: only ``'cancel'``)
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
-     * @param {openerp.web.DataSet} dataset a dataset object used to communicate with the server
+     * @param {db.web.DataSet} dataset a dataset object used to communicate with the server
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
@@ -772,14 +772,14 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
                     active_ids: [record_id || false],
                     active_model: dataset.model
                 });
-                action.context = new openerp.web.CompoundContext(dataset.get_context(), action.context);
+                action.context = new db.web.CompoundContext(dataset.get_context(), action.context);
                 self.do_action(action, result_handler);
             } else {
                 result_handler();
             }
         };
 
-        var context = new openerp.web.CompoundContext(dataset.get_context(), action_data.context || {});
+        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
 
         if (action_data.special) {
             handler({result: {"type":"ir.actions.act_window_close"}});
@@ -794,7 +794,7 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
     /**
      * Directly set a view to use instead of calling fields_view_get. This method must
      * be called before start(). When an embedded view is set, underlying implementations
-     * of openerp.web.View must use the provided view instead of any other one.
+     * of db.web.View must use the provided view instead of any other one.
      *
      * @param embedded_view A view.
      */
@@ -841,7 +841,7 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
     },
     on_sidebar_manage_view: function() {
         if (this.fields_view && this.fields_view.arch) {
-            $('<xmp>' + openerp.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
+            $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
         } else {
             this.notification.warn("Manage Views", "Could not find current view declaration");
         }
@@ -855,7 +855,7 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
     on_sidebar_import: function() {
     },
     on_sidebar_export: function() {
-        var export_view = new openerp.web.DataExport(this, this.dataset);
+        var export_view = new db.web.DataExport(this, this.dataset);
         export_view.start();
     },
     on_sidebar_translate: function() {
@@ -865,12 +865,7 @@ openerp.web.View = openerp.web.Widget.extend(/** @lends openerp.web.View# */{
     }
 });
 
-/**
- * Registry for all the main views
- */
-openerp.web.views = new openerp.web.Registry();
-
-openerp.web.json_node_to_xml = function(node, single_quote, indent) {
+db.web.json_node_to_xml = function(node, single_quote, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     // Maybe usefull for xml view editor
 
@@ -899,7 +894,7 @@ openerp.web.json_node_to_xml = function(node, single_quote, indent) {
         r += '>\n';
         var childs = [];
         for (var i = 0, ii = node.children.length; i < ii; i++) {
-            childs.push(openerp.web.json_node_to_xml(node.children[i], single_quote, indent + 1));
+            childs.push(db.web.json_node_to_xml(node.children[i], single_quote, indent + 1));
         }
         r += childs.join('\n');
         r += '\n' + sindent + '</' + node.tag + '>';

From b612f2563f04ce8a271522787b83641275afdfcd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 15 Sep 2011 04:48:01 +0000
Subject: [PATCH 51/51] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110915044801-ku4i0ixvpozhyaup
---
 addons/account_analytic_analysis/i18n/mk.po | 296 ++++++++++++++++++++
 addons/account_coda/i18n/sl.po              | 259 +++++++++++++++++
 addons/base_crypt/i18n/sl.po                |  84 ++++++
 addons/google_map/i18n/mk.po                |  53 ++++
 addons/html_view/i18n/mk.po                 |  63 +++++
 5 files changed, 755 insertions(+)
 create mode 100644 addons/account_analytic_analysis/i18n/mk.po
 create mode 100644 addons/account_coda/i18n/sl.po
 create mode 100644 addons/base_crypt/i18n/sl.po
 create mode 100644 addons/google_map/i18n/mk.po
 create mode 100644 addons/html_view/i18n/mk.po

diff --git a/addons/account_analytic_analysis/i18n/mk.po b/addons/account_analytic_analysis/i18n/mk.po
new file mode 100644
index 00000000000..81d5d115207
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/mk.po
@@ -0,0 +1,296 @@
+# Macedonian 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:14+0000\n"
+"PO-Revision-Date: 2011-09-14 08:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-15 04:47+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+"Број на часови кои можат да бидат фактурирани, плус часови кои веќе се "
+"фактурирани."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+"Пресметано според формулата: Максимална фактурирана цена - Фактурирана цена."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr "Пресметано според формулата: Максимална количина - Вкупно часови"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_invoiced_date:0
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Billing"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
+#, python-format
+msgid "You try to bypass an access rule (Document type: %s)."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_to_invoice:0
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "All Uninvoiced Entries"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
diff --git a/addons/account_coda/i18n/sl.po b/addons/account_coda/i18n/sl.po
new file mode 100644
index 00000000000..b2c7e144795
--- /dev/null
+++ b/addons/account_coda/i18n/sl.po
@@ -0,0 +1,259 @@
+# Slovenian 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:14+0000\n"
+"PO-Revision-Date: 2011-09-14 11:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@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-09-15 04:47+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#. module: account_coda
+#: help:account.coda,journal_id:0
+#: field:account.coda.import,journal_id:0
+msgid "Bank Journal"
+msgstr "Bančni dnevnik"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr "Dnevnik"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Account Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
+#. module: account_coda
+#: field:account.coda.import,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,date:0
+msgid "Import Date"
+msgstr "Datum uvoza"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Dnevnik uvoza"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Import"
+msgstr "Uvozi"
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:51
+#, python-format
+msgid "Coda file not found for bank statement !!"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,awaiting_account:0
+msgid ""
+"Set here the default account that will be used, if the partner is found but "
+"does not have the bank account, or if he is domiciled"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+msgid "Company"
+msgstr "Podjetje"
+
+#. module: account_coda
+#: help:account.coda.import,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
+msgid "Coda Import Logs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda,name:0
+msgid "Store the detail of bank statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:167
+#, python-format
+msgid "The bank account %s is not defined for the partner %s.\n"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"\n"
+"    Module provides functionality to import\n"
+"    bank statements from coda files.\n"
+"    "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Statements"
+msgstr "Izpiski"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr "Rezultat"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Result of Imported Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: help:account.coda.import,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bančni izpisek"
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda Logs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:311
+#, python-format
+msgid "Result"
+msgstr "Rezultat"
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Click on 'New' to select your file :"
+msgstr "Kliknite na \"Novo\" za izbiro vaše datoteke:"
+
+#. module: account_coda
+#: field:account.coda.import,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr "Zapri"
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated Bank Statements"
+msgstr "Generirani bačni izpiski"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA - import bank statements from coda file"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Configure Your Journal and Account :"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Coda Import"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,journal_id:0
+msgid "Journal"
+msgstr "Dnevnik"
diff --git a/addons/base_crypt/i18n/sl.po b/addons/base_crypt/i18n/sl.po
new file mode 100644
index 00000000000..d52c5723ba9
--- /dev/null
+++ b/addons/base_crypt/i18n/sl.po
@@ -0,0 +1,84 @@
+# Slovenian 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:14+0000\n"
+"PO-Revision-Date: 2011-09-14 11:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@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-09-15 04:48+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ne morete imeti dva uporabnika z istim prijavnim imenom!"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Izbrano podjetje ni v dovoljenih podjetjih za tega uporabnika"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Please specify the password !"
+msgstr "Prosim, navedite geslo !"
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr "Osnovno - enkripcija gesla"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:132
+#, python-format
+msgid "Error"
+msgstr "Napaka"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid ""
+"This module replaces the cleartext password in the database with a password "
+"hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs "
+"the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten "
+"password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security "
+"measures,\n"
+"as the password is still transmitted unencrypted on the network (by the "
+"client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+"Ta modul nadomešča obliko besedilnega geslo v bazi podatkov z hash geslom,\n"
+"ki preprečuje komurkoli branje izvirnega gesla.\n"
+"Za vašo obstoječo bazo uporabnikov, odstranitev gesla v obliki besedila se "
+"pojavi pri\n"
+"prvi prijavi uporabnika v bazo podatkov, po namestitvi base_crypt.\n"
+"Po namestitvi tega modula ne bo mogoče obnoviti pozabiljenega gesla za vaše\n"
+"uporabnike, edina rešitev je, da admin nastavi novo geslo.\n"
+"\n"
+"Opomba: namestitev tega modula ne pomeni ignoriranja osnovnih varnostnih "
+"ukrepov,\n"
+"ker se geslo še vedno prenaša nešifrirano v omrežju (preko klienta),\n"
+"razen če ne uporabljate varni protokol kot je XML-RPCS.\n"
+"                    "
diff --git a/addons/google_map/i18n/mk.po b/addons/google_map/i18n/mk.po
new file mode 100644
index 00000000000..5835b35357f
--- /dev/null
+++ b/addons/google_map/i18n/mk.po
@@ -0,0 +1,53 @@
+# Macedonian 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-09-14 08:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-15 04:47+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Мапа"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr ""
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Стартувај Google Map"
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid ""
+"The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+
+#. module: google_map
+#: model:ir.module.module,shortdesc:google_map.module_meta_information
+msgid "Google Map"
+msgstr ""
+
+#. module: google_map
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Адреса на партнерот"
diff --git a/addons/html_view/i18n/mk.po b/addons/html_view/i18n/mk.po
new file mode 100644
index 00000000000..dd98a0f9818
--- /dev/null
+++ b/addons/html_view/i18n/mk.po
@@ -0,0 +1,63 @@
+# Macedonian 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-09-14 08:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-09-15 04:47+0000\n"
+"X-Generator: Launchpad (build 13921)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Име"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Компанија"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Html тест"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Html пример"
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "Html преглед"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Банки"
+
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid ""
+"\n"
+"    This is the test module which shows html tag supports in normal xml form "
+"view.\n"
+"    "
+msgstr ""
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"