From e693a24c0dda998e802719f5341689f0b29c30f7 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 9 Mar 2011 19:01:07 +0530
Subject: [PATCH 01/29] [IMP] more than one sprints overlaps need seperation of
 that sprints

bzr revid: rme@tinyerp.com-20110309133107-19cm6vwn1l92i8nk
---
 .../project_scrum/report/sprint_burndown.py   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/project_scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
index 3f862d0db3c..2c4d1933a40 100644
--- a/addons/project_scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -44,11 +44,13 @@ class report_tasks(report_int):
         pool = pooler.get_pool(cr.dbname)
         sprint_pool = pool.get('project.scrum.sprint')
         task_pool = pool.get('project.task')
-        # For add the report header on the top of the report.
-        tb = text_box.T(loc=(320, 500), text="/hL/15/bBurndown Chart", line_style=None)
-        tb.draw()
-        int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
+        x, y = 75, 200
+
         for sprint in sprint_pool.browse(cr, uid, ids, context=context):
+        # For add the report header on the top of the report.
+            tb = text_box.T(loc=(x+60 ,y+170), text="/hL/15/b%s"%(sprint.name), line_style=None)
+            tb.draw()
+            int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
             task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context)
             datas = _burndown.compute_burndown(cr, uid, task_ids, sprint.date_start, sprint.date_stop)
             max_hour = reduce(lambda x,y: max(y[1],x), datas, 0) or None 
@@ -62,15 +64,16 @@ class report_tasks(report_int):
                 return result
 
             guideline__data=[(datas[0][0],max_hour), (datas[-1][0],0)]
-
-            ar = area.T(x_grid_style=line_style.gray50_dash1,
+            ar = area.T(loc=(x,y), x_grid_style=line_style.gray50_dash1,
                 x_axis=axis.X(label="Date", format=int_to_date),
                 y_axis=axis.Y(label="Burndown Chart - Planned Hours"),
                 x_grid_interval=_interval_get,
                 x_range = (datas[0][0],datas[-1][0]),
                 y_range = (0,max_hour),
                 legend = None,
-                size = (680,450))
+                size = (200,150))
+            y += 300
+
             ar.add_plot(line_plot.T(data=guideline__data, line_style=line_style.red))
             ar.add_plot(line_plot.T(data=datas, line_style=line_style.green))
 
@@ -80,6 +83,8 @@ class report_tasks(report_int):
             legend.draw(ar,[entr1,entr2],canv)
 
             ar.draw(canv)
+            tb = text_box.T(loc=(x+40 ,y-100), text="/hL/15/bBurndown Chart", line_style=None)
+            tb.draw() 
         canv.close()
 
         self.obj = _burndown.external_pdf(io.getvalue())

From e05fb14653936d309d92571a41c87eebe1581c54 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Mon, 14 Mar 2011 11:45:04 +0530
Subject: [PATCH 02/29] [IMP] project_scrum : burndown chart print from the
 it's form view with button

bzr revid: rme@tinyerp.com-20110314061504-om53158jxc33z0vg
---
 addons/project_scrum/project_scrum_report.xml | 2 +-
 addons/project_scrum/project_scrum_view.xml   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/project_scrum/project_scrum_report.xml b/addons/project_scrum/project_scrum_report.xml
index b958732d3c4..cfd1984f9bb 100644
--- a/addons/project_scrum/project_scrum_report.xml
+++ b/addons/project_scrum/project_scrum_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="project.scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
+        <report auto="False"  menu="False" id="report_scrum_sprint_burndown_chart" model="project.scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
     </data>
 </openerp>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 950cf0f41cf..82c19c09238 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -300,8 +300,10 @@
                             <field colspan="4" name="retrospective" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state" readonly="1"/>
+                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" 
+                        			string="Burndown Chart" type="action" icon="gtk-print"/>
                         <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                         <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>

From 33978d90a8f367771d20854451db28633692c5bd Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Tue, 15 Mar 2011 15:13:58 +0530
Subject: [PATCH 03/29] [FIX] project_scrum : burn down chart print only from
 it's form view with button & removed previous development

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

bzr revid: rme@tinyerp.com-20110315094358-86s5sup5xoz98gsb
---
 .../project_scrum/report/sprint_burndown.py   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/project_scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
index 2c4d1933a40..25bd24a5b5f 100644
--- a/addons/project_scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -44,13 +44,11 @@ class report_tasks(report_int):
         pool = pooler.get_pool(cr.dbname)
         sprint_pool = pool.get('project.scrum.sprint')
         task_pool = pool.get('project.task')
-        x, y = 75, 200
-
-        for sprint in sprint_pool.browse(cr, uid, ids, context=context):
         # For add the report header on the top of the report.
-            tb = text_box.T(loc=(x+60 ,y+170), text="/hL/15/b%s"%(sprint.name), line_style=None)
-            tb.draw()
-            int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
+        tb = text_box.T(loc=(320, 500), text="/hL/15/bBurndown Chart", line_style=None)
+        tb.draw()
+        int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
+        for sprint in sprint_pool.browse(cr, uid, ids, context=context):
             task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context)
             datas = _burndown.compute_burndown(cr, uid, task_ids, sprint.date_start, sprint.date_stop)
             max_hour = reduce(lambda x,y: max(y[1],x), datas, 0) or None 
@@ -64,16 +62,15 @@ class report_tasks(report_int):
                 return result
 
             guideline__data=[(datas[0][0],max_hour), (datas[-1][0],0)]
-            ar = area.T(loc=(x,y), x_grid_style=line_style.gray50_dash1,
+            
+            ar = area.T(x_grid_style=line_style.gray50_dash1,
                 x_axis=axis.X(label="Date", format=int_to_date),
                 y_axis=axis.Y(label="Burndown Chart - Planned Hours"),
                 x_grid_interval=_interval_get,
                 x_range = (datas[0][0],datas[-1][0]),
                 y_range = (0,max_hour),
                 legend = None,
-                size = (200,150))
-            y += 300
-
+                size = (680,450))
             ar.add_plot(line_plot.T(data=guideline__data, line_style=line_style.red))
             ar.add_plot(line_plot.T(data=datas, line_style=line_style.green))
 
@@ -83,8 +80,6 @@ class report_tasks(report_int):
             legend.draw(ar,[entr1,entr2],canv)
 
             ar.draw(canv)
-            tb = text_box.T(loc=(x+40 ,y-100), text="/hL/15/bBurndown Chart", line_style=None)
-            tb.draw() 
         canv.close()
 
         self.obj = _burndown.external_pdf(io.getvalue())

From 21c468bc0d5486e16db24cfb1b5cfb8903180c18 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Tue, 15 Mar 2011 19:16:32 +0530
Subject: [PATCH 04/29] [IMP] crm_claim : history of change in stage should be
 appear in the claim's history

bzr revid: rme@tinyerp.com-20110315134632-i7267ccjhyzwzyf8
---
 addons/crm_claim/crm_claim.py | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 1829aa9a171..92f5a73ac56 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -24,6 +24,7 @@ from crm import crm
 import time
 import binascii
 import tools
+from tools.translate import _
 
 CRM_CLAIM_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -81,6 +82,49 @@ class crm_claim(crm.crm_case, osv.osv):
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
     
+    def write(self, cr, uid, ids, vals, context=None):
+        if not context:
+            context = {}
+            
+        if 'stage_id' in vals and vals['stage_id']:
+            type = context and context.get('stage_type', '')
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
+            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name, details=_("Changed Stage to: ") + stage_obj.name)
+            message=''
+            for case in self.browse(cr, uid, ids, context=context):
+                message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+                self.log(cr, uid, case.id, message)
+        return super(crm_claim,self).write(cr, uid, ids, vals, context)
+    
+    def stage_historize(self, cr, uid, ids, stage, context=None):
+        stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+        self.history(cr, uid, ids, _('Stage'), details=stage_obj.name)
+        for case in self.browse(cr, uid, ids, context=context):
+            if case.type == 'lead':
+                message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+            elif case.type == 'opportunity':
+                message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+            self.log(cr, uid, case.id, message)
+        return True
+
+    def stage_next(self, cr, uid, ids, context=None):
+        stage = super(crm_claim, self).stage_next(cr, uid, ids, context=context)
+        if stage:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            if stage_obj.on_change:
+                data = {'probability': stage_obj.probability}
+                self.write(cr, uid, ids, data)
+        return stage
+
+    def stage_previous(self, cr, uid, ids, context=None):
+        stage = super(crm_claim, self).stage_previous(cr, uid, ids, context=context)
+        if stage:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            if stage_obj.on_change:
+                data = {'probability': stage_obj.probability}
+                self.write(cr, uid, ids, data)
+        return stage
+    
     def _get_stage_id(self, cr, uid, context=None):
         """Finds type of stage according to object.
         @param self: The object pointer

From 9ae08c35349f8d79903533b2fb79570799930df1 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 16 Mar 2011 14:10:56 +0530
Subject: [PATCH 05/29] [FIX] crm_claim : stage of claim is not changing on
 button click due to context

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

bzr revid: rme@tinyerp.com-20110316084056-nhx9j4u1re79gu5q
---
 addons/crm_claim/crm_claim_view.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 63df2c35d0d..39e9bd7fc38 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -102,8 +102,12 @@
 
                         <group colspan="2" col="4">
                             <field name="stage_id" domain="[('type','=','claim')]"/>
-                            <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        <button name="stage_previous" string=""
+                            states="open,pending,draft" type="object"
+                            icon="gtk-go-back" context="{'stage_type': 'claim'}" />
+                        <button name="stage_next" string=""
+                            states="open,pending,draft" type="object"
+                            icon="gtk-go-forward" context="{'stage_type': 'claim'}" />
                         </group>
                         <newline />
                         <field name="priority"/>
@@ -178,8 +182,9 @@
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                    <tree string="History">
+                                    <tree string="History iiiii">
                                         <field name="display_text" string="History Information"/>
+                                        <field name="history" invisible="1"/>
                                         <button
                                             string="Reply"
                                             name="%(crm.action_crm_send_mail)d"

From b28a788dcb8d1c26bd825229b646117eed1edcd8 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 16 Mar 2011 14:18:55 +0530
Subject: [PATCH 06/29] [IMP] crm_claim : problem in the tree string

bzr revid: rme@tinyerp.com-20110316084855-z4au2w4awk3syxkf
---
 addons/crm_claim/crm_claim_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 39e9bd7fc38..0bb3ea96f3c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -182,9 +182,8 @@
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                    <tree string="History iiiii">
+                                    <tree string="History">
                                         <field name="display_text" string="History Information"/>
-                                        <field name="history" invisible="1"/>
                                         <button
                                             string="Reply"
                                             name="%(crm.action_crm_send_mail)d"

From fe654d22697b869b9c20e0059c56ca09b987c7e3 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 16 Mar 2011 14:58:49 +0530
Subject: [PATCH 07/29] [IMP] crm_claim : changed message string And remove
 useless code

bzr revid: rme@tinyerp.com-20110316092849-nr6bjtzspmydh8fd
---
 addons/crm_claim/crm_claim.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 92f5a73ac56..a2fdee2ecb3 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -92,7 +92,7 @@ class crm_claim(crm.crm_case, osv.osv):
             self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name, details=_("Changed Stage to: ") + stage_obj.name)
             message=''
             for case in self.browse(cr, uid, ids, context=context):
-                message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+                message = _("The stage of claim '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
                 self.log(cr, uid, case.id, message)
         return super(crm_claim,self).write(cr, uid, ids, vals, context)
     
@@ -100,10 +100,7 @@ class crm_claim(crm.crm_case, osv.osv):
         stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
         self.history(cr, uid, ids, _('Stage'), details=stage_obj.name)
         for case in self.browse(cr, uid, ids, context=context):
-            if case.type == 'lead':
-                message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
-            elif case.type == 'opportunity':
-                message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+            message = _("The stage of claim '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
             self.log(cr, uid, case.id, message)
         return True
 
@@ -112,8 +109,7 @@ class crm_claim(crm.crm_case, osv.osv):
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
             if stage_obj.on_change:
-                data = {'probability': stage_obj.probability}
-                self.write(cr, uid, ids, data)
+                self.write(cr, uid, ids)
         return stage
 
     def stage_previous(self, cr, uid, ids, context=None):
@@ -121,8 +117,7 @@ class crm_claim(crm.crm_case, osv.osv):
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
             if stage_obj.on_change:
-                data = {'probability': stage_obj.probability}
-                self.write(cr, uid, ids, data)
+                self.write(cr, uid, ids)
         return stage
     
     def _get_stage_id(self, cr, uid, context=None):

From 1d456d5a4eaadd0a78b2402d0f658a745739789d Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Wed, 16 Mar 2011 18:08:21 +0530
Subject: [PATCH 08/29] [FIX] crm_claim : change in stage should create history

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

bzr revid: rme@tinyerp.com-20110316123821-f9ynbn08gupmf33u
---
 addons/crm_claim/crm_claim.py       | 28 ++--------------------------
 addons/crm_claim/crm_claim_view.xml |  8 ++------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a2fdee2ecb3..b7ffe764a03 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -82,42 +82,18 @@ class crm_claim(crm.crm_case, osv.osv):
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
     }
     
-    def write(self, cr, uid, ids, vals, context=None):
-        if not context:
-            context = {}
-            
-        if 'stage_id' in vals and vals['stage_id']:
-            type = context and context.get('stage_type', '')
-            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
-            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name, details=_("Changed Stage to: ") + stage_obj.name)
-            message=''
-            for case in self.browse(cr, uid, ids, context=context):
-                message = _("The stage of claim '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
-                self.log(cr, uid, case.id, message)
-        return super(crm_claim,self).write(cr, uid, ids, vals, context)
-    
-    def stage_historize(self, cr, uid, ids, stage, context=None):
-        stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-        self.history(cr, uid, ids, _('Stage'), details=stage_obj.name)
-        for case in self.browse(cr, uid, ids, context=context):
-            message = _("The stage of claim '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
-            self.log(cr, uid, case.id, message)
-        return True
-
     def stage_next(self, cr, uid, ids, context=None):
         stage = super(crm_claim, self).stage_next(cr, uid, ids, context=context)
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            if stage_obj.on_change:
-                self.write(cr, uid, ids)
+            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name)
         return stage
 
     def stage_previous(self, cr, uid, ids, context=None):
         stage = super(crm_claim, self).stage_previous(cr, uid, ids, context=context)
         if stage:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
-            if stage_obj.on_change:
-                self.write(cr, uid, ids)
+            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name)
         return stage
     
     def _get_stage_id(self, cr, uid, context=None):
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0bb3ea96f3c..63df2c35d0d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -102,12 +102,8 @@
 
                         <group colspan="2" col="4">
                             <field name="stage_id" domain="[('type','=','claim')]"/>
-                        <button name="stage_previous" string=""
-                            states="open,pending,draft" type="object"
-                            icon="gtk-go-back" context="{'stage_type': 'claim'}" />
-                        <button name="stage_next" string=""
-                            states="open,pending,draft" type="object"
-                            icon="gtk-go-forward" context="{'stage_type': 'claim'}" />
+                            <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
+                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                         <newline />
                         <field name="priority"/>

From 68e4357e4716fb7b16fe57b28255067107c2baff Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 Mar 2011 17:29:04 +0100
Subject: [PATCH 09/29] [FIX] root dispatcher should raise a 404 error when a
 controller is not found

bzr revid: xmo@openerp.com-20110321162904-33ai6lqaty0unhro
---
 openerpweb/openerpweb.py       |  2 +-
 openerpweb/tests/test_model.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index f966501f72c..89706a9366c 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -265,7 +265,7 @@ class Root(object):
                     if getattr(m, 'exposed', 0):
                         print "Calling", ps, c, meth, m
                         return m(**kw)
-
+            raise cherrypy.NotFound('/' + '/'.join(l))
         else:
             raise cherrypy.HTTPRedirect('/base/static/openerp/base.html', 301)
     default.exposed = True
diff --git a/openerpweb/tests/test_model.py b/openerpweb/tests/test_model.py
index 1d0d058b092..d84f3a36c5d 100644
--- a/openerpweb/tests/test_model.py
+++ b/openerpweb/tests/test_model.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import cherrypy
 import mock
 import unittest2
 import openerpweb.openerpweb
@@ -18,3 +19,20 @@ class OpenERPModelTest(unittest2.TestCase):
         Model.read([42])
         session.execute.assert_called_once_with(
             'a.b', 'read', [42])
+
+class DispatcherTest(unittest2.case.TestCase):
+    def test_default_redirect(self):
+        self.assertRaises(
+            cherrypy.HTTPRedirect,
+            openerpweb.openerpweb.Root().default)
+    def test_serve_static_missing(self):
+        self.assertRaises(
+            cherrypy.NotFound,
+            openerpweb.openerpweb.Root().default,
+            'does-not-exist', 'static', 'bar')
+    def test_serve_controller_missing(self):
+        self.assertRaises(
+            cherrypy.NotFound,
+            openerpweb.openerpweb.Root().default,
+            'controller', 'does', 'not', 'exist')
+

From e49be016f309553cbcba3277c6d725808879eba3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 Mar 2011 18:03:57 +0100
Subject: [PATCH 10/29] [ADD] tests for the root dispatcher, fix dispatching:
 start from the *end* of the url and walk backwards to try to find a
 dispatcher and its method

bzr revid: xmo@openerp.com-20110321170357-6k9f7qjww1s2wj3g
---
 openerpweb/openerpweb.py       |  2 +-
 openerpweb/tests/test_model.py | 45 +++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 89706a9366c..f858ff61aa5 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -255,7 +255,7 @@ class Root(object):
             p = os.path.normpath(os.path.join(*l))
             return cherrypy.lib.static.serve_file(os.path.join(path_addons, p))
         elif len(l) > 1:
-            for i in range(1, len(l) + 1):
+            for i in range(len(l), 1, -1):
                 ps = "/" + "/".join(l[0:i])
                 if ps in controllers_path:
                     c = controllers_path[ps]
diff --git a/openerpweb/tests/test_model.py b/openerpweb/tests/test_model.py
index d84f3a36c5d..4272d1fe796 100644
--- a/openerpweb/tests/test_model.py
+++ b/openerpweb/tests/test_model.py
@@ -20,7 +20,36 @@ class OpenERPModelTest(unittest2.TestCase):
         session.execute.assert_called_once_with(
             'a.b', 'read', [42])
 
-class DispatcherTest(unittest2.case.TestCase):
+class FakeController(object):
+    pass
+
+class DispatcherTest(unittest2.TestCase):
+    def setUp(self):
+        controller = FakeController()
+        self.mock_method = mock.Mock()
+        controller.method = self.mock_method
+        self.mock_method.exposed = True
+
+        self.mock_index = mock.Mock()
+        controller.index = self.mock_index
+        self.mock_index.exposed = True
+
+        self.patcher = mock.patch.dict(
+            openerpweb.openerpweb.controllers_path,
+            {'/some/controller/path': controller})
+        self.patcher.start()
+
+        controller2 = FakeController()
+        controller2.index = self.mock_index
+        self.patcher2 = mock.patch.dict(
+            openerpweb.openerpweb.controllers_path,
+            {'/some/other/controller': FakeController(),
+             '/some/other/controller/2': controller2})
+        self.patcher2.start()
+    def tearDown(self):
+        self.patcher2.stop()
+        self.patcher.stop()
+
     def test_default_redirect(self):
         self.assertRaises(
             cherrypy.HTTPRedirect,
@@ -30,9 +59,23 @@ class DispatcherTest(unittest2.case.TestCase):
             cherrypy.NotFound,
             openerpweb.openerpweb.Root().default,
             'does-not-exist', 'static', 'bar')
+
     def test_serve_controller_missing(self):
         self.assertRaises(
             cherrypy.NotFound,
             openerpweb.openerpweb.Root().default,
             'controller', 'does', 'not', 'exist')
 
+    def test_find_controller_method(self):
+        openerpweb.openerpweb.Root().default(
+            'some', 'controller', 'path', 'method')
+        self.mock_method.assert_called_once_with()
+    def test_find_controller_index(self):
+        openerpweb.openerpweb.Root().default(
+            'some', 'controller', 'path')
+        self.mock_index.assert_called_once_with()
+
+    def test_nested_paths(self):
+        openerpweb.openerpweb.Root().default(
+            'some', 'other', 'controller', '2')
+        self.mock_index.assert_called_once_with()

From 7a5be24866001a9fb979dd380a324d5c1c2fe549 Mon Sep 17 00:00:00 2001
From: "RME (OpenERP)" <rme@tinyerp.com>
Date: Tue, 22 Mar 2011 17:45:12 +0530
Subject: [PATCH 11/29] [FIX] membership : membership search view having
 problem in web client

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

bzr revid: rme@tinyerp.com-20110322121512-xh15w0he81gch1lp
---
 addons/membership/membership_view.xml | 52 +++++++++++----------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 2b0869670e9..533a734b500 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -162,38 +162,26 @@
             <field name="model">res.partner</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <field name="category_id" position="after">
-          <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                     <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-          <separator orientation="vertical"/>
-          <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-          <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-          <separator orientation="vertical"/>
-                   <field name="membership_stop" string="End Membership Date"/>
-                   <field name="membership_start" invisible="1"/>
-                   <newline/>
-               </field>
-            </field>
-        </record>
-
-        <record id="view_res_partner_member_filter2" model="ir.ui.view">
-            <field name="name">res.partner.select2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="view_res_partner_member_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <field name="membership_start" position="after">
-                <newline/>
-              <group expand="0" string="Group By..." colspan="10" col="8">
-                <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-                  <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-                  <separator orientation="vertical"/>
-                    <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-                    <separator orientation="vertical"/>
-                  <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-                  <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-                </group>
-                </field>
+            	<search string="Membership Partners">
+		          	<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+		            <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+	          		<separator orientation="vertical"/>
+		          	<filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+		          	<filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+	          		<separator orientation="vertical"/>
+	                <field name="membership_stop" string="End Membership Date"/>
+	                <field name="membership_start" invisible="1"/>
+	                <newline/>
+	                <group expand="0" string="Group By..." colspan="10" col="8">
+	                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+	              		<separator orientation="vertical"/>
+	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+	                	<separator orientation="vertical"/>
+	                	<filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+	              		<filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+	            	</group>
+	           </search>
             </field>
         </record>
 

From 16cbdc2a9004c12587d843e8abee8ea8ff311465 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Mar 2011 15:11:17 +0100
Subject: [PATCH 12/29] [ADD] Be Stubborn. Obey the Goat.

Basic testing infrastructure for the base addon JS

bzr revid: xmo@openerp.com-20110322141117-7htmchkc4pyus3e2
---
 addons/base/static/openerp/js/tests.js        |   56 +
 addons/base/static/openerp/test.html          |   29 +
 addons/base/static/qunit/qunit-2011-23-22.css |  248 +++
 addons/base/static/qunit/qunit-2011-23-22.js  | 1456 +++++++++++++++++
 4 files changed, 1789 insertions(+)
 create mode 100644 addons/base/static/openerp/js/tests.js
 create mode 100644 addons/base/static/openerp/test.html
 create mode 100644 addons/base/static/qunit/qunit-2011-23-22.css
 create mode 100644 addons/base/static/qunit/qunit-2011-23-22.js

diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
new file mode 100644
index 00000000000..fe5a2998079
--- /dev/null
+++ b/addons/base/static/openerp/js/tests.js
@@ -0,0 +1,56 @@
+/**
+ * @function
+ * Defines a module scope (which lasts until the next call to module).
+ *
+ * This module scopes implies setup and teardown callbacks running for each test.
+ *
+ * @param {String} name the name of the module
+ * @param {Object} [lifecycle] callbacks to run before and after each test of the module
+ * @param {Function} lifecycle.setup function running before each test of this module
+ * @param {Function} lifecycle.teardown function running after each test of this module
+ */
+var module;
+/**
+ * @function
+ * Defines a given test to run. Runs all the assertions present in the test
+ *
+ * @param {String} name the name of the test
+ * @param {Number} [expected] number of assertions expected to run in this test (useful for asynchronous tests)
+ * @param {Function} test the testing code to run, holding a sequence of assertions (at least one)
+ */
+var test;
+/**
+ * @function
+ * The most basic boolean assertion (~assertTrue or assert).
+ *
+ * Passes if its argument is truthy
+ *
+ * @param {Boolean} state an arbitrary expression, evaluated in a boolean context
+ * @param {String} [message] the message to output with the assertion result
+ */
+var ok;
+/**
+ * @function
+ * Equality assertion (~assertEqual)
+ *
+ * Passes if both arguments are equal (via <code>==</code>)
+ *
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var equal;
+/**
+ * @function
+ * Inequality assertion (~assertEqual)
+ *
+ * Passes if the arguments are different (via <code>!=</code>)
+ *
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var notEqual, deepEqual, notDeepEqual,
+    strictEqual, notStrictEqual, raises, start, stop;
+$(document).ready(function () {
+});
diff --git a/addons/base/static/openerp/test.html b/addons/base/static/openerp/test.html
new file mode 100644
index 00000000000..0fd13cde45a
--- /dev/null
+++ b/addons/base/static/openerp/test.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html style="height: 100%">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>OpenERP</title>
+    <link rel="shortcut icon" href="/openobject/static/images/favicon.ico" type="image/x-icon"/>
+
+    <link rel="stylesheet" href="/base/static/qunit/qunit-2011-23-22.css">
+    <script src="/base/static/qunit/qunit-2011-23-22.js" type="text/javascript"></script>
+
+    <script src="/base/static/underscore/underscore.js" type="text/javascript"></script>
+
+    <!-- jquery -->
+    <script src="/base/static/jquery/jquery-1.5.1.js"></script>
+
+    <script src="/base/static/openerp/js/base.js"></script>
+    <script src="/base/static/openerp/js/base_chrome.js"></script>
+    <script src="/base/static/openerp/js/base_views.js"></script>
+
+</head>
+    <body id="oe" class="openerp">
+        <h1 id="qunit-header">OpenERP Base Test Suite</h1>
+        <h2 id="qunit-banner"></h2>
+        <div id="qunit-testrunner-toolbar"></div>
+        <h2 id="qunit-userAgent"></h2>
+        <ol id="qunit-tests"></ol>
+    </body>
+    <script type="text/javascript" src="/base/static/openerp/js/tests.js"></script>
+</html>
diff --git a/addons/base/static/qunit/qunit-2011-23-22.css b/addons/base/static/qunit/qunit-2011-23-22.css
new file mode 100644
index 00000000000..cc791a9b099
--- /dev/null
+++ b/addons/base/static/qunit/qunit-2011-23-22.css
@@ -0,0 +1,248 @@
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+    font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li {
+    font-size: small;
+}
+
+#qunit-tests {
+    font-size: smaller;
+}
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+    margin: 0;
+    padding: 0;
+}
+
+/** Header */
+
+#qunit-header {
+    padding: 0.5em 0 0.5em 1em;
+
+    color: #8699a4;
+    background-color: #0d3349;
+
+    font-size: 1.5em;
+    line-height: 1em;
+    font-weight: normal;
+
+    border-radius: 15px 15px 0 0;
+    -moz-border-radius: 15px 15px 0 0;
+    -webkit-border-top-right-radius: 15px;
+    -webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+    text-decoration: none;
+    color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+    color: #fff;
+}
+
+#qunit-banner {
+    height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+    padding: 0.5em 0 0.5em 2em;
+    color: #5E740B;
+    background-color: #eee;
+}
+
+#qunit-userAgent {
+    padding: 0.5em 0 0.5em 2.5em;
+    background-color: #2b81af;
+    color: #fff;
+    text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+    list-style-position: inside;
+}
+
+#qunit-tests li {
+    padding: 0.4em 0.5em 0.4em 2.5em;
+    border-bottom: 1px solid #fff;
+    list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
+    display: none;
+}
+
+#qunit-tests li strong {
+    cursor: pointer;
+}
+
+#qunit-tests li a {
+    padding: 0.5em;
+    color: #c2ccd1;
+    text-decoration: none;
+}
+
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+    color: #000;
+}
+
+#qunit-tests ol {
+    margin-top: 0.5em;
+    padding: 0.5em;
+
+    background-color: #fff;
+
+    border-radius: 15px;
+    -moz-border-radius: 15px;
+    -webkit-border-radius: 15px;
+
+    box-shadow: inset 0px 2px 13px #999;
+    -moz-box-shadow: inset 0px 2px 13px #999;
+    -webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+#qunit-tests table {
+    border-collapse: collapse;
+    margin-top: .2em;
+}
+
+#qunit-tests th {
+    text-align: right;
+    vertical-align: top;
+    padding: 0 .5em 0 0;
+}
+
+#qunit-tests td {
+    vertical-align: top;
+}
+
+#qunit-tests pre {
+    margin: 0;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+#qunit-tests del {
+    background-color: #e0f2be;
+    color: #374e0c;
+    text-decoration: none;
+}
+
+#qunit-tests ins {
+    background-color: #ffcaca;
+    color: #500;
+    text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts {
+    color: black;
+}
+
+#qunit-tests b.passed {
+    color: #5E740B;
+}
+
+#qunit-tests b.failed {
+    color: #710909;
+}
+
+#qunit-tests li li {
+    margin: 0.5em;
+    padding: 0.4em 0.5em 0.4em 0.5em;
+    background-color: #fff;
+    border-bottom: none;
+    list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+    color: #5E740B;
+    background-color: #fff;
+    border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass {
+    color: #528CE0;
+    background-color: #D2E0E6;
+}
+
+#qunit-tests .pass .test-name {
+    color: #366097;
+}
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected {
+    color: #999999;
+}
+
+#qunit-banner.qunit-pass {
+    background-color: #C6E746;
+}
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+    color: #710909;
+    background-color: #fff;
+    border-left: 26px solid #EE5757;
+}
+
+#qunit-tests > li:last-child {
+    border-radius: 0 0 15px 15px;
+    -moz-border-radius: 0 0 15px 15px;
+    -webkit-border-bottom-right-radius: 15px;
+    -webkit-border-bottom-left-radius: 15px;
+}
+
+#qunit-tests .fail {
+    color: #000000;
+    background-color: #EE5757;
+}
+
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name {
+    color: #000000;
+}
+
+#qunit-tests .fail .test-actual {
+    color: #EE5757;
+}
+
+#qunit-tests .fail .test-expected {
+    color: green;
+}
+
+#qunit-banner.qunit-fail {
+    background-color: #EE5757;
+}
+
+/** Result */
+
+#qunit-testresult {
+    padding: 0.5em 0.5em 0.5em 2.5em;
+
+    color: #2b81af;
+    background-color: #D2E0E6;
+
+    border-bottom: 1px solid white;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+    position: absolute;
+    top: -10000px;
+    left: -10000px;
+}
diff --git a/addons/base/static/qunit/qunit-2011-23-22.js b/addons/base/static/qunit/qunit-2011-23-22.js
new file mode 100644
index 00000000000..18f8ae1715c
--- /dev/null
+++ b/addons/base/static/qunit/qunit-2011-23-22.js
@@ -0,0 +1,1456 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+    var defined = {
+        setTimeout: typeof window.setTimeout !== "undefined",
+        sessionStorage: (function() {
+            try {
+                return !!sessionStorage.getItem;
+            } catch(e) {
+                return false;
+            }
+        })()
+    };
+
+    var testId = 0;
+
+    var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
+        this.name = name;
+        this.testName = testName;
+        this.expected = expected;
+        this.testEnvironmentArg = testEnvironmentArg;
+        this.async = async;
+        this.callback = callback;
+        this.assertions = [];
+    };
+    Test.prototype = {
+        init: function() {
+            var tests = id("qunit-tests");
+            if (tests) {
+                var b = document.createElement("strong");
+                b.innerHTML = "Running " + this.name;
+                var li = document.createElement("li");
+                li.appendChild(b);
+                li.className = "running";
+                li.id = this.id = "test-output" + testId++;
+                tests.appendChild(li);
+            }
+        },
+        setup: function() {
+            if (this.module != config.previousModule) {
+                if (config.previousModule) {
+                    QUnit.moduleDone({
+                                name: config.previousModule,
+                                failed: config.moduleStats.bad,
+                                passed: config.moduleStats.all - config.moduleStats.bad,
+                                total: config.moduleStats.all
+                            });
+                }
+                config.previousModule = this.module;
+                config.moduleStats = { all: 0, bad: 0 };
+                QUnit.moduleStart({
+                            name: this.module
+                        });
+            }
+
+            config.current = this;
+            this.testEnvironment = extend({
+                        setup: function() {
+                        },
+                        teardown: function() {
+                        }
+                    }, this.moduleTestEnvironment);
+            if (this.testEnvironmentArg) {
+                extend(this.testEnvironment, this.testEnvironmentArg);
+            }
+
+            QUnit.testStart({
+                        name: this.testName
+                    });
+
+            // allow utility functions to access the current test environment
+            // TODO why??
+            QUnit.current_testEnvironment = this.testEnvironment;
+
+            try {
+                if (!config.pollution) {
+                    saveGlobal();
+                }
+
+                this.testEnvironment.setup.call(this.testEnvironment);
+            } catch(e) {
+                QUnit.ok(false, "Setup failed on " + this.testName + ": " + e.message);
+            }
+        },
+        run: function() {
+            if (this.async) {
+                QUnit.stop();
+            }
+
+            if (config.notrycatch) {
+                this.callback.call(this.testEnvironment);
+                return;
+            }
+            try {
+                this.callback.call(this.testEnvironment);
+            } catch(e) {
+                fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
+                QUnit.ok(false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e));
+                // else next test will carry the responsibility
+                saveGlobal();
+
+                // Restart the tests if they're blocking
+                if (config.blocking) {
+                    start();
+                }
+            }
+        },
+        teardown: function() {
+            try {
+                checkPollution();
+                this.testEnvironment.teardown.call(this.testEnvironment);
+            } catch(e) {
+                QUnit.ok(false, "Teardown failed on " + this.testName + ": " + e.message);
+            }
+        },
+        finish: function() {
+            if (this.expected && this.expected != this.assertions.length) {
+                QUnit.ok(false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run");
+            }
+
+            var good = 0, bad = 0,
+                    tests = id("qunit-tests");
+
+            config.stats.all += this.assertions.length;
+            config.moduleStats.all += this.assertions.length;
+
+            if (tests) {
+                var ol = document.createElement("ol");
+
+                for (var i = 0; i < this.assertions.length; i++) {
+                    var assertion = this.assertions[i];
+
+                    var li = document.createElement("li");
+                    li.className = assertion.result ? "pass" : "fail";
+                    li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+                    ol.appendChild(li);
+
+                    if (assertion.result) {
+                        good++;
+                    } else {
+                        bad++;
+                        config.stats.bad++;
+                        config.moduleStats.bad++;
+                    }
+                }
+
+                // store result when possible
+                if (QUnit.config.reorder && defined.sessionStorage) {
+                    if (bad) {
+                        sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad)
+                    } else {
+                        sessionStorage.removeItem("qunit-" + this.testName);
+                    }
+                }
+
+                if (bad == 0) {
+                    ol.style.display = "none";
+                }
+
+                var b = document.createElement("strong");
+                b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
+
+                var a = document.createElement("a");
+                a.innerHTML = "Rerun";
+                a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+
+                addEvent(b, "click", function() {
+                    var next = b.nextSibling.nextSibling,
+                            display = next.style.display;
+                    next.style.display = display === "none" ? "block" : "none";
+                });
+
+                addEvent(b, "dblclick", function(e) {
+                    var target = e && e.target ? e.target : window.event.srcElement;
+                    if (target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b") {
+                        target = target.parentNode;
+                    }
+                    if (window.location && target.nodeName.toLowerCase() === "strong") {
+                        window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+                    }
+                });
+
+                var li = id(this.id);
+                li.className = bad ? "fail" : "pass";
+                li.removeChild(li.firstChild);
+                li.appendChild(b);
+                li.appendChild(a);
+                li.appendChild(ol);
+
+            } else {
+                for (var i = 0; i < this.assertions.length; i++) {
+                    if (!this.assertions[i].result) {
+                        bad++;
+                        config.stats.bad++;
+                        config.moduleStats.bad++;
+                    }
+                }
+            }
+
+            try {
+                QUnit.reset();
+            } catch(e) {
+                fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
+            }
+
+            QUnit.testDone({
+                        name: this.testName,
+                        failed: bad,
+                        passed: this.assertions.length - bad,
+                        total: this.assertions.length
+                    });
+        },
+
+        queue: function() {
+            var test = this;
+            synchronize(function() {
+                test.init();
+            });
+            function run() {
+                // each of these can by async
+                synchronize(function() {
+                    test.setup();
+                });
+                synchronize(function() {
+                    test.run();
+                });
+                synchronize(function() {
+                    test.teardown();
+                });
+                synchronize(function() {
+                    test.finish();
+                });
+            }
+
+            // defer when previous test run passed, if storage is available
+            var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
+            if (bad) {
+                run();
+            } else {
+                synchronize(run);
+            }
+            ;
+        }
+
+    };
+
+    var QUnit = {
+
+        // call on start of module test to prepend name to all tests
+        module: function(name, testEnvironment) {
+            config.currentModule = name;
+            config.currentModuleTestEnviroment = testEnvironment;
+        },
+
+        asyncTest: function(testName, expected, callback) {
+            if (arguments.length === 2) {
+                callback = expected;
+                expected = 0;
+            }
+
+            QUnit.test(testName, expected, callback, true);
+        },
+
+        test: function(testName, expected, callback, async) {
+            var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg;
+
+            if (arguments.length === 2) {
+                callback = expected;
+                expected = null;
+            }
+            // is 2nd argument a testEnvironment?
+            if (expected && typeof expected === 'object') {
+                testEnvironmentArg = expected;
+                expected = null;
+            }
+
+            if (config.currentModule) {
+                name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+            }
+
+            if (!validTest(config.currentModule + ": " + testName)) {
+                return;
+            }
+
+            var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
+            test.module = config.currentModule;
+            test.moduleTestEnvironment = config.currentModuleTestEnviroment;
+            test.queue();
+        },
+
+        /**
+         * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+         */
+        expect: function(asserts) {
+            config.current.expected = asserts;
+        },
+
+        /**
+         * Asserts true.
+         * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+         */
+        ok: function(a, msg) {
+            a = !!a;
+            var details = {
+                result: a,
+                message: msg
+            };
+            msg = escapeHtml(msg);
+            QUnit.log(details);
+            config.current.assertions.push({
+                        result: a,
+                        message: msg
+                    });
+        },
+
+        /**
+         * Checks that the first two arguments are equal, with an optional message.
+         * Prints out both actual and expected values.
+         *
+         * Prefered to ok( actual == expected, message )
+         *
+         * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+         *
+         * @param Object actual
+         * @param Object expected
+         * @param String message (optional)
+         */
+        equal: function(actual, expected, message) {
+            QUnit.push(expected == actual, actual, expected, message);
+        },
+
+        notEqual: function(actual, expected, message) {
+            QUnit.push(expected != actual, actual, expected, message);
+        },
+
+        deepEqual: function(actual, expected, message) {
+            QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+        },
+
+        notDeepEqual: function(actual, expected, message) {
+            QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+        },
+
+        strictEqual: function(actual, expected, message) {
+            QUnit.push(expected === actual, actual, expected, message);
+        },
+
+        notStrictEqual: function(actual, expected, message) {
+            QUnit.push(expected !== actual, actual, expected, message);
+        },
+
+        raises: function(block, expected, message) {
+            var actual, ok = false;
+
+            if (typeof expected === 'string') {
+                message = expected;
+                expected = null;
+            }
+
+            try {
+                block();
+            } catch (e) {
+                actual = e;
+            }
+
+            if (actual) {
+                // we don't want to validate thrown error
+                if (!expected) {
+                    ok = true;
+                    // expected is a regexp
+                } else if (QUnit.objectType(expected) === "regexp") {
+                    ok = expected.test(actual);
+                    // expected is a constructor
+                } else if (actual instanceof expected) {
+                    ok = true;
+                    // expected is a validation function which returns true is validation passed
+                } else if (expected.call({}, actual) === true) {
+                    ok = true;
+                }
+            }
+
+            QUnit.ok(ok, message);
+        },
+
+        start: function() {
+            config.semaphore--;
+            if (config.semaphore > 0) {
+                // don't start until equal number of stop-calls
+                return;
+            }
+            if (config.semaphore < 0) {
+                // ignore if start is called more often then stop
+                config.semaphore = 0;
+            }
+            // A slight delay, to avoid any current callbacks
+            if (defined.setTimeout) {
+                window.setTimeout(function() {
+                    if (config.timeout) {
+                        clearTimeout(config.timeout);
+                    }
+
+                    config.blocking = false;
+                    process();
+                }, 13);
+            } else {
+                config.blocking = false;
+                process();
+            }
+        },
+
+        stop: function(timeout) {
+            config.semaphore++;
+            config.blocking = true;
+
+            if (timeout && defined.setTimeout) {
+                clearTimeout(config.timeout);
+                config.timeout = window.setTimeout(function() {
+                    QUnit.ok(false, "Test timed out");
+                    QUnit.start();
+                }, timeout);
+            }
+        }
+    };
+
+// Backwards compatibility, deprecated
+    QUnit.equals = QUnit.equal;
+    QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+    var config = {
+        // The queue of tests to run
+        queue: [],
+
+        // block until document ready
+        blocking: true,
+
+        // by default, run previously failed tests first
+        // very useful in combination with "Hide passed tests" checked
+        reorder: true,
+
+        noglobals: false,
+        notrycatch: false
+    };
+
+// Load paramaters
+    (function() {
+        var location = window.location || { search: "", protocol: "file:" },
+                params = location.search.slice(1).split("&"),
+                length = params.length,
+                urlParams = {},
+                current;
+
+        if (params[ 0 ]) {
+            for (var i = 0; i < length; i++) {
+                current = params[ i ].split("=");
+                current[ 0 ] = decodeURIComponent(current[ 0 ]);
+                // allow just a key to turn on a flag, e.g., test.html?noglobals
+                current[ 1 ] = current[ 1 ] ? decodeURIComponent(current[ 1 ]) : true;
+                urlParams[ current[ 0 ] ] = current[ 1 ];
+                if (current[ 0 ] in config) {
+                    config[ current[ 0 ] ] = current[ 1 ];
+                }
+            }
+        }
+
+        QUnit.urlParams = urlParams;
+        config.filter = urlParams.filter;
+
+        // Figure out if we're running the tests from a server or not
+        QUnit.isLocal = !!(location.protocol === 'file:');
+    })();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+    if (typeof exports === "undefined" || typeof require === "undefined") {
+        extend(window, QUnit);
+        window.QUnit = QUnit;
+    } else {
+        extend(exports, QUnit);
+        exports.QUnit = QUnit;
+    }
+
+// define these after exposing globals to keep them in these QUnit namespace only
+    extend(QUnit, {
+                config: config,
+
+                // Initialize the configuration options
+                init: function() {
+                    extend(config, {
+                                stats: { all: 0, bad: 0 },
+                                moduleStats: { all: 0, bad: 0 },
+                                started: +new Date,
+                                updateRate: 1000,
+                                blocking: false,
+                                autostart: true,
+                                autorun: false,
+                                filter: "",
+                                queue: [],
+                                semaphore: 0
+                            });
+
+                    var tests = id("qunit-tests"),
+                            banner = id("qunit-banner"),
+                            result = id("qunit-testresult");
+
+                    if (tests) {
+                        tests.innerHTML = "";
+                    }
+
+                    if (banner) {
+                        banner.className = "";
+                    }
+
+                    if (result) {
+                        result.parentNode.removeChild(result);
+                    }
+
+                    if (tests) {
+                        result = document.createElement("p");
+                        result.id = "qunit-testresult";
+                        result.className = "result";
+                        tests.parentNode.insertBefore(result, tests);
+                        result.innerHTML = 'Running...<br/>&nbsp;';
+                    }
+                },
+
+                /**
+                 * Resets the test setup. Useful for tests that modify the DOM.
+                 *
+                 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+                 */
+                reset: function() {
+                    if (window.jQuery) {
+                        jQuery("#main, #qunit-fixture").html(config.fixture);
+                    } else {
+                        var main = id('main') || id('qunit-fixture');
+                        if (main) {
+                            main.innerHTML = config.fixture;
+                        }
+                    }
+                },
+
+                /**
+                 * Trigger an event on an element.
+                 *
+                 * @example triggerEvent( document.body, "click" );
+                 *
+                 * @param {Element} elem
+                 * @param {String} type
+                 */
+                triggerEvent: function(elem, type, event) {
+                    if (document.createEvent) {
+                        event = document.createEvent("MouseEvents");
+                        event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+                                0, 0, 0, 0, 0, false, false, false, false, 0, null);
+                        elem.dispatchEvent(event);
+
+                    } else if (elem.fireEvent) {
+                        elem.fireEvent("on" + type);
+                    }
+                },
+
+                // Safe object type checking
+                is: function(type, obj) {
+                    return QUnit.objectType(obj) == type;
+                },
+
+                objectType: function(obj) {
+                    if (typeof obj === "undefined") {
+                        return "undefined";
+
+                        // consider: typeof null === object
+                    }
+                    if (obj === null) {
+                        return "null";
+                    }
+
+                    var type = Object.prototype.toString.call(obj)
+                            .match(/^\[object\s(.*)\]$/)[1] || '';
+
+                    switch (type) {
+                        case 'Number':
+                            if (isNaN(obj)) {
+                                return "nan";
+                            } else {
+                                return "number";
+                            }
+                        case 'String':
+                        case 'Boolean':
+                        case 'Array':
+                        case 'Date':
+                        case 'RegExp':
+                        case 'Function':
+                            return type.toLowerCase();
+                    }
+                    if (typeof obj === "object") {
+                        return "object";
+                    }
+                    return undefined;
+                },
+
+                push: function(result, actual, expected, message) {
+                    var details = {
+                        result: result,
+                        message: message,
+                        actual: actual,
+                        expected: expected
+                    };
+
+                    message = escapeHtml(message) || (result ? "okay" : "failed");
+                    message = '<span class="test-message">' + message + "</span>";
+                    expected = escapeHtml(QUnit.jsDump.parse(expected));
+                    actual = escapeHtml(QUnit.jsDump.parse(actual));
+                    var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
+                    if (actual != expected) {
+                        output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
+                        output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) + '</pre></td></tr>';
+                    }
+                    if (!result) {
+                        var source = sourceFromStacktrace();
+                        if (source) {
+                            details.source = source;
+                            output += '<tr class="test-source"><th>Source: </th><td><pre>' + source + '</pre></td></tr>';
+                        }
+                    }
+                    output += "</table>";
+
+                    QUnit.log(details);
+
+                    config.current.assertions.push({
+                                result: !!result,
+                                message: output
+                            });
+                },
+
+                url: function(params) {
+                    params = extend(extend({}, QUnit.urlParams), params);
+                    var querystring = "?",
+                            key;
+                    for (key in params) {
+                        querystring += encodeURIComponent(key) + "=" +
+                                encodeURIComponent(params[ key ]) + "&";
+                    }
+                    return window.location.pathname + querystring.slice(0, -1);
+                },
+
+                // Logging callbacks; all receive a single argument with the listed properties
+                // run test/logs.html for any related changes
+                begin: function() {
+                },
+                // done: { failed, passed, total, runtime }
+                done: function() {
+                },
+                // log: { result, actual, expected, message }
+                log: function() {
+                },
+                // testStart: { name }
+                testStart: function() {
+                },
+                // testDone: { name, failed, passed, total }
+                testDone: function() {
+                },
+                // moduleStart: { name }
+                moduleStart: function() {
+                },
+                // moduleDone: { name, failed, passed, total }
+                moduleDone: function() {
+                }
+            });
+
+    if (typeof document === "undefined" || document.readyState === "complete") {
+        config.autorun = true;
+    }
+
+    addEvent(window, "load", function() {
+        QUnit.begin({});
+
+        // Initialize the config, saving the execution queue
+        var oldconfig = extend({}, config);
+        QUnit.init();
+        extend(config, oldconfig);
+
+        config.blocking = false;
+
+        var userAgent = id("qunit-userAgent");
+        if (userAgent) {
+            userAgent.innerHTML = navigator.userAgent;
+        }
+        var banner = id("qunit-header");
+        if (banner) {
+            banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' +
+                    '<label><input name="noglobals" type="checkbox"' + ( config.noglobals ? ' checked="checked"' : '' ) + '>noglobals</label>' +
+                    '<label><input name="notrycatch" type="checkbox"' + ( config.notrycatch ? ' checked="checked"' : '' ) + '>notrycatch</label>';
+            addEvent(banner, "change", function(event) {
+                var params = {};
+                params[ event.target.name ] = event.target.checked ? true : undefined;
+                window.location = QUnit.url(params);
+            });
+        }
+
+        var toolbar = id("qunit-testrunner-toolbar");
+        if (toolbar) {
+            var filter = document.createElement("input");
+            filter.type = "checkbox";
+            filter.id = "qunit-filter-pass";
+            addEvent(filter, "click", function() {
+                var ol = document.getElementById("qunit-tests");
+                if (filter.checked) {
+                    ol.className = ol.className + " hidepass";
+                } else {
+                    var tmp = " " + ol.className.replace(/[\n\t\r]/g, " ") + " ";
+                    ol.className = tmp.replace(/ hidepass /, " ");
+                }
+                if (defined.sessionStorage) {
+                    if (filter.checked) {
+                        sessionStorage.setItem("qunit-filter-passed-tests", "true");
+                    } else {
+                        sessionStorage.removeItem("qunit-filter-passed-tests");
+                    }
+                }
+            });
+            if (defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests")) {
+                filter.checked = true;
+                var ol = document.getElementById("qunit-tests");
+                ol.className = ol.className + " hidepass";
+            }
+            toolbar.appendChild(filter);
+
+            var label = document.createElement("label");
+            label.setAttribute("for", "qunit-filter-pass");
+            label.innerHTML = "Hide passed tests";
+            toolbar.appendChild(label);
+        }
+
+        var main = id('main') || id('qunit-fixture');
+        if (main) {
+            config.fixture = main.innerHTML;
+        }
+
+        if (config.autostart) {
+            QUnit.start();
+        }
+    });
+
+    function done() {
+        config.autorun = true;
+
+        // Log the last module results
+        if (config.currentModule) {
+            QUnit.moduleDone({
+                        name: config.currentModule,
+                        failed: config.moduleStats.bad,
+                        passed: config.moduleStats.all - config.moduleStats.bad,
+                        total: config.moduleStats.all
+                    });
+        }
+
+        var banner = id("qunit-banner"),
+                tests = id("qunit-tests"),
+                runtime = +new Date - config.started,
+                passed = config.stats.all - config.stats.bad,
+                html = [
+                    'Tests completed in ',
+                    runtime,
+                    ' milliseconds.<br/>',
+                    '<span class="passed">',
+                    passed,
+                    '</span> tests of <span class="total">',
+                    config.stats.all,
+                    '</span> passed, <span class="failed">',
+                    config.stats.bad,
+                    '</span> failed.'
+                ].join('');
+
+        if (banner) {
+            banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+        }
+
+        if (tests) {
+            id("qunit-testresult").innerHTML = html;
+        }
+
+        QUnit.done({
+                    failed: config.stats.bad,
+                    passed: passed,
+                    total: config.stats.all,
+                    runtime: runtime
+                });
+    }
+
+    function validTest(name) {
+        var filter = config.filter,
+                run = false;
+
+        if (!filter) {
+            return true;
+        }
+
+        var not = filter.charAt(0) === "!";
+        if (not) {
+            filter = filter.slice(1);
+        }
+
+        if (name.indexOf(filter) !== -1) {
+            return !not;
+        }
+
+        if (not) {
+            run = true;
+        }
+
+        return run;
+    }
+
+// so far supports only Firefox, Chrome and Opera (buggy)
+// could be extended in the future to use something like https://github.com/csnover/TraceKit
+    function sourceFromStacktrace() {
+        try {
+            throw new Error();
+        } catch (e) {
+            if (e.stacktrace) {
+                // Opera
+                return e.stacktrace.split("\n")[6];
+            } else if (e.stack) {
+                // Firefox, Chrome
+                return e.stack.split("\n")[4];
+            }
+        }
+    }
+
+    function escapeHtml(s) {
+        if (!s) {
+            return "";
+        }
+        s = s + "";
+        return s.replace(/[\&"<>\\]/g, function(s) {
+            switch (s) {
+                case "&": return "&amp;";
+                case "\\": return "\\\\";
+                case '"': return '\"';
+                case "<": return "&lt;";
+                case ">": return "&gt;";
+                default: return s;
+            }
+        });
+    }
+
+    function synchronize(callback) {
+        config.queue.push(callback);
+
+        if (config.autorun && !config.blocking) {
+            process();
+        }
+    }
+
+    function process() {
+        var start = (new Date()).getTime();
+
+        while (config.queue.length && !config.blocking) {
+            if (config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate)) {
+                config.queue.shift()();
+            } else {
+                window.setTimeout(process, 13);
+                break;
+            }
+        }
+        if (!config.blocking && !config.queue.length) {
+            done();
+        }
+    }
+
+    function saveGlobal() {
+        config.pollution = [];
+
+        if (config.noglobals) {
+            for (var key in window) {
+                config.pollution.push(key);
+            }
+        }
+    }
+
+    function checkPollution(name) {
+        var old = config.pollution;
+        saveGlobal();
+
+        var newGlobals = diff(config.pollution, old);
+        if (newGlobals.length > 0) {
+            ok(false, "Introduced global variable(s): " + newGlobals.join(", "));
+        }
+
+        var deletedGlobals = diff(old, config.pollution);
+        if (deletedGlobals.length > 0) {
+            ok(false, "Deleted global variable(s): " + deletedGlobals.join(", "));
+        }
+    }
+
+// returns a new Array with the elements that are in a but not in b
+    function diff(a, b) {
+        var result = a.slice();
+        for (var i = 0; i < result.length; i++) {
+            for (var j = 0; j < b.length; j++) {
+                if (result[i] === b[j]) {
+                    result.splice(i, 1);
+                    i--;
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    function fail(message, exception, callback) {
+        if (typeof console !== "undefined" && console.error && console.warn) {
+            console.error(message);
+            console.error(exception);
+            console.warn(callback.toString());
+
+        } else if (window.opera && opera.postError) {
+            opera.postError(message, exception, callback.toString);
+        }
+    }
+
+    function extend(a, b) {
+        for (var prop in b) {
+            if (b[prop] === undefined) {
+                delete a[prop];
+            } else {
+                a[prop] = b[prop];
+            }
+        }
+
+        return a;
+    }
+
+    function addEvent(elem, type, fn) {
+        if (elem.addEventListener) {
+            elem.addEventListener(type, fn, false);
+        } else if (elem.attachEvent) {
+            elem.attachEvent("on" + type, fn);
+        } else {
+            fn();
+        }
+    }
+
+    function id(name) {
+        return !!(typeof document !== "undefined" && document && document.getElementById) &&
+                document.getElementById(name);
+    }
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+    QUnit.equiv = function () {
+
+        var innerEquiv; // the real equiv function
+        var callers = []; // stack to decide between skip/abort functions
+        var parents = []; // stack to avoiding loops from circular referencing
+
+        // Call the o related callback with the given arguments.
+        function bindCallbacks(o, callbacks, args) {
+            var prop = QUnit.objectType(o);
+            if (prop) {
+                if (QUnit.objectType(callbacks[prop]) === "function") {
+                    return callbacks[prop].apply(callbacks, args);
+                } else {
+                    return callbacks[prop]; // or undefined
+                }
+            }
+        }
+
+        var callbacks = function () {
+
+            // for string, boolean, number and null
+            function useStrictEquality(b, a) {
+                if (b instanceof a.constructor || a instanceof b.constructor) {
+                    // to catch short annotaion VS 'new' annotation of a declaration
+                    // e.g. var i = 1;
+                    //      var j = new Number(1);
+                    return a == b;
+                } else {
+                    return a === b;
+                }
+            }
+
+            return {
+                "string": useStrictEquality,
+                "boolean": useStrictEquality,
+                "number": useStrictEquality,
+                "null": useStrictEquality,
+                "undefined": useStrictEquality,
+
+                "nan": function (b) {
+                    return isNaN(b);
+                },
+
+                "date": function (b, a) {
+                    return QUnit.objectType(b) === "date" && a.valueOf() === b.valueOf();
+                },
+
+                "regexp": function (b, a) {
+                    return QUnit.objectType(b) === "regexp" &&
+                            a.source === b.source && // the regex itself
+                            a.global === b.global && // and its modifers (gmi) ...
+                            a.ignoreCase === b.ignoreCase &&
+                            a.multiline === b.multiline;
+                },
+
+                // - skip when the property is a method of an instance (OOP)
+                // - abort otherwise,
+                //   initial === would have catch identical references anyway
+                "function": function () {
+                    var caller = callers[callers.length - 1];
+                    return caller !== Object &&
+                            typeof caller !== "undefined";
+                },
+
+                "array": function (b, a) {
+                    var i, j, loop;
+                    var len;
+
+                    // b could be an object literal here
+                    if (! (QUnit.objectType(b) === "array")) {
+                        return false;
+                    }
+
+                    len = a.length;
+                    if (len !== b.length) { // safe and faster
+                        return false;
+                    }
+
+                    //track reference to avoid circular references
+                    parents.push(a);
+                    for (i = 0; i < len; i++) {
+                        loop = false;
+                        for (j = 0; j < parents.length; j++) {
+                            if (parents[j] === a[i]) {
+                                loop = true;//dont rewalk array
+                            }
+                        }
+                        if (!loop && ! innerEquiv(a[i], b[i])) {
+                            parents.pop();
+                            return false;
+                        }
+                    }
+                    parents.pop();
+                    return true;
+                },
+
+                "object": function (b, a) {
+                    var i, j, loop;
+                    var eq = true; // unless we can proove it
+                    var aProperties = [], bProperties = []; // collection of strings
+
+                    // comparing constructors is more strict than using instanceof
+                    if (a.constructor !== b.constructor) {
+                        return false;
+                    }
+
+                    // stack constructor before traversing properties
+                    callers.push(a.constructor);
+                    //track reference to avoid circular references
+                    parents.push(a);
+
+                    for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+                        loop = false;
+                        for (j = 0; j < parents.length; j++) {
+                            if (parents[j] === a[i])
+                                loop = true; //don't go down the same path twice
+                        }
+                        aProperties.push(i); // collect a's properties
+
+                        if (!loop && ! innerEquiv(a[i], b[i])) {
+                            eq = false;
+                            break;
+                        }
+                    }
+
+                    callers.pop(); // unstack, we are done
+                    parents.pop();
+
+                    for (i in b) {
+                        bProperties.push(i); // collect b's properties
+                    }
+
+                    // Ensures identical properties name
+                    return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+                }
+            };
+        }();
+
+        innerEquiv = function () { // can take multiple arguments
+            var args = Array.prototype.slice.apply(arguments);
+            if (args.length < 2) {
+                return true; // end transition
+            }
+
+            return (function (a, b) {
+                if (a === b) {
+                    return true; // catch the most you can
+                } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || QUnit.objectType(a) !== QUnit.objectType(b)) {
+                    return false; // don't lose time with error prone cases
+                } else {
+                    return bindCallbacks(a, callbacks, [b, a]);
+                }
+
+                // apply transition with (1..n) arguments
+            })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length - 1));
+        };
+
+        return innerEquiv;
+
+    }();
+
+    /**
+     * jsDump
+     * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+     * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+     * Date: 5/15/2008
+     * @projectDescription Advanced and extensible data dumping for Javascript.
+     * @version 1.0.0
+     * @author Ariel Flesler
+     * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+     */
+    QUnit.jsDump = (function() {
+        function quote(str) {
+            return '"' + str.toString().replace(/"/g, '\\"') + '"';
+        }
+
+        function literal(o) {
+            return o + '';
+        }
+
+        function join(pre, arr, post) {
+            var s = jsDump.separator(),
+                    base = jsDump.indent(),
+                    inner = jsDump.indent(1);
+            if (arr.join)
+                arr = arr.join(',' + s + inner);
+            if (!arr)
+                return pre + post;
+            return [ pre, inner + arr, base + post ].join(s);
+        }
+        
+        function array(arr) {
+            var i = arr.length,    ret = Array(i);
+            this.up();
+            while (i--)
+                ret[i] = this.parse(arr[i]);
+            this.down();
+            return join('[', ret, ']');
+        }
+
+        var reName = /^function (\w+)/;
+
+        var jsDump = {
+            parse:function(obj, type) { //type is used mostly internally, you can fix a (custom)type in advance
+                var parser = this.parsers[ type || this.typeOf(obj) ];
+                type = typeof parser;
+
+                return type == 'function' ? parser.call(this, obj) :
+                        type == 'string' ? parser :
+                                this.parsers.error;
+            },
+            typeOf:function(obj) {
+                var type;
+                if (obj === null) {
+                    type = "null";
+                } else if (typeof obj === "undefined") {
+                    type = "undefined";
+                } else if (QUnit.is("RegExp", obj)) {
+                    type = "regexp";
+                } else if (QUnit.is("Date", obj)) {
+                    type = "date";
+                } else if (QUnit.is("Function", obj)) {
+                    type = "function";
+                } else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
+                    type = "window";
+                } else if (obj.nodeType === 9) {
+                    type = "document";
+                } else if (obj.nodeType) {
+                    type = "node";
+                } else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
+                    type = "array";
+                } else {
+                    type = typeof obj;
+                }
+                return type;
+            },
+            separator:function() {
+                return this.multiline ? this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+            },
+            indent:function(extra) {// extra can be a number, shortcut for increasing-calling-decreasing
+                if (!this.multiline)
+                    return '';
+                var chr = this.indentChar;
+                if (this.HTML)
+                    chr = chr.replace(/\t/g, '   ').replace(/ /g, '&nbsp;');
+                return Array(this._depth_ + (extra || 0)).join(chr);
+            },
+            up:function(a) {
+                this._depth_ += a || 1;
+            },
+            down:function(a) {
+                this._depth_ -= a || 1;
+            },
+            setParser:function(name, parser) {
+                this.parsers[name] = parser;
+            },
+            // The next 3 are exposed so you can use them
+            quote:quote,
+            literal:literal,
+            join:join,
+            //
+            _depth_: 1,
+            // This is the list of parsers, to modify them, use jsDump.setParser
+            parsers:{
+                window: '[Window]',
+                document: '[Document]',
+                error:'[ERROR]', //when no parser is found, shouldn't happen
+                unknown: '[Unknown]',
+                'null':'null',
+                'undefined':'undefined',
+                'function':function(fn) {
+                    var ret = 'function',
+                            name = 'name' in fn ? fn.name : (reName.exec(fn) || [])[1];//functions never have name in IE
+                    if (name)
+                        ret += ' ' + name;
+                    ret += '(';
+
+                    ret = [ ret, QUnit.jsDump.parse(fn, 'functionArgs'), '){'].join('');
+                    return join(ret, QUnit.jsDump.parse(fn, 'functionCode'), '}');
+                },
+                array: array,
+                nodelist: array,
+                arguments: array,
+                object:function(map) {
+                    var ret = [ ];
+                    QUnit.jsDump.up();
+                    for (var key in map)
+                        ret.push(QUnit.jsDump.parse(key, 'key') + ': ' + QUnit.jsDump.parse(map[key]));
+                    QUnit.jsDump.down();
+                    return join('{', ret, '}');
+                },
+                node:function(node) {
+                    var open = QUnit.jsDump.HTML ? '&lt;' : '<',
+                            close = QUnit.jsDump.HTML ? '&gt;' : '>';
+
+                    var tag = node.nodeName.toLowerCase(),
+                            ret = open + tag;
+
+                    for (var a in QUnit.jsDump.DOMAttrs) {
+                        var val = node[QUnit.jsDump.DOMAttrs[a]];
+                        if (val)
+                            ret += ' ' + a + '=' + QUnit.jsDump.parse(val, 'attribute');
+                    }
+                    return ret + close + open + '/' + tag + close;
+                },
+                functionArgs:function(fn) {//function calls it internally, it's the arguments part of the function
+                    var l = fn.length;
+                    if (!l) return '';
+
+                    var args = Array(l);
+                    while (l--)
+                        args[l] = String.fromCharCode(97 + l);//97 is 'a'
+                    return ' ' + args.join(', ') + ' ';
+                },
+                key:quote, //object calls it internally, the key part of an item in a map
+                functionCode:'[code]', //function calls it internally, it's the content of the function
+                attribute:quote, //node calls it internally, it's an html attribute value
+                string:quote,
+                date:quote,
+                regexp:literal, //regex
+                number:literal,
+                'boolean':literal
+            },
+            DOMAttrs:{//attributes to dump from nodes, name=>realName
+                id:'id',
+                name:'name',
+                'class':'className'
+            },
+            HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
+            indentChar:'  ',//indentation unit
+            multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+        };
+
+        return jsDump;
+    })();
+
+// from Sizzle.js
+    function getText(elems) {
+        var ret = "", elem;
+
+        for (var i = 0; elems[i]; i++) {
+            elem = elems[i];
+
+            // Get the text from text nodes and CDATA nodes
+            if (elem.nodeType === 3 || elem.nodeType === 4) {
+                ret += elem.nodeValue;
+
+                // Traverse everything else, except comment nodes
+            } else if (elem.nodeType !== 8) {
+                ret += getText(elem.childNodes);
+            }
+        }
+
+        return ret;
+    }
+
+    /*
+     * Javascript Diff Algorithm
+     *  By John Resig (http://ejohn.org/)
+     *  Modified by Chu Alan "sprite"
+     *
+     * Released under the MIT license.
+     *
+     * More Info:
+     *  http://ejohn.org/projects/javascript-diff-algorithm/
+     *
+     * Usage: QUnit.diff(expected, actual)
+     *
+     * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+     */
+    QUnit.diff = (function() {
+        function diff(o, n) {
+            var ns = new Object();
+            var os = new Object();
+
+            for (var i = 0; i < n.length; i++) {
+                if (ns[n[i]] == null)
+                    ns[n[i]] = {
+                        rows: new Array(),
+                        o: null
+                    };
+                ns[n[i]].rows.push(i);
+            }
+
+            for (var i = 0; i < o.length; i++) {
+                if (os[o[i]] == null)
+                    os[o[i]] = {
+                        rows: new Array(),
+                        n: null
+                    };
+                os[o[i]].rows.push(i);
+            }
+
+            for (var i in ns) {
+                if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
+                    n[ns[i].rows[0]] = {
+                        text: n[ns[i].rows[0]],
+                        row: os[i].rows[0]
+                    };
+                    o[os[i].rows[0]] = {
+                        text: o[os[i].rows[0]],
+                        row: ns[i].rows[0]
+                    };
+                }
+            }
+
+            for (var i = 0; i < n.length - 1; i++) {
+                if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
+                        n[i + 1] == o[n[i].row + 1]) {
+                    n[i + 1] = {
+                        text: n[i + 1],
+                        row: n[i].row + 1
+                    };
+                    o[n[i].row + 1] = {
+                        text: o[n[i].row + 1],
+                        row: i + 1
+                    };
+                }
+            }
+
+            for (var i = n.length - 1; i > 0; i--) {
+                if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
+                        n[i - 1] == o[n[i].row - 1]) {
+                    n[i - 1] = {
+                        text: n[i - 1],
+                        row: n[i].row - 1
+                    };
+                    o[n[i].row - 1] = {
+                        text: o[n[i].row - 1],
+                        row: i - 1
+                    };
+                }
+            }
+
+            return {
+                o: o,
+                n: n
+            };
+        }
+
+        return function(o, n) {
+            o = o.replace(/\s+$/, '');
+            n = n.replace(/\s+$/, '');
+            var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+
+            var str = "";
+
+            var oSpace = o.match(/\s+/g);
+            if (oSpace == null) {
+                oSpace = [" "];
+            }
+            else {
+                oSpace.push(" ");
+            }
+            var nSpace = n.match(/\s+/g);
+            if (nSpace == null) {
+                nSpace = [" "];
+            }
+            else {
+                nSpace.push(" ");
+            }
+
+            if (out.n.length == 0) {
+                for (var i = 0; i < out.o.length; i++) {
+                    str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+                }
+            }
+            else {
+                if (out.n[0].text == null) {
+                    for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+                        str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+                    }
+                }
+
+                for (var i = 0; i < out.n.length; i++) {
+                    if (out.n[i].text == null) {
+                        str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+                    }
+                    else {
+                        var pre = "";
+
+                        for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
+                            pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+                        }
+                        str += " " + out.n[i].text + nSpace[i] + pre;
+                    }
+                }
+            }
+
+            return str;
+        };
+    })();
+
+})(this);

From 2a068e215241bd3de4d956d9d52d342d09339090 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 22 Mar 2011 17:57:42 +0100
Subject: [PATCH 13/29] [FIX] Removed useless dependency in the documentation
 generator that is difficult to install under ubuntu.

bzr revid: nicolas.vanhoren@openerp.com-20110322165742-umlvufznh5unkhh5
---
 doc/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 365a1b7086b..d3f486f19c5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,7 +25,7 @@ import sys, os
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage' ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

From 8284359b831a981edcaaf367836d406ca422ce5e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 Mar 2011 18:18:01 +0100
Subject: [PATCH 14/29] [IMP] Improved FieldChar widget

bzr revid: fme@openerp.com-20110322171801-e5jmov41xg3pnzfz
---
 addons/base/static/openerp/base.css         |   3 +
 addons/base/static/openerp/base.xml         |  63 ++++++----
 addons/base/static/openerp/js/base_views.js | 129 ++++++++++++--------
 doc/source/addons.rst                       |  16 ++-
 4 files changed, 141 insertions(+), 70 deletions(-)

diff --git a/addons/base/static/openerp/base.css b/addons/base/static/openerp/base.css
index 0be7bcb8807..f84d76a0f07 100644
--- a/addons/base/static/openerp/base.css
+++ b/addons/base/static/openerp/base.css
@@ -416,6 +416,9 @@ body.openerp {
     border-bottom-width: 1px;
     margin: 6px 4px 6px 1px;
 }
+.openerp input[required=required], .openerp select[required=required] {
+    background-color: #D2D2FF;
+}
 
 /* jQuery UI override */
 .openerp .ui-widget {
diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index d640b21803d..40edce66c3e 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -162,28 +162,28 @@
             <td t-att-colspan="td.colspan gt 1 ? td.colspan : undefined"
                 t-att-width="td.width ? td.width : undefined"
                 t-att-nowrap="td.is_field_label ? 'true' : undefined"
-                t-att-valign="td.table ? 'top' : undefined">
-                    <t t-raw="td.render()"/>
+                t-att-valign="td.table ? 'top' : undefined"
+                t-att-id="td.element_id"
+            >
+                <t t-raw="td.render()"/>
             </td>
         </t>
     </tr>
     </table>
 </t>
 <t t-name="WidgetNotebook">
-    <div t-att-id="widget.element_id">
-        <ul>
-            <li t-foreach="widget.pages" t-as="page">
-                <a t-att-href="'#' + widget.element_id + '-' + page_index">
-                    <t t-esc="page.string"/>
-                </a>
-            </li>
-        </ul>
-        <t t-foreach="widget.pages" t-as="page">
-            <div t-att-id="widget.element_id + '-' + page_index">
-                <t t-raw="page.render()"/>
-            </div>
-        </t>
-    </div>
+    <ul>
+        <li t-foreach="widget.pages" t-as="page">
+            <a t-att-href="'#' + widget.element_id + '-' + page_index">
+                <t t-esc="page.string"/>
+            </a>
+        </li>
+    </ul>
+    <t t-foreach="widget.pages" t-as="page">
+        <div t-att-id="widget.element_id + '-' + page_index">
+            <t t-raw="page.render()"/>
+        </div>
+    </t>
 </t>
 <t t-name="WidgetSeparator">
     <div t-att-class="'separator ' + (widget.node.attrs.orientation || 'horizontal')">
@@ -191,23 +191,39 @@
     </div>
 </t>
 <t t-name="WidgetLabel">
-    <label t-att-for="widget.for.element_id" t-att-title="widget.for.help" style="display: block; text-align: right;" t-att-ondblclick="'console.log(openerp.screen.oe_main.formview.widgets[\'' + widget.for.element_id + '\'])'">
+    <label t-att-for="widget.for.element_id" t-att-title="widget.for.help" style="display: block; text-align: right;" t-att-ondblclick="'console.log(\'' + widget.for.element_id + '\', openerp.screen.' + widget.for.element_id + ')'">
         <t t-esc="widget.for.string"/>
         <span t-if="widget.for.help">?</span>
         :
     </label>
 </t>
 <t t-name="FieldChar">
-    <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%"/>
+    <input type="text"
+        t-att-name="widget.name"
+        t-att-required="widget.node.attrs.required ? 'required' : undefined"
+        t-att-class="'field_' + widget.type" style="width: 100%"
+    />
 </t>
 <t t-name="FieldText">
-    <textarea rows="6" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%;"></textarea>
+    <textarea rows="6" style="width: 100%;"
+        t-att-name="widget.name"
+        t-att-required="widget.node.attrs.required ? 'required' : undefined"
+        t-att-class="'field_' + widget.type"
+    ></textarea>
 </t>
 <t t-name="FieldDate">
-    <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%" placeholder="Widget Date"/>
+    <input type="text" style="width: 100%"
+        t-att-name="widget.name"
+        t-att-required="widget.node.attrs.required ? 'required' : undefined"
+        t-att-class="'field_' + widget.type"
+    />
 </t>
 <t t-name="FieldDatetime">
-    <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%" placeholder="Widget Datetime"/>
+    <input type="text" style="width: 100%"
+        t-att-name="widget.name"
+        t-att-required="widget.node.attrs.required ? 'required' : undefined"
+        t-att-class="'field_' + widget.type"
+    />
 </t>
 <t t-name="FieldSelection">
     <select t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%">
@@ -226,6 +242,11 @@
         One2Many widget
     </div>
 </t>
+<t t-name="FieldMany2Many">
+    <div style="background: #ccc; padding: 20px">
+        Many2Many widget
+    </div>
+</t>
 <t t-name="FieldReference">
     <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%" placeholder="Widget Reference"/>
 </t>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 586f958651e..d9db2348066 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -273,7 +273,7 @@ openerp.base.FormView =  openerp.base.Controller.extend({
     },
     on_record_loaded: function() {
         for (var f in this.fields) {
-            this.fields[f].set_value();
+            this.fields[f].set_value(this.datarecord.values[f]);
         }
     }
 });
@@ -487,9 +487,17 @@ openerp.base.WidgetSeparator = openerp.base.Widget.extend({
     }
 });
 
+openerp.base.WidgetButton = openerp.base.Widget.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "WidgetButton";
+    }
+});
+
 openerp.base.WidgetLabel = openerp.base.Widget.extend({
     init: function(view, node) {
         this.is_field_label = true;
+        this.element_name = 'label_' + node.attrs.name;
 
         this._super(view, node);
 
@@ -498,19 +506,13 @@ openerp.base.WidgetLabel = openerp.base.Widget.extend({
     }
 });
 
-openerp.base.WidgetButton = openerp.base.Widget.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "WidgetButton";
-    }
-});
-
 openerp.base.Field = openerp.base.Widget.extend({
     init: function(view, node) {
         this.name = node.attrs.name;
         view.fields[this.name] = this;
         this.type = node.attrs.widget || view.fields_view.fields[node.attrs.name].type;
         this.element_name = "field_" + this.name + "_" + this.type;
+        this.original_value;
 
         this._super(view, node);
 
@@ -523,7 +525,8 @@ openerp.base.Field = openerp.base.Widget.extend({
         this.help = node.attrs.help || this.field.help;
         this.nolabel = (node.attrs.nolabel == '1');
     },
-    set_value: function() {
+    set_value: function(value) {
+        this.original_value = value;
     }
 });
 
@@ -536,53 +539,35 @@ openerp.base.FieldChar = openerp.base.Field.extend({
         this._super.apply(this, arguments);
         // this.$element.bind('change',)  ... blur, focus, ...
     },
-    set_value: function() {
-        this.$element.val(this.view.datarecord.values[this.name]);
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        if (value != null && value !== false) {
+            this.$element.find('input').val(this.to_string(value));
+        }
+    },
+    get_value: function() {
+        return this.from_string(this.$element.find('input').val());
+    },
+    to_string: function(value) {
+        return value.toString();
+    },
+    from_string: function(value) {
+        return value.toString();
     },
     on_change: function() {
         //this.view.update_field(this.name,value);
     }
 });
 
-openerp.base.FieldEmail = openerp.base.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "FieldEmail";
-    }
+openerp.base.FieldEmail = openerp.base.FieldChar.extend({
 });
 
-openerp.base.FieldUrl = openerp.base.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "FieldChar";
-    }
+openerp.base.FieldUrl = openerp.base.FieldChar.extend({
 });
 
-openerp.base.FieldFloat = openerp.base.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "FieldChar";
-    }
-});
-
-openerp.base.FieldBoolean = openerp.base.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "FieldBoolean";
-    }
-});
-
-openerp.base.FieldDate = openerp.base.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "FieldDate";
-    }
-});
-
-openerp.base.FieldDatetime = openerp.base.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "FieldDatetime";
+openerp.base.FieldFloat = openerp.base.FieldChar.extend({
+    to_string: function(value) {
+        return value.toFixed(2);
     }
 });
 
@@ -590,6 +575,43 @@ openerp.base.FieldText = openerp.base.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldText";
+    },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        if (value != null && value !== false) {
+            this.$element.find('textarea').val(value);
+        }
+    },
+    get_value: function() {
+        return this.$element.find('textarea').val();
+    }
+});
+
+openerp.base.FieldBoolean = openerp.base.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "FieldBoolean";
+    },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        this.$element.find('input')[0].checked = value;
+    },
+    get_value: function() {
+        this.$element.find('input')[0].checked;
+    }
+});
+
+openerp.base.FieldDate = openerp.base.FieldChar.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "FieldDate";
+    }
+});
+
+openerp.base.FieldDatetime = openerp.base.FieldChar.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "FieldDatetime";
     }
 });
 
@@ -601,6 +623,15 @@ openerp.base.FieldSelection = openerp.base.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.template = "FieldSelection";
+    },
+    set_value: function(value) {
+        this._super.apply(this, arguments);
+        if (value != null && value !== false) {
+            this.$element.find('select').val(value);
+        }
+    },
+    get_value: function() {
+        return this.$element.find('select').val();
     }
 });
 
@@ -638,14 +669,16 @@ openerp.base.widgets = {
     'separator' : openerp.base.WidgetSeparator,
     'label' : openerp.base.WidgetLabel,
     'char' : openerp.base.FieldChar,
-    'url' : openerp.base.FieldUrl,
     'email' : openerp.base.FieldEmail,
+    'url' : openerp.base.FieldUrl,
+    'text' : openerp.base.FieldText,
     'date' : openerp.base.FieldDate,
     'datetime' : openerp.base.FieldDatetime,
-    'text' : openerp.base.FieldText,
     'selection' : openerp.base.FieldSelection,
     'many2one' : openerp.base.FieldMany2One,
+    'many2many' : openerp.base.FieldMany2Many,
     'one2many' : openerp.base.FieldOne2Many,
+    'one2many_list' : openerp.base.FieldOne2Many,
     'reference' : openerp.base.FieldReference,
     'boolean' : openerp.base.FieldBoolean,
     'float' : openerp.base.FieldFloat,
diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index 976054bc47e..cb9864b28d2 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -86,6 +86,21 @@ replace ``addons`` by the directory in which your own addon lives.
      and run ``nosetests addons`` instead of the ``unit2`` command,
      the result should be exactly the same.
 
+APIs
+----
+
+Javascript
+++++++++++
+
+.. js:class:: openerp.base.Widget(view, node)
+
+    :param openerp.base.Controller view: The view to which the widget belongs
+    :param Object node: the ``fields_view_get`` descriptor for the widget
+
+.. js:attribute:: openerp.base.Widget.$element
+
+    The widget's root element as jQuery object
+
 * Addons lifecycle (loading, execution, events, ...)
 
   * Python-side
@@ -97,7 +112,6 @@ replace ``addons`` by the directory in which your own addon lives.
 * Extending templates
   .. how do you handle deploying static files via e.g. a separate lighttpd?
 * Python public APIs
-* Javascript public APIs
 * QWeb templates description?
 * OpenERP Web modules (from OpenERP modules)
 

From efa2ac293908b1ab9153b8fbc4e013d5bb0ae013 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Mar 2011 20:10:43 +0100
Subject: [PATCH 15/29] [ADD] ids and set methods on DataSet

bzr revid: xmo@openerp.com-20110322191043-d2s7qz2riuv7tjkd
---
 addons/base/controllers/main.py             |   2 +-
 addons/base/static/openerp/js/base_views.js | 209 ++++++++++++++++----
 addons/base/static/openerp/js/tests.js      | 146 +++++++++++++-
 3 files changed, 316 insertions(+), 41 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 9c3aeb55b12..185f2d18bca 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -167,7 +167,7 @@ class DataSet(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def fields(self, req, model):
-        return {'fields': req.session.model(model).fields_get(False)}
+        return {'fields': req.session.model(model).fields_get()}
 
     @openerpweb.jsonrequest
     def load(self, req, model, domain=[], fields=['id']):
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index d9db2348066..156b11a9f61 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -94,60 +94,195 @@ openerp.base.EmbbededView = openerp.base.Controller.extend({
 // to replace Action
 });
 
+/**
+ * Management interface between views and the collection of selected OpenERP
+ * records (represents the view's state?)
+ */
 openerp.base.DataSet =  openerp.base.Controller.extend({
-    init: function(session, element_id, model) {
-        this._super(session, element_id);
-        this.model = model;
-        // SHOULD USE THE ONE FROM FIELDS VIEW GET BECAUSE OF SELECTION
-        // Should merge those 2
-        this.model_fields = null;
-        this.fields = [];
+    init: function(session, model) {
+        this._super(session);
+        this._model = model;
 
-        this.domain = [];
-        this.context = {};
-        this.order = "";
-        this.count = null;
-        this.ids = [];
-        this.values = {};
-/*
-    group_by
-        rows record
-            fields of row1 field fieldname
-                { type: value: text: text_format: text_completions type_*: a
-*/
+        this._fields = null;
+
+        this._ids = [];
+        this._active_ids = null;
+        this._active_id_index = 0;
+
+        this._sort = [];
+        this._domain = [];
+        this._context = {};
     },
     start: function() {
-        this.rpc("/base/dataset/fields", {"model":this.model}, this.on_fields);
+        // TODO: fields_view_get fields selection?
+        this.rpc("/base/dataset/fields", {"model":this._model}, this.on_fields);
     },
     on_fields: function(result) {
-        this.model_fields = result.fields;
+        this._fields = result._fields;
         this.on_ready();
     },
-    do_load: function(offset, limit) {
-        this.rpc("/base/dataset/load", {model: this.model, fields: this.fields }, this.on_loaded);
+
+    /**
+     * Fetch all the records selected by this DataSet, based on its domain
+     * and context.
+     *
+     * Fires the on_ids event.
+     *
+     * @param {Number} [offset=0] The index from which selected records should be returned
+     * @param {Number} [limit=null] The maximum number of records to return
+     * @returns itself
+     */
+    ids: function (offset, limit) {
+        offset = offset || 0;
+        limit = limit || null;
+        this.rpc('/base/dataset/load', {
+            model: this._model,
+            fields: this._fields,
+            domain: this._domain,
+            context: this._context,
+            sort: this._sort,
+            offset: offset,
+            limit: limit
+        }, _.bind(function (records) {
+            var data_records = _.map(
+                records, function (record) {
+                    return new openerp.base.DataRecord(
+                        this.session, this._model,
+                        this._fields, record);
+                }, this);
+
+            this.on_ids(data_records, {
+                offset: offset,
+                limit: limit,
+                domain: this._domain,
+                context: this._context,
+                sort: this._sort
+            });
+        }, this));
+        return this;
     },
-    on_loaded: function(data) {
-        this.ids = data.ids;
-        this.values = data.values;
+    /**
+     * @event
+     *
+     * Fires after the DataSet fetched the records matching its internal ids selection
+     * 
+     * @param {Array} records An array of the DataRecord fetched
+     * @param event The on_ids event object
+     * @param {Number} event.offset the offset with which the original DataSet#ids call was performed
+     * @param {Number} event.limit the limit set on the original DataSet#ids call
+     * @param {Array} event.domain the domain set on the DataSet before DataSet#ids was called
+     * @param {Object} event.context the context set on the DataSet before DataSet#ids was called
+     * @param {Array} event.sort the sorting criteria used to get the ids
+     */
+    on_ids: function (records, event) {
+
     },
-    on_reloaded: function(ids) {
+
+    /**
+     * Fetch all the currently active records for this DataSet (records selected via DataSet#select)
+     *
+     * @param {Number} [offset=0] The index from which selected records should be returned
+     * @param {Number} [limit=-1] The maximum number of records to return
+     * @returns itself
+     */
+    active_ids: function (offset, limit) {
+        return this;
+    },
+    /**
+     * @event
+     *
+     * Fires after the DataSet fetched the records matching its internal active ids selection
+     *
+     * @param {Array} records An array of the DataRecord fetched
+     * @param event The on_active_ids event object
+     * @param {Number} event.offset the offset with which the original DataSet#ids call was performed
+     * @param {Number} event.limit the limit set on the original DataSet#ids call
+     * @param {Array} event.sort the sorting criteria used to get the ids
+     */
+    on_active_ids: function (records, event) {
+
+    },
+
+    /**
+     * Fetches the current active record for this DataSet
+     *
+     * @returns itself
+     */
+    active_id: function () {
+        return this;
+    },
+    /**
+     * Fires after the DataSet fetched the record matching the current active record
+     *
+     * @param record the record matching the provided id, or null if there is no record for this id
+     */
+    on_active_id: function (record) {
+
+    },
+
+    /**
+     * Configures the DataSet
+     * 
+     * @param options DataSet options
+     * @param {Array} options.domain the domain to assign to this DataSet for filtering
+     * @param {Object} options.context the context this DataSet should use during its calls
+     * @param {Array} options.sort the sorting criteria for this DataSet
+     * @returns itself
+     */
+    set: function (options) {
+        if (options.domain) {
+            this._domain = _.clone(options.domain);
+        }
+        if (options.context) {
+            this._context = _.clone(options.context);
+        }
+        if (options.sort) {
+            this._sort = _.clone(options.sort);
+        }
+        return this;
+    },
+
+    /**
+     * Activates the previous id in the active sequence. If there is no previous id, wraps around to the last one
+     * @returns itself
+     */
+    prev: function () {
+        return this;
+    },
+    /**
+     * Activates the next id in the active sequence. If there is no next id, wraps around to the first one
+     * @returns itself
+     */
+    next: function () {
+        return this;
+    },
+
+    /**
+     * Sets active_ids and/or active_id by value:
+     *
+     * * If only <code>ids</code> is provided
+     *   - Activates all ids part of the current selection
+     *   - Sets active_id to be the first id of the selection
+     * * If only <code>id</code> is provided, activates this id (for both active_id and active_ids)
+     * * If both <code>id</code> and <code>ids</code> are provided
+     *   - Activates all ids part of the current selection
+     *   - If <code>id</code> is part of the active ids, activates it, otherwise see first option
+     *
+     * @param {Array} [ids] the list of ids to activate
+     * @param {Object} [id] the id to activate
+     */
+    select: function (ids, id) {
+        return this;
     }
 });
 
 openerp.base.DataRecord =  openerp.base.Controller.extend({
-    init: function(session,  model, fields) {
+    init: function(session, model, fields, values) {
         this._super(session, null);
         this.model = model;
-        this.id = null;
+        this.id = values.id || null;
         this.fields = fields;
-        this.values = {};
-    },
-    load: function(id) {
-        this.id = id;
-        this.rpc("/base/datarecord/load", {"model": this.model, "id": id, "fields": "todo"}, this.on_loaded);
-    },
-    on_loaded: function(result) {
-        this.values = result.value;
+        this.values = values;
     },
     on_change: function() {
     },
diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index fe5a2998079..46d08ff8691 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -19,6 +19,18 @@ var module;
  * @param {Function} test the testing code to run, holding a sequence of assertions (at least one)
  */
 var test;
+/**
+ * @function
+ * Defines an asynchronous test: equivalent to calling stop() at the start of
+ * a normal test().
+ *
+ * The test code needs to restart the test runner via start()
+ * 
+ * @param {String} name the name of the test
+ * @param {Number} [expected] number of assertions expected to run in this test (useful for asynchronous tests)
+ * @param {Function} test the testing code to run, holding a sequence of assertions (at least one)
+ */
+var asyncTest;
 /**
  * @function
  * The most basic boolean assertion (~assertTrue or assert).
@@ -42,7 +54,7 @@ var ok;
 var equal;
 /**
  * @function
- * Inequality assertion (~assertEqual)
+ * Inequality assertion (~assertNotEqual)
  *
  * Passes if the arguments are different (via <code>!=</code>)
  *
@@ -50,7 +62,135 @@ var equal;
  * @param {Object} expected the object to check against
  * @param {String} [message] message output with the assertion result
  */
-var notEqual, deepEqual, notDeepEqual,
-    strictEqual, notStrictEqual, raises, start, stop;
+var notEqual;
+/**
+ * @function
+ * Recursive equality assertion.
+ *
+ * Works on primitive types using <code>===</code> and traversing through
+ * Objects and Arrays as well checking their components
+ * 
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var deepEqual;
+var notDeepEqual, strictEqual, notStrictEqual, raises;
+/**
+ * @function
+ * Starts running the test runner again from the point where it was
+ * <code>stop</code>ped.
+ *
+ * Used to resume testing after a callback.
+ */
+var start;
+/**
+ * @function
+ * Stops the test runner in order to wait for an asynchronous test to run
+ *
+ * @param {Number} [timeout] fails the test after the timeout triggers, only for debugging tests
+ */
+var stop;
+
+var Session = function () {
+    return {
+        rpc: function (_url, params, on_success) {
+            setTimeout(on_success);
+        }
+    };
+};
 $(document).ready(function () {
+    var openerp;
+    module("ids_callback", {
+        setup: function () {
+            openerp = window.openerp.init();
+        }
+    });
+    asyncTest("Baseline event attributes", 6, function () {
+        var dataset = new openerp.base.DataSet(
+                new Session());
+        dataset.on_ids.add(function (records, event) {
+            deepEqual(records, [], 'No records returned');
+            equal(event.offset, 0, 'No offset set in call');
+            equal(event.limit, null, 'No limit set in call');
+            deepEqual(event.domain, [], 'No domain on the dataset');
+            deepEqual(event.context, {}, 'No context on the dataset');
+            deepEqual(event.sort, [], 'The dataset is not sorted');
+            start();
+        });
+        dataset.ids();
+    });
+    asyncTest("Offset and limit", 2, function () {
+        var dataset = new openerp.base.DataSet(
+                new Session());
+        dataset.on_ids.add(function (records, event) {
+            equal(event.offset, 20);
+            equal(event.limit, 42);
+            start();
+        });
+        dataset.ids(20, 42);
+    });
+    asyncTest("Domain and context propagation", 3, function () {
+        var dataset = new openerp.base.DataSet(
+                new Session());
+        var domain_value = [['foo', '=', 'bar']];
+        var context_value= {active_id:3, active_ids:42};
+        var sort_value = ['foo'];
+        dataset.on_ids.add(function (records, event) {
+            deepEqual(event.domain, domain_value);
+            deepEqual(event.context, context_value);
+            deepEqual(event.sort, sort_value);
+            start();
+        });
+        dataset.set({
+            domain: domain_value,
+            context: context_value,
+            sort: sort_value
+        });
+        dataset.ids();
+    });
+    asyncTest("Data records", function () {
+        var dataset = new openerp.base.DataSet({
+            rpc: function (url, _params, on_success) {
+                equal('/base/dataset/load', url);
+                _.delay(on_success, 0, [
+                    {id: 1, sequence: 3, name: "dummy", age: 42},
+                    {id: 5, sequence: 7, name: "whee", age: 55}
+                ]);
+            }
+        });
+        dataset.on_ids.add(function (records) {
+            equal(records.length, 2, "I loaded two virtual records");
+            var d1 = records[0],
+                d2 = records[1];
+            ok(d1 instanceof openerp.base.DataRecord);
+            ok(d2 instanceof openerp.base.DataRecord);
+            start();
+        });
+        dataset.ids();
+    });
+
+    var dataset;
+    module("set", {
+        setup: function () {
+            var openerp = window.openerp.init();
+            dataset = new openerp.base.DataSet();
+        }
+    });
+    test('Basic properties setting', function () {
+        var domain_value = [['foo', '=', 'bar']];
+        var result = dataset.set({
+            domain: domain_value
+        });
+        ok(dataset === result);
+        deepEqual(domain_value, dataset._domain);
+    });
+    test("Ensure changes don't stick", function () {
+        var domain = [['foo', '=', 'bar']];
+        dataset.set({
+            domain: domain
+        });
+        domain.pop();
+        deepEqual([['foo', '=', 'bar']], dataset._domain);
+    });
 });

From 6a4fc40d5335018db58607a4cae22c8c60231ec1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Mar 2011 20:22:08 +0100
Subject: [PATCH 16/29] [ADD] finish documenting QUnit functions (for IDEs)

bzr revid: xmo@openerp.com-20110322192208-8usouja1b665s1mm
---
 addons/base/static/openerp/js/tests.js | 51 +++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index 46d08ff8691..62d1dcda40b 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -75,7 +75,56 @@ var notEqual;
  * @param {String} [message] message output with the assertion result
  */
 var deepEqual;
-var notDeepEqual, strictEqual, notStrictEqual, raises;
+/**
+ * @function
+ * Recursive inequality assertion.
+ *
+ * Works on primitive types using <code>!==</code> and traversing through
+ * Objects and Arrays as well checking their components
+ *
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var notDeepEqual;
+/**
+ * @function
+ * Strict equality assertion (~assertEqual)
+ *
+ * Passes if both arguments are identical (via <code>===</code>)
+ *
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var strictEqual;
+/**
+ * @function
+ * Strict inequality assertion (~assertNotEqual)
+ *
+ * Passes if both arguments are identical (via <code>!==</code>)
+ *
+ * @param {Object} actual the object to check for correctness (processing result)
+ * @param {Object} expected the object to check against
+ * @param {String} [message] message output with the assertion result
+ */
+var notStrictEqual;
+/**
+ * @function
+ * Passes if the provided block raised an exception.
+ *
+ * The <code>expect</code> argument can be provided to perform further assertion checks on the exception itself:
+ * * If it's a <code>RegExp</code> test the exception against the regexp (message?)
+ * * If it's a constructor, check if the exception is an instance of it
+ * * If it's an other type of function, call it with the exception as first parameter
+ *   - If the function returns true, the assertion validates
+ *   - Otherwise it fails
+ *
+ * @param {Function} block function which should raise an exception when called
+ * @param {Object} [expect] a RegExp, a constructor or a Function
+ * @param {String} [message] message output with the assertion result
+ */
+var raises;
 /**
  * @function
  * Starts running the test runner again from the point where it was

From 77b9c7bd8ba01938f62233af8a7ba4b81e070ff5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Mar 2011 21:36:44 +0100
Subject: [PATCH 17/29] [ADD] basic implementations of DataSet.select and
 DataSet.active_ids

bzr revid: xmo@openerp.com-20110322203644-iubno2jusxp4z98p
---
 addons/base/static/openerp/js/base_views.js | 29 +++++++++----------
 addons/base/static/openerp/js/tests.js      | 31 ++++++++++++++++++++-
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 156b11a9f61..7bd96b45d86 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -135,7 +135,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
     ids: function (offset, limit) {
         offset = offset || 0;
         limit = limit || null;
-        this.rpc('/base/dataset/load', {
+        this.rpc('/base/dataset/find', {
             model: this._model,
             fields: this._fields,
             domain: this._domain,
@@ -174,18 +174,24 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @param {Object} event.context the context set on the DataSet before DataSet#ids was called
      * @param {Array} event.sort the sorting criteria used to get the ids
      */
-    on_ids: function (records, event) {
-
-    },
+    on_ids: function (records, event) { },
 
     /**
      * Fetch all the currently active records for this DataSet (records selected via DataSet#select)
      *
-     * @param {Number} [offset=0] The index from which selected records should be returned
-     * @param {Number} [limit=-1] The maximum number of records to return
      * @returns itself
      */
-    active_ids: function (offset, limit) {
+    active_ids: function () {
+        this.rpc('/base/dataset/get', {
+            ids: this._active_ids
+        }, _.bind(function (records) {
+            this.on_active_ids(_.map(
+                records, function (record) {
+                    return new openerp.base.DataRecord(
+                        this.session, this._model,
+                        this._fields, record);
+                }, this));
+        }, this));
         return this;
     },
     /**
@@ -194,14 +200,8 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * Fires after the DataSet fetched the records matching its internal active ids selection
      *
      * @param {Array} records An array of the DataRecord fetched
-     * @param event The on_active_ids event object
-     * @param {Number} event.offset the offset with which the original DataSet#ids call was performed
-     * @param {Number} event.limit the limit set on the original DataSet#ids call
-     * @param {Array} event.sort the sorting criteria used to get the ids
      */
-    on_active_ids: function (records, event) {
-
-    },
+    on_active_ids: function (records) { },
 
     /**
      * Fetches the current active record for this DataSet
@@ -272,6 +272,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @param {Object} [id] the id to activate
      */
     select: function (ids, id) {
+        this._active_ids = ids;
         return this;
     }
 });
diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index 62d1dcda40b..cbb9c7f0dca 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -201,7 +201,7 @@ $(document).ready(function () {
     asyncTest("Data records", function () {
         var dataset = new openerp.base.DataSet({
             rpc: function (url, _params, on_success) {
-                equal('/base/dataset/load', url);
+                equal('/base/dataset/find', url);
                 _.delay(on_success, 0, [
                     {id: 1, sequence: 3, name: "dummy", age: 42},
                     {id: 5, sequence: 7, name: "whee", age: 55}
@@ -242,4 +242,33 @@ $(document).ready(function () {
         domain.pop();
         deepEqual([['foo', '=', 'bar']], dataset._domain);
     });
+
+    module('active_ids', {
+        setup: function () {
+            openerp = window.openerp.init();
+        }
+    });
+    test('Get pre-set active_ids', 6, function () {
+        var dataset = new openerp.base.DataSet({
+            rpc: function (url, params, on_success) {
+                equal(url, '/base/dataset/get');
+                deepEqual(params.ids, [1, 2, 3]);
+                _.delay(on_success, 0, _.map(
+                    params.ids, function (id) {
+                        return {id: id, sequence: id, name: 'foo'+id};
+                    }
+                ));
+            }
+        });
+        stop(500);
+        dataset.select([1, 2, 3]);
+        dataset.on_active_ids.add(function (data_records) {
+            equal(data_records.length, 3);
+            equal(data_records[0].values.id, 1);
+            equal(data_records[1].values.id, 2);
+            equal(data_records[2].values.id, 3);
+            start();
+        });
+        dataset.active_ids();
+    });
 });

From 8570ae1fff417ae0ff5eb3077c32f57ca031f6ab Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Mar 2011 21:52:18 +0100
Subject: [PATCH 18/29] [IMP] use asyncTest rather than test + stop()

bzr revid: xmo@openerp.com-20110322205218-h2skfkandip8pv8u
---
 addons/base/static/openerp/js/tests.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index cbb9c7f0dca..86ae3e9f380 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -248,7 +248,7 @@ $(document).ready(function () {
             openerp = window.openerp.init();
         }
     });
-    test('Get pre-set active_ids', 6, function () {
+    asyncTest('Get pre-set active_ids', 6, function () {
         var dataset = new openerp.base.DataSet({
             rpc: function (url, params, on_success) {
                 equal(url, '/base/dataset/get');
@@ -260,7 +260,6 @@ $(document).ready(function () {
                 ));
             }
         });
-        stop(500);
         dataset.select([1, 2, 3]);
         dataset.on_active_ids.add(function (data_records) {
             equal(data_records.length, 3);

From f35a9899814a1c193f7eb296f1d2ee7e2de94e9c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 23 Mar 2011 04:36:07 +0000
Subject: [PATCH 19/29] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110323043607-ydbntrwael93hvcn
---
 addons/auction/i18n/pt_BR.po                  |   2 +-
 addons/base_report_creator/i18n/gl.po         | 526 +++++++++++++++
 addons/crm/i18n/ru.po                         |   8 +-
 addons/hr_attendance/i18n/gl.po               | 600 ++++++++++++++++++
 addons/lunch/i18n/bg.po                       | 540 ++++++++++++++++
 addons/mail_gateway/i18n/es_PY.po             | 356 +++++++++++
 addons/mail_gateway/i18n/gl.po                | 366 +++++++++++
 addons/marketing_campaign_crm_demo/i18n/gl.po | 193 ++++++
 addons/mrp_subproduct/i18n/gl.po              | 129 ++++
 addons/outlook/i18n/gl.po                     | 157 +++++
 addons/procurement/i18n/id.po                 |  40 +-
 addons/product_manufacturer/i18n/gl.po        |  88 +++
 addons/share/i18n/pt_BR.po                    |   2 +-
 13 files changed, 2982 insertions(+), 25 deletions(-)
 create mode 100644 addons/base_report_creator/i18n/gl.po
 create mode 100644 addons/hr_attendance/i18n/gl.po
 create mode 100644 addons/lunch/i18n/bg.po
 create mode 100644 addons/mail_gateway/i18n/es_PY.po
 create mode 100644 addons/mail_gateway/i18n/gl.po
 create mode 100644 addons/marketing_campaign_crm_demo/i18n/gl.po
 create mode 100644 addons/mrp_subproduct/i18n/gl.po
 create mode 100644 addons/outlook/i18n/gl.po
 create mode 100644 addons/product_manufacturer/i18n/gl.po

diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 414eae17b40..95e421502af 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: auction
diff --git a/addons/base_report_creator/i18n/gl.po b/addons/base_report_creator/i18n/gl.po
new file mode 100644
index 00000000000..1cd4dc67972
--- /dev/null
+++ b/addons/base_report_creator/i18n/gl.po
@@ -0,0 +1,526 @@
+# Galician 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-03-22 17:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.filter,expression:0
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
+" e.g. res_partner.id=3"
+msgstr ""
+"Introduza unha expresión para o campo baseada en como desexa filtrar os "
+"rexistros. Por exemplo res_partner.id=3"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_report_menu_create
+msgid "Menu Create"
+msgstr "Crear menú"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_type:0
+msgid "Graph Type"
+msgstr "Tipo de gráfico"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Used View"
+msgstr "Vista utilizada"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Filter Values"
+msgstr "Valores filtro"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,graph_mode:0
+msgid "Graph Mode"
+msgstr "Modo de gráfico"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:320
+#, python-format
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
+msgstr ""
+"Hai modelo(s) (%s) na selección que non están relacionados con ningún outro "
+"modelo"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Legend"
+msgstr "Lenda"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Graph View"
+msgstr "Vista gráfico"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,expression:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: base_report_creator
+#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
+msgid "Set Filter Fields"
+msgstr "Fixar campos de filtrado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Ending Date"
+msgstr "Data de finalización"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
+msgid "Report Filters"
+msgstr "Filtros informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,sql_query:0
+msgid "SQL Query"
+msgstr "Interrogación SQL"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: view:report.menu.create:0
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Minimum"
+msgstr "Mínimo"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
+msgid "Operator"
+msgstr "Operador"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "OR"
+msgstr "ou"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.base_report_creator_action
+msgid "Custom Reports"
+msgstr "Informes personalizados"
+
+#. module: base_report_creator
+#: code:addons/base_report_creator/base_report_creator.py:320
+#, python-format
+msgid "No Related Models!!"
+msgstr "Non existen modelos relacionados!"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Menu Information"
+msgstr "Información do menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Sum"
+msgstr "Suma"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You must have to give calendar view's color,start date and delay."
+msgstr "Debe indicar a cor, a data inicial e o atraso da vista calendario."
+
+#. module: base_report_creator
+#: field:base_report_creator.report,model_ids:0
+msgid "Reported Objects"
+msgstr "Obxectos de informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Field List"
+msgstr "Lista de campos"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,type:0
+msgid "Report Type"
+msgstr "Tipo de informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Add filter"
+msgstr "Engadir filtro"
+
+#. module: base_report_creator
+#: model:ir.actions.act_window,name:base_report_creator.action_report_menu_create
+msgid "Create Menu for Report"
+msgstr "Crear menú para o informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Form"
+msgstr "Formulario"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+#: selection:base_report_creator.report.fields,calendar_mode:0
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "/"
+msgstr "/"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report.fields,report_id:0
+#: field:base_report_creator.report.filter,report_id:0
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report
+msgid "Report"
+msgstr "Informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Starting Date"
+msgstr "Data de inicio"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Filters on Fields"
+msgstr "Filtros en campos"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,group_ids:0
+msgid "Authorized Groups"
+msgstr "Grupos autorizados"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Tree"
+msgstr "Árbore"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_graph_orientation:0
+msgid "Graph Orientation"
+msgstr "Orientación gráfico"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Authorized Groups (empty for all)"
+msgstr "Grupos autorizados (baleiro para todos)"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Security"
+msgstr "Seguridade"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Nome do menú"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.filter,condition:0
+#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "AND"
+msgstr "E"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can not display field which are not stored in Database."
+msgstr "Non pode amosar un campo que non estea almacenado na base de datos."
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,calendar_mode:0
+msgid "Calendar Mode"
+msgstr "Modo calendario"
+
+#. module: base_report_creator
+#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
+msgid "Display Fields"
+msgstr "Campos a amosar"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "Y Axis"
+msgstr "Eixo Y"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Calendar"
+msgstr "Calendario"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_type1:0
+#: selection:base_report_creator.report,view_type2:0
+#: selection:base_report_creator.report,view_type3:0
+msgid "Graph"
+msgstr "Gráfico"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
+msgid "Field Name"
+msgstr "Nome do campo"
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
+msgid "Set Filter Values"
+msgstr "Fixar valores filtrado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Vertical"
+msgstr "Vertical"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,type:0
+msgid "Rows And Columns Report"
+msgstr "Informe de filas e columnas"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "General Configuration"
+msgstr "Configuración xeral"
+
+#. module: base_report_creator
+#: help:base_report_creator.report.fields,sequence:0
+msgid "Gives the sequence order when displaying a list of fields."
+msgstr "Indica a orde da secuencia cando se amosa unha lista de campos."
+
+#. module: base_report_creator
+#: wizard_view:base_report_creator.report_filter.fields,init:0
+msgid "Select Field to filter"
+msgstr "Seleccione o campo a filtrar"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_orientation:0
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,group_method:0
+msgid "Grouping Method"
+msgstr "Método de agrupamento"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,condition:0
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
+msgid "Condition"
+msgstr "Condición"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Count"
+msgstr "Reconto"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,graph_mode:0
+msgid "X Axis"
+msgstr "Eixo X"
+
+#. module: base_report_creator
+#: field:report.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú Pai"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
+msgid "Confirm Filter"
+msgstr "Confirmar filtro"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.filter,name:0
+msgid "Filter Name"
+msgstr "Nome do filtro"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Open Report"
+msgstr "Abrir informe"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
+msgid "Report Creator"
+msgstr "Creador de informes"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,end:0
+#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
+#: view:report.menu.create:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: base_report_creator
+#: constraint:base_report_creator.report:0
+msgid "You can apply aggregate function to the non calculated field."
+msgstr "Pode aplicar a función de agregado para o campo non calculado."
+
+#. module: base_report_creator
+#: field:base_report_creator.report,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type1:0
+msgid "First View"
+msgstr "Primeira vista"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Delay"
+msgstr "Atraso"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,field_id:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "Unique Colors"
+msgstr "Cores únicas"
+
+#. module: base_report_creator
+#: help:base_report_creator.report,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the report "
+"without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar o informe sen eliminalo."
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Pie Chart"
+msgstr "Gráfico de sectores"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type3:0
+msgid "Third View"
+msgstr "Terceira vista"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,calendar_mode:0
+msgid "End Date"
+msgstr "Data de remate"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,name:0
+msgid "Report Name"
+msgstr "Nome do informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Fields"
+msgstr "Campos"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Average"
+msgstr "Termo medio"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "Use %(uid)s to filter by the connected user"
+msgstr "Use %(uid)s para filtrar polo usuario conectado"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report.fields,group_method:0
+msgid "Maximum"
+msgstr "Maximo"
+
+#. module: base_report_creator
+#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
+msgid "Continue"
+msgstr "Continuar"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
+msgid "Values"
+msgstr "Valores"
+
+#. module: base_report_creator
+#: selection:base_report_creator.report,view_graph_type:0
+msgid "Bar Chart"
+msgstr "Gráfico de barras"
+
+#. module: base_report_creator
+#: field:base_report_creator.report,view_type2:0
+msgid "Second View"
+msgstr "Segunda vista"
+
+#. module: base_report_creator
+#: view:report.menu.create:0
+msgid "Create Menu For This Report"
+msgstr "Crear menú para este informe"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+msgid "View parameters"
+msgstr "Ver parámetros"
+
+#. module: base_report_creator
+#: field:base_report_creator.report.fields,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: base_report_creator
+#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
+msgid "Filter Field"
+msgstr "Filtrar campo"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,field_ids:0
+msgid "Fields to Display"
+msgstr "Campos a amosar"
+
+#. module: base_report_creator
+#: view:base_report_creator.report:0
+#: field:base_report_creator.report,filter_ids:0
+msgid "Filters"
+msgstr "Filtros"
+
+#. module: base_report_creator
+#: model:ir.module.module,description:base_report_creator.module_meta_information
+msgid ""
+"This module allows you to create any statistic\n"
+"report on several objects. It's a SQL query builder and browser\n"
+"for and users.\n"
+"\n"
+"After installing the module, it adds a menu to define custom report in\n"
+"the \"Dashboard\" menu.\n"
+msgstr ""
+"Este módulo permite crear calquera informe estatístico sobre varios "
+"obxectos. É un xerador de consultas SQL e navegador para calquera usuario. "
+"Despois de instalar o módulo, engádese un menú para definir informes "
+"personalizados no menú \"Taboleiro\".\n"
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index c00f64960d3..e34ba6e139e 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-14 18:33+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2011-03-22 14:25+0000\n"
+"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: crm
@@ -991,7 +991,7 @@ msgstr "Сделки"
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "Категория партнера"
+msgstr "Категория контрагента"
 
 #. module: crm
 #: view:crm.add.note:0
diff --git a/addons/hr_attendance/i18n/gl.po b/addons/hr_attendance/i18n/gl.po
new file mode 100644
index 00000000000..4be010ed1e6
--- /dev/null
+++ b/addons/hr_attendance/i18n/gl.po
@@ -0,0 +1,600 @@
+# Galician 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-03-22 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Control do tempo"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "Hoxe"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Non rexistrou a saída a última vez. Por favor, introduza a data e a hora da "
+"saída."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Total período:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Imprimir informe erros presencias"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "A data do rexistro de saída debe ser anterior."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Data rexistro"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"The Time Tracking functionality aims to manage employee attendances from "
+"Sign in/Sign out actions. You can also link this feature to an attendance "
+"device using OpenERP's web service features."
+msgstr ""
+"A funcionalidade de Seguimento de Tempos permítelle xestionar as asistencias "
+"dos empregados a través das accións de Rexistrar Entrada/Rexistrar Saída. "
+"Tamén pode enlazar esta funcionalidade cun dispositivo de rexistro de "
+"asistencia usando as características do servizo web de OpenERP."
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Presente"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Preguntar para rexistrar entrada / saída"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Razón da acción"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "Aceptar"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Defina o motivo da asistencia"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Erro! Non pode seleccionar un departamento para o cal o empregado sexa o "
+"director."
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr "Presenzas por mes"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Nome empregados"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr "Causas de asistencia/ausencia"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "UserError"
+msgstr "ErroDeUsuario"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Data de finalización"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendance"
+msgstr "Asistencia empregado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "A data do rexistro de entrada debe ser anterior"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "Un rexistro de entrada debe estar despois dun rexistro de saída!"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "Asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Atraso máx. (minutos)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Buscar presenzas RH"
+
+#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid ""
+"\n"
+"    This module aims to manage employee's attendances.\n"
+"    Keeps account of the attendances of the employees on the basis of the\n"
+"    actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+"\n"
+"    Este módulo serve para xestionar a asistencia dos empregados. Controla a "
+"asistencia dos empregados mediante as accións(Rexistrar entrada/ Rexistrar "
+"saída) realizadas por eles.\n"
+"       "
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+"Erro: Rexistro de entrada (resp. Rexistro de saída) debe seguir ó Rexistro "
+"de saída (resp. Rexistro de entrada)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "Xullo"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr "Informe erros de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Data de inicio"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Atraso mín."
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Iniciar sesión"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Operación"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr "Non hai datos dispoñibles"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "Decembro"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) Un atraso negativo significa que o empregado traballou máis horas das "
+"codificadas."
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Especifique a razón de entrada e saída no caso de horas extras."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Imprimir informe mensual de asistencias"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Entrada Saída"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
+#: view:hr.sign.in.out:0
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "Rexistrar entrada/saída"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.sign.out.ask"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "Un rexistro de saída debe estar despois dun rexistro de entrada!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "Xuño"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Erro na impresión do informe de asistencia"
+
+#. module: hr_attendance
+#: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
+msgid "Attendances Of Employees"
+msgstr "Asistencia de empregados"
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "Novembro"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Erro! Non pode crear unha xerarquía recorrente de empregados."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendances"
+msgstr "As miñas presenzas"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "Xaneiro"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Acceder"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Información para a análise"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-Out Entry must follow Sign-In."
+msgstr "O rexistro de entrada debe seguir ó rexistro de saída."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Erros de asistencia"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Acción"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
+msgstr ""
+"Se precisa que o seu persoal fiche ó inicio e ó final da xornada laboral, "
+"esta ferramenta do OpenERP permítelle efectuar esta xestión. Se cada "
+"empregado se vinculou a un usuario do sistema, pódese controlar a súa "
+"xornada con este botón de acción."
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+msgid "Employee ID"
+msgstr "ID de empregado"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Imprimir informe de presenza semanal"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "ID empregado"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Indique o motivo da entrada/saída."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) Un valor positivo significa que o empregado traballou menos có "
+"programado."
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Imprimir informe de asistencia mensualmente"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign out"
+msgstr "Pechar sesión"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr "Atraso"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "Empregado"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:136
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Tentou %s cunha data anterior a outro evento! Tente poñerse en contacto co "
+"administrador para corrixir as asistencias."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr "O seu último rexistro de saída"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr "Data rexistrada"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+msgid "Attendances"
+msgstr "Asistencias"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "Maio"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "O seu último rexistro entrada"
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "Pechar sesión"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+"Entrada/Saída. Nalgunhas empresas, o persoal ten que fichar cando chegan ó "
+"traballo e ó rematar a xornada. Se cada empregado se vinculou a un usuario "
+"do sistema, pódese controlar a súa xornada con este botón de acción."
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Nome do empregado"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "Ausente"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "Febreiro"
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action's type"
+msgstr "Tipo de acción"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr "Asistencia empregado"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Estado actual"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Aínda que indique esta demora, considérase que o erro é voluntario"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Non se atoparon rexistros para a súa selección!"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign in the last time. Please enter the date and time you signed "
+"in."
+msgstr ""
+"Non rexistrou a entrada a última vez. Por favor, introduza a data e a hora "
+"da entrada."
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.sign.in.out.ask"
diff --git a/addons/lunch/i18n/bg.po b/addons/lunch/i18n/bg.po
new file mode 100644
index 00000000000..95ef1ae4eac
--- /dev/null
+++ b/addons/lunch/i18n/bg.po
@@ -0,0 +1,540 @@
+# Bulgarian 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-03-22 19:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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-03-23 04:36+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr "Поръчки за обяд"
+
+#. module: lunch
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
+#: wizard_view:lunch.order.cancel,init:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Продукти"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Месец   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Потвърдено"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Област"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Обща цена"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
+#: wizard_button:lunch.order.confirm,init,go:0
+msgid "Confirm Order"
+msgstr "Потвърждения на поръчка"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,zero:0
+msgid "Set to Zero"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: lunch
+#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
+msgid "Name of box"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,cancel:0
+msgid "Yes"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.order.cancel,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.order.confirm,init:0
+msgid "Orders Confirmation"
+msgstr ""
+
+#. module: lunch
+#: wizard_view:lunch.cashbox.clean,init:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr ""
+
+#. module: lunch
+#: wizard_button:lunch.cashbox.clean,init,end:0
+#: wizard_button:lunch.order.confirm,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: rml:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.cashmove,name:0
+#: field:lunch.category,name:0
+#: rml:lunch.order:0
+#: field:lunch.product,name:0
+msgid "Name"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+#: rml:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.amount,year:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/mail_gateway/i18n/es_PY.po b/addons/mail_gateway/i18n/es_PY.po
new file mode 100644
index 00000000000..fd46c3e69b6
--- /dev/null
+++ b/addons/mail_gateway/i18n/es_PY.po
@@ -0,0 +1,356 @@
+# Spanish (Paraguay) 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-03-22 10:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Paraguay) <es_PY@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-03-23 04:36+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID del recurso"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método no implementado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/mail_gateway/i18n/gl.po b/addons/mail_gateway/i18n/gl.po
new file mode 100644
index 00000000000..87922670af6
--- /dev/null
+++ b/addons/mail_gateway/i18n/gl.po
@@ -0,0 +1,366 @@
+# Galician 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-03-22 10:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:36+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr "ID do Recurso"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr "Método non aplicado"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr "Desde"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr "Abrir datos anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr "Detalles da mensaxe"
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr "ID da Mensaxe"
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr "ID referencia"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr "Rexistros pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro! Non pode crear membros asociados recorrentes."
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr "ID da mensaxe no e-mail."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr "Destinatarios do e-mail."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr "Rexistro da pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr "Ferramentas do servidor de correo"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr "Destinatarios do e-mail"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr "Socio"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " wrote on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr "Ata"
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr "Referencias dos e-mails."
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr "Destinatarios do email en copia carbón (CC)."
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr "Sistema de pasarela de correo"
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr "Nome do obxecto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr "Nome do socio"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr "Fíos pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr "E-mails"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr "Fase"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr " nota engadida en "
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr "E-mail de"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr "Fío"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Mensaxe da pasarela de correo electrónico"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr "Mensaxes"
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr "Usuario responsable"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr "Convertido en oportunidade"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr "Cco"
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr "É o rexistro?"
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr "Destinatarios do e-mail en copia carbón oculta (cco)."
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr "Mensaxe da pasarela de correo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr "Historia"
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr "Fío da pasarela de correo"
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr "Abrir un documento"
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr "Detalles do e-mail"
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr "Cc"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:254
+#, python-format
+msgid " on %s:\n"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr "Buscar e-mail"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr "recibir"
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+"A pasarela de correo xenérica permite enviar e recibir e-mails* Rexistro dos "
+"e-mails* Integración doada con calquera módulo"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr "Estado cambiado a: "
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr "Amosar texto"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr "Etapa cambiada a: "
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr "Mensaxe"
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr "ID da mensaxe no servidor de correo."
+
+#, python-format
+#~ msgid " wrote on "
+#~ msgstr " escrito o "
+
+#, python-format
+#~ msgid " on "
+#~ msgstr " en "
diff --git a/addons/marketing_campaign_crm_demo/i18n/gl.po b/addons/marketing_campaign_crm_demo/i18n/gl.po
new file mode 100644
index 00000000000..30457774cd3
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/gl.po
@@ -0,0 +1,193 @@
+# Galician 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-03-22 11:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:36+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr "Informe da campaña de márketing de demostración"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr ""
+"Ola, grazas polo xeneroso interese amosado en OpenERP. Saúdos, o Equipo de "
+"OpenERP."
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Datos demo para os módulos márketing_campaign."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Ola, Grazas polo interese amosado e pola compra do libro OpenERP. Se precisa "
+"máis información, non dubide en escribir a este enderezo. Agradecémoslle "
+"sinceiramente a súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Propor subscribirse ó OpenERP Discovery Day en maio de 2010"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Propor a formación de pago ós asociados Prata"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Grazas por amosar o seu interese en OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Grazas por mercar o libro de OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "Propor unha formación técnica a asociados Ouro"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Ola: Temos unha excelente oferta que pode ser axeitada para vostede. Para os "
+"nosos asociados Silver, estamos a ofrecer a asociación Gold. Se precisa máis "
+"información, non dubide en escribir a este enderezo. Agradecémoslle "
+"sinceiramente a súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Empresa:"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Ola: Grazas polo seu interese e pola súa subscrición á formación técnica. Se "
+"precisa máis información, non dubide en escribir a este enderezo. "
+"Agradecémoslle sinceiramente a súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Compañía :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Grazas por subscribirse á formación técnica"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Grazas por subscribirse ó OpenERP Discovery Day"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Ola: Temos unha excelente oferta que pode ser axeitada para vostede. Estamos "
+"a ofrecer ós nosos asociados Gold formación técnica gratuíta en xuño de "
+"2010. Se precisa máis información, non dubide en escribir a este enderezo. "
+"Agradecémoslle sinceiramente a súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+"Ola: Grazas polo seu interese e pola subscrición ó OpenERP Discovery Day. Se "
+"precisa máis información, non dubide en escribir a este enderezo. "
+"Agradecémoslle sinceiramente á súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Ola: Temos unha excelente oferta que pode ser axeitada para vostede. "
+"Ofrecémoslle subscribirse ó OpenERP Discovery Day de maio de 2010. Se "
+"precisa máis información, non dubide en escribir a este enderezo. "
+"Agradecémoslle sinceiramente a súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Ola: Temos unha excelente oferta que pode ser axeitada para vostede. Para os "
+"nosos asociados Silver, temos formación técnica pagada en xuño 2010. Se "
+"precisa máis información, non dubide en escribir a este enderezo. "
+"Agradecémoslle sinceiramente a súa cooperación. Saúdos, o equipo de OpenERP,"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Acción de simulacro"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr "márketing_campaign_crm_demo"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Propoñer a asociación ouro ós asociados prata"
diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_subproduct/i18n/gl.po
new file mode 100644
index 00000000000..b9e7209a733
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/gl.po
@@ -0,0 +1,129 @@
+# Galician 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-03 16:58+0000\n"
+"PO-Revision-Date: 2011-03-22 18:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Tódalas cantidades de produto deben ser superiores a cero. Debe instalar o "
+"módulo mrp_subproduct se desexa xestionar produtos extra nas LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "subprodutos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orde de fabricación"
+
+#. module: mrp_subproduct
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+msgid ""
+"MRP Sub Product - To produce several products from one production order"
+msgstr ""
+"MRP Subproduto - Para producir varios produtos desde unha orde de fabricación"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidade produto"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_produtos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de cantidade"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp_subproduct
+#: model:ir.module.module,description:mrp_subproduct.module_meta_information
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"You can configure sub-products in the bill of material.\n"
+"Without this module:\n"
+"    A + B + C -> D\n"
+"With this module:\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+"\n"
+"Este módulo permítelle producir varios produtos desde unha orde de "
+"produción. Pode configurar os subprodutos na lista de materiais. Sen este "
+"módulo: A + B + C -> D Con este módulo: A + B + C -> D + E\n"
+"    "
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM do produto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de materiais"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You can not create recursive BoM."
+msgstr "Erro! Non pode crear Listas de Material recorrentes."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Subprodutos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr "A cantidade do pedido non pode ser negativa ou cero!"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Subproduto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fixo"
diff --git a/addons/outlook/i18n/gl.po b/addons/outlook/i18n/gl.po
new file mode 100644
index 00000000000..1748240cc96
--- /dev/null
+++ b/addons/outlook/i18n/gl.po
@@ -0,0 +1,157 @@
+# Galician 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-03-22 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:36+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Manual de instalación"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Outlook Plug-In"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Omitir"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interface Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nome do arquivo"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Conector Outlook "
+
+#. module: outlook
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid ""
+"\n"
+"      This module provide the Outlook plug-in. \n"
+"\n"
+"      Outlook plug-in allows you to select an object that you’d like to add\n"
+"      to your email and its attachments from MS Outlook. You can select a "
+"partner, a task,\n"
+"      a project, an analytical account, or any other object and Archived "
+"selected\n"
+"      mail in mailgate.messages with attachments.\n"
+"\n"
+"      "
+msgstr ""
+"\n"
+"      Este módulo prové o conector (plug-in) de Outlook. O conector de "
+"Outlook permítelle seleccionar un obxecto que desexaría achegar ó seu correo "
+"e os seus anexos desde MS Outlook. Pode seleccionar unha empresa, unha "
+"tarefa, un proxecto, unha conta analítica, ou calquera outro obxecto, e "
+"arquivar o correo seleccionado en mensaxes de correo con anexos.\n"
+"\n"
+"      "
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "O arquivo de documentación: Como instalar o conector Outlook."
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.instalador"
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
+msgid "Outlook Plug-In Configuration"
+msgstr "Configuración do conector Outlook"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso da configuración"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"Este conector permítelle vincular o seu correo electrónico con documentos "
+"OpenERP. Pódeo achegar á calquera elemento de OpenERP ou crear un novo."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Permítelle seleccionar un obxecto ó que desexe engadir o seu correo "
+"electrónico e os arquivos anexos."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Pechar"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos da instalación e configuración"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Imaxe"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Arquivo do conector Outlook. Garde este arquivo e instale este conector na "
+"aplicación Outlook."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Configurar"
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index 97a53ca1949..0bc8654be73 100644
--- a/addons/procurement/i18n/id.po
+++ b/addons/procurement/i18n/id.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-21 09:53+0000\n"
+"PO-Revision-Date: 2011-03-22 06:13+0000\n"
 "Last-Translator: moelyana <Unknown>\n"
 "Language-Team: Indonesian <id@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-03-22 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:36+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: procurement
@@ -665,17 +665,19 @@ msgstr "Informasi Umum"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Jalankan Procurement"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "selesai"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
 msgstr ""
+"Kuantitas procurement  akan dengan dibulatkan ke atas  ke beberapa bagian "
+"ini."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -685,42 +687,42 @@ msgstr ""
 #: view:procurement.order.compute.all:0
 #: view:procurement.orderpoint.compute:0
 msgid "Cancel"
-msgstr ""
+msgstr "Batal"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Mode order kembali"
 
 #. module: procurement
 #: field:procurement.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Sumber berkas"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Tidak begitu penting"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Hitung semua penjadwalan"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "Saat Ini"
 
 #. module: procurement
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Procurement dalam pengecualian"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Details"
-msgstr ""
+msgstr "Rincian"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action5
@@ -728,7 +730,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:procurement.procurement_exceptions
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Pengadaan Pengecualian"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -748,7 +750,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Tanggal terjadwal"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -756,28 +758,28 @@ msgstr ""
 #: field:procurement.order,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary"
-msgstr ""
+msgstr "Sementara"
 
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
-msgstr ""
+msgstr "min"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Aturan Kuantitas"
 
 #. module: procurement
 #: selection:procurement.order,state:0
diff --git a/addons/product_manufacturer/i18n/gl.po b/addons/product_manufacturer/i18n/gl.po
new file mode 100644
index 00000000000..6405cc8a2ae
--- /dev/null
+++ b/addons/product_manufacturer/i18n/gl.po
@@ -0,0 +1,88 @@
+# Galician 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-03-22 18:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+"Un módulo que engade fabricantes e atributos no formulario de produto"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Código produto fabricante"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Nome do modelo de produto"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Atributos do produto"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Atributos do produto"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Atributo"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Valor"
+
+#. module: product_manufacturer
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Erro: Código EAN non válido"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Atributos"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Fabricantes e atributos dos produtos"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Nome produto fabricante"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Fabricante"
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index 2d63bea4f39..dfadb15541a 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: share

From 99f90b17a2459f08153af26963b10ce58c7bbb40 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 08:27:12 +0100
Subject: [PATCH 20/29] [FIX] split selection of a range of ids and activation
 of a single id into two methods, write some tests

bzr revid: xmo@openerp.com-20110323072712-10gohth1mxrgh6o1
---
 addons/base/static/openerp/js/base_views.js | 68 +++++++++++++++++----
 addons/base/static/openerp/js/tests.js      | 56 +++++++++++++++++
 2 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 7bd96b45d86..0b852138795 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -247,6 +247,10 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @returns itself
      */
     prev: function () {
+        this._active_id_index -= 1;
+        if (this._active_id_index < 0) {
+            this._active_id_index = this._active_ids.length - 1;
+        }
         return this;
     },
     /**
@@ -254,26 +258,68 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @returns itself
      */
     next: function () {
+        this._active_id_index += 1;
+        if (this._active_id_index >= this._active_ids.length) {
+            this._active_id_index = 0;
+        }
         return this;
     },
 
     /**
-     * Sets active_ids and/or active_id by value:
+     * Sets active_ids by value:
      *
-     * * If only <code>ids</code> is provided
-     *   - Activates all ids part of the current selection
-     *   - Sets active_id to be the first id of the selection
-     * * If only <code>id</code> is provided, activates this id (for both active_id and active_ids)
-     * * If both <code>id</code> and <code>ids</code> are provided
-     *   - Activates all ids part of the current selection
-     *   - If <code>id</code> is part of the active ids, activates it, otherwise see first option
+     * * Activates all ids part of the current selection
+     * * Sets active_id to be the first id of the selection
      *
-     * @param {Array} [ids] the list of ids to activate
-     * @param {Object} [id] the id to activate
+     * @param {Array} ids the list of ids to activate
+     * @returns itself
      */
-    select: function (ids, id) {
+    select: function (ids) {
         this._active_ids = ids;
+        this._active_id_index = 0;
         return this;
+    },
+    /**
+     * Fetches the ids of the currently selected records, if any.
+     */
+    get_active_ids: function () {
+        return this._active_ids;
+    },
+    /**
+     * Sets the current active_id by value
+     *
+     * If there are no active_ids selected, selects the provided id as the sole active_id
+     *
+     * If there are ids selected and the provided id is not in them, raise an error
+     *
+     * @param {Object} id the id to activate
+     * @returns itself
+     */
+    activate: function (id) {
+        if(!this._active_ids) {
+            this._active_ids = [id];
+            this._active_id_index = 0;
+        } else {
+            var index = _.indexOf(this._active_ids, id);
+            if (index == -1) {
+                throw new Error(
+                    "Could not find id " + id +
+                    " in array [" + this._active_ids.join(', ') + "]");
+            }
+            this._active_id_index = index;
+        }
+        return this;
+    },
+    /**
+     * Fetches the id of the current active record, if any.
+     *
+     * @returns record? record id or <code>null</code>
+     */
+    get_active_id: function () {
+        if (!this._active_ids) {
+            return null;
+        }
+        return this._active_ids[this._active_id_index];
     }
 });
 
diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index 86ae3e9f380..0b3bf5d6529 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -243,6 +243,62 @@ $(document).ready(function () {
         deepEqual([['foo', '=', 'bar']], dataset._domain);
     });
 
+    module('ids_activation', {
+        setup: function () {
+            var openerp = window.openerp.init();
+            dataset = new openerp.base.DataSet();
+        }
+    });
+    test('activate id', function () {
+        dataset.activate(1);
+        deepEqual(dataset.get_active_ids(), [1]);
+        equal(dataset.get_active_id(), 1);
+    });
+    test('set active_ids', function () {
+        dataset.select([1, 2, 3]);
+        deepEqual(dataset.get_active_ids(), [1, 2, 3],
+                "selecting an ids range");
+        equal(dataset.get_active_id(), 1);
+    });
+    test('activate incorrect id', function () {
+        dataset.select([1, 2, 3]);
+        raises(function () { dataset.activate(42); },
+               "Activating an id not present in the selection is an error");
+    });
+    test('reset active id on set active ids', function () {
+        dataset.select([1, 2, 3]).activate(3).select([1, 2, 3]);
+        equal(dataset.get_active_id(), 1,
+              "selecting an ids range resets the active id");
+    });
+
+    module('active_id_iteration', {
+        setup: function () {
+            var openerp = window.openerp.init();
+            dataset = new openerp.base.DataSet();
+            dataset.select([1, 2, 3]);
+        }
+    });
+    test('step forward', function () {
+        dataset.activate(1);
+        dataset.next();
+        equal(dataset.get_active_id(), 2);
+    });
+    test('wraparound forward', function () {
+        dataset.activate(3);
+        dataset.next();
+        equal(dataset.get_active_id(), 1);
+    });
+    test('step back', function () {
+        dataset.activate(3);
+        dataset.prev();
+        equal(dataset.get_active_id(), 2);
+    });
+    test('wraparound back', function () {
+        dataset.activate(1);
+        dataset.prev();
+        equal(dataset.get_active_id(), 3);
+    });
+
     module('active_ids', {
         setup: function () {
             openerp = window.openerp.init();

From 1284858cb181a7ea2cb76c0672bea51145a56b7b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 08:54:29 +0100
Subject: [PATCH 21/29] [ADD] get_active_id, use API functions more instead of
 internals in DataSet

bzr revid: xmo@openerp.com-20110323075429-ek9bvxs6vzoxcqlc
---
 addons/base/static/openerp/js/base_views.js | 11 +++++-
 addons/base/static/openerp/js/tests.js      | 40 ++++++++++++++++-----
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 0b852138795..e24b5835d44 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -183,7 +183,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      */
     active_ids: function () {
         this.rpc('/base/dataset/get', {
-            ids: this._active_ids
+            ids: this.get_active_ids()
         }, _.bind(function (records) {
             this.on_active_ids(_.map(
                 records, function (record) {
@@ -209,6 +209,15 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @returns itself
      */
     active_id: function () {
+        this.rpc('/base/dataset/get', {
+            ids: [this.get_active_id()]
+        }, _.bind(function (records) {
+            var record = records[0];
+            this.on_active_id(
+                record && new openerp.base.DataRecord(
+                        this.session, this._model,
+                        this._fields, record));
+        }, this));
         return this;
     },
     /**
diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index 0b3bf5d6529..596eb134031 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -299,23 +299,28 @@ $(document).ready(function () {
         equal(dataset.get_active_id(), 3);
     });
 
-    module('active_ids', {
-        setup: function () {
-            openerp = window.openerp.init();
-        }
-    });
-    asyncTest('Get pre-set active_ids', 6, function () {
-        var dataset = new openerp.base.DataSet({
+    var ResponseAssertSession = function (response_ids) {
+        return {
             rpc: function (url, params, on_success) {
                 equal(url, '/base/dataset/get');
-                deepEqual(params.ids, [1, 2, 3]);
+                deepEqual(params.ids, response_ids);
                 _.delay(on_success, 0, _.map(
                     params.ids, function (id) {
                         return {id: id, sequence: id, name: 'foo'+id};
                     }
                 ));
             }
-        });
+        };
+    };
+
+    module('active_ids', {
+        setup: function () {
+            openerp = window.openerp.init();
+        }
+    });
+    asyncTest('Get pre-set active_ids', 6, function () {
+        var dataset = new openerp.base.DataSet(
+            new ResponseAssertSession([1, 2, 3]));
         dataset.select([1, 2, 3]);
         dataset.on_active_ids.add(function (data_records) {
             equal(data_records.length, 3);
@@ -326,4 +331,21 @@ $(document).ready(function () {
         });
         dataset.active_ids();
     });
+
+    module('active_id', {
+        setup: function () {
+            openerp = window.openerp.init();
+        }
+    });
+    test('Get pre-set active_id', 3, function () {
+        var dataset = new openerp.base.DataSet(
+            new ResponseAssertSession([42]));
+        stop(500);
+        dataset.select([1, 2, 3, 42]).activate(42);
+        dataset.on_active_id.add(function (data_record) {
+            equal(data_record.values.id, 42);
+            start();
+        });
+        dataset.active_id();
+    });
 });

From 3d65a024d2cce9cd9dd8258a36f18bea7a4d8aea Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 09:34:41 +0100
Subject: [PATCH 22/29] [IMP] implement DataSet.find, rename .ids() to .fetch()
 (and the corresponding event), make list and form views use the new dataset
 API

bzr revid: xmo@openerp.com-20110323083441-ego3wphgpb94obrg
---
 addons/base/controllers/main.py             | 14 ++++--
 addons/base/static/openerp/base.xml         |  1 -
 addons/base/static/openerp/js/base_views.js | 54 ++++++++-------------
 addons/base/static/openerp/js/tests.js      | 16 +++---
 4 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 185f2d18bca..f976f809a44 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -170,11 +170,15 @@ class DataSet(openerpweb.Controller):
         return {'fields': req.session.model(model).fields_get()}
 
     @openerpweb.jsonrequest
-    def load(self, req, model, domain=[], fields=['id']):
-        m = req.session.model(model)
-        ids = m.search(domain)
-        values = m.read(ids, fields)
-        return {'ids': ids, 'values': values}
+    def find(self, request, model, fields=False, offset=0, limit=False,
+             domain=None, context=None, sort=None):
+        Model = request.session.model(model)
+        ids = Model.search(domain or [], offset or 0, limit or False,
+                           sort or False, context or False)
+        if fields and fields == ['id']:
+            # shortcut read if we only want the ids
+            return map(lambda id: {'id': id}, ids)
+        return Model.read(ids, fields or False)
 
 
 class DataRecord(openerpweb.Controller):
diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 40edce66c3e..c416d9cf093 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -348,7 +348,6 @@
         <input id="mode_list" type="button" value="ListView"/>
         <input id="mode_form" type="button" value="FormView"/>
     </div>
-    <div id="oe_action_dataset" style="display:none;"></div>
     <div id="oe_action_search" ></div>
     <div id="oe_action_list" ></div>
     <div id="oe_action_form" ></div>
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index e24b5835d44..de42b5470bb 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -44,7 +44,7 @@ openerp.base.Action =  openerp.base.Controller.extend({
     },
     do_action_window: function(action) {
         this.formview_id = false;
-        this.dataset = new openerp.base.DataSet(this.session, "oe_action_dataset", action.res_model);
+        this.dataset = new openerp.base.DataSet(this.session, action.res_model);
         this.dataset.start();
 
         // Locate first tree view
@@ -101,7 +101,7 @@ openerp.base.EmbbededView = openerp.base.Controller.extend({
 openerp.base.DataSet =  openerp.base.Controller.extend({
     init: function(session, model) {
         this._super(session);
-        this._model = model;
+        this.model = model;
 
         this._fields = null;
 
@@ -115,7 +115,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
     },
     start: function() {
         // TODO: fields_view_get fields selection?
-        this.rpc("/base/dataset/fields", {"model":this._model}, this.on_fields);
+        this.rpc("/base/dataset/fields", {"model":this.model}, this.on_fields);
     },
     on_fields: function(result) {
         this._fields = result._fields;
@@ -132,11 +132,11 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @param {Number} [limit=null] The maximum number of records to return
      * @returns itself
      */
-    ids: function (offset, limit) {
+    fetch: function (offset, limit) {
         offset = offset || 0;
         limit = limit || null;
         this.rpc('/base/dataset/find', {
-            model: this._model,
+            model: this.model,
             fields: this._fields,
             domain: this._domain,
             context: this._context,
@@ -147,11 +147,11 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
             var data_records = _.map(
                 records, function (record) {
                     return new openerp.base.DataRecord(
-                        this.session, this._model,
+                        this.session, this.model,
                         this._fields, record);
                 }, this);
 
-            this.on_ids(data_records, {
+            this.on_fetch(data_records, {
                 offset: offset,
                 limit: limit,
                 domain: this._domain,
@@ -174,7 +174,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * @param {Object} event.context the context set on the DataSet before DataSet#ids was called
      * @param {Array} event.sort the sorting criteria used to get the ids
      */
-    on_ids: function (records, event) { },
+    on_fetch: function (records, event) { },
 
     /**
      * Fetch all the currently active records for this DataSet (records selected via DataSet#select)
@@ -188,7 +188,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
             this.on_active_ids(_.map(
                 records, function (record) {
                     return new openerp.base.DataRecord(
-                        this.session, this._model,
+                        this.session, this.model,
                         this._fields, record);
                 }, this));
         }, this));
@@ -215,7 +215,7 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
             var record = records[0];
             this.on_active_id(
                 record && new openerp.base.DataRecord(
-                        this.session, this._model,
+                        this.session, this.model,
                         this._fields, record));
         }, this));
         return this;
@@ -398,7 +398,7 @@ openerp.base.SearchView = openerp.base.Controller.extend({
         // collect all non disabled domains definitions, AND them
         // evaluate as python expression
         // save the result in this.domain
-        this.dataset.do_load();
+        this.dataset.fetch();
     },
     on_clear: function() {
     }
@@ -422,7 +422,6 @@ openerp.base.FormView =  openerp.base.Controller.extend({
     init: function(session, element_id, dataset, view_id) {
         this._super(session, element_id);
         this.dataset = dataset;
-        this.dataset_index = 0;
         this.model = dataset.model;
         this.view_id = view_id;
         this.fields_views = {};
@@ -447,22 +446,11 @@ openerp.base.FormView =  openerp.base.Controller.extend({
         }
         // bind to all wdigets that have onchange ??
 
-        // When the dataset is loaded load the first record (like gtk)
-        this.dataset.on_loaded.add_last(this.do_load_record);
-
-        // When a datarecord is loaded display the values in the inputs
-        this.datarecord = new openerp.base.DataRecord(this.session, this.model,{});
-        this.datarecord.on_loaded.add_last(this.on_record_loaded);
-
+        this.dataset.on_fetch.add(this.on_record_loaded);
     },
-    do_load_record: function() {
-        // if dataset is empty display the empty datarecord
-        if(this.dataset.ids.length == 0) {
-            this.on_record_loaded();
-        }
-        this.datarecord.load(this.dataset.ids[this.dataset_index]);
-    },
-    on_record_loaded: function() {
+    on_record_loaded: function(records) {
+        this.datarecord = records[0];
+        console.log('record', this.datarecord);
         for (var f in this.fields) {
             this.fields[f].set_value(this.datarecord.values[f]);
         }
@@ -508,20 +496,18 @@ openerp.base.ListView = openerp.base.Controller.extend({
                 this.colmodel.push({ name: col.attrs.name, index: col.attrs.name });
             }
         }
-        //this.log(this.cols);
         this.dataset.fields = this.cols;
-        this.dataset.on_loaded.add_last(this.do_fill_table);
+        this.dataset.on_fetch.add(this.do_fill_table);
     },
-    do_fill_table: function() {
-        //this.log("do_fill_table");
+    do_fill_table: function(records) {
+        this.log("do_fill_table");
         
         var self = this;
         //this.log(this.dataset.data);
         var rows = [];
-        var ids = this.dataset.ids;
-        for(var i = 0; i < ids.length; i++)  {
+        for(var i = 0; i < records.length; i++)  {
             // TODO very strange is sometimes non existing ? even as admin ? example ir.ui.menu
-            var row = this.dataset.values[ids[i]];
+            var row = records[i].values;
             if(row)
                 rows.push(row);
 //            else
diff --git a/addons/base/static/openerp/js/tests.js b/addons/base/static/openerp/js/tests.js
index 596eb134031..39c8f213fe6 100644
--- a/addons/base/static/openerp/js/tests.js
+++ b/addons/base/static/openerp/js/tests.js
@@ -158,7 +158,7 @@ $(document).ready(function () {
     asyncTest("Baseline event attributes", 6, function () {
         var dataset = new openerp.base.DataSet(
                 new Session());
-        dataset.on_ids.add(function (records, event) {
+        dataset.on_fetch.add(function (records, event) {
             deepEqual(records, [], 'No records returned');
             equal(event.offset, 0, 'No offset set in call');
             equal(event.limit, null, 'No limit set in call');
@@ -167,17 +167,17 @@ $(document).ready(function () {
             deepEqual(event.sort, [], 'The dataset is not sorted');
             start();
         });
-        dataset.ids();
+        dataset.fetch();
     });
     asyncTest("Offset and limit", 2, function () {
         var dataset = new openerp.base.DataSet(
                 new Session());
-        dataset.on_ids.add(function (records, event) {
+        dataset.on_fetch.add(function (records, event) {
             equal(event.offset, 20);
             equal(event.limit, 42);
             start();
         });
-        dataset.ids(20, 42);
+        dataset.fetch(20, 42);
     });
     asyncTest("Domain and context propagation", 3, function () {
         var dataset = new openerp.base.DataSet(
@@ -185,7 +185,7 @@ $(document).ready(function () {
         var domain_value = [['foo', '=', 'bar']];
         var context_value= {active_id:3, active_ids:42};
         var sort_value = ['foo'];
-        dataset.on_ids.add(function (records, event) {
+        dataset.on_fetch.add(function (records, event) {
             deepEqual(event.domain, domain_value);
             deepEqual(event.context, context_value);
             deepEqual(event.sort, sort_value);
@@ -196,7 +196,7 @@ $(document).ready(function () {
             context: context_value,
             sort: sort_value
         });
-        dataset.ids();
+        dataset.fetch();
     });
     asyncTest("Data records", function () {
         var dataset = new openerp.base.DataSet({
@@ -208,7 +208,7 @@ $(document).ready(function () {
                 ]);
             }
         });
-        dataset.on_ids.add(function (records) {
+        dataset.on_fetch.add(function (records) {
             equal(records.length, 2, "I loaded two virtual records");
             var d1 = records[0],
                 d2 = records[1];
@@ -216,7 +216,7 @@ $(document).ready(function () {
             ok(d2 instanceof openerp.base.DataRecord);
             start();
         });
-        dataset.ids();
+        dataset.fetch();
     });
 
     var dataset;

From 2594a8cad652f71c62a2e5cbe260fb57f5fe1ed1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 10:08:01 +0100
Subject: [PATCH 23/29] [ADD] tests for DataSet.(do_)find

bzr revid: xmo@openerp.com-20110323090801-vx75gc5vk0hx71og
---
 addons/base/controllers/main.py             |  4 +++
 addons/base/static/openerp/js/base_views.js |  1 -
 addons/base/tests/test_dataset.py           | 37 +++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 addons/base/tests/test_dataset.py

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index f976f809a44..f5eda8020c5 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -172,6 +172,10 @@ class DataSet(openerpweb.Controller):
     @openerpweb.jsonrequest
     def find(self, request, model, fields=False, offset=0, limit=False,
              domain=None, context=None, sort=None):
+        return self.do_find(request, model, fields, offset, limit,
+                     domain, context, sort)
+    def do_find(self, request, model, fields=False, offset=0, limit=False,
+             domain=None, context=None, sort=None):
         Model = request.session.model(model)
         ids = Model.search(domain or [], offset or 0, limit or False,
                            sort or False, context or False)
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index de42b5470bb..e2876333868 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -450,7 +450,6 @@ openerp.base.FormView =  openerp.base.Controller.extend({
     },
     on_record_loaded: function(records) {
         this.datarecord = records[0];
-        console.log('record', this.datarecord);
         for (var f in this.fields) {
             this.fields[f].set_value(this.datarecord.values[f]);
         }
diff --git a/addons/base/tests/test_dataset.py b/addons/base/tests/test_dataset.py
new file mode 100644
index 00000000000..c0cd8d7a465
--- /dev/null
+++ b/addons/base/tests/test_dataset.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+import mock
+import unittest2
+import base.controllers.main
+
+class TestDataSetController(unittest2.TestCase):
+    def setUp(self):
+        self.dataset = base.controllers.main.DataSet()
+        self.request = mock.Mock()
+        self.read = self.request.session.model().read
+        self.search = self.request.session.model().search
+
+    def test_empty_find(self):
+        self.search.return_value = []
+        self.read.return_value = []
+
+        self.assertFalse(self.dataset.do_find(self.request, 'fake.model'))
+        self.read.assert_called_once_with([], False)
+
+    def test_regular_find(self):
+        self.search.return_value = [1, 2, 3]
+
+        self.dataset.do_find(self.request, 'fake.model')
+        self.read.assert_called_once_with([1, 2, 3], False)
+
+    def test_ids_shortcut(self):
+        self.search.return_value = [1, 2, 3]
+        self.read.return_value = [
+            {'id': 1, 'name': 'foo'},
+            {'id': 2, 'name': 'bar'},
+            {'id': 3, 'name': 'qux'}
+        ]
+
+        self.assertEqual(
+            self.dataset.do_find(self.request, 'fake.model', ['id']),
+            [{'id': 1}, {'id': 2}, {'id': 3}])
+        self.assertFalse(self.read.called)

From 65c8aaf78b7e4cabbd3c2888c9e09e30297c748d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 11:50:31 +0100
Subject: [PATCH 24/29] [ADD] some doc for the dataset

bzr revid: xmo@openerp.com-20110323105031-9j2s5d2g8kxwf9wu
---
 addons/base/static/openerp/js/base_views.js |  10 +-
 doc/source/addons.rst                       | 178 +++++++++++++++++++-
 2 files changed, 181 insertions(+), 7 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index e2876333868..f86be31c89a 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -167,11 +167,11 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      * Fires after the DataSet fetched the records matching its internal ids selection
      * 
      * @param {Array} records An array of the DataRecord fetched
-     * @param event The on_ids event object
-     * @param {Number} event.offset the offset with which the original DataSet#ids call was performed
-     * @param {Number} event.limit the limit set on the original DataSet#ids call
-     * @param {Array} event.domain the domain set on the DataSet before DataSet#ids was called
-     * @param {Object} event.context the context set on the DataSet before DataSet#ids was called
+     * @param event The on_fetch event object
+     * @param {Number} event.offset the offset with which the original DataSet#fetch call was performed
+     * @param {Number} event.limit the limit set on the original DataSet#fetch call
+     * @param {Array} event.domain the domain set on the DataSet before DataSet#fetch was called
+     * @param {Object} event.context the context set on the DataSet before DataSet#fetch was called
      * @param {Array} event.sort the sorting criteria used to get the ids
      */
     on_fetch: function (records, event) { },
diff --git a/doc/source/addons.rst b/doc/source/addons.rst
index cb9864b28d2..71bfe9ceb37 100644
--- a/doc/source/addons.rst
+++ b/doc/source/addons.rst
@@ -97,9 +97,183 @@ Javascript
     :param openerp.base.Controller view: The view to which the widget belongs
     :param Object node: the ``fields_view_get`` descriptor for the widget
 
-.. js:attribute:: openerp.base.Widget.$element
+    .. js:attribute:: $element
 
-    The widget's root element as jQuery object
+        The widget's root element as jQuery object
+
+.. js:class:: openerp.base.DataSet(session, model)
+
+    :param openerp.base.Session session: the RPC session object
+    :param String model: the model managed by this dataset
+
+    The DataSet is the abstraction for a sequence of records stored in
+    database.
+
+    It provides interfaces for reading records based on search
+    criteria, and for selecting and fetching records based on
+    activated ids.
+
+    .. js:function:: fetch([offset][, limit])
+
+       :param Number offset: the index from which records should start
+                             being returned (section)
+       :param Number limit: the maximum number of records to return
+       :returns: the dataset instance it was called on
+
+       Asynchronously fetches the records selected by the DataSet's
+       domain and context, in the provided sort order if any.
+
+       Only fetches the fields selected by the DataSet.
+
+       On success, triggers :js:func:`on_fetch`
+
+    .. js:function:: on_fetch(records, event)
+
+        :param Array records: an array of
+                             :js:class:`openerp.base.DataRecord`
+                             matching the DataSet's selection
+        :param event: a data holder letting the event handler fetch
+                     meta-informations about the event.
+        :type event: OnFetchEvent
+
+        Fired after :js:func:`fetch` is done fetching the records
+        selected by the DataSet.
+
+    .. js:function:: active_ids
+
+        :returns: the dataset instance it was called on
+
+        Asynchronously fetches the active records for this DataSet.
+
+        On success, triggers :js:func:`on_active_ids`
+
+    .. js:function:: on_active_ids(records)
+
+        :param Array records: an array of
+                              :js:class:`openerp.base.DataRecord`
+                              matching the currently active ids
+
+        Fired after :js:func:`active_ids` fetched the records matching
+        the DataSet's active ids.
+
+    .. js:function:: active_id
+
+        :returns: the dataset instance in was called on
+
+        Asynchronously fetches the current active record.
+
+        On success, triggers :js:func:`on_active_id`
+
+    .. js:function:: on_active_id(record)
+
+        :param Object record: the record fetched by
+                              :js:func:`active_id`, or ``null``
+        :type record: openerp.base.DataRecord
+
+        Fired after :js:func:`active_id` fetched the record matching
+        the dataset's active id
+
+    .. js:function:: set(options)
+
+        :param Object options: the options to set on the dataset
+        :type options: DataSetOptions
+        :returns: the dataset instance it was called on
+
+        Configures the data set by setting various properties on it
+
+    .. js:function:: prev
+
+        :returns: the dataset instance it was called on
+
+        Activates the id preceding the current one in the active ids
+        sequence of the dataset.
+
+        If the current active id is at the start of the sequence,
+        wraps back to the last id of the sequence.
+
+    .. js:function:: next
+
+        :returns: the dataset instance it was called on
+
+        Activates the id following the current one in the active ids
+        sequence.
+
+        If the current active id is the last of the sequence, wraps
+        back to the beginning of the active ids sequence.
+
+    .. js:function:: select(ids)
+
+        :param Array ids: the identifiers to activate on the dataset
+        :returns: the dataset instance it was called on
+
+        Activates all the ids specified in the dataset, resets the
+        current active id to be the first id of the new sequence.
+
+        The internal order will be the same as the ids list provided.
+
+    .. js:function:: get_active_ids
+
+        :returns: the list of current active ids for the dataset
+
+    .. js:function:: activate(id)
+
+        :param Number id: the id to activate
+        :returns: the dataset instance it was called on
+
+        Activates the id provided in the dataset. If no ids are
+        selected, selects the id in the dataset.
+
+        If ids are already selected and the provided id is not in that
+        selection, raises an error.
+
+    .. js:function:: get_active_id
+
+        :returns: the dataset's current active id
+
+.. js:class:: openerp.base.DataRecord(session, model, fields, values)
+
+Ad-hoc objects and structural types
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These objects are not associated with any specific class, they're
+generally literal objects created on the spot. Names are merely
+convenient ways to refer to them and their properties.
+
+.. js:class:: OnFetchEvent
+
+    .. js:attribute:: context
+
+        The context used for the :js:func:`fetch` call (domain set on
+        the :js:class:`openerp.base.DataSet` when ``fetch`` was
+        called)
+
+    .. js:attribute:: domain
+
+        The domain used for the :js:func:`fetch` call
+
+    .. js:attribute:: limit
+
+        The limit with which the original :js:func:`fetch` call was
+        performed
+
+    .. js:attribute:: offset
+
+        The offset with which the original :js:func:`fetch` call was
+        performed
+
+    .. js:attribute:: sort
+
+       The sorting criteria active on the
+       :js:class:`openerp.base.DataSet` when :js:func:`fetch` was
+       called
+
+.. js:class:: DataSetOptions
+
+    .. js:attribute:: context
+
+    .. js:attribute:: domain
+
+    .. js:attribute:: sort
 
 * Addons lifecycle (loading, execution, events, ...)
 

From 801fae18ca92eecd9f6febcc15ec4f3ee0887cc4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 13:08:06 +0100
Subject: [PATCH 25/29] [ADD] implement forgotten DataSet.get RPC method, test
 it a bit

bzr revid: xmo@openerp.com-20110323120806-uhas8xvxnpsa1dm2
---
 addons/base/controllers/main.py             | 27 ++++++++++++++
 addons/base/static/openerp/js/base_views.js |  6 ++--
 addons/base/tests/test_dataset.py           | 39 +++++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index f5eda8020c5..723b0ae39dc 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -176,6 +176,9 @@ class DataSet(openerpweb.Controller):
                      domain, context, sort)
     def do_find(self, request, model, fields=False, offset=0, limit=False,
              domain=None, context=None, sort=None):
+        """ Performs a search() followed by a read() (if needed) using the
+        provided search criteria, only   
+        """
         Model = request.session.model(model)
         ids = Model.search(domain or [], offset or 0, limit or False,
                            sort or False, context or False)
@@ -184,6 +187,30 @@ class DataSet(openerpweb.Controller):
             return map(lambda id: {'id': id}, ids)
         return Model.read(ids, fields or False)
 
+    @openerpweb.jsonrequest
+    def get(self, request, model, ids):
+        self.do_get(request, model, ids)
+
+    def do_get(self, request, model, ids):
+        """ Fetches and returns the records of the model ``model`` whose ids
+        are in ``ids``.
+
+        The results are in the same order as the inputs, but elements may be
+        missing (if there is no record left for the id)
+
+        :param request: the JSON-RPC2 request object
+        :type request: openerpweb.JsonRequest
+        :param model: the model to read from
+        :type model: str
+        :param ids: a list of identifiers
+        :type ids: list
+        """
+        Model = request.session.model(model)
+        records = Model.read(ids)
+
+        record_map = dict((record['id'], record) for record in records)
+
+        return [record_map[id] for id in ids if record_map.get(id)]
 
 class DataRecord(openerpweb.Controller):
     _cp_path = "/base/datarecord"
diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index f86be31c89a..004d57fd13b 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -183,7 +183,8 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      */
     active_ids: function () {
         this.rpc('/base/dataset/get', {
-            ids: this.get_active_ids()
+            ids: this.get_active_ids(),
+            model: this.model
         }, _.bind(function (records) {
             this.on_active_ids(_.map(
                 records, function (record) {
@@ -210,7 +211,8 @@ openerp.base.DataSet =  openerp.base.Controller.extend({
      */
     active_id: function () {
         this.rpc('/base/dataset/get', {
-            ids: [this.get_active_id()]
+            ids: [this.get_active_id()],
+            model: this.model
         }, _.bind(function (records) {
             var record = records[0];
             this.on_active_id(
diff --git a/addons/base/tests/test_dataset.py b/addons/base/tests/test_dataset.py
index c0cd8d7a465..80d1e52561b 100644
--- a/addons/base/tests/test_dataset.py
+++ b/addons/base/tests/test_dataset.py
@@ -35,3 +35,42 @@ class TestDataSetController(unittest2.TestCase):
             self.dataset.do_find(self.request, 'fake.model', ['id']),
             [{'id': 1}, {'id': 2}, {'id': 3}])
         self.assertFalse(self.read.called)
+
+    def test_get(self):
+        self.read.return_value = [
+            {'id': 1, 'name': 'baz'},
+            {'id': 3, 'name': 'foo'},
+            {'id': 2, 'name': 'bar'}
+        ]
+
+        result = self.dataset.do_get(
+            self.request, 'fake.model', [3, 2, 1])
+        self.read.assert_called_once_with(
+            [3, 2, 1])
+        self.assertFalse(self.search.called)
+
+        self.assertEqual(
+            result,
+            [
+                {'id': 3, 'name': 'foo'},
+                {'id': 2, 'name': 'bar'},
+                {'id': 1, 'name': 'baz'}
+            ]
+        )
+
+    def test_get_missing_result(self):
+        self.read.return_value = [
+            {'id': 1, 'name': 'baz'},
+            {'id': 2, 'name': 'bar'}
+        ]
+
+        result = self.dataset.do_get(
+            self.request, 'fake.model', [3, 2, 1])
+
+        self.assertEqual(
+            result,
+            [
+                {'id': 2, 'name': 'bar'},
+                {'id': 1, 'name': 'baz'}
+            ]
+        )

From 1d587145de0bfad76db50b5e2a96a659ad42e032 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 13:21:26 +0100
Subject: [PATCH 26/29] [IMP] fix docstrings on DataSet, insert into internal
 APIdoc (and fix documentation PYTHONPATH to generate this correctly)

bzr revid: xmo@openerp.com-20110323122126-3qj7vkhjsc6l0x5x
---
 addons/base/controllers/main.py | 23 ++++++++++++++++++++++-
 doc/source/conf.py              |  3 ++-
 doc/source/development.rst      |  9 +++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 723b0ae39dc..58dc837379e 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -177,7 +177,26 @@ class DataSet(openerpweb.Controller):
     def do_find(self, request, model, fields=False, offset=0, limit=False,
              domain=None, context=None, sort=None):
         """ Performs a search() followed by a read() (if needed) using the
-        provided search criteria, only   
+        provided search criteria
+
+        :param request: a JSON-RPC request object
+        :type request: openerpweb.JsonRequest
+        :param model: the name of the model to search on
+        :type model: str
+        :param fields: a list of the fields to return in the result records
+        :type fields: [str]
+        :param offset: from which index should the results start being returned
+        :type offset: int
+        :param limit: the maximum number of records to return
+        :type limit: int
+        :param domain: the search domain for the query
+        :type domain: list
+        :param context: the context in which the search should be executed
+        :type context: dict
+        :param sort: sorting directives
+        :type sort: list
+        :returns: a list of result records
+        :rtype: []
         """
         Model = request.session.model(model)
         ids = Model.search(domain or [], offset or 0, limit or False,
@@ -204,6 +223,8 @@ class DataSet(openerpweb.Controller):
         :type model: str
         :param ids: a list of identifiers
         :type ids: list
+        :returns: a list of records, in the same order as the list of ids
+        :rtype: list
         """
         Model = request.session.model(model)
         records = Model.read(ids)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index d3f486f19c5..13a490c5072 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -16,7 +16,8 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../../addons'))
+sys.path.insert(0, os.path.abspath('../..'))
 
 # -- General configuration -----------------------------------------------------
 
diff --git a/doc/source/development.rst b/doc/source/development.rst
index a2be0ec2eef..afc6040227d 100644
--- a/doc/source/development.rst
+++ b/doc/source/development.rst
@@ -8,6 +8,15 @@ Contributing to OpenERP Web
 * Style guide and coding conventions (PEP8? More)
 * Test frameworks in JS?
 
+Internal API Doc
+----------------
+
+Python
+++++++
+
+.. autoclass:: base.controllers.main.DataSet
+    :members:
+
 Testing
 -------
 

From c6aab663bc60d73fdb265b41370f84cf89e68f86 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Mar 2011 13:22:17 +0100
Subject: [PATCH 27/29] [FIX] rst rtype specification for a bare list is the
 constructor name

bzr revid: xmo@openerp.com-20110323122217-ehqru2nu2iq2jhvj
---
 addons/base/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 58dc837379e..11db3d3a5c2 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -196,7 +196,7 @@ class DataSet(openerpweb.Controller):
         :param sort: sorting directives
         :type sort: list
         :returns: a list of result records
-        :rtype: []
+        :rtype: list
         """
         Model = request.session.model(model)
         ids = Model.search(domain or [], offset or 0, limit or False,

From b507d2231faa93d18b30cd95e806b394c37fbb8f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 24 Mar 2011 02:08:14 +0100
Subject: [PATCH 28/29] loud thinking about viewmanager

bzr revid: al@openerp.com-20110324010814-n8hk09002jfq65eg
---
 addons/base/static/openerp/js/base_views.js | 58 +++++++++++++--------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js
index 004d57fd13b..b9ee746f081 100644
--- a/addons/base/static/openerp/js/base_views.js
+++ b/addons/base/static/openerp/js/base_views.js
@@ -4,6 +4,13 @@
 
 openerp.base$views = function(openerp) {
 
+// process all kind of actions
+openerp.base.ActionManager = openerp.base.Controller.extend({
+// This controller should be used for one2many also or not ?
+// to replace Action
+});
+
+// This will be ViewManager Abstract/Common
 openerp.base.Action =  openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
@@ -11,6 +18,10 @@ openerp.base.Action =  openerp.base.Controller.extend({
         this.dataset = null;
         this.searchview_id = false;
         this.searchview = null;
+        this.search_visible = true;
+
+        // this will be changed into
+        // this.views = { "list": { "view_id":1234, "controller": instance} }
         this.listview_id = false;
         this.listview = null;
         this.formview_id = false;
@@ -22,6 +33,7 @@ openerp.base.Action =  openerp.base.Controller.extend({
         this.$element.find("#mode_form").bind('click',this.on_mode_form);
         this.on_mode_list();
     },
+    // this will be changed into on_view_switch(kind_of_view)
     on_mode_list: function() {
         $("#oe_action_form").hide();
         $("#oe_action_search").show();
@@ -32,6 +44,7 @@ openerp.base.Action =  openerp.base.Controller.extend({
         $("#oe_action_search").hide();
         $("#oe_action_list").hide();
     },
+    // This will move to actionmanager
     do_action: function(action) {
         // instantiate the right controllers by understanding the action
         this.action = action;
@@ -42,11 +55,21 @@ openerp.base.Action =  openerp.base.Controller.extend({
             this.do_action_window(action);
         }
     },
+    // this will be renamed setup_view_manager_from_an_actwindow and will setup this.views
     do_action_window: function(action) {
-        this.formview_id = false;
+        // this will move into set_dataset()
         this.dataset = new openerp.base.DataSet(this.session, action.res_model);
         this.dataset.start();
 
+        this.searchview_id = false;
+        if(this.listview && action.search_view_id) {
+            this.searchview_id = action.search_view_id[0];
+        }
+        this.searchview = new openerp.base.SearchView(this.session, "oe_action_search", this.dataset, this.searchview_id);
+        this.searchview.start();
+
+        // Those two will be a foreach kind of view
+
         // Locate first tree view
         this.listview_id = false;
         for(var i = 0; i < action.views.length; i++)  {
@@ -59,7 +82,7 @@ openerp.base.Action =  openerp.base.Controller.extend({
         this.listview.start();
 
         // Locate first form view
-        this.listview_id = false;
+        this.formview_id = false;
         for(var j = 0; j < action.views.length; j++)  {
             if(action.views[j][1] == "form") {
                 this.formview_id = action.views[j][0];
@@ -69,29 +92,22 @@ openerp.base.Action =  openerp.base.Controller.extend({
         this.formview = new openerp.base.FormView(this.session, "oe_action_form", this.dataset, this.formview_id);
         this.formview.start();
 
-        // Take the only possible search view. Is that consistent ?
-        this.searchview_id = false;
-        if(this.listview && action.search_view_id) {
-            this.searchview_id = action.search_view_id[0];
-        }
-        this.searchview = new openerp.base.SearchView(this.session, "oe_action_search", this.dataset, this.searchview_id);
-        this.searchview.start();
-    }
+    },
+    // create when root, also add to parent when o2m
+    on_create: function() {
+    },
+    on_remove: function() {
+    },
+    on_edit: function() {
+    },
 });
 
-openerp.base.View = openerp.base.Controller.extend({
-// This controller should be used for one2many also or not ?
-// to replace Action
+// Extends view manager
+openerp.base.ViewManagerRoot = openerp.base.Controller.extend({
 });
 
-openerp.base.ActionView = openerp.base.Controller.extend({
-// This controller should be used for one2many also or not ?
-// to replace Action
-});
-
-openerp.base.EmbbededView = openerp.base.Controller.extend({
-// This controller should be used for one2many also or not ?
-// to replace Action
+// Extends view manager
+openerp.base.ViewManagerUsedAsAMany2One = openerp.base.Controller.extend({
 });
 
 /**

From b5d02ab327b7ed3dc88ccd75be88587556c820b0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 24 Mar 2011 04:49:23 +0000
Subject: [PATCH 29/29] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110324044923-41vu5q9ctj3nry8j
---
 bin/addons/base/i18n/ro.po | 39 +++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/bin/addons/base/i18n/ro.po b/bin/addons/base/i18n/ro.po
index 2254ebce308..467f8fe56fd 100644
--- a/bin/addons/base/i18n/ro.po
+++ b/bin/addons/base/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-17 12:20+0000\n"
+"PO-Revision-Date: 2011-03-23 16:38+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:49+0000\n"
 "X-Generator: Launchpad (build 12559)\n"
 
 #. module: base
@@ -58,7 +58,7 @@ msgstr "Metadate"
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr "Alcatuirea afisarii"
+msgstr "Alcatuirea afișării"
 
 #. module: base
 #: field:base.language.import,code:0
@@ -1408,7 +1408,7 @@ msgstr "Calea completă"
 #. module: base
 #: view:res.request:0
 msgid "References"
-msgstr "Referinta"
+msgstr "Referințe"
 
 #. module: base
 #: view:res.lang:0
@@ -2311,7 +2311,7 @@ msgstr ""
 #. module: base
 #: field:ir.default,ref_id:0
 msgid "ID Ref."
-msgstr "Referinta ID"
+msgstr "Referința ID"
 
 #. module: base
 #: model:ir.actions.server,name:base.action_start_configurator
@@ -2776,7 +2776,7 @@ msgid ""
 "If the selected language is loaded in the system, all documents related to "
 "this partner will be printed in this language. If not, it will be english."
 msgstr ""
-"Dacă limba selectata este încărcată în sistem, toate documentele legate de "
+"Dacă limba selectată este încărcată în sistem, toate documentele legate de "
 "acest partener vor fi tipărite în această limbă. Dacă nu, limba folosita va "
 "fi engleză."
 
@@ -3295,7 +3295,7 @@ msgstr "Ucraineană / українська"
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translation Terms"
-msgstr ""
+msgstr "Traducere termeni"
 
 #. module: base
 #: model:res.country,name:base.sn
@@ -3599,7 +3599,7 @@ msgstr ""
 #: field:workflow,name:0
 #: field:workflow.activity,name:0
 msgid "Name"
-msgstr "Nume raport-XML"
+msgstr "Nume"
 
 #. module: base
 #: help:ir.actions.act_window,multi:0
@@ -4377,6 +4377,7 @@ msgstr "Contract de mentenanţă"
 #: help:ir.actions.server,trigger_obj_id:0
 msgid "Select the object from the model on which the workflow will executed."
 msgstr ""
+"Selectați din cadrul modelului obiectul pentru care procesul va fi executat."
 
 #. module: base
 #: field:res.partner,employee:0
@@ -4386,7 +4387,7 @@ msgstr "Angajat"
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr ""
+msgstr "Acces creare"
 
 #. module: base
 #: field:res.partner.address,state_id:0
@@ -4675,7 +4676,7 @@ msgstr "Spaniolă (MX) / Español (MX)"
 #. module: base
 #: view:res.log:0
 msgid "My Logs"
-msgstr ""
+msgstr "Logul meu"
 
 #. module: base
 #: model:res.country,name:base.bt
@@ -5770,7 +5771,7 @@ msgstr "Nucleul OpenERP , necesar pentru toate instalarile."
 #: view:publisher_warranty.contract.wizard:0
 #: view:res.widget.wizard:0
 msgid "Cancel"
-msgstr "Anulare"
+msgstr "Renunță"
 
 #. module: base
 #: selection:base.language.export,format:0
@@ -6629,6 +6630,8 @@ msgid ""
 "Please be patient, this operation may take a few minutes (depending on the "
 "number of modules currently installed)..."
 msgstr ""
+"Vă rugăm să aveți răbdare, această operație poate dura câteva minute "
+"(depinzând de numărul de module instalate)..."
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -7457,7 +7460,7 @@ msgstr "Insulele Heard şi McDonald"
 #. module: base
 #: field:ir.actions.act_window,view_id:0
 msgid "View Ref."
-msgstr "Referinta view"
+msgstr "Referință view"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -7715,6 +7718,8 @@ msgid ""
 "Important when you deal with multiple actions, the execution order will be "
 "decided based on this, low number is higher priority."
 msgstr ""
+"Important când lucrați cu acțiuni multiple: ordinea de execuție este decisă "
+"de regula număr mic prioritate mare."
 
 #. module: base
 #: field:ir.actions.report.xml,header:0
@@ -7739,7 +7744,7 @@ msgstr "Croată / hrvatski jezik"
 #. module: base
 #: field:base.language.install,overwrite:0
 msgid "Overwrite Existing Terms"
-msgstr ""
+msgstr "Suprascrie termenii existenți"
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -8289,7 +8294,7 @@ msgstr "Acțiuni"
 #. module: base
 #: selection:res.request,priority:0
 msgid "High"
-msgstr ""
+msgstr "Ridicat"
 
 #. module: base
 #: field:ir.exports.line,export_id:0
@@ -8532,9 +8537,9 @@ msgid ""
 "Check this box if the partner is a supplier. If it's not checked, purchase "
 "people will not see it when encoding a purchase order."
 msgstr ""
-"Bifați aceasta căsuță dacă partenerul este un furnizor. dacă nu este bifata, "
-"personalul care se ocupa de aprovizionare nu îl vor vedea atunci când "
-"întocmesc un ordin de cumpărare."
+"Bifați această căsuță dacă partenerul este un furnizor. Dacă nu bifați, "
+"utilizatorul care se ocupa de aprovizionare nu îl va vedea atunci când "
+"întocmește o comandă de aprovizionare."
 
 #. module: base
 #: field:ir.model.fields,relation_field:0